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

Changed the win32 part of this function to be thread safe and to make the

Browse Source 
2000-04-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gutils.c (g_getenv): Changed the win32 part of this function to
	be thread safe and to make the returned environment string
	persistent to match the UN*X behavior. This is again a response to
	Bug #8983.

	* glib.h (G_LOCK_NAME): Removed parentheses around the lock name,
	as that seems to cause problems for some compilers and really
	isn't necessary.
This commit is contained in:
Sebastian Wilhelmi 2000-04-19 08:43:52 +00:00 committed by Sebastian Wilhelmi
parent 70ce489b36
commit e366512775
12 changed files with 200 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gutils.c (g_getenv): Changed the win32 part of this function to
be thread safe and to make the returned environment string
persistent to match the UN*X behavior. This is again a response to
Bug #8983.
* glib.h (G_LOCK_NAME): Removed parentheses around the lock name,
as that seems to cause problems for some compilers and really
isn't necessary.
Wed Apr 19 08:32:32 2000 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_new): make sure that

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gutils.c (g_getenv): Changed the win32 part of this function to
be thread safe and to make the returned environment string
persistent to match the UN*X behavior. This is again a response to
Bug #8983.
* glib.h (G_LOCK_NAME): Removed parentheses around the lock name,
as that seems to cause problems for some compilers and really
isn't necessary.
Wed Apr 19 08:32:32 2000 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_new): make sure that

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gutils.c (g_getenv): Changed the win32 part of this function to
be thread safe and to make the returned environment string
persistent to match the UN*X behavior. This is again a response to
Bug #8983.
* glib.h (G_LOCK_NAME): Removed parentheses around the lock name,
as that seems to cause problems for some compilers and really
isn't necessary.
Wed Apr 19 08:32:32 2000 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_new): make sure that

11
ChangeLog.pre-2-12
View File

@ -1,3 +1,14 @@
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gutils.c (g_getenv): Changed the win32 part of this function to
be thread safe and to make the returned environment string
persistent to match the UN*X behavior. This is again a response to
Bug #8983.
* glib.h (G_LOCK_NAME): Removed parentheses around the lock name,
as that seems to cause problems for some compilers and really
isn't necessary.
Wed Apr 19 08:32:32 2000 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_new): make sure that

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gutils.c (g_getenv): Changed the win32 part of this function to
be thread safe and to make the returned environment string
persistent to match the UN*X behavior. This is again a response to
Bug #8983.
* glib.h (G_LOCK_NAME): Removed parentheses around the lock name,
as that seems to cause problems for some compilers and really
isn't necessary.
Wed Apr 19 08:32:32 2000 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_new): make sure that

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gutils.c (g_getenv): Changed the win32 part of this function to
be thread safe and to make the returned environment string
persistent to match the UN*X behavior. This is again a response to
Bug #8983.
* glib.h (G_LOCK_NAME): Removed parentheses around the lock name,
as that seems to cause problems for some compilers and really
isn't necessary.
Wed Apr 19 08:32:32 2000 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_new): make sure that

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gutils.c (g_getenv): Changed the win32 part of this function to
be thread safe and to make the returned environment string
persistent to match the UN*X behavior. This is again a response to
Bug #8983.
* glib.h (G_LOCK_NAME): Removed parentheses around the lock name,
as that seems to cause problems for some compilers and really
isn't necessary.
Wed Apr 19 08:32:32 2000 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_new): make sure that

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gutils.c (g_getenv): Changed the win32 part of this function to
be thread safe and to make the returned environment string
persistent to match the UN*X behavior. This is again a response to
Bug #8983.
* glib.h (G_LOCK_NAME): Removed parentheses around the lock name,
as that seems to cause problems for some compilers and really
isn't necessary.
Wed Apr 19 08:32:32 2000 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_new): make sure that

2
glib.h
View File

@ -3130,7 +3130,7 @@ void g_static_rw_lock_free (GStaticRWLock* lock);
* G_TRYLOCK() respectively.
*/
extern void glib_dummy_decl (void);
#define G_LOCK_NAME(name) (g__ ## name ## _lock)
#define G_LOCK_NAME(name) g__ ## name ## _lock
#ifdef G_THREADS_ENABLED
# define G_LOCK_DEFINE_STATIC(name) static G_LOCK_DEFINE (name)
# define G_LOCK_DEFINE(name) \

2
glib/glib.h
View File

@ -3130,7 +3130,7 @@ void g_static_rw_lock_free (GStaticRWLock* lock);
* G_TRYLOCK() respectively.
*/
extern void glib_dummy_decl (void);
#define G_LOCK_NAME(name) (g__ ## name ## _lock)
#define G_LOCK_NAME(name) g__ ## name ## _lock
#ifdef G_THREADS_ENABLED
# define G_LOCK_DEFINE_STATIC(name) static G_LOCK_DEFINE (name)
# define G_LOCK_DEFINE(name) \

75
glib/gutils.c
View File

@ -379,38 +379,71 @@ g_getenv (const gchar *variable)
return getenv (variable);
#else
gchar *v;
guint k;
static gchar *p = NULL;
static gint l;
G_LOCK_DEFINE_STATIC (getenv);
struct env_struct
{
gchar *key;
gchar *value;
} *env;
static GArray *environs = NULL;
gchar *system_env;
guint length, i;
gchar dummy[2];
g_return_val_if_fail (variable != NULL, NULL);
v = getenv (variable);
if (!v)
return NULL;
G_LOCK (getenv);
if (!environs)
environs = g_array_new (FALSE, FALSE, sizeof (struct env_struct));
/* First we try to find the envinronment variable inside the already
* found ones.
*/
for (i = 0; i < environs->len; i++)
{
env = &g_array_index (environs, struct env_struct, i);
if (strcmp (env->key, variable) == 0)
{
g_assert (env->value);
G_UNLOCK (getenv);
return env->value;
}
}
/* If not found, we ask the system */
system_env = getenv (variable);
if (!system_env)
{
G_UNLOCK (getenv);
return NULL;
}
/* On Windows NT, it is relatively typical that environment variables
* contain references to other environment variables. Handle that by
* calling ExpandEnvironmentStrings.
*/
g_array_set_size (environs, environs->len + 1);
env = &g_array_index (environs, struct env_struct, environs->len - 1);
/* First check how much space we need */
k = ExpandEnvironmentStrings (v, dummy, 2);
/* Then allocate that much, and actualy do the expansion */
if (p == NULL)
{
p = g_malloc (k);
l = k;
}
else if (k > l)
{
p = g_realloc (p, k);
l = k;
}
ExpandEnvironmentStrings (v, p, k);
return p;
length = ExpandEnvironmentStrings (system_env, dummy, 2);
/* Then allocate that much, and actualy do the expansion and insert
* the new found pair into our buffer
*/
env->value = g_malloc (length);
env->key = g_strdup (variable);
ExpandEnvironmentStrings (system_env, env->value, length);
G_UNLOCK (getenv);
return env->value;
#endif
}

75
gutils.c
View File

@ -379,38 +379,71 @@ g_getenv (const gchar *variable)
return getenv (variable);
#else
gchar *v;
guint k;
static gchar *p = NULL;
static gint l;
G_LOCK_DEFINE_STATIC (getenv);
struct env_struct
{
gchar *key;
gchar *value;
} *env;
static GArray *environs = NULL;
gchar *system_env;
guint length, i;
gchar dummy[2];
g_return_val_if_fail (variable != NULL, NULL);
v = getenv (variable);
if (!v)
return NULL;
G_LOCK (getenv);
if (!environs)
environs = g_array_new (FALSE, FALSE, sizeof (struct env_struct));
/* First we try to find the envinronment variable inside the already
* found ones.
*/
for (i = 0; i < environs->len; i++)
{
env = &g_array_index (environs, struct env_struct, i);
if (strcmp (env->key, variable) == 0)
{
g_assert (env->value);
G_UNLOCK (getenv);
return env->value;
}
}
/* If not found, we ask the system */
system_env = getenv (variable);
if (!system_env)
{
G_UNLOCK (getenv);
return NULL;
}
/* On Windows NT, it is relatively typical that environment variables
* contain references to other environment variables. Handle that by
* calling ExpandEnvironmentStrings.
*/
g_array_set_size (environs, environs->len + 1);
env = &g_array_index (environs, struct env_struct, environs->len - 1);
/* First check how much space we need */
k = ExpandEnvironmentStrings (v, dummy, 2);
/* Then allocate that much, and actualy do the expansion */
if (p == NULL)
{
p = g_malloc (k);
l = k;
}
else if (k > l)
{
p = g_realloc (p, k);
l = k;
}
ExpandEnvironmentStrings (v, p, k);
return p;
length = ExpandEnvironmentStrings (system_env, dummy, 2);
/* Then allocate that much, and actualy do the expansion and insert
* the new found pair into our buffer
*/
env->value = g_malloc (length);
env->key = g_strdup (variable);
ExpandEnvironmentStrings (system_env, env->value, length);
G_UNLOCK (getenv);
return env->value;
#endif
}