# HG changeset patch
# User masneyb
# Date 1073477495 0
# Node ID 52c5ee1fa455be81e24b076982e23a399b991987
# Parent  28a50fb598ed0ceeb4a3001a732cac973b2851be
2003-1-7 Brian Masney <masneyb@gftp.org>

        * lib/protocols.c (parse_time) - insert the right year for files that
        are from last year and the year is not shown in the ls output.
	(from simon.munton@m5data.com)

diff -r 28a50fb598ed -r 52c5ee1fa455 ChangeLog
--- a/ChangeLog	Wed Jan 07 11:45:01 2004 +0000
+++ b/ChangeLog	Wed Jan 07 12:11:35 2004 +0000
@@ -1,3 +1,19 @@
+2003-1-7 Brian Masney <masneyb@gftp.org>
+	* lib/protocols.c (parse_time) - insert the right year for files that
+	are from last year and the year is not shown in the ls output.
+
+        * src/uicommon/gftpui.c (_gftpui_common_thread_callback)
+        src/uicommon/gftpui.h - added a retries variable to the cdata structure
+
+        * src/uicommon/gftpui.c (gftpui_common_cmd_open) src/uicommon/gftpui.c
+        - actually connect to the remote server
+
+        * src/uicommon/gftpuicallbacks.c src/uicommon/gftpui.c - in the
+        callback functions, don't change the return value
+
+        * src/text/textui.c (gftpui_generic_thread) - don't spawn a thread,
+        just call the function directly
+
 2003-1-6 Brian Masney <masneyb@gftp.org>
 	* lib/gftp.h lib/protocols.c lib/rfc959.c - added MVS directory parsing
 	support. Also, in the VMS and EPLF directory formats, update the
@@ -1959,7 +1975,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.198 2004/01/07 11:44:59 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.199 2004/01/07 12:11:34 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 28a50fb598ed -r 52c5ee1fa455 lib/protocols.c
--- a/lib/protocols.c	Wed Jan 07 11:45:01 2004 +0000
+++ b/lib/protocols.c	Wed Jan 07 12:11:35 2004 +0000
@@ -1172,7 +1172,11 @@
           tmppos = strptime (str, "%h %d %H:%M", &curtime);
           t = time (NULL);
           loctime = localtime (&t);
-          curtime.tm_year = loctime->tm_year;
+
+          if (curtime.tm_mon > loctime->tm_mon)
+            curtime.tm_year = loctime->tm_year - 1;
+          else
+            curtime.tm_year = loctime->tm_year;
         }
       else
         tmppos = strptime (str, "%h %d %Y", &curtime);