projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
setenv.c
diff --git
a/lib/setenv.c
b/lib/setenv.c
index
f185e04
..
2383248
100644
(file)
--- a/
lib/setenv.c
+++ b/
lib/setenv.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 1992,1995-1999,2000-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003
,2005,2006
Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@
-13,18
+13,15
@@
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#if
HAVE_CONFIG_H
+#if
!_LIBC
# include <config.h>
#endif
#include <alloca.h>
#include <errno.h>
# include <config.h>
#endif
#include <alloca.h>
#include <errno.h>
-#if !_LIBC
-# if !defined errno && !defined HAVE_ERRNO_DECL
-extern int errno;
-# endif
+#ifndef __set_errno
# define __set_errno(ev) ((errno) = (ev))
#endif
# define __set_errno(ev) ((errno) = (ev))
#endif
@@
-34,13
+31,8
@@
extern int errno;
# include <unistd.h>
#endif
# 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
#endif
#if !_LIBC
@@
-163,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
{
/* See whether the value is already known. */
#ifdef USE_TSEARCH
- new_value = (char *) alloca (namelen + 1 + vallen);
# ifdef _LIBC
# ifdef _LIBC
+ new_value = (char *) alloca (namelen + 1 + vallen);
__mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
value, vallen);
# else
__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);
memcpy (new_value, name, namelen);
new_value[namelen] = '=';
memcpy (&new_value[namelen + 1], value, vallen);
@@
-180,8
+179,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)
{
new_environ[size] = (char *) malloc (namelen + 1 + vallen);
if (new_environ[size] == NULL)
{
-#if
def USE_TSEARCH
- freea (new_value);
+#if
defined USE_TSEARCH && !defined _LIBC
+ free
s
a (new_value);
#endif
__set_errno (ENOMEM);
UNLOCK;
#endif
__set_errno (ENOMEM);
UNLOCK;
@@
-200,8
+199,8
@@
__add_to_environ (const char *name, const char *value, const char *combined,
user string or not. */
STORE_VALUE (new_environ[size]);
}
user string or not. */
STORE_VALUE (new_environ[size]);
}
-#if
def USE_TSEARCH
- freea (new_value);
+#if
defined USE_TSEARCH && !defined _LIBC
+ free
s
a (new_value);
#endif
}
#endif
}
@@
-223,11
+222,19
@@
__add_to_environ (const char *name, const char *value, const char *combined,
else
{
#ifdef USE_TSEARCH
else
{
#ifdef USE_TSEARCH
- char *new_value
= alloca (namelen + 1 + vallen)
;
+ char *new_value;
# ifdef _LIBC
# ifdef _LIBC
+ new_value = alloca (namelen + 1 + vallen);
__mempcpy (__mempcpy (__mempcpy (new_value, name, namelen), "=", 1),
value, vallen);
# else
__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);
memcpy (new_value, name, namelen);
new_value[namelen] = '=';
memcpy (&new_value[namelen + 1], value, vallen);
@@
-240,9
+247,10
@@
__add_to_environ (const char *name, const char *value, const char *combined,
np = malloc (namelen + 1 + vallen);
if (np == NULL)
{
np = malloc (namelen + 1 + vallen);
if (np == NULL)
{
-#if
def USE_TSEARCH
- freea (new_value);
+#if
defined USE_TSEARCH && !defined _LIBC
+ free
s
a (new_value);
#endif
#endif
+ __set_errno (ENOMEM);
UNLOCK;
return -1;
}
UNLOCK;
return -1;
}
@@
-257,8
+265,8
@@
__add_to_environ (const char *name, const char *value, const char *combined,
/* And remember the value. */
STORE_VALUE (np);
}
/* And remember the value. */
STORE_VALUE (np);
}
-#if
def USE_TSEARCH
- freea (new_value);
+#if
defined USE_TSEARCH && !defined _LIBC
+ free
s
a (new_value);
#endif
}
#endif
}