Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / sysdeps / mach / hurd / mmap.c

diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c
index ca340450128b4d930e1ddfc32015aaf5a95cb099..1e6ab401af57e147fefa3fff6cfebb0af897cd71 100644 (file)
--- a/sysdeps/mach/hurd/mmap.c
+++ b/sysdeps/mach/hurd/mmap.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -26,12 +26,12 @@
    is nonzero, it is the desired mapping address.  If the MAP_FIXED bit is
    set in FLAGS, the mapping will be at ADDR exactly (which must be
    page-aligned); otherwise the system chooses a convenient nearby address.
-   The return value is the actual mapping address chosen or (__ptr_t) -1
+   The return value is the actual mapping address chosen or (void *) -1
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-__ptr_t
-__mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
+void *
+__mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
   error_t err;
   vm_prot_t vmprot;
@@ -41,32 +41,8 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
   mapaddr = (vm_address_t) addr;
 
   /* ADDR and OFFSET must be page-aligned.  */
-  if ((mapaddr & (vm_page_size - 1)) || (offset & (vm_page_size - 1)))
-    return (__ptr_t) (long int) __hurd_fail (EINVAL);
-
-  if ((flags & (MAP_TYPE|MAP_INHERIT)) == MAP_ANON
-      && prot == (PROT_READ|PROT_WRITE)) /* cf VM_PROT_DEFAULT */
-    {
-      /* vm_allocate has (a little) less overhead in the kernel too.  */
-      err = __vm_allocate (__mach_task_self (), &mapaddr, len,
-                          mapaddr == NULL);
-
-      if (err == KERN_NO_SPACE)
-       {
-         if (flags & MAP_FIXED)
-           {
-             /* XXX this is not atomic as it is in unix! */
-             /* The region is already allocated; deallocate it first.  */
-             err = __vm_deallocate (__mach_task_self (), mapaddr, len);
-             if (!err)
-               err = __vm_allocate (__mach_task_self (), &mapaddr, len, 0);
-           }
-         else if (mapaddr != NULL)
-           err = __vm_allocate (__mach_task_self (), &mapaddr, len, 1);
-       }
-
-      return err ? (__ptr_t) (long int) __hurd_fail (err) : (__ptr_t) mapaddr;
-    }
+  if ((mapaddr & (__vm_page_size - 1)) || (offset & (__vm_page_size - 1)))
+    return (void *) (long int) __hurd_fail (EINVAL);
 
   vmprot = VM_PROT_NONE;
   if (prot & PROT_READ)
@@ -79,7 +55,7 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
   switch (flags & MAP_TYPE)
     {
     default:
-      return (__ptr_t) (long int) __hurd_fail (EINVAL);
+      return (void *) (long int) __hurd_fail (EINVAL);
 
     case MAP_ANON:
       memobj = MACH_PORT_NULL;
@@ -93,10 +69,17 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
          {
            if (err == MIG_BAD_ID || err == EOPNOTSUPP || err == ENOSYS)
              err = ENODEV;     /* File descriptor doesn't support mmap.  */
-           return (__ptr_t) (long int) __hurd_dfail (fd, err);
+           return (void *) (long int) __hurd_dfail (fd, err);
          }
        switch (prot & (PROT_READ|PROT_WRITE))
          {
+         /* Although it apparently doesn't make sense to map a file with
+            protection set to PROT_NONE, it is actually sometimes done.
+            In particular, that's how localedef reserves some space for
+            the locale archive file, the rationale being that some
+            implementations take into account whether the mapping is
+            anonymous or not when selecting addresses.  */
+         case PROT_NONE:
          case PROT_READ:
            memobj = robj;
            if (wobj != MACH_PORT_NULL)
@@ -114,8 +97,8 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
                /* Remove extra reference.  */
                __mach_port_deallocate (__mach_task_self (), memobj);
              }
-           else if (wobj == MACH_PORT_NULL && /* Not writable by mapping.  */
-                    !(flags & MAP_SHARED))
+           else if (wobj == MACH_PORT_NULL /* Not writable by mapping.  */
+                    && !(flags & MAP_SHARED))
              /* The file can only be mapped for reading.  Since we are
                 making a private mapping, we will never try to write the
                 object anyway, so we don't care.  */
@@ -123,11 +106,11 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
            else
              {
                __mach_port_deallocate (__mach_task_self (), wobj);
-               return (__ptr_t) (long int) __hurd_fail (EACCES);
+               return (void *) (long int) __hurd_fail (EACCES);
              }
            break;
-         default:              /* impossible */
-           return 0;
+         default:
+           __builtin_unreachable ();
          }
        break;
        /* XXX handle MAP_NOEXTEND */
@@ -138,7 +121,7 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 
   err = __vm_map (__mach_task_self (),
                  &mapaddr, (vm_size_t) len, (vm_address_t) 0,
-                 mapaddr == NULL,
+                 mapaddr == 0,
                  memobj, (vm_offset_t) offset,
                  ! (flags & MAP_SHARED),
                  vmprot, VM_PROT_ALL,
@@ -160,7 +143,7 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
                            (flags & MAP_SHARED) ? VM_INHERIT_SHARE
                            : VM_INHERIT_COPY);
        }
-      else if (mapaddr != NULL)
+      else if (mapaddr != 0)
        err = __vm_map (__mach_task_self (),
                        &mapaddr, (vm_size_t) len, (vm_address_t) 0,
                        1, memobj, (vm_offset_t) offset,
@@ -174,9 +157,10 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
     __mach_port_deallocate (__mach_task_self (), memobj);
 
   if (err)
-    return (__ptr_t) (long int) __hurd_fail (err);
+    return (void *) (long int) __hurd_fail (err);
 
-  return (__ptr_t) mapaddr;
+  return (void *) mapaddr;
 }
 
+libc_hidden_def (__mmap)
 weak_alias (__mmap, mmap)