Merge branch 'master' of https://github.com/kisli/vmime

kisli · Apr 21, 2014 · ed62ed3 · ed62ed3
2 parents 99d919c + 51e753d
commit ed62ed3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/vmime/platforms/windows/windowsCodepages.hpp b/src/vmime/platforms/windows/windowsCodepages.hpp
@@ -57,6 +57,7 @@ class windowsCodepages
 		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
@@ -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;