X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fputenv.c;h=68e5fec31b900643415d1ff7d117719c2711df77;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=87c5522810ac60ad8b61bf2ad990810642c523ab;hpb=68900e91578c2f84454cb930afa3ef52a7483779;p=gnulib.git
diff --git a/lib/putenv.c b/lib/putenv.c
index 87c552281..68e5fec31 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,11 +1,12 @@
-/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003 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 . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
+
+/* Specification. */
+#include
#include
/* Include errno.h *after* sys/types.h to work around header problems
on AIX 3.2.5. */
#include
-#if !_LIBC
-# if !defined errno
-extern int errno;
-# endif
+#ifndef __set_errno
# define __set_errno(ev) ((errno) = (ev))
#endif
-/* Don't include stdlib.h because some (e.g., Solaris 7) declare putenv
- with a non-const argument. That would conflict with the declaration of
- rpl_putenv below (due to the #define putenv rpl_putenv from config.h). */
-
-void *malloc ();
-void free ();
-
#include
-
-#if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
-# include
-#endif
+#include
#if HAVE_GNU_LD
# define environ __environ
@@ -56,15 +44,15 @@ extern char **environ;
/* 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)
+# define LOCK __libc_lock_lock (envlock)
+# define UNLOCK __libc_lock_unlock (envlock)
#else
# define LOCK
# define UNLOCK
#endif
static int
-unsetenv (const char *name)
+_unsetenv (const char *name)
{
size_t len;
char **ep;
@@ -83,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;
@@ -103,7 +91,7 @@ unsetenv (const char *name)
/* Put STRING, which is of the form "NAME=VALUE", in the environment.
If STRING contains no `=', then remove STRING from the environment. */
int
-rpl_putenv (const char *string)
+putenv (char *string)
{
const char *const name_end = strchr (string, '=');
register size_t size;
@@ -112,13 +100,13 @@ rpl_putenv (const char *string)
if (name_end == NULL)
{
/* Remove the variable from the environment. */
- return unsetenv (string);
+ 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;
@@ -128,18 +116,17 @@ rpl_putenv (const 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;
- if (last_environ != NULL)
- free (last_environ);
+ free (last_environ);
last_environ = new_environ;
environ = new_environ;
}
else
- *ep = (char *) string;
+ *ep = string;
return 0;
}