From a66539faaa9fe5b1f1c797476dc341cd1b304cd1 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Wed, 14 Aug 2024 19:45:55 +0200 Subject: [PATCH] epee: string_tools: keep full path in cut_off_extension --- contrib/epee/src/string_tools.cpp | 2 +- tests/unit_tests/epee_utils.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/epee/src/string_tools.cpp b/contrib/epee/src/string_tools.cpp index aeb490d5d76..36356d77e65 100644 --- a/contrib/epee/src/string_tools.cpp +++ b/contrib/epee/src/string_tools.cpp @@ -189,7 +189,7 @@ namespace string_tools //---------------------------------------------------------------------------- std::string cut_off_extension(const std::string& str) { - return boost::filesystem::path(str).stem().string(); + return boost::filesystem::path(str).replace_extension("").string(); } #ifdef _WIN32 diff --git a/tests/unit_tests/epee_utils.cpp b/tests/unit_tests/epee_utils.cpp index 46b27d85b1b..dc4933144a2 100644 --- a/tests/unit_tests/epee_utils.cpp +++ b/tests/unit_tests/epee_utils.cpp @@ -1451,6 +1451,13 @@ TEST(StringTools, GetExtension) EXPECT_EQ(std::string{"3"}, epee::string_tools::get_extension("1.2.3")); } +TEST(StringTools, CutOffExtension) +{ + EXPECT_EQ(std::string{}, epee::string_tools::get_extension("")); + EXPECT_EQ(std::string{"/home/user/Monero/wallets/wallet"}, epee::string_tools::get_extension("/home/user/Monero/wallets/wallet")); + EXPECT_EQ(std::string{"/home/user/Monero/wallets/wallet"}, epee::string_tools::get_extension("/home/user/Monero/wallets/wallet.keys")); +} + TEST(NetUtils, IPv4NetworkAddress) { static_assert(epee::net_utils::ipv4_network_address::get_type_id() == epee::net_utils::address_type::ipv4, "bad ipv4 type id");