luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-31 16:32:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

win32: g_getenv() should return "" if variable exists and empty

Browse Source 
On Windows, GetEnvironmentVariable() returns 0 for empty variables.
Checking GetLastError() == ERROR_ENVVAR_NOT_FOUND helps make a
difference between a variable that does not exist or an empty one
which should return "".

https://bugzilla.gnome.org/show_bug.cgi?id=679617
This commit is contained in:
Marc-André Lureau
2012-07-09 04:12:02 +02:00
parent 6007a4b0b1
commit bfbfbec91e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glib/genviron.c
View File

@@ -466,7 +466,11 @@ g_getenv (const gchar *variable)
if (len == 0) if (len == 0)
{ {
g_free (wname); g_free (wname);
return NULL; if (GetLastError () == ERROR_ENVVAR_NOT_FOUND)
return NULL;
quark = g_quark_from_static_string ("");
return g_quark_to_string (quark);
} }
else if (len == 1) else if (len == 1)
len = 2; len = 2;