X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsetenv.c;h=83b52b88b980a297ca1944746be527eeeee79ad8;hb=a9577e5bdf9e9814ff774a2a68e9f83b5e842fe6;hp=57e6dd9e6c5ffead331999887bb255f7db0e373c;hpb=336175d085dac321bc026534f4d9193c092183d3;p=gnulib.git
diff --git a/lib/setenv.c b/lib/setenv.c
index 57e6dd9e6..83b52b88b 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -1,88 +1,45 @@
-/* Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003,2005-2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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 3 of the License, or
+ (at your option) any later version.
- The GNU C Library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
-#if HAVE_CONFIG_H
+#if !_LIBC
# include
#endif
+#include
-#ifdef __GNUC__
-# ifndef alloca
-# define alloca __builtin_alloca
-# endif
-#else
-# ifdef _MSC_VER
-# include
-# define alloca _alloca
-# else
-# if HAVE_ALLOCA_H
-# include
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifdef __hpux /* This section must match that of bison generated files. */
-# ifdef __cplusplus
-extern "C" void *alloca (unsigned int);
-# else /* not __cplusplus */
-void *alloca ();
-# endif /* not __cplusplus */
-# else /* not __hpux */
-# ifndef alloca
-char *alloca ();
-# endif
-# endif /* __hpux */
-# endif
-# endif
-# endif
-#endif
+/* Specification. */
+#include
#include
-#if !_LIBC
-# if !defined errno && !defined HAVE_ERRNO_DECL
-extern int errno;
-# endif
+#ifndef __set_errno
# define __set_errno(ev) ((errno) = (ev))
#endif
-#if _LIBC || HAVE_STDLIB_H
-# include
-#endif
-#if _LIBC || HAVE_STRING_H
-# include
-#endif
+#include
#if _LIBC || HAVE_UNISTD_H
# include
#endif
-/* For those losing systems which don't have 'alloca' we have to add
- some additional code emulating it. */
-#if _LIBC || HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
+#if _LIBC || !HAVE_SETENV
+
+#if !_LIBC
+# include "malloca.h"
#endif
#if !_LIBC
# define __environ environ
-# ifndef HAVE_ENVIRON_DECL
-extern char **environ;
-# endif
#endif
#if _LIBC
@@ -198,11 +155,18 @@ __add_to_environ (const char *name, const char *value, const char *combined,
{
/* See whether the value is already known. */
#ifdef USE_TSEARCH
- new_value = (char *) alloca (namelen + 1 + vallen);
# ifdef _LIBC
+ new_value = (char *) alloca (namelen + 1 + vallen);
__mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
value, vallen);
# else
+ new_value = (char *) malloca (namelen + 1 + vallen);
+ if (new_value == NULL)
+ {
+ __set_errno (ENOMEM);
+ UNLOCK;
+ return -1;
+ }
memcpy (new_value, name, namelen);
new_value[namelen] = '=';
memcpy (&new_value[namelen + 1], value, vallen);
@@ -215,7 +179,7 @@ __add_to_environ (const char *name, const char *value, const char *combined,
new_environ[size] = (char *) malloc (namelen + 1 + vallen);
if (new_environ[size] == NULL)
{
-#ifdef USE_TSEARCH
+#if defined USE_TSEARCH && !defined _LIBC
freea (new_value);
#endif
__set_errno (ENOMEM);
@@ -235,7 +199,7 @@ __add_to_environ (const char *name, const char *value, const char *combined,
user string or not. */
STORE_VALUE (new_environ[size]);
}
-#ifdef USE_TSEARCH
+#if defined USE_TSEARCH && !defined _LIBC
freea (new_value);
#endif
}
@@ -258,11 +222,19 @@ __add_to_environ (const char *name, const char *value, const char *combined,
else
{
#ifdef USE_TSEARCH
- char *new_value = alloca (namelen + 1 + vallen);
+ char *new_value;
# ifdef _LIBC
+ new_value = alloca (namelen + 1 + vallen);
__mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
value, vallen);
# else
+ new_value = malloca (namelen + 1 + vallen);
+ if (new_value == NULL)
+ {
+ __set_errno (ENOMEM);
+ UNLOCK;
+ return -1;
+ }
memcpy (new_value, name, namelen);
new_value[namelen] = '=';
memcpy (&new_value[namelen + 1], value, vallen);
@@ -275,9 +247,10 @@ __add_to_environ (const char *name, const char *value, const char *combined,
np = malloc (namelen + 1 + vallen);
if (np == NULL)
{
-#ifdef USE_TSEARCH
+#if defined USE_TSEARCH && !defined _LIBC
freea (new_value);
#endif
+ __set_errno (ENOMEM);
UNLOCK;
return -1;
}
@@ -292,7 +265,7 @@ __add_to_environ (const char *name, const char *value, const char *combined,
/* And remember the value. */
STORE_VALUE (np);
}
-#ifdef USE_TSEARCH
+#if defined USE_TSEARCH && !defined _LIBC
freea (new_value);
#endif
}
@@ -315,7 +288,7 @@ setenv (const char *name, const char *value, int replace)
never made it. Nevertheless the POSIX.9 standard (POSIX bindings
for Fortran 77) requires this function. */
int
-clearenv ()
+clearenv (void)
{
LOCK;
@@ -353,3 +326,5 @@ text_set_element (__libc_subfreeres, free_mem);
weak_alias (__setenv, setenv)
weak_alias (__clearenv, clearenv)
#endif
+
+#endif /* _LIBC || !HAVE_SETENV */