Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not try to convert to utf8 strings that are already encoded in it

Browse Source 
such case may happen if conversion from utf8 to current locale fails.
This commit is contained in:
Andrzej Rybczak
2009-12-24 00:53:53 +01:00
parent bdc65ead7a
commit 934efd5383
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/charset.cpp
View File

@@ -33,6 +33,26 @@
namespace namespace
{ {
bool is_utf8(const char *s)
{
for (; *s; ++s)
{
if (*s & 0x80) // 1xxxxxxx
{
char c = 0x40;
unsigned i = 0;
while (c & *s)
++i, c >>= 1;
if (i < 1 || i > 3) // not 110xxxxx, 1110xxxx, 11110xxx
return false;
for (unsigned j = 0; j < i; ++j)
if (!*++s || !(*s & 0x80) || *s & 0x40) // 10xxxxxx
return false;
}
}
return true;
}
bool has_non_ascii_chars(const char *s) bool has_non_ascii_chars(const char *s)
{ {
for (; *s; ++s) for (; *s; ++s)
@@ -92,7 +112,7 @@ std::string utf_to_locale_cpy(const std::string &s)
void locale_to_utf(std::string &s) void locale_to_utf(std::string &s)
{ {
if (s.empty() || Config.system_encoding.empty() || !has_non_ascii_chars(s.c_str())) if (s.empty() || Config.system_encoding.empty() || !has_non_ascii_chars(s.c_str()) || is_utf8(s.c_str()))
return; return;
const char *tmp = strdup(s.c_str()); const char *tmp = strdup(s.c_str());
charset_convert(Config.system_encoding.c_str(), "utf-8", tmp, 1, s.length()); charset_convert(Config.system_encoding.c_str(), "utf-8", tmp, 1, s.length());
@@ -116,7 +136,7 @@ void utf_to_locale(const char *&s, bool delete_old)
void locale_to_utf(const char *&s, bool delete_old) void locale_to_utf(const char *&s, bool delete_old)
{ {
if (!s || Config.system_encoding.empty() || !has_non_ascii_chars(s)) if (!s || Config.system_encoding.empty() || !has_non_ascii_chars(s) || is_utf8(s))
return; return;
charset_convert(Config.system_encoding.c_str(), "utf-8", s, delete_old); charset_convert(Config.system_encoding.c_str(), "utf-8", s, delete_old);
} }