Module setenv does not depend on 'malloc-posix', 'realloc-posix'.

diff --git a/ChangeLog b/ChangeLog
index edb9122d5e6300aba8ee6930730f1a21709f83c6..361016a2e413e9294aee98431b488bdc08d27958 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-09  Bruno Haible  <bruno@clisp.org>
+
+       Module setenv does not depend on 'malloc-posix', 'realloc-posix'.
+       * lib/setenv.c (__add_to_environ): Set errno to ENOMEM when malloc or
+       realloc failed.
+
 2010-06-08  Peter Simons  <simons@cryp.to>
 
        maint.mk: make the news-check rule more configurable

diff --git a/lib/setenv.c b/lib/setenv.c
index ee9da0d8090c02936b4f5c2a6ddc2070116a28d5..178191c6173f161e20d0a63e395037a404c34498 100644 (file)
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -147,6 +147,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;
         }