tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Windows: compute_utf8fn did not strip path when needed

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-01-30 18:59:39 +01:00
parent 0a09ffc23b
commit f0d064a6e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/utf8fn.cpp
View File

@ -7,15 +7,15 @@ using namespace std;
string compute_utf8fn(const RclConfig *config, const string& ifn, bool simple) string compute_utf8fn(const RclConfig *config, const string& ifn, bool simple)
{ {
string lfn(simple ? path_getsimple(ifn) : ifn);
#ifdef _WIN32 #ifdef _WIN32
// On windows file names are read as UTF16 wchar_t and converted to UTF-8 // On windows file names are read as UTF16 wchar_t and converted to UTF-8
// while scanning directories // while scanning directories
return ifn; return lfn;
#else #else
string charset = config->getDefCharset(true); string charset = config->getDefCharset(true);
string utf8fn; string utf8fn;
int ercnt; int ercnt;
string lfn(simple ? path_getsimple(ifn) : ifn);
if (!transcode(lfn, utf8fn, charset, "UTF-8", &ercnt)) { if (!transcode(lfn, utf8fn, charset, "UTF-8", &ercnt)) {
LOGERR("compute_utf8fn: fn transcode failure from [" << charset << LOGERR("compute_utf8fn: fn transcode failure from [" << charset <<
"] to UTF-8 for: [" << lfn << "]\n"); "] to UTF-8 for: [" << lfn << "]\n");