Changeset 281 for cpp/frams/virtfile/stdiofile.cpp

Timestamp:

12/27/14 01:01:43 (9 years ago)

Author:

Maciej Komosinski

Message:

Support for wide char (unicode) names of files and directories under Windows, internally encoded as char* utf-8

File:

• cpp/frams/virtfile/stdiofile.cpp (modified) (3 diffs)

cpp/frams/virtfile/stdiofile.cpp

@@ -7 +7 @@
 #include <common/nonstd_stdio.h>
 #include <common/framsg.h>
+#include <common/Convert.h>
 
-VirtFILE* StdioFileSystem::Vfopen(const char* path,const char*mode)
+VirtFILE* StdioFileSystem::Vfopen(const char *path, const char *mode)
 {
         //printFM("Vfopen %s %s",path,mode);
 #ifdef USE_MFILE
-        MFILE *f=mfopen(path,mode);
+        MFILE *f = mfopen(path, mode);
 #else
-        FILE *f=fopen(path,mode);
+#ifdef _WIN32
+        FILE *f = _wfopen(Convert::utf8ToUtf16(path).c_str(), Convert::strTOwstr(mode).c_str());
+#else
+        FILE *f = fopen(path, mode);
+#endif
 #endif
         //printFM("%p",f);
-        if (f) return new StdioFILE(f,path); else return 0;
+        if (f) return new StdioFILE(f, path); else return 0;
 }
 
@@ -23 +28 @@
 {
         //printFM("Vopendir %s",path);
-        DIR *d=opendir(path);
+#ifdef _WIN32
+        DIRTYPE *d = wopendir(Convert::utf8ToUtf16(path).c_str());
+#else
+        DIR *d = opendir(path);
+#endif
         //printFM("%p",d);
         if (d) return new StdioDIR(d); else return 0;
@@ -48 +57 @@
 {
         //printFM("Vreaddir %s",dir);
+#ifdef _WIN32
+        wdirent *wde=wreaddir(dir);
+        if (wde==NULL) return NULL;
+        strcpy(de.d_name, Convert::wstrToUtf8(wde->d_name).c_str());
+        return &de;
+#else
         return readdir(dir);
+#endif
 }