Avoid relocwrapper link errors due to gnulib replacement functions.

diff --git a/ChangeLog b/ChangeLog
index d8cafae3ba7c57ad4f34d6f4784b0911eab5142e..57d9e2c981d78b7c6cc1977cc5c2525c10297d7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-09  Bruno Haible  <bruno@clisp.org>
+
+       Avoid relocwrapper link errors due to gnulib replacement functions.
+       * lib/areadlink.c: Use the system's malloc, realloc functions.
+       (areadlink): Set errno to ENOMEM explicitly.
+       * modules/areadlink (Depends-on): Remove malloc-posix.
+       Reported by Ben Pfaff <blp@cs.stanford.edu>.
+
 2010-06-09  Bruno Haible  <bruno@clisp.org>
 
        Avoid relocwrapper link errors due to gnulib replacement functions.

diff --git a/lib/areadlink.c b/lib/areadlink.c
index b0db4200cb2e7e77b2cc71ecd34870bbd93fb828..1c82c55d25fd8c67f21ef8c0be28eec4f403dbca 100644 (file)
--- a/lib/areadlink.c
+++ b/lib/areadlink.c
@@ -35,6 +35,10 @@
 # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
 #endif
 
+/* Use the system functions, not the gnulib overrides in this file.  */
+#undef malloc
+#undef realloc
+
 /* The initial buffer size for the link value.  A power of 2
    detects arithmetic overflow earlier, but is not required.  */
 enum {
@@ -85,8 +89,12 @@ areadlink (char const *filename)
             {
               buffer = (char *) malloc (link_length);
               if (buffer == NULL)
-                /* errno is ENOMEM.  */
-                return NULL;
+                {
+                  /* It's easier to set errno to ENOMEM than to rely on the
+                     'malloc-posix' gnulib module.  */
+                  errno = ENOMEM;
+                  return NULL;
+                }
               memcpy (buffer, initial_buf, link_length);
             }
           else
@@ -113,7 +121,11 @@ areadlink (char const *filename)
         }
       buffer = (char *) malloc (buf_size);
       if (buffer == NULL)
-        /* errno is ENOMEM.  */
-        return NULL;
+        {
+          /* It's easier to set errno to ENOMEM than to rely on the
+             'malloc-posix' gnulib module.  */
+          errno = ENOMEM;
+          return NULL;
+        }
     }
 }

diff --git a/modules/areadlink b/modules/areadlink
index 199c77fa2f4a437b5831e34184dc12682dba4e76..316626994fd4963a413b1b6f59529d7601a0e666 100644 (file)
--- a/modules/areadlink
+++ b/modules/areadlink
@@ -6,7 +6,6 @@ lib/areadlink.h
 lib/areadlink.c
 
 Depends-on:
-malloc-posix
 readlink
 ssize_t
 stdint