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

shared: use more portable path_open() method

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-05-18 09:02:06 +02:00
parent c6dac9347f
commit 2c44b805cf
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/conftree.cpp
View File

@ -234,7 +234,8 @@ ConfSimple::ConfSimple(const char *fname, int readonly, bool tildexp,
if (!readonly && !path_exists(fname)) {
mode |= ios::trunc;
}
fstream input = path_open(fname, mode);
fstream input;
path_open(fname, mode, input);
if (!input.is_open()) {
LOGDEB0("ConfSimple::ConfSimple: fstream(w)(" << fname << ", " << mode <<
") errno " << errno << "\n");
@ -245,7 +246,7 @@ ConfSimple::ConfSimple(const char *fname, int readonly, bool tildexp,
input.clear();
status = STATUS_RO;
// open readonly
input = path_open(fname, ios::in);
path_open(fname, ios::in, input);
}
if (!input.is_open()) {
@ -577,7 +578,8 @@ bool ConfSimple::write()
return true;
}
if (m_filename.length()) {
fstream output = path_open(m_filename, ios::out | ios::trunc);
fstream output;
path_open(m_filename, ios::out | ios::trunc, output);
if (!output.is_open()) {
return 0;
}

24
src/utils/pathut.cpp
View File

@ -836,6 +836,9 @@ bool path_makepath(const string& ipath, int mode)
return true;
}
#if !defined(__GNUC__) || __GNUC__ > 4
// Not sure what g++ version supports fstream assignment but 4.9
// (jessie) certainly does not
std::fstream path_open(const std::string& path, int mode)
{
#if defined(_WIN32) && defined (_MSC_VER)
@ -853,6 +856,27 @@ std::fstream path_open(const std::string& path, int mode)
return std::fstream(path, std::ios_base::openmode(mode));
#endif
}
#endif
bool path_open(const std::string& path, int mode, std::fstream& outstream)
{
#if defined(_WIN32) && defined (_MSC_VER)
// MSC STL has support for using wide chars in fstream
// constructor. We need this if, e.g. the user name/home directory
// is not ASCII. Actually don't know how to do this with gcc
wchar_t wpath[MAX_PATH + 1];
utf8towchar(path, wpath, MAX_PATH);
outstream.open(wpath, std::ios_base::openmode(mode));
if (!outstream.is_open()) {
LOGERR("path_open("<< path << ", "<< mode <<") errno " << errno <<"\n");
return false;
}
return true;
#else
outstream.open(path, std::ios_base::openmode(mode));
return outstream.is_open();
#endif
}
bool path_isdir(const string& path, bool follow)
{

1
src/utils/pathut.h
View File

@ -147,6 +147,7 @@ extern bool path_makepath(const std::string& path, int mode);
* @param path an utf-8 file path.
* @param mode is an std::fstream mode (ios::in etc.) */
extern std::fstream path_open(const std::string& path, int mode);
extern bool path_open(const std::string& path, int mode, std::fstream& outstream);
/// Where we create the user data subdirs
extern std::string path_homedata();