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

fs/Charset: return Error on SetFSCharset() failure

Browse Source 
Don't abort the process, let the caller decide instead.
This commit is contained in:
Max Kellermann
2014-11-29 22:33:30 +01:00
parent 5b1db917bc
commit fd2c6b8a4b
5 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/fs/Charset.cxx
View File

@@ -21,9 +21,10 @@
#include "Charset.hxx"
#include "Domain.hxx"
#include "Limits.hxx"
#include "system/FatalError.hxx"
#include "Log.hxx"
#include "Traits.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#ifdef HAVE_GLIB
#include <glib.h>
@@ -36,6 +37,8 @@
#ifdef HAVE_GLIB
static constexpr Domain convert_domain("convert");
/**
* Maximal number of bytes required to represent path name in UTF-8
* (including nul-terminator).
@@ -50,29 +53,37 @@ static std::string fs_charset;
gcc_pure
static bool
IsSupportedCharset(const char *charset)
CheckCharset(const char *charset, Error &error)
{
/* convert a space to check if the charset is valid */
char *test = g_convert(" ", 1, charset, "UTF-8", nullptr, nullptr, nullptr);
if (test == nullptr)
GError *error2 = nullptr;
char *test = g_convert(" ", 1, charset, "UTF-8", nullptr, nullptr, &error2);
if (test == nullptr) {
error.Set(convert_domain, error2->code, error2->message);
g_error_free(error2);
return false;
}
g_free(test);
return true;
}
void
SetFSCharset(const char *charset)
bool
SetFSCharset(const char *charset, Error &error)
{
assert(charset != nullptr);
if (!IsSupportedCharset(charset))
FormatFatalError("invalid filesystem charset: %s", charset);
if (!CheckCharset(charset, error)) {
error.FormatPrefix("Failed to initialize filesystem charset '%s': ",
charset);
return false;
}
fs_charset = charset;
FormatDebug(path_domain,
"SetFSCharset: fs charset is: %s", fs_charset.c_str());
return true;
}
#endif