patching file sysdeps/mach/hurd/mmap.c Hunk #1 FAILED at 37. Hunk #2 succeeded at 55 with fuzz 2 (offset 3 lines). Hunk #3 FAILED at 100. Hunk #4 FAILED at 125. Hunk #5 FAILED at 140. Hunk #6 FAILED at 152. 5 out of 6 hunks FAILED -- saving rejects to file sysdeps/mach/hurd/mmap.c.rej Reject file sysdeps/mach/hurd/mmap.c.rej: --- sysdeps/mach/hurd/mmap.c +++ sysdeps/mach/hurd/mmap.c @@ -37,6 +37,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) vm_prot_t vmprot; memory_object_t memobj; vm_address_t mapaddr; + boolean_t copy; mapaddr = (vm_address_t) addr; @@ -100,7 +103,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) __mach_port_deallocate (__mach_task_self (), memobj); } else if (wobj == MACH_PORT_NULL /* Not writable by mapping. */ - && !(flags & MAP_SHARED)) + && copy) /* 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. */ @@ -125,9 +128,8 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) &mapaddr, (vm_size_t) len, (vm_address_t) 0, mapaddr == 0, memobj, (vm_offset_t) offset, - ! (flags & MAP_SHARED), - vmprot, VM_PROT_ALL, - (flags & MAP_SHARED) ? VM_INHERIT_SHARE : VM_INHERIT_COPY); + copy, vmprot, VM_PROT_ALL, + copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE); if (flags & MAP_FIXED) { @@ -140,10 +142,8 @@ __mmap (void *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, 0, memobj, (vm_offset_t) offset, - ! (flags & MAP_SHARED), - vmprot, VM_PROT_ALL, - (flags & MAP_SHARED) ? VM_INHERIT_SHARE - : VM_INHERIT_COPY); + copy, vmprot, VM_PROT_ALL, + copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE); } } else @@ -152,10 +152,8 @@ __mmap (void *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, 1, memobj, (vm_offset_t) offset, - ! (flags & MAP_SHARED), - vmprot, VM_PROT_ALL, - (flags & MAP_SHARED) ? VM_INHERIT_SHARE - : VM_INHERIT_COPY); + copy, vmprot, VM_PROT_ALL, + copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE); } if (memobj != MACH_PORT_NULL)