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

fs/Features: add macro FS_CHARSET_ALWAYS_UTF8

Browse Source
This commit is contained in:
Max Kellermann 2019-04-24 14:28:55 +02:00
parent 162845cc6d
commit 7a98a784b2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/fs/AllocatedPath.cxx
View File

@ -32,24 +32,24 @@ AllocatedPath::~AllocatedPath() noexcept = default;
AllocatedPath AllocatedPath
AllocatedPath::FromUTF8(const char *path_utf8) noexcept AllocatedPath::FromUTF8(const char *path_utf8) noexcept
{ {
#if defined(HAVE_FS_CHARSET) || defined(_WIN32) #ifdef FS_CHARSET_ALWAYS_UTF8
return FromFS(path_utf8);
#else
try { try {
return AllocatedPath(::PathFromUTF8(path_utf8)); return AllocatedPath(::PathFromUTF8(path_utf8));
} catch (...) { } catch (...) {
return nullptr; return nullptr;
} }
#else
return FromFS(path_utf8);
#endif #endif
} }
AllocatedPath AllocatedPath
AllocatedPath::FromUTF8Throw(const char *path_utf8) AllocatedPath::FromUTF8Throw(const char *path_utf8)
{ {
#if defined(HAVE_FS_CHARSET) || defined(_WIN32) #ifdef FS_CHARSET_ALWAYS_UTF8
return AllocatedPath(::PathFromUTF8(path_utf8));
#else
return FromFS(path_utf8); return FromFS(path_utf8);
#else
return AllocatedPath(::PathFromUTF8(path_utf8));
#endif #endif
} }

7
src/fs/Features.hxx
View File

@ -26,4 +26,11 @@
#define HAVE_FS_CHARSET #define HAVE_FS_CHARSET
#endif #endif
#if !defined(HAVE_FS_CHARSET) && !defined(_WIN32)
/**
* Is the filesystem character set hard-coded to UTF-8?
*/
#define FS_CHARSET_ALWAYS_UTF8
#endif
#endif #endif