aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-10-29 16:25:06 +0200
committerMartin Ridgers <[email protected]>2021-10-29 16:25:43 +0200
commitcbd4069f31b2ce0a53ba7960ade0dc196d2ea6d2 (patch)
treea2af4f14adb5a61ac5b5b3e3b5071f326dfc62b2
parentDon't prompt for user input on POSIX when displaying help (diff)
downloadzen-cbd4069f31b2ce0a53ba7960ade0dc196d2ea6d2.tar.xz
zen-cbd4069f31b2ce0a53ba7960ade0dc196d2ea6d2.zip
Stubbed out getenv lua config handling
-rw-r--r--zenserver/config.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/zenserver/config.cpp b/zenserver/config.cpp
index 2b7705fd4..fdba9089c 100644
--- a/zenserver/config.cpp
+++ b/zenserver/config.cpp
@@ -299,6 +299,7 @@ ParseServiceConfig(const std::filesystem::path& DataRoot, ZenServiceConfig& Serv
// any more than it needs to
lua.set_function("getenv", [&](const std::string env) -> sol::object {
+#if ZEN_PLATFORM_WINDOWS
std::wstring EnvVarValue;
size_t RequiredSize = 0;
std::wstring EnvWide = zen::Utf8ToWide(env);
@@ -310,6 +311,10 @@ ParseServiceConfig(const std::filesystem::path& DataRoot, ZenServiceConfig& Serv
EnvVarValue.resize(RequiredSize);
_wgetenv_s(&RequiredSize, EnvVarValue.data(), RequiredSize, EnvWide.c_str());
return sol::make_object(lua, zen::WideToUtf8(EnvVarValue.c_str()));
+#else
+ ZEN_UNUSED(env);
+ return sol::make_object(lua, sol::lua_nil);
+#endif
});
try