X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpagealign_alloc.c;h=28e8209f71f509ffe04dfd0eda601d9783b9ee72;hb=a831084b365c91725c12bbdeb67fb309b8b8d00c;hp=e848b06065a163bb48a86dc2925b5c7c9c553c63;hpb=c49424557579cb46914ba4f080720d8b94abab39;p=gnulib.git

diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index e848b0606..28e8209f7 100644
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* Written by Derek R. Price <derek@ximbiot.com>.  */
@@ -28,9 +28,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -44,6 +42,20 @@
 #include "exit.h"
 #include "getpagesize.h"
 #include "xalloc.h"
+#include "gettext.h"
+
+#define _(str) gettext (str)
+
+#if HAVE_MMAP
+/* Define MAP_FILE when it isn't otherwise.  */
+# ifndef MAP_FILE
+#  define MAP_FILE 0
+# endif
+/* Define MAP_FAILED for old systems which neglect to.  */
+# ifndef MAP_FAILED
+#  define MAP_FAILED ((void *)-1)
+# endif
+#endif
 
 
 #if HAVE_MMAP || ! HAVE_POSIX_MEMALIGN
@@ -95,7 +107,7 @@ get_memnode (void *aligned_ptr)
     if (c->aligned_ptr == aligned_ptr)
       break;
 
-  if (!c)
+  if (c == NULL)
     /* An attempt to free untracked memory.  A wrong pointer was passed
        to pagealign_free().  */
     abort ();
@@ -116,33 +128,42 @@ pagealign_alloc (size_t size)
 {
   void *ret;
 #if HAVE_MMAP
-  int flags;
+# ifdef HAVE_MAP_ANONYMOUS
+  const int fd = -1;
+  const int flags = MAP_ANONYMOUS | MAP_PRIVATE;
+# else /* !HAVE_MAP_ANONYMOUS */
   static int fd = -1;  /* Only open /dev/zero once in order to avoid limiting
 			  the amount of memory we may allocate based on the
 			  number of open file descriptors.  */
-# ifdef HAVE_MAP_ANONYMOUS
-  flags = MAP_ANONYMOUS | MAP_PRIVATE;
-  fd = -1;
-# else /* !HAVE_MAP_ANONYMOUS */
-  flags = MAP_FILE | MAP_PRIVATE;
+  const int flags = MAP_FILE | MAP_PRIVATE;
   if (fd == -1)
     {
       fd = open ("/dev/zero", O_RDONLY, 0666);
       if (fd < 0)
-	error (EXIT_FAILURE, errno, "Failed to open /dev/zero for read");
+	error (EXIT_FAILURE, errno, _("Failed to open /dev/zero for read"));
     }
 # endif /* HAVE_MAP_ANONYMOUS */
   ret = mmap (NULL, size, PROT_READ | PROT_WRITE, flags, fd, 0);
-  if (!ret)
-    error (EXIT_FAILURE, errno, "mmap to /dev/zero failed");
+  if (ret == MAP_FAILED)
+    return NULL;
   new_memnode (ret, size);
 #elif HAVE_POSIX_MEMALIGN
   int status = posix_memalign (&ret, getpagesize (), size);
   if (status)
-    error (EXIT_FAILURE, status, "posix_memalign failed");
+    {
+      errno = status;
+      return NULL;
+    }
 #else /* !HAVE_MMAP && !HAVE_POSIX_MEMALIGN */
   size_t pagesize = getpagesize ();
-  void *unaligned_ptr = xmalloc (size + pagesize - 1);
+  void *unaligned_ptr = malloc (size + pagesize - 1);
+  if (unaligned_ptr == NULL)
+    {
+      /* Set errno.  We don't know whether malloc already set errno: some
+	 implementations of malloc do, some don't.  */
+      errno = ENOMEM;
+      return NULL;
+    }
   ret = (char *) unaligned_ptr
         + ((- (unsigned long) unaligned_ptr) & (pagesize - 1));
   new_memnode (ret, unaligned_ptr);
@@ -151,11 +172,24 @@ pagealign_alloc (size_t size)
 }
 
 
+void *
+pagealign_xalloc (size_t size)
+{
+  void *ret;
+
+  ret = pagealign_alloc (size);
+  if (ret == NULL)
+    xalloc_die ();
+  return ret;
+}
+
+
 void
 pagealign_free (void *aligned_ptr)
 {
 #if HAVE_MMAP
-  munmap (aligned_ptr, get_memnode (aligned_ptr));
+  if (munmap (aligned_ptr, get_memnode (aligned_ptr)) < 0)
+    error (EXIT_FAILURE, errno, "Failed to unmap memory");
 #elif HAVE_POSIX_MEMALIGN
   free (aligned_ptr);
 #else