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

do not exclude iconv support if unicode is enabled

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-01-17 14:10:44 +01:00
parent 7d82da3fed
commit fd5a3e142c
6 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/charset.cpp
View File

@@ -20,12 +20,13 @@
#include "charset.h"
#if !defined(_UTF8) && defined(HAVE_ICONV_H)
#if defined(SUPPORTED_LOCALES) && defined(HAVE_ICONV_H)
#include <iconv.h>
#include <cstdlib>
#include <cstring>
#include <fstream>
#include <iostream>
#include <stdexcept>
#include "locale.h"
@@ -95,7 +96,10 @@ void init_current_locale()
return;
std::ifstream f(SUPPORTED_LOCALES);
if (!f.is_open())
{
std::cerr << "ncmpcpp: cannot open file "SUPPORTED_LOCALES"!\n";
return;
}
envlocale += " ";
std::string line;
while (!f.eof())
@@ -105,10 +109,19 @@ void init_current_locale()
{
try
{
locale_charset = strdup((line.substr(line.find(" ")+1) + "//TRANSLIT").c_str());
std::string charset = line.substr(line.find(" ")+1);
if (charset == "UTF-8"
|| charset == "utf-8"
|| charset == "utf8")
{
f.close();
return;
}
locale_charset = strdup((charset + "//TRANSLIT").c_str());
}
catch (std::out_of_range)
{
f.close();
return;
}
break;
@@ -165,5 +178,5 @@ void str_pool_locale_to_utf(char *&s)
charset_convert(locale_charset, "utf8", s);
}
#endif
#endif // SUPPORTED_LOCALES && HAVE_ICONV_H