X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fputenv.c;h=cc14b938955eb65279b97c735b4add8abdc0e9bb;hb=b156173b313f1903489b8c0c74292de350637f5f;hp=0b1e6644e4f2b2d5d6afffb2a1c1891a68a47137;hpb=310c41f74d42756b22ed2fcbe42b69bbe75a9ecf;p=gnulib.git
diff --git a/lib/putenv.c b/lib/putenv.c
index 0b1e6644e..cc14b9389 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-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,45 +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 2.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). */
-
-char *malloc ();
-void free ();
-
-#if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H)
-# include
-#endif
-#if defined (__GNU_LIBRARY__) || defined (HAVE_UNISTD_H)
-# include
-#endif
-
-#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
@@ -71,12 +51,8 @@ __libc_lock_define_initialized (static, envlock)
# define UNLOCK
#endif
-#ifndef NULL
-# define NULL 0
-#endif
-
static int
-unsetenv (const char *name)
+_unsetenv (const char *name)
{
size_t len;
char **ep;
@@ -115,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;
@@ -124,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;
@@ -145,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;
}