X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fputenv.c;h=cc14b938955eb65279b97c735b4add8abdc0e9bb;hb=1a2869593e115e4a6c74aaa0b23ca612357403ce;hp=1c097ccc47e9e53bb000e6f72c6c82bb32e675a9;hpb=a62be9f4039b4499cfbb76e394cad2259d03fa84;p=gnulib.git
diff --git a/lib/putenv.c b/lib/putenv.c
index 1c097ccc4..cc14b9389 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,11 +1,12 @@
-/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2008
+ 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,12 +15,12 @@
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
@@ -30,18 +31,8 @@
# 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
@@ -61,7 +52,7 @@ __libc_lock_define_initialized (static, envlock)
#endif
static int
-unsetenv (const char *name)
+_unsetenv (const char *name)
{
size_t len;
char **ep;
@@ -100,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;
@@ -109,7 +100,7 @@ rpl_putenv (const char *string)
if (name_end == NULL)
{
/* Remove the variable from the environment. */
- return unsetenv (string);
+ return _unsetenv (string);
}
size = 0;
@@ -130,13 +121,12 @@ rpl_putenv (const char *string)
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;
}