luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-25 03:17:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add tests for '=' in names and values.

Browse Source 
2003-08-07  Matthias Clasen  <maclas@gmx.de>

	* tests/env-test.c: Add tests for '=' in names and values.

	* glib/gutils.c (g_setenv, g_unsetenv): Check that the variable name doesn't contain '='. Add a
	declaration for environ.  (#119338)
This commit is contained in:
Matthias Clasen
2003-08-07 21:51:38 +00:00
committed by Matthias Clasen
parent 4d2921959e
commit 96838a7a88
8 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
glib/gutils.c
View File

@@ -697,7 +697,7 @@ g_getenv (const gchar *variable)
/**
* g_setenv:
* @variable: the environment variable to set.
* @variable: the environment variable to set, must not contain '='.
* @value: the value for to set the variable to.
* @overwrite: whether to change the variable if it already exists.
*
@@ -716,6 +716,7 @@ g_setenv (const gchar *variable,
gboolean overwrite)
{
gint result;
g_return_val_if_fail (strchr (variable, '=') == NULL, FALSE);
#ifdef HAVE_SETENV
result = setenv (variable, value, overwrite);
#else
@@ -733,10 +734,17 @@ g_setenv (const gchar *variable,
#endif
return result == 0;
}
#ifndef HAVE_UNSETENV
/* According to the Single Unix Specification, environ is not in
* any system header, although unistd.h often declares it.
*/
extern char **environ;
#endif
/**
* g_unsetenv:
* @variable: the environment variable to remove.
* @variable: the environment variable to remove, must not contain '='.
*
* Removes an environment variable from the environment.
*
@@ -750,11 +758,15 @@ void
g_unsetenv (const gchar *variable)
{
#ifdef HAVE_UNSETENV
g_return_if_fail (strchr (variable, '=') == NULL);
unsetenv (variable);
#else
int i, len;
gchar **e, **f;
g_return_if_fail (strchr (variable, '=') == NULL);
len = strlen (variable);
/* Mess directly with the environ array.