# HG changeset patch
# User masneyb
# Date 1178277910 0
# Node ID c127065adc0623dbecd9e4ce9a8bb672f5aa1061
# Parent  b099517df21a1a6918be8a3bb88d4de761b3ea46
2007-5-4 Brian Masney <masneyb@gftp.org>

        * lib/protocols.c (_gftp_get_next_charset) - fixed problem when multiple
        character sets are specified in the remote_charsets variable.
        (from Shixin Zeng) (partially closes #156371)

diff -r b099517df21a -r c127065adc06 ChangeLog
--- a/ChangeLog	Fri May 04 11:22:45 2007 +0000
+++ b/ChangeLog	Fri May 04 11:25:10 2007 +0000
@@ -1,4 +1,8 @@
 2007-5-4 Brian Masney <masneyb@gftp.org>
+	* lib/protocols.c (_gftp_get_next_charset) - fixed problem when multiple
+	character sets are specified in the remote_charsets variable.
+	(from Shixin Zeng) (partially closes #156371)
+
 	* lib/protocols.c (_do_convert_string) - added two missing continue
 	statements. This fixes a problem converting the string to a different
 	character set. (from Shixin Zeng) (partially closes #156371)
diff -r b099517df21a -r c127065adc06 lib/protocols.c
--- a/lib/protocols.c	Fri May 04 11:22:45 2007 +0000
+++ b/lib/protocols.c	Fri May 04 11:25:10 2007 +0000
@@ -433,9 +433,9 @@
   for (; **curpos == ' ' || **curpos == '\t'; (*curpos)++);
 
   if ((endpos = strchr (*curpos, ',')) == NULL)
-    len = strlen (*curpos);
+    len = strlen (*curpos) - 1; /* the trailing ',' should be omitted */
   else
-    len = endpos - *curpos + 1;
+    len = endpos - *curpos;
 
   for (retlen = len - 1;
        (*curpos)[retlen - 1] == ' ' || (*curpos)[retlen - 1] == '\t';