diff options
| author | Zousar Shaker <[email protected]> | 2025-04-24 08:26:29 -0600 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-04-24 08:26:29 -0600 |
| commit | 787449efb4de24fd12f3af3c4e466a9629203108 (patch) | |
| tree | cb4a0e84a0381e9b4a087401037ba5837e8e65d7 /src/zenserver/config | |
| parent | Changelog update terminology (diff) | |
| parent | 5.6.6-pre1 (diff) | |
| download | zen-787449efb4de24fd12f3af3c4e466a9629203108.tar.xz zen-787449efb4de24fd12f3af3c4e466a9629203108.zip | |
Merge branch 'main' into zs/zencli-list-namespaces-buckets
Diffstat (limited to 'src/zenserver/config')
| -rw-r--r-- | src/zenserver/config/luaconfig.cpp | 23 | ||||
| -rw-r--r-- | src/zenserver/config/luaconfig.h | 5 |
2 files changed, 3 insertions, 25 deletions
diff --git a/src/zenserver/config/luaconfig.cpp b/src/zenserver/config/luaconfig.cpp index f742fa34a..2c54de29e 100644 --- a/src/zenserver/config/luaconfig.cpp +++ b/src/zenserver/config/luaconfig.cpp @@ -4,27 +4,6 @@ namespace zen::LuaConfig { -std::string -MakeSafePath(const std::string_view Path) -{ -#if ZEN_PLATFORM_WINDOWS - if (Path.empty()) - { - return std::string(Path); - } - - std::string FixedPath(Path); - std::replace(FixedPath.begin(), FixedPath.end(), '/', '\\'); - if (!FixedPath.starts_with("\\\\?\\")) - { - FixedPath.insert(0, "\\\\?\\"); - } - return FixedPath; -#else - return std::string(Path); -#endif -}; - void EscapeBackslash(std::string& InOutString) { @@ -101,7 +80,7 @@ FilePathOption::Parse(sol::object Object) std::string Str = Object.as<std::string>(); if (!Str.empty()) { - Value = MakeSafePath(Str); + Value = MakeSafeAbsolutePath(Str); } } diff --git a/src/zenserver/config/luaconfig.h b/src/zenserver/config/luaconfig.h index 76b3088a3..ce7013a9a 100644 --- a/src/zenserver/config/luaconfig.h +++ b/src/zenserver/config/luaconfig.h @@ -4,10 +4,10 @@ #include <zenbase/concepts.h> #include <zencore/fmtutils.h> +#include <zenutil/commandlineoptions.h> ZEN_THIRD_PARTY_INCLUDES_START #include <fmt/format.h> -#include <cxxopts.hpp> #include <sol/sol.hpp> ZEN_THIRD_PARTY_INCLUDES_END @@ -20,8 +20,7 @@ ZEN_THIRD_PARTY_INCLUDES_END namespace zen::LuaConfig { -std::string MakeSafePath(const std::string_view Path); -void EscapeBackslash(std::string& InOutString); +void EscapeBackslash(std::string& InOutString); class OptionValue { |