changeset 842:0d6fba16c7db

2006-11-2 Brian Masney <[e-mail]> * lib/gftp.h lib/protocols.c - added _do_convert_string(), which is the common code that was in gftp_string_to_utf8() and gftp_string_from_utf8().

--- a/ChangeLog	Fri Nov 03 01:36:01 2006 +0000
+++ b/ChangeLog	Fri Nov 03 02:01:16 2006 +0000
@@ -1,4 +1,8 @@
 2006-11-2 Brian Masney <[e-mail]>
+	* lib/gftp.h lib/protocols.c - added _do_convert_string(), which is
+	the common code that was in gftp_string_to_utf8() and
+	gftp_string_from_utf8(). 
+
 	* lib/local.c (local_chdir) - fixed double free of the utf8 variable.
 	This only occured in the CVS version.
 
@@ -3673,7 +3677,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.491 2006/11/03 01:36:00 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.492 2006/11/03 02:01:16 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 

--- a/lib/gftp.h	Fri Nov 03 01:36:01 2006 +0000
+++ b/lib/gftp.h	Fri Nov 03 02:01:16 2006 +0000
@@ -500,6 +500,7 @@
 #if GLIB_MAJOR_VERSION > 1
   GIConv iconv; 
   unsigned int iconv_initialized : 1;
+  char *iconv_charset;
 #endif
 };
 

--- a/lib/protocols.c	Fri Nov 03 01:36:01 2006 +0000
+++ b/lib/protocols.c	Fri Nov 03 02:01:16 2006 +0000
@@ -161,6 +161,8 @@
     {
       g_iconv_close (request->iconv);
       request->iconv_initialized = 0;
+      g_free (request->iconv_charset);
+      request->iconv_charset = NULL;
     }
 #endif
 
@@ -414,89 +416,134 @@
 _gftp_get_next_charset (char **curpos)
 {
   char *ret, *endpos;
+  size_t len, retlen;
 
   if (**curpos == '\0')
     return (NULL);
 
-  ret = *curpos;
+  for (; **curpos == ' ' || **curpos == '\t'; (*curpos)++);
+
   if ((endpos = strchr (*curpos, ',')) == NULL)
-    *curpos += strlen (*curpos);
+    len = strlen (*curpos);
+  else
+    len = endpos - *curpos + 1;
+
+  for (retlen = len - 1;
+       (*curpos)[retlen - 1] == ' ' || (*curpos)[retlen - 1] == '\t';
+       retlen--);
+
+  ret = g_malloc0 (retlen + 1);
+  memcpy (ret, *curpos, retlen);
+
+  for (*curpos += len; **curpos == ','; (*curpos)++);
+
+  return (ret);
+}
+
+
+static void
+_do_show_iconv_error (const char *str, char *charset, int from_utf8,
+                      GError * error)
+{
+  const char *fromset, *toset;
+
+  if (from_utf8)
+    {
+      fromset = "UTF-8";
+      toset = charset;
+    }
   else
     {
-      *endpos = '\0';
-      *curpos = endpos + 1;
+      fromset = charset;
+      toset = "UTF-8";
     }
 
-  return (ret);
+  printf (_("Error converting string '%s' from character set %s to character set %s: %s\n"),
+          str, fromset, toset, error->message);
 }
 
 
 /*@null@*/ char *
-gftp_string_to_utf8 (gftp_request * request, const char *str, size_t *dest_len)
+_do_convert_string (gftp_request * request, const char *str,
+                    size_t *dest_len, int from_utf8)
 {
-  char *ret, *remote_charsets, *stpos, *cur_charset, *tempstr;
-  GError * error = NULL;
+  char *remote_charsets, *ret, *fromset, *toset, *stpos, *cur_charset;
+  GError * error;
   gsize bread;
 
   if (request == NULL)
     return (NULL);
 
-  if (g_utf8_validate (str, -1, NULL))
+  if (g_utf8_validate (str, -1, NULL) != from_utf8)
     return (NULL);
-  else if (request->iconv_initialized)
+
+  error = NULL;
+  gftp_lookup_request_option (request, "remote_charsets", &remote_charsets);
+  if (*remote_charsets == '\0' || request->use_local_encoding)
     {
-      ret = g_convert_with_iconv (str, -1, request->iconv, &bread, dest_len, 
-                                  &error);
+      if (from_utf8)
+        ret = g_locale_from_utf8 (str, -1, &bread, dest_len, &error);
+      else
+        ret = g_locale_to_utf8 (str, -1, &bread, dest_len, &error);
+
       if (ret == NULL)
-        printf (_("Error converting string '%s' from character set %s to character set %s: %s\n"),
-                str, _("<unknown>"), "UTF-8", error->message);
+        _do_show_iconv_error (str, request->iconv_charset, from_utf8, error);
 
       return (ret);
     }
 
-  gftp_lookup_request_option (request, "remote_charsets", &tempstr);
-  if (*tempstr == '\0')
+  if (request->iconv_initialized)
     {
-      error = NULL;
-      if ((ret = g_locale_to_utf8 (str, -1, &bread, dest_len, &error)) != NULL)
-        return (ret);
-
-      /* Don't use request->logging_function since the strings must be in UTF-8
-         for the GTK+ 2.x port */
-      printf (_("Error converting string '%s' to UTF-8 from current locale: %s\n"),
-              str, error->message);
-      return (NULL);
+      ret = g_convert_with_iconv (str, -1, request->iconv, &bread, dest_len,
+                                  &error);
+      if (ret == NULL)
+        _do_show_iconv_error (str, request->iconv_charset, from_utf8, error);
+
+      return (ret);
     }
 
-  remote_charsets = g_strdup (tempstr);
-  ret = NULL;
   stpos = remote_charsets;
   while ((cur_charset = _gftp_get_next_charset (&stpos)) != NULL)
     {
-      if ((request->iconv = g_iconv_open ("UTF-8", cur_charset)) == (GIConv) -1)
-        continue;
+      if (from_utf8)
+        {
+          fromset = "UTF-8";
+          toset = cur_charset;
+        }
+      else
+        {
+          fromset = cur_charset;
+          toset = "UTF-8";
+        }
+
+      if ((request->iconv = g_iconv_open (toset, fromset)) == (GIConv) -1)
+        {
+          g_free (cur_charset);
+          continue;
+        }
 
       error = NULL;
       if ((ret = g_convert_with_iconv (str, -1, request->iconv, &bread,
                                        dest_len, &error)) == NULL)
         {
-          printf (_("Error converting string '%s' from character set %s to character set %s: %s\n"),
-                  str, cur_charset, "UTF-8", error->message);
-
           g_iconv_close (request->iconv);
           request->iconv = NULL;
-          continue;
+          _do_show_iconv_error (str, cur_charset, from_utf8, error);
+          g_free (cur_charset);
         }
-      else
-        {
-          request->iconv_initialized = 1;
-          break;
-        }
+
+      request->iconv_initialized = 1;
+      request->iconv_charset = cur_charset;
+      return (ret);
     }
 
-  g_free (remote_charsets);
-
-  return (ret);
+  return (NULL);
+}
+
+/*@null@*/ char *
+gftp_string_to_utf8 (gftp_request * request, const char *str, size_t *dest_len)
+{
+  return (_do_convert_string (request, str, dest_len, 0));
 }
 
 
@@ -504,74 +551,7 @@
 gftp_string_from_utf8 (gftp_request * request, const char *str,
                        size_t *dest_len)
 {
-  char *ret, *remote_charsets, *stpos, *cur_charset, *tempstr;
-  GError * error = NULL;
-  gsize bread;
-
-  if (request == NULL)
-    return (NULL);
-
-  /* FIXME - use request->use_local_encoding */
-
-  /* If the string isn't in UTF-8 format, assume it is already in the current
-     locale... */
-  if (!g_utf8_validate (str, -1, NULL))
-    return (NULL);
-  else if (request->iconv_initialized)
-    {
-      ret = g_convert_with_iconv (str, -1, request->iconv, &bread, dest_len, 
-                                  &error);
-      if (ret == NULL)
-        printf (_("Error converting string '%s' from character set %s to character set %s: %s\n"),
-                str, "UTF-8", _("<unknown>"), error->message);
-
-      return (ret);
-    }
-
-  gftp_lookup_request_option (request, "remote_charsets", &tempstr);
-  if (*tempstr == '\0')
-    {
-      error = NULL;
-      if ((ret = g_locale_from_utf8 (str, -1, &bread, dest_len,
-                                     &error)) != NULL)
-        return (ret);
-
-      /* Don't use request->logging_function since the strings must be in UTF-8
-         for the GTK+ 2.x port */
-      printf (_("Error converting string '%s' to current locale from UTF-8: %s\n"),
-              str, error->message);
-      return (NULL);
-    }
-
-  remote_charsets = g_strdup (tempstr);
-  ret = NULL;
-  stpos = remote_charsets;
-  while ((cur_charset = _gftp_get_next_charset (&stpos)) != NULL)
-    {
-      if ((request->iconv = g_iconv_open (cur_charset, "UTF-8")) == (GIConv) -1)
-        continue;
-
-      error = NULL;
-      if ((ret = g_convert_with_iconv (str, -1, request->iconv, &bread,
-                                       dest_len, &error)) == NULL)
-        {
-          printf (_("Error converting string '%s' from character set %s to character set %s: %s\n"),
-                  str, "UTF-8", cur_charset, error->message);
-
-          g_iconv_close (request->iconv);
-          request->iconv = NULL;
-          continue;
-        }
-      else
-        {
-          request->iconv_initialized = 1;
-          break;
-        }
-    }
-
-  g_free (remote_charsets);
-
-  return (ret);
+  return (_do_convert_string (request, str, dest_len, 1));
 }
 
 #else