|
a/src/common/utf8fn.cpp |
|
b/src/common/utf8fn.cpp |
|
... |
|
... |
| 5 |
|
5 |
|
| 6 |
using namespace std;
|
6 |
using namespace std;
|
| 7 |
|
7 |
|
| 8 |
string compute_utf8fn(const RclConfig *config, const string& ifn, bool simple)
|
8 |
string compute_utf8fn(const RclConfig *config, const string& ifn, bool simple)
|
| 9 |
{
|
9 |
{
|
|
|
10 |
#ifdef _WIN32
|
|
|
11 |
// On windows file names are read as UTF16 wchar_t and converted to UTF-8
|
|
|
12 |
// while scanning directories
|
|
|
13 |
return ifn;
|
|
|
14 |
#else
|
| 10 |
string charset = config->getDefCharset(true);
|
15 |
string charset = config->getDefCharset(true);
|
| 11 |
string utf8fn;
|
16 |
string utf8fn;
|
| 12 |
int ercnt;
|
17 |
int ercnt;
|
| 13 |
string lfn(simple ? path_getsimple(ifn) : ifn);
|
18 |
string lfn(simple ? path_getsimple(ifn) : ifn);
|
| 14 |
if (!transcode(lfn, utf8fn, charset, "UTF-8", &ercnt)) {
|
19 |
if (!transcode(lfn, utf8fn, charset, "UTF-8", &ercnt)) {
|
|
... |
|
... |
| 19 |
charset << "] to UTF-8 for: [" << lfn << "]\n");
|
24 |
charset << "] to UTF-8 for: [" << lfn << "]\n");
|
| 20 |
}
|
25 |
}
|
| 21 |
LOGDEB1("compute_utf8fn: transcoded from [" << lfn << "] to [" <<
|
26 |
LOGDEB1("compute_utf8fn: transcoded from [" << lfn << "] to [" <<
|
| 22 |
utf8fn << "] (" << charset << "->" << "UTF-8)\n");
|
27 |
utf8fn << "] (" << charset << "->" << "UTF-8)\n");
|
| 23 |
return utf8fn;
|
28 |
return utf8fn;
|
|
|
29 |
#endif
|
| 24 |
}
|
30 |
}
|