diff options
| author | Vincent Richard <[email protected]> | 2014-04-21 18:13:48 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2014-04-21 18:13:48 +0000 |
| commit | ed62ed39bbb8f9ab73642255f444e936f72acffb (patch) | |
| tree | 3be8caa1c7569528a78a92fd487c49014886e163 | |
| parent | Fixed unit test. (diff) | |
| parent | Merge pull request #83 from NPU/master (diff) | |
| download | vmime-ed62ed39bbb8f9ab73642255f444e936f72acffb.tar.gz vmime-ed62ed39bbb8f9ab73642255f444e936f72acffb.zip | |
Merge branch 'master' of https://github.com/kisli/vmime
| -rw-r--r-- | src/vmime/platforms/windows/windowsCodepages.hpp | 1 | ||||
| -rw-r--r-- | src/vmime/platforms/windows/windowsFile.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/vmime/platforms/windows/windowsCodepages.hpp b/src/vmime/platforms/windows/windowsCodepages.hpp index dfd6afdd..e66b2303 100644 --- a/src/vmime/platforms/windows/windowsCodepages.hpp +++ b/src/vmime/platforms/windows/windowsCodepages.hpp @@ -57,6 +57,7 @@ public: if (stricmp(s8_Name, "EUC-JP") == 0) return 20932; if (stricmp(s8_Name, "euc-kr") == 0) return 51949; if (stricmp(s8_Name, "GB18030") == 0) return 54936; + if (stricmp(s8_Name, "GBK") == 0) return 54936; if (stricmp(s8_Name, "gb2312") == 0) return 936; if (stricmp(s8_Name, "hz-gb-2312") == 0) return 52936; if (stricmp(s8_Name, "IBM00858") == 0) return 858; diff --git a/src/vmime/platforms/windows/windowsFile.cpp b/src/vmime/platforms/windows/windowsFile.cpp index 0ab90b16..5ecafa58 100644 --- a/src/vmime/platforms/windows/windowsFile.cpp +++ b/src/vmime/platforms/windows/windowsFile.cpp @@ -352,7 +352,7 @@ void windowsFile::createDirectoryImpl(const vmime::utility::file::path& fullPath { const vmime::string nativePath = windowsFileSystemFactory::pathToStringImpl(path); - windowsFile tmp(fullPath); + windowsFile tmp(path); if (tmp.isDirectory()) return; |