luo980/cpp-httplib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix problems on English locale

Browse Source
This commit is contained in:
yhirose 2024-11-13 22:09:31 -05:00
parent 7604602eca
commit cc89f4d170
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
httplib.h
View File

@ -2258,13 +2258,33 @@ make_basic_authentication_header(const std::string &username,
namespace detail { namespace detail {
#if defined(_WIN32)
std::wstring u8string_to_wstring(const char *s) {
std::wstring ws;
auto len = static_cast<int>(strlen(s));
auto wlen = ::MultiByteToWideChar(CP_UTF8, 0, s, len, nullptr, 0);
if (wlen > 0) {
ws.resize(wlen);
wlen = ::MultiByteToWideChar(CP_UTF8, 0, s, len, const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(ws.data())), wlen);
if (wlen != ws.size()) {
ws.clear();
}
}
return ws;
}
#endif
struct FileStat { struct FileStat {
FileStat(const std::string &path); FileStat(const std::string &path);
bool is_file() const; bool is_file() const;
bool is_dir() const; bool is_dir() const;
private: private:
#if defined(_WIN32)
struct _stat st_;
#else
struct stat st_; struct stat st_;
#endif
int ret_ = -1; int ret_ = -1;
}; };
@ -2639,7 +2659,12 @@ inline bool is_valid_path(const std::string &path) {
} }
inline FileStat::FileStat(const std::string &path) { inline FileStat::FileStat(const std::string &path) {
#if defined(_WIN32)
auto wpath = u8string_to_wstring(path.c_str());
ret_ = _wstat(wpath.c_str(), &st_);
#else
ret_ = stat(path.c_str(), &st_); ret_ = stat(path.c_str(), &st_);
#endif
} }
inline bool FileStat::is_file() const { inline bool FileStat::is_file() const {
return ret_ >= 0 && S_ISREG(st_.st_mode); return ret_ >= 0 && S_ISREG(st_.st_mode);
@ -2909,19 +2934,8 @@ inline bool mmap::open(const char *path) {
close(); close();
#if defined(_WIN32) #if defined(_WIN32)
std::wstring wpath; auto wpath = u8string_to_wstring(path);
{ if (wpath.empty()) { return false; }
auto cp = ::GetACP();
auto len = static_cast<int>(strlen(path));
auto wlen = ::MultiByteToWideChar(cp, 0, path, len, nullptr, 0);
if (wlen <= 0) { return false; }
wpath.resize(wlen);
auto pwpath = const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(wpath.data()));
wlen = ::MultiByteToWideChar(cp, 0, path, len, pwpath, wlen);
if (wlen != wpath.size()) { return false; }
}
#if _WIN32_WINNT >= _WIN32_WINNT_WIN8 #if _WIN32_WINNT >= _WIN32_WINNT_WIN8
hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ,

2
test/test.cc
View File

@ -5287,7 +5287,7 @@ TEST(MountTest, MultibytesPathName) {
Client cli("localhost", PORT); Client cli("localhost", PORT);
auto res = cli.Get("/日本語Dir/日本語File.txt"); auto res = cli.Get(u8"/日本語Dir/日本語File.txt");
ASSERT_TRUE(res); ASSERT_TRUE(res);
EXPECT_EQ(StatusCode::OK_200, res->status); EXPECT_EQ(StatusCode::OK_200, res->status);
EXPECT_EQ(u8"日本語コンテンツ", res->body); EXPECT_EQ(u8"日本語コンテンツ", res->body);