X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fputenv.c;h=68e5fec31b900643415d1ff7d117719c2711df77;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=df2f39fe5d120d5611e2bb3b1a58c879eef1fec2;hpb=729a416929445412aa45238f483c266f0555c6d8;p=gnulib.git
diff --git a/lib/putenv.c b/lib/putenv.c
index df2f39fe5..68e5fec31 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,11 +1,12 @@
-/* Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2011 Free Software
+ Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu.
- This program is free software; you can redistribute it and/or modify it
+ This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
+ Free Software Foundation; either version 3 of the License, or any
later version.
This program is distributed in the hope that it will be useful,
@@ -14,37 +15,24 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
-#include
+#include
-#if HAVE_CONFIG_H
-# include
-#endif
+/* Specification. */
+#include
-/* Define-away any (possibly conflicting) prototype of putenv.
- Many systems omit the `const' attribute on the argument. */
-#define putenv _sys_putenv
+#include
-#if defined (__GNU_LIBRARY__) || defined (HAVE_STDLIB_H)
-# include
-#endif
-#if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
-# include
-#endif
-#if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
-# include
+/* Include errno.h *after* sys/types.h to work around header problems
+ on AIX 3.2.5. */
+#include
+#ifndef __set_errno
+# define __set_errno(ev) ((errno) = (ev))
#endif
-#undef putenv
-
-#if !defined (__GNU_LIBRARY__) && !defined (HAVE_STRCHR)
-# define strchr index
-#endif
-#if !defined (__GNU_LIBRARY__) && !defined (HAVE_MEMCPY)
-# define memcpy(d,s,n) bcopy ((s), (d), (n))
-#endif
+#include
+#include
#if HAVE_GNU_LD
# define environ __environ
@@ -52,11 +40,58 @@
extern char **environ;
#endif
+#if _LIBC
+/* This lock protects against simultaneous modifications of `environ'. */
+# include
+__libc_lock_define_initialized (static, envlock)
+# define LOCK __libc_lock_lock (envlock)
+# define UNLOCK __libc_lock_unlock (envlock)
+#else
+# define LOCK
+# define UNLOCK
+#endif
+
+static int
+_unsetenv (const char *name)
+{
+ size_t len;
+ char **ep;
+
+ if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+ len = strlen (name);
+
+ LOCK;
+
+ ep = environ;
+ while (*ep != NULL)
+ if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+ {
+ /* 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. */
+ }
+ else
+ ++ep;
+
+ UNLOCK;
+
+ return 0;
+}
+
-/* Put STRING, which is of the form "NAME=VALUE", in the environment. */
+/* Put STRING, which is of the form "NAME=VALUE", in the environment.
+ If STRING contains no `=', then remove STRING from the environment. */
int
-putenv (string)
- const char *string;
+putenv (char *string)
{
const char *const name_end = strchr (string, '=');
register size_t size;
@@ -65,24 +100,13 @@ putenv (string)
if (name_end == NULL)
{
/* Remove the variable from the environment. */
- size = strlen (string);
- for (ep = environ; *ep != NULL; ++ep)
- if (!strncmp (*ep, string, size) && (*ep)[size] == '=')
- {
- while (ep[1] != NULL)
- {
- ep[0] = ep[1];
- ++ep;
- }
- *ep = NULL;
- return 0;
- }
+ return _unsetenv (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;
@@ -92,18 +116,17 @@ putenv (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;
- if (last_environ != NULL)
- free ((void *) last_environ);
+ free (last_environ);
last_environ = new_environ;
environ = new_environ;
}
else
- *ep = (char *) string;
+ *ep = string;
return 0;
}