Ticket #1506: filezilla3_beta2_sftp_utf8.patch

engine/sftpcontrolsocket.cpp

@@ -264 +264 @@
     LogMessage(Status, _("Connecting to %s:%d..."), server.GetHost().c_str(), server.GetPort());
     SetWait(true);
 
+    if (server.GetEncodingType() == ENCODING_UTF8)
+        m_useUTF8 = true;
     if (m_pCurrentServer)
         delete m_pCurrentServer;
     m_pCurrentServer = new CServer(server);
@@ -277 +279 @@
     if (executable == _T(""))
         executable = _T("fzsftp");
 
-    m_pid = wxExecute(executable + _T(" -v"), wxEXEC_ASYNC, m_pProcess);
+    m_pid = wxExecute(executable + _T(" -v") + (m_useUTF8 ? _T(" -utf8") : _T("")), wxEXEC_ASYNC, m_pProcess);
     if (!m_pid)
     {
         delete m_pProcess;
@@ -481 +483 @@
 
     cmd += _T("\n");
 
-    const wxCharBuffer str = cmd.mb_str();
+    const wxCharBuffer str = m_useUTF8 ? cmd.mb_str(wxConvUTF8) : cmd.mb_str();
     if (!m_pProcess)
         return false;
 
@@ -862 +864 @@
         return FZ_REPLY_INTERNALERROR;
     }
 
-    wxCharBuffer str = entry.mb_str();
+    wxCharBuffer str = m_useUTF8 ? entry.mb_str(wxConvUTF8) : entry.mb_str();
     int len = strlen(str);
     char* buffer = new char[len + 1];
     strcpy(buffer, str);

putty/fzsftp.c

@@ -1 +1 @@
 #include "putty.h"
 #include "misc.h"
 
+int gnFzUseUTF8 = 0;    // use UTF8 enooding or not
+
 int fznotify(sftpEventTypes type)
 {
     fprintf(stdout, "%c", (int)type + '0');

putty/fzsftp.h

@@ -25 +25 @@
     sftpReqUnknown
 };
 
+extern int gnFzUseUTF8;     // use UTF8 encoding or not
+
 int fznotify(sftpEventTypes type);
 int fzprintf(sftpEventTypes type, const char* p, ...);
 int fzprintf_raw(sftpEventTypes type, const char* p, ...);

putty/psftp.c

@@ -2907 +2907 @@
     } else if (strcmp(argv[i], "--") == 0) {
         i++;
         break;
+    } else if (strcmp(argv[i], "-utf8") == 0) {
+        gnFzUseUTF8 = 1;
     } else {
         cmdline_error("unknown option \"%s\"", argv[i]);
     }

putty/windows/winsftp.c

@@ -77 +77 @@
     HANDLE h;
     RFile *ret;
 
-    h = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL,
-           OPEN_EXISTING, 0, 0);
+    if (gnFzUseUTF8) {
+        int len;
+
+        // convert from UTF-8 to UNICODE
+        len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0);
+        if (len != 0)
+        {
+            wchar_t *p1;
+
+            p1 = malloc(sizeof(wchar_t) * (len*2+1));
+            MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1 , (LPWSTR)p1, len*2);
+            h = CreateFileW(p1, GENERIC_READ, FILE_SHARE_READ, NULL,
+                   OPEN_EXISTING, 0, 0);
+            free(p1);
+        }
+        else {
+            h = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL,
+                   OPEN_EXISTING, 0, 0);
+        }
+    }
+    else {
+        h = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL,
+               OPEN_EXISTING, 0, 0);
+    }
     if (h == INVALID_HANDLE_VALUE)
     return NULL;
 
@@ -125 +147 @@
     HANDLE h;
     WFile *ret;
 
-    h = CreateFile(name, GENERIC_WRITE, 0, NULL,
-           CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+    if (gnFzUseUTF8) {
+        int len;
+
+        // convert from UTF-8 to UNICODE
+        len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0);
+        if (len != 0)
+        {
+            wchar_t *p1;
+
+            p1 = malloc(sizeof(wchar_t) * (len*2+1));
+            MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1 , (LPWSTR)p1, len*2);
+            h = CreateFileW(p1, GENERIC_WRITE, 0, NULL,
+                   CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+            free(p1);
+        }
+        else {
+            h = CreateFile(name, GENERIC_WRITE, 0, NULL,
+                    CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+        }
+    }
+    else {
+        h = CreateFile(name, GENERIC_WRITE, 0, NULL,
+                CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+    }
     if (h == INVALID_HANDLE_VALUE)
     return NULL;
 
@@ -141 +185 @@
     HANDLE h;
     WFile *ret;
 
-    h = CreateFile(name, GENERIC_WRITE, FILE_SHARE_READ, NULL,
-           OPEN_EXISTING, 0, 0);
+    if (gnFzUseUTF8) {
+        int len;
+
+        // convert from UTF-8 to UNICODE
+        len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0);
+        if (len != 0)
+        {
+            wchar_t *p1;
+
+            p1 = malloc(sizeof(wchar_t) * (len*2+1));
+            MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1 , (LPWSTR)p1, len*2);
+            h = CreateFileW(p1, GENERIC_WRITE, FILE_SHARE_READ, NULL,
+                   OPEN_EXISTING, 0, 0);
+            free(p1);
+        }
+        else {
+            h = CreateFile(name, GENERIC_WRITE, FILE_SHARE_READ, NULL,
+                   OPEN_EXISTING, 0, 0);
+        }
+    }
+    else {
+        h = CreateFile(name, GENERIC_WRITE, FILE_SHARE_READ, NULL,
+               OPEN_EXISTING, 0, 0);
+    }
     if (h == INVALID_HANDLE_VALUE)
     return NULL;
 
@@ -223 +289 @@
 int file_type(char *name)
 {
     DWORD attr;
-    attr = GetFileAttributes(name);
+    if (gnFzUseUTF8) {
+        int len;
+
+        // convert from UTF-8 to UNICODE
+        len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0);
+        if (len != 0)
+        {
+            wchar_t *p1;
+
+            p1 = malloc(sizeof(wchar_t) * (len*2+1));
+            MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1 , (LPWSTR)p1, len*2);
+            attr = GetFileAttributesW(name);
+            free(p1);
+        }
+        else {
+            attr = GetFileAttributes(name);
+        }
+    }
+    else {
+        attr = GetFileAttributes(name);
+    }
     /* We know of no `weird' files under Windows. */
     if (attr == (DWORD)-1)
     return FILE_TYPE_NONEXISTENT;