aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee/src
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-08-22 20:39:09 -0500
committerluigi1111 <luigi1111w@gmail.com>2018-08-22 20:39:09 -0500
commit140eb78231a08f60e0ec420643e8c1049daa2d43 (patch)
tree1e9e3658dc2577197d093a6fc8f1034583949940 /contrib/epee/src
parentMerge pull request #4146 (diff)
parentmlog: handle filenames without parent directories (diff)
downloadmonero-140eb78231a08f60e0ec420643e8c1049daa2d43.tar.xz
Merge pull request #4179
262e391 mlog: handle filenames without parent directories (moneromooo-monero)
Diffstat (limited to 'contrib/epee/src')
-rw-r--r--contrib/epee/src/mlog.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
index e8248c958..818fc0a69 100644
--- a/contrib/epee/src/mlog.cpp
+++ b/contrib/epee/src/mlog.cpp
@@ -142,7 +142,9 @@ void mlog_configure(const std::string &filename_base, bool console, const std::s
{
std::vector<boost::filesystem::path> found_files;
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();
if (filename.size() >= filename_base.size() && std::memcmp(filename.data(), filename_base.data(), filename_base.size()) == 0)