oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Charset.cxx: replace \ with / when converting path to UTF-8 on Windows

Browse Source
This commit is contained in:
Denis Krjuchkov
2013-12-05 12:51:01 +06:00
parent dc554ca61f
commit 62dc8e4131
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/fs/Charset.cxx
View File

@@ -23,9 +23,12 @@
#include "Limits.hxx"
#include "system/FatalError.hxx"
#include "Log.hxx"
#include "Traits.hxx"
#include <glib.h>
#include <algorithm>
#include <assert.h>
#include <string.h>
@@ -74,13 +77,29 @@ GetFSCharset()
return fs_charset.empty() ? "utf-8" : fs_charset.c_str();
}
static inline void FixSeparators(std::string &s)
{
#ifdef WIN32
// For whatever reason GCC can't convert constexpr to value reference.
// This leads to link errors when passing separators directly.
auto from = PathTraitsFS::SEPARATOR;
auto to = PathTraitsUTF8::SEPARATOR;
std::replace(s.begin(), s.end(), from, to);
#else
(void)s;
#endif
}
std::string
PathToUTF8(const char *path_fs)
{
assert(path_fs != nullptr);
if (fs_charset.empty())
return std::string(path_fs);
if (fs_charset.empty()) {
auto result = std::string(path_fs);
FixSeparators(result);
return result;
}
GIConv conv = g_iconv_open("utf-8", fs_charset.c_str());
if (conv == reinterpret_cast<GIConv>(-1))
@@ -101,7 +120,9 @@ PathToUTF8(const char *path_fs)
if (ret == static_cast<size_t>(-1) || in_left > 0)
return std::string();
return std::string(path_utf8, sizeof(path_utf8) - out_left);
auto result_path = std::string(path_utf8, sizeof(path_utf8) - out_left);
FixSeparators(result_path);
return result_path;
}
char *