diff lib/rfc959.c @ 845:8263cc35c027

2006-11-2 Brian Masney <masneyb@gftp.org> * lib/gftp.h lib/local.c lib/misc.c lib/protocols.c lib/rfc959.c lib/sshv2.c - added gftp_filename_to_utf8() and gftp_filename_from_utf8(). (gftp_string_from_utf8) - added argument that will force the local encoding to be used.
author masneyb
date Fri, 03 Nov 2006 03:02:51 +0000
parents 57aad6d4b304
children 14858879916f
line wrap: on
line diff
--- a/lib/rfc959.c	Fri Nov 03 02:37:09 2006 +0000
+++ b/lib/rfc959.c	Fri Nov 03 03:02:51 2006 +0000
@@ -203,7 +203,7 @@
 
   if (argument != NULL)
     {
-      utf8 = gftp_string_from_utf8 (request, argument, &destlen);
+      utf8 = gftp_filename_from_utf8 (request, argument, &destlen);
       if (utf8 != NULL)
         {
           tempstr = g_strconcat (command, " ", utf8, "\r\n", NULL);
@@ -320,7 +320,7 @@
         }
       else
         {
-          utf8 = gftp_string_from_utf8 (request, newval, &destlen);
+          utf8 = gftp_string_from_utf8 (request, -1, newval, &destlen);
           if (utf8 != NULL)
             len += strlen (utf8);
           else
@@ -391,7 +391,7 @@
   if (request->directory)
     g_free (request->directory);
 
-  utf8 = gftp_string_to_utf8 (request, dir, &destlen);
+  utf8 = gftp_filename_to_utf8 (request, dir, &destlen);
   if (utf8 != NULL)
     request->directory = utf8;
   else
@@ -1727,7 +1727,7 @@
   g_return_val_if_fail (file != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
-  utf8 = gftp_string_from_utf8 (request, file, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, file, &destlen);
   if (utf8 != NULL)
     {
       tempstr = g_strdup_printf ("SITE CHMOD %o %s\r\n", mode, utf8);
@@ -1759,7 +1759,7 @@
   g_return_val_if_fail (command != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
-  utf8 = gftp_string_from_utf8 (request, command, &destlen);
+  utf8 = gftp_string_from_utf8 (request, -1, command, &destlen);
   if (utf8 != NULL)
     {
       if (specify_site)