changeset 281:1c7cde8a3a53

2003-10-4 Brian Masney <masneyb@gftp.org> * lib/protocols.c - fix for CRAY directory listings. Some UNIX directory listings with files containing spaces could be misinterpreted. * cvsclean - purge the m4 directory, but save the largefile.m4 file. (from Nathan Robertson <nathanr@nathanr.net>)
author masneyb
date Sat, 04 Oct 2003 14:45:38 +0000
parents f8b95f89dfb7
children e28086437451
files ChangeLog cvsclean lib/protocols.c
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Oct 03 20:35:55 2003 +0000
+++ b/ChangeLog	Sat Oct 04 14:45:38 2003 +0000
@@ -1,3 +1,10 @@
+2003-10-4 Brian Masney <masneyb@gftp.org>
+	* lib/protocols.c - fix for CRAY directory listings. Some UNIX directory
+	listings with files containing spaces could be misinterpreted.
+
+	* cvsclean - purge the m4 directory, but save the largefile.m4 file.
+	(from Nathan Robertson <nathanr@nathanr.net>)
+
 2003-10-03  Marcel Telka  <marcel@telka.sk>
 
 	* configure.in (ALL_LINGUAS): Added sk.
@@ -1537,7 +1544,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.144 2003/10/03 20:35:55 marcel Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.145 2003/10/04 14:45:38 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/cvsclean	Fri Oct 03 20:35:55 2003 +0000
+++ b/cvsclean	Sat Oct 04 14:45:38 2003 +0000
@@ -7,5 +7,5 @@
 find . -name ".#*" -exec rm -f {} \;
 rm -rf intl
 rm -rf autom4te.cache
-rm -f po/Makefile.in.in po/*.gmo po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin config.log config.cache config.status config.h gftp.spec stamp-h stamp-h.in ABOUT-NLS INSTALL config.guess config.rpath config.status config.sub configure install-sh missing mkinstalldirs build-stamp
-
+rm -f po/Makefile.in.in po/*.gmo po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin config.log config.cache config.status config.h gftp.spec stamp-h stamp-h.in ABOUT-NLS INSTALL config.guess config.rpath config.status config.sub configure install-sh missing mkinstalldirs aclocal.m4 config.h.in .gdb_history TAGS
+cd m4 && mv largefile.m4 largefile.4m && rm -f *.m4 && mv largefile.4m largefile.m4
--- a/lib/protocols.c	Fri Oct 03 20:35:55 2003 +0000
+++ b/lib/protocols.c	Sat Oct 04 14:45:38 2003 +0000
@@ -1100,7 +1100,7 @@
         *endpos = tmppos;
     }
 
-  return (mktime (&curtime));
+  return (ret);
 }
 
 
@@ -1277,7 +1277,7 @@
       startpos = goto_next_token (startpos);
     }
 
-  if (request->server_type != GFTP_DIRTYPE_CRAY)
+  if (request->server_type == GFTP_DIRTYPE_CRAY)
     {
       /* See if this is a Cray directory listing. It has the following format:
       drwx------     2 feiliu    g913     DK  common      4096 Sep 24  2001 wv */