X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsetenv.c;h=173d95f28b4853599777e28f7d20fdb7d32cd904;hb=a8c57e011a0ab59ce3aa97d46d4f4ad496367560;hp=b4c55322907ce70864434e168e407476b409c929;hpb=8d8eda4eab3d2801251daf4eb31756c3595e2fc6;p=gnulib.git
diff --git a/lib/setenv.c b/lib/setenv.c
index b4c553229..173d95f28 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2010 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2011 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
@@ -15,6 +15,7 @@
along with this program. If not, see . */
#if !_LIBC
+# define _GL_USE_STDLIB_ALLOC 1
# include
#endif
@@ -112,8 +113,8 @@ int
__add_to_environ (const char *name, const char *value, const char *combined,
int replace)
{
- register char **ep;
- register size_t size;
+ char **ep;
+ size_t size;
const size_t namelen = strlen (name);
const size_t vallen = value != NULL ? strlen (value) + 1 : 0;
@@ -147,6 +148,9 @@ __add_to_environ (const char *name, const char *value, const char *combined,
: realloc (last_environ, (size + 2) * sizeof (char *)));
if (new_environ == NULL)
{
+ /* It's easier to set errno to ENOMEM than to rely on the
+ 'malloc-posix' and 'realloc-posix' gnulib modules. */
+ __set_errno (ENOMEM);
UNLOCK;
return -1;
}
@@ -249,7 +253,7 @@ __add_to_environ (const char *name, const char *value, const char *combined,
if (np == NULL)
#endif
{
- np = malloc (namelen + 1 + vallen);
+ np = (char *) malloc (namelen + 1 + vallen);
if (np == NULL)
{
#if defined USE_TSEARCH && !defined _LIBC