nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-23 23:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix argument order in the Windows implementation of getEnvOs

Browse Source 
See the build failure in https://github.com/msys2/MINGW-packages/pull/22499

(cherry picked from commit 355f08a728)

# Conflicts:
#	src/libutil/windows/environment-variables.cc
This commit is contained in:
John Ericson 2024-11-12 00:48:40 -05:00 committed by Mergify
parent ef21dfa221
commit 9fd776200b
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libutil/windows/environment-variables.cc
View File

@ -4,7 +4,34 @@
namespace nix {
<<<<<<< HEAD
int unsetenv(const char *name)
=======
std::optional<OsString> getEnvOs(const OsString & key)
{
// Determine the required buffer size for the environment variable value
DWORD bufferSize = GetEnvironmentVariableW(key.c_str(), nullptr, 0);
if (bufferSize == 0) {
return std::nullopt;
}
// Allocate a buffer to hold the environment variable value
std::wstring value{bufferSize, L'\0'};
// Retrieve the environment variable value
DWORD resultSize = GetEnvironmentVariableW(key.c_str(), &value[0], bufferSize);
if (resultSize == 0) {
return std::nullopt;
}
// Resize the string to remove the extra null characters
value.resize(resultSize);
return value;
}
int unsetenv(const char * name)
>>>>>>> 355f08a72 (Fix argument order in the Windows implementation of `getEnvOs`)
{
return -SetEnvironmentVariableA(name, nullptr);
}