External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use UTF8ToUTF16

Browse Source
This commit is contained in:
codicodi 2016-11-03 12:36:51 +01:00 committed by GitHub
parent 92a1b16c36
commit a5cb0cca2f
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fmt/posix.cc
View File

@ -64,16 +64,8 @@ inline std::size_t convert_rwcount(std::size_t count) { return count; }
std::FILE* u8fopen(fmt::CStringRef filename, fmt::CStringRef mode) { std::FILE* u8fopen(fmt::CStringRef filename, fmt::CStringRef mode) {
#ifdef _WIN32 #ifdef _WIN32
wchar_t namebuff[FILENAME_MAX]; fmt::UTF8ToUTF16 conv(filename.c_str());
wchar_t modebuff[100]; // VC++ provides numerous extension modes... return FMT_SYSTEM(_wfopen(conv.c_str(), modebuff));
int r1 = FMT_SYSTEM(MultiByteToWideChar(CP_UTF8,
MB_ERR_INVALID_CHARS, filename.c_str(), -1, namebuff, FILENAME_MAX));
int r2 = FMT_SYSTEM(MultiByteToWideChar(CP_UTF8,
MB_ERR_INVALID_CHARS, mode.c_str(), -1, modebuff, 100));
if (r1 == 0 || r2 == 0)
FMT_THROW(fmt::WindowsError(::GetLastError(),
"couldn't convert filename or mode to native encoding"));
return FMT_SYSTEM(_wfopen(namebuff, modebuff));
#else #else
return FMT_SYSTEM(fopen(filename.c_str(), mode.c_str())); return FMT_SYSTEM(fopen(filename.c_str(), mode.c_str()));
#endif #endif
@ -81,14 +73,9 @@ std::FILE* u8fopen(fmt::CStringRef filename, fmt::CStringRef mode) {
int u8open(fmt::CStringRef filename, int flags, int mode) { int u8open(fmt::CStringRef filename, int flags, int mode) {
#ifdef _WIN32 #ifdef _WIN32
wchar_t namebuff[FILENAME_MAX]; fmt::UTF8ToUTF16 conv(filename.c_str());
int r = FMT_SYSTEM(MultiByteToWideChar(CP_UTF8,
MB_ERR_INVALID_CHARS, filename.c_str(), -1, namebuff, FILENAME_MAX));
if (r == 0)
FMT_THROW(fmt::WindowsError(::GetLastError(),
"couldn't convert filename to native encoding"));
int fd = -1; int fd = -1;
FMT_SYSTEM(_wsopen_s(&fd, namebuff, flags, _SH_DENYNO, mode)); FMT_POSIX(wsopen_s(&fd, conv.c_str(), flags, _SH_DENYNO, mode));
return fd; return fd;
#else #else
return FMT_POSIX_CALL(open(filename, flags, mode)); return FMT_POSIX_CALL(open(filename, flags, mode));