diff lib/local.c @ 845:8263cc35c027

2006-11-2 Brian Masney <[e-mail]> * 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.

--- a/lib/local.c	Fri Nov 03 02:37:09 2006 +0000
+++ b/lib/local.c	Fri Nov 03 03:02:51 2006 +0000
@@ -69,7 +69,7 @@
       return (GFTP_ERETRYABLE);
     }
 
-  utf8 = gftp_string_to_utf8 (request, tempstr, &destlen);
+  utf8 = gftp_filename_to_utf8 (request, tempstr, &destlen);
   if (utf8 != NULL)
     request->directory = utf8;
   else
@@ -90,7 +90,7 @@
   g_return_val_if_fail (request->protonum == GFTP_LOCAL_NUM, GFTP_EFATAL);
   g_return_val_if_fail (directory != NULL, GFTP_EFATAL);
 
-  utf8 = gftp_string_from_utf8 (request, directory, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, directory, &destlen);
   if (utf8 != NULL)
     {
       ret = chdir (utf8);
@@ -168,7 +168,7 @@
       flags |= O_LARGEFILE;
 #endif
 
-      utf8 = gftp_string_from_utf8 (request, filename, &destlen);
+      utf8 = gftp_filename_from_utf8 (request, filename, &destlen);
       if (utf8 != NULL)
         {
           request->datafd = gftp_fd_open (request, utf8, flags, 0);
@@ -227,7 +227,7 @@
 #endif
 
       perms = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
-      utf8 = gftp_string_from_utf8 (request, filename, &destlen);
+      utf8 = gftp_filename_from_utf8 (request, filename, &destlen);
       if (utf8 != NULL)
         {
           request->datafd = gftp_fd_open (request, utf8, flags, perms);
@@ -298,7 +298,7 @@
   char *utf8;
   int ret;
 
-  utf8 = gftp_string_from_utf8 (request, filename, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, filename, &destlen);
   if (utf8 != NULL)
     {
       ret = stat (utf8, &st);
@@ -415,7 +415,7 @@
   else
     dir = request->directory;
 
-  utf8 = gftp_string_from_utf8 (request, dir, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, dir, &destlen);
   if (utf8 != NULL)
     {
       lpd->dir = opendir (utf8);
@@ -447,7 +447,7 @@
   char *utf8;
   int ret;
 
-  utf8 = gftp_string_from_utf8 (request, filename, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, filename, &destlen);
   if (utf8 != NULL)
     {
       ret = stat (utf8, &st);
@@ -474,7 +474,7 @@
   g_return_val_if_fail (request->protonum == GFTP_LOCAL_NUM, GFTP_EFATAL);
   g_return_val_if_fail (directory != NULL, GFTP_EFATAL);
 
-  utf8 = gftp_string_from_utf8 (request, directory, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, directory, &destlen);
   if (utf8 != NULL)
     {
       ret = rmdir (utf8);
@@ -510,7 +510,7 @@
   g_return_val_if_fail (request->protonum == GFTP_LOCAL_NUM, GFTP_EFATAL);
   g_return_val_if_fail (file != NULL, GFTP_EFATAL);
 
-  utf8 = gftp_string_from_utf8 (request, file, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, file, &destlen);
   if (utf8 != NULL)
     {
       ret = unlink (utf8);
@@ -548,7 +548,7 @@
 
   perms = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
 
-  utf8 = gftp_string_from_utf8 (request, directory, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, directory, &destlen);
   if (utf8 != NULL)
     {
       ret = mkdir (utf8, perms);
@@ -588,9 +588,9 @@
   g_return_val_if_fail (oldname != NULL, GFTP_EFATAL);
   g_return_val_if_fail (newname != NULL, GFTP_EFATAL);
 
-  old_utf8 = gftp_string_from_utf8 (request, oldname, &destlen);
+  old_utf8 = gftp_filename_from_utf8 (request, oldname, &destlen);
   conv_oldname = old_utf8 != NULL ? old_utf8 : oldname;
-  new_utf8 = gftp_string_from_utf8 (request, newname, &destlen);
+  new_utf8 = gftp_filename_from_utf8 (request, newname, &destlen);
   conv_newname = new_utf8 != NULL ? new_utf8 : newname;
 
   if (rename (conv_oldname, conv_newname) == 0)
@@ -628,7 +628,7 @@
   g_return_val_if_fail (request->protonum == GFTP_LOCAL_NUM, GFTP_EFATAL);
   g_return_val_if_fail (file != NULL, GFTP_EFATAL);
 
-  utf8 = gftp_string_from_utf8 (request, file, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, file, &destlen);
   if (utf8 != NULL)
     {
       ret = chmod (utf8, mode);
@@ -670,7 +670,7 @@
   time_buf.modtime = datetime;
   time_buf.actime = datetime;
 
-  utf8 = gftp_string_from_utf8 (request, file, &destlen);
+  utf8 = gftp_filename_from_utf8 (request, file, &destlen);
   if (utf8 != NULL)
     {
       ret = utime (utf8, &time_buf);