Added support for paths containing unicode characters on Windows (#156)

Author: Greisby

trantor/net/TcpConnection.h

@@ -59,13 +59,25 @@ class TRANTOR_EXPORT TcpConnection
     /**
      * @brief Send a file to the peer.
      *
-     * @param fileName
+     * @param fileName in UTF-8
      * @param offset
      * @param length
      */
     virtual void sendFile(const char *fileName,
                           size_t offset = 0,
                           size_t length = 0) = 0;
+#ifdef _WIN32
+    /**
+     * @brief Send a file to the peer.
+     *
+     * @param fileName in UCS-2 (windows only)
+     * @param offset
+     * @param length
+     */
+    virtual void sendFile(const wchar_t *fileName,
+                          size_t offset = 0,
+                          size_t length = 0) = 0;
+#endif  // WIN32
 
     /**
      * @brief Get the local address of the connection.

trantor/net/inner/TcpConnectionImpl.cc

@@ -33,9 +33,6 @@
 #include <openssl/x509v3.h>
 #include <openssl/err.h>
 #endif
-#ifdef _WIN32
-#define stat _stati64
-#endif
 #include <regex>
 
 using namespace trantor;
@@ -1273,7 +1270,19 @@ void TcpConnectionImpl::sendFile(const char *fileName,
                                  size_t length)
 {
     assert(fileName);
-#ifndef _WIN32
+#ifdef _WIN32
+    // Convert UTF-8 file path to UCS-2
+    int nSizeNeeded = ::MultiByteToWideChar(
+        CP_UTF8, 0, fileName, (int)strnlen_s(fileName, MAX_PATH), NULL, 0);
+    std::wstring wFileName(nSizeNeeded, 0);
+    ::MultiByteToWideChar(CP_UTF8,
+                          0,
+                          fileName,
+                          (int)strnlen_s(fileName, MAX_PATH),
+                          &wFileName[0],
+                          nSizeNeeded);
+    sendFile(wFileName.c_str(), offset, length);
+#else   // _WIN32
     int fd = open(fileName, O_RDONLY);
 
     if (fd < 0)
@@ -1295,16 +1304,22 @@ void TcpConnectionImpl::sendFile(const char *fileName,
     }
 
     sendFile(fd, offset, length);
-#else
-#ifndef _MSC_VER
-    auto fp = fopen(fileName, "rb");
-#else
+#endif  // _WIN32
+}
+
+#ifdef _WIN32
+void TcpConnectionImpl::sendFile(const wchar_t *fileName,
+                                 size_t offset,
+                                 size_t length)
+{
+    assert(fileName);
     FILE *fp;
-    if (fopen_s(&fp, fileName, "rb") != 0)
-    {
+#ifndef _MSC_VER
+    fp = _wfopen(fileName, L"rb");
+#else   // _MSC_VER
+    if (_wfopen_s(&fp, fileName, L"rb") != 0)
         fp = nullptr;
-    }
-#endif
+#endif  // _MSC_VER
     if (fp == nullptr)
     {
         LOG_SYSERR << fileName << " open error";
@@ -1313,8 +1328,8 @@ void TcpConnectionImpl::sendFile(const char *fileName,
 
     if (length == 0)
     {
-        struct stat filestat;
-        if (stat(fileName, &filestat) < 0)
+        struct _stati64 filestat;
+        if (_wstati64(fileName, &filestat) < 0)
         {
             LOG_SYSERR << fileName << " stat error";
             fclose(fp);
@@ -1324,8 +1339,8 @@ void TcpConnectionImpl::sendFile(const char *fileName,
     }
 
     sendFile(fp, offset, length);
-#endif
 }
+#endif  // _WIN32
 
 #ifndef _WIN32
 void TcpConnectionImpl::sendFile(int sfd, size_t offset, size_t length)

trantor/net/inner/TcpConnectionImpl.h

@@ -115,6 +115,11 @@ class TcpConnectionImpl : public TcpConnection,
     virtual void sendFile(const char *fileName,
                           size_t offset = 0,
                           size_t length = 0) override;
+#ifdef _WIN32
+    virtual void sendFile(const wchar_t *fileName,
+                          size_t offset = 0,
+                          size_t length = 0) override;
+#endif  // WIN32
 
     virtual const InetAddress &localAddr() const override
     {

trantor/utils/AsyncFileLogger.cc

@@ -18,6 +18,8 @@
 #ifdef __linux__
 #include <sys/prctl.h>
 #endif
+#else
+#include <Windows.h>
 #endif
 #include <string.h>
 #include <iostream>
@@ -184,7 +186,17 @@ AsyncFileLogger::LoggerFile::LoggerFile(const std::string &filePath,
 #ifndef _MSC_VER
     fp_ = fopen(fileFullName_.c_str(), "a");
 #else
-    fp_ = _fsopen(fileFullName_.c_str(), "a+", _SH_DENYWR);
+    // Convert UTF-8 file to UCS-2
+    int nSizeNeeded = ::MultiByteToWideChar(
+        CP_UTF8, 0, &fileFullName_[0], (int)fileFullName_.size(), NULL, 0);
+    std::wstring wFullName(nSizeNeeded, 0);
+    ::MultiByteToWideChar(CP_UTF8,
+                          0,
+                          &fileFullName_[0],
+                          (int)fileFullName_.size(),
+                          &wFullName[0],
+                          nSizeNeeded);
+    fp_ = _wfsopen(wFullName.c_str(), L"a+", _SH_DENYWR);
 #endif
     if (fp_ == nullptr)
     {
@@ -232,7 +244,30 @@ AsyncFileLogger::LoggerFile::~LoggerFile()
             filePath_ + fileBaseName_ + "." +
             creationDate_.toCustomedFormattedString("%y%m%d-%H%M%S") +
             std::string(seq) + fileExtName_;
+#ifndef _WIN32
         rename(fileFullName_.c_str(), newName.c_str());
+#else   // _WIN32
+        // Convert UTF-8 file to UCS-2
+        int nSizeNeeded = ::MultiByteToWideChar(
+            CP_UTF8, 0, &fileFullName_[0], (int)fileFullName_.size(), NULL, 0);
+        std::wstring wFullName(nSizeNeeded, 0);
+        ::MultiByteToWideChar(CP_UTF8,
+                              0,
+                              &fileFullName_[0],
+                              (int)fileFullName_.size(),
+                              &wFullName[0],
+                              nSizeNeeded);
+        nSizeNeeded = ::MultiByteToWideChar(
+            CP_UTF8, 0, &newName[0], (int)newName.size(), NULL, 0);
+        std::wstring wNewName(nSizeNeeded, 0);
+        ::MultiByteToWideChar(CP_UTF8,
+                              0,
+                              &newName[0],
+                              (int)newName.size(),
+                              &wNewName[0],
+                              nSizeNeeded);
+        _wrename(wFullName.c_str(), wNewName.c_str());
+#endif  // _WIN32
     }
 }