Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4179 

262e391 mlog: handle filenames without parent directories (moneromooo-monero)
This commit is contained in:
luigi1111 2018-08-22 20:39:09 -05:00
parent 1eebb3d8fc 262e391fb1
commit 140eb78231
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/epee/src/mlog.cpp
View File

@ -142,7 +142,9 @@ void mlog_configure(const std::string &filename_base, bool console, const std::s
{ {
std::vector<boost::filesystem::path> found_files; std::vector<boost::filesystem::path> found_files;
const boost::filesystem::directory_iterator end_itr; const boost::filesystem::directory_iterator end_itr;
for (boost::filesystem::directory_iterator iter(boost::filesystem::path(filename_base).parent_path()); iter != end_itr; ++iter) const boost::filesystem::path filename_base_path(filename_base);
const boost::filesystem::path parent_path = filename_base_path.has_parent_path() ? filename_base_path.parent_path() : ".";
for (boost::filesystem::directory_iterator iter(parent_path); iter != end_itr; ++iter)
{ {
const std::string filename = iter->path().string(); const std::string filename = iter->path().string();
if (filename.size() >= filename_base.size() && std::memcmp(filename.data(), filename_base.data(), filename_base.size()) == 0) if (filename.size() >= filename_base.size() && std::memcmp(filename.data(), filename_base.data(), filename_base.size()) == 0)