diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-12-15 20:14:02 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-12-15 20:14:19 +0100 |
| commit | 1cd4fffcde4edd4853e039da9a42e0972d851a51 (patch) | |
| tree | 82c1f750fd5acf88414b85a421c7b7212d9efcfc /lib/putenv.c | |
| parent | 20ccae8dbb8d92a6a32e0275c517f70961c6b833 (diff) | |
| download | guile-1cd4fffcde4edd4853e039da9a42e0972d851a51.tar.gz | |
Use Gnulib's `sys_stat' module; update Gnulib.
* .x-sc_prohibit_S_IS_definition: New file.
* m4/gnulib-cache.m4: Add `sys_stat'.
* libguile/filesys.c: Remove `S_IS*' macro definitions for Ultrix and
MinGW.
Diffstat (limited to 'lib/putenv.c')
| -rw-r--r-- | lib/putenv.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/putenv.c b/lib/putenv.c index 53cc83912..630a51099 100644 --- a/lib/putenv.c +++ b/lib/putenv.c @@ -44,8 +44,8 @@ extern char **environ; /* This lock protects against simultaneous modifications of `environ'. */ # include <bits/libc-lock.h> __libc_lock_define_initialized (static, envlock) -# define LOCK __libc_lock_lock (envlock) -# define UNLOCK __libc_lock_unlock (envlock) +# define LOCK __libc_lock_lock (envlock) +# define UNLOCK __libc_lock_unlock (envlock) #else # define LOCK # define UNLOCK @@ -71,13 +71,13 @@ _unsetenv (const char *name) while (*ep != NULL) if (!strncmp (*ep, name, len) && (*ep)[len] == '=') { - /* Found it. Remove this pointer by moving later ones back. */ - char **dp = ep; + /* Found it. Remove this pointer by moving later ones back. */ + char **dp = ep; - do - dp[0] = dp[1]; - while (*dp++); - /* Continue the loop in case NAME appears again. */ + do + dp[0] = dp[1]; + while (*dp++); + /* Continue the loop in case NAME appears again. */ } else ++ep; @@ -106,7 +106,7 @@ putenv (char *string) size = 0; for (ep = environ; *ep != NULL; ++ep) if (!strncmp (*ep, string, name_end - string) && - (*ep)[name_end - string] == '=') + (*ep)[name_end - string] == '=') break; else ++size; @@ -116,9 +116,9 @@ putenv (char *string) static char **last_environ = NULL; char **new_environ = (char **) malloc ((size + 2) * sizeof (char *)); if (new_environ == NULL) - return -1; + return -1; (void) memcpy ((void *) new_environ, (void *) environ, - size * sizeof (char *)); + size * sizeof (char *)); new_environ[size] = (char *) string; new_environ[size + 1] = NULL; free (last_environ); |