changeset 427:3a83011227bc

2004-3-17 Brian Masney <masneyb@gftp.org> * lib/rfc2068.c (parse_html_line) - fix for parsing file sizes
author masneyb
date Wed, 17 Mar 2004 11:59:27 +0000
parents c5d14dca70c3
children f882d8e205c5
files ChangeLog lib/rfc2068.c
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Mar 16 14:50:10 2004 +0000
+++ b/ChangeLog	Wed Mar 17 11:59:27 2004 +0000
@@ -1,3 +1,11 @@
+2004-3-17 Brian Masney <masneyb@gftp.org>
+	* lib/rfc2068.c (parse_html_line) - fix for parsing file sizes
+
+	* ChangeLog-old - updated with summary of changes since 2.0.16
+
+	* docs/website/index.html.in - updated the list of translations
+	available
+
 2004-3-16 Brian Masney <masneyb@gftp.org>
 	* lib/ftpcommon.h lib/gftp.h lib/rfc959.c src/uicommon/gftpui.c -
 	fixes so that FXP transfers work again
@@ -2286,7 +2294,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.234 2004/03/16 14:50:06 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.235 2004/03/17 11:59:25 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/lib/rfc2068.c	Tue Mar 16 14:50:10 2004 +0000
+++ b/lib/rfc2068.c	Wed Mar 17 11:59:27 2004 +0000
@@ -570,11 +570,8 @@
 
   kpos = strchr (pos, 'k');
   mpos = strchr (pos, 'M');
-  if (kpos == NULL)
-    stpos = mpos;
-  else if (mpos == NULL)
-    stpos = kpos;
-  else if (kpos < stpos)
+
+  if (kpos != NULL && (mpos == NULL || (kpos < mpos)))
     stpos = kpos;
   else
     stpos = mpos;