X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsetenv.c;h=c3f9dc4ca4495c75803fda6de49581c335310bfd;hb=9db47123ce74651bda88707c3f67441622aae399;hp=04073caa0391ef40020604c3c3ec2a19212c28a6;hpb=757bd39e4b07efaefaef3ef11027b7b7b40f5911;p=gnulib.git

diff --git a/lib/setenv.c b/lib/setenv.c
index 04073caa0..c3f9dc4ca 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -28,23 +28,14 @@ extern int errno;
 # define __set_errno(ev) ((errno) = (ev))
 #endif
 
-#if _LIBC || HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if _LIBC || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #if _LIBC || HAVE_UNISTD_H
 # include <unistd.h>
 #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
+# include "allocsa.h"
 #endif
 
 #if !_LIBC
@@ -167,11 +158,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 *) allocsa (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);
@@ -184,8 +182,8 @@ __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
-		  freea (new_value);
+#if defined USE_TSEARCH && !defined _LIBC
+		  freesa (new_value);
 #endif
 		  __set_errno (ENOMEM);
 		  UNLOCK;
@@ -204,8 +202,8 @@ __add_to_environ (const char *name, const char *value, const char *combined,
 		 user string or not.  */
 	      STORE_VALUE (new_environ[size]);
 	    }
-#ifdef USE_TSEARCH
-	  freea (new_value);
+#if defined USE_TSEARCH && !defined _LIBC
+	  freesa (new_value);
 #endif
 	}
 
@@ -227,11 +225,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 = allocsa (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);
@@ -244,9 +250,10 @@ __add_to_environ (const char *name, const char *value, const char *combined,
 	      np = malloc (namelen + 1 + vallen);
 	      if (np == NULL)
 		{
-#ifdef USE_TSEARCH
-		  freea (new_value);
+#if defined USE_TSEARCH && !defined _LIBC
+		  freesa (new_value);
 #endif
+		  __set_errno (ENOMEM);
 		  UNLOCK;
 		  return -1;
 		}
@@ -261,8 +268,8 @@ __add_to_environ (const char *name, const char *value, const char *combined,
 	      /* And remember the value.  */
 	      STORE_VALUE (np);
 	    }
-#ifdef USE_TSEARCH
-	  freea (new_value);
+#if defined USE_TSEARCH && !defined _LIBC
+	  freesa (new_value);
 #endif
 	}
 
@@ -284,7 +291,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;