aboutsummaryrefslogtreecommitdiffstats
path: root/src/fs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/fs/Charset.cxx4
-rw-r--r--src/fs/Charset.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx
index 3e324f470..39bb36e77 100644
--- a/src/fs/Charset.cxx
+++ b/src/fs/Charset.cxx
@@ -70,10 +70,10 @@ SetFSCharset(const char *charset)
"SetFSCharset: fs charset is: %s", fs_charset.c_str());
}
-const std::string &
+const char *
GetFSCharset()
{
- return fs_charset;
+ return fs_charset.empty() ? "utf-8" : fs_charset.c_str();
}
std::string
diff --git a/src/fs/Charset.hxx b/src/fs/Charset.hxx
index 19dabeb2b..a89cb0459 100644
--- a/src/fs/Charset.hxx
+++ b/src/fs/Charset.hxx
@@ -29,7 +29,7 @@
* Gets file system character set name.
*/
gcc_const
-const std::string &
+const char *
GetFSCharset();
void