aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2024-07-16 19:02:24 -0400
committerluigi1111 <luigi1111w@gmail.com>2024-07-16 19:02:24 -0400
commitcaa62bc9ea1c5f2ffe3ffa440ad230e1de509bfd (patch)
tree49b578f5eaf40c483fbcaadec8d1c7fa5a60c329 /contrib
parentMerge pull request #9386 (diff)
parentepee: fix mlog filename compare bug. (diff)
downloadmonero-caa62bc9ea1c5f2ffe3ffa440ad230e1de509bfd.tar.xz
Merge pull request #9392HEADmaster
b894042 epee: fix mlog filename compare bug. (0xFFFC0000)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/epee/src/mlog.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
index 4ca1a3632..46b535504 100644
--- a/contrib/epee/src/mlog.cpp
+++ b/contrib/epee/src/mlog.cpp
@@ -176,11 +176,12 @@ 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;
const boost::filesystem::path filename_base_path(filename_base);
+ const std::string filename_base_name = filename_base_path.filename().string();
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)
+ const std::string filename = iter->path().filename().string();
+ if (filename.size() >= filename_base_name.size() && std::memcmp(filename.data(), filename_base_name.data(), filename_base_name.size()) == 0)
{
found_files.push_back(iter->path());
}