util: Add ArgsManager::GetPathArg() function

Co-authored-by: Ryan Ofsky <ryan@ofsky.org>

2 files changed, 17 insertions, 0 deletions

diff --git a/src/util/system.cpp b/src/util/system.cpp
index 4ead39dd6c..82770dc665 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -399,6 +399,13 @@ std::optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) co
     return std::nullopt;
 }
 
+fs::path ArgsManager::GetPathArg(std::string pathlike_arg) const
+{
+    auto result = fs::PathFromString(GetArg(pathlike_arg, "")).lexically_normal();
+    // Remove trailing slash, if present.
+    return result.has_filename() ? result : result.parent_path();
+}
+
 const fs::path& ArgsManager::GetBlocksDirPath() const
 {
     LOCK(cs_args);
diff --git a/src/util/system.h b/src/util/system.h
index a8fd21fcaa..6b7bd38cc2 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -265,6 +265,16 @@ protected:
     std::optional<const Command> GetCommand() const;
 
     /**
+     * Get a normalized path from a specified pathlike argument
+     *
+     * It is guaranteed that the returned path has no trailing slashes.
+     *
+     * @param pathlike_arg Pathlike argument to get a path from (e.g., "-datadir", "-blocksdir" or "-walletdir")
+     * @return Normalized path which is get from a specified pathlike argument
+     */
+    fs::path GetPathArg(std::string pathlike_arg) const;
+
+    /**
      * Get blocks directory path
      *
      * @return Blocks path which is network specific