Update.
2004-05-10 Jakub Jelinek <jakub@redhat.com>
* sysdeps/posix/sysconf.c (__sysconf) <cases _SC_REALTIME_SIGNALS,
_SC_PRIORITY_SCHEDULING, _SC_TIMERS, _SC_ASYNCHRONOUS_IO,
_SC_PRIORITIZED_IO, _SC_SYNCHRONIZED_IO, _SC_FSYNC, _SC_MAPPED_FILES,
_SC_MEMLOCK, _SC_MEMLOCK_RANGE, _SC_MEMORY_PROTECTION,
_SC_MESSAGE_PASSING, _SC_SEMAPHORES, _SC_SHARED_MEMORY_OBJECTS,
_SC_THREADS, _SC_THREAD_SAFE_FUNCTIONS, _SC_THREAD_ATTR_STACKADDR,
_SC_THREAD_ATTR_STACKSIZE, _SC_THREAD_PRIORITY_SCHEDULING,
_SC_THREAD_PRIO_INHERIT, _SC_THREAD_PRIO_PROTECT,
_SC_THREAD_PROCESS_SHARED>: Return _POSIX_* value instead of 1.
* sysdeps/unix/sysv/linux/sysconf.c (__sysconf)
<case _SC_MONOTONIC_CLOCK>: Return _POSIX_VERSION instead of 1.
2004-05-07 Jeroen Dekkers <jeroen@dekkers.cx>
* sysdeps/mach/hurd/i386/Makefile (CFLAGS-init-first.c): Add
-momit-leaf-frame-pointer.
* inet/test-ifaddrs.c (addr_string): Surround AF_PACKET case with
#ifdef AF_PACKET.
* sysdeps/mach/hurd/getcwd.c
(_hurd_canonicalize_directory_name_intern): Only realloc when
size is <= 0.
* sysdeps/mach/hurd/mmap.c (__mmap): Fail when addr or offset
isn't page aligned.
* sysdeps/mach/hurd/spawni.c (EXPAND_DTABLE): Set dtablesize to
new size.
* sysdeps/mach/hurd/Versions (GLIBC_PRIVATE): Add __libc_read,
__libc_write and __libc_lseek64.
2004-06-01 18:53:04 +00:00
|
|
|
/* Copyright (C) 1994,1995,1996,1997,1999,2002,2003,2004
|
2003-09-05 21:25:15 +00:00
|
|
|
Free Software Foundation, Inc.
|
1997-06-23 21:55:26 +00:00
|
|
|
This file is part of the GNU C Library.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1997-06-23 21:55:26 +00:00
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1997-06-23 21:55:26 +00:00
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with the GNU C Library; if not, write to the Free
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 USA. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/mman.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <hurd.h>
|
|
|
|
#include <hurd/fd.h>
|
|
|
|
|
|
|
|
/* Map addresses starting near ADDR and extending for LEN bytes. from
|
|
|
|
OFFSET into the file FD describes according to PROT and FLAGS. If ADDR
|
|
|
|
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.
|
1997-10-15 05:34:02 +00:00
|
|
|
The return value is the actual mapping address chosen or (__ptr_t) -1
|
1995-02-18 01:27:10 +00:00
|
|
|
for errors (in which case `errno' is set). A successful `mmap' call
|
|
|
|
deallocates any previous mapping for the affected region. */
|
|
|
|
|
1997-10-15 05:34:02 +00:00
|
|
|
__ptr_t
|
|
|
|
__mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
|
|
|
error_t err;
|
|
|
|
vm_prot_t vmprot;
|
|
|
|
memory_object_t memobj;
|
|
|
|
vm_address_t mapaddr;
|
Regenerated
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
1995-12-12 02:42:14 +00:00
|
|
|
|
1999-07-11 11:44:31 +00:00
|
|
|
mapaddr = (vm_address_t) addr;
|
|
|
|
|
Update.
2004-05-10 Jakub Jelinek <jakub@redhat.com>
* sysdeps/posix/sysconf.c (__sysconf) <cases _SC_REALTIME_SIGNALS,
_SC_PRIORITY_SCHEDULING, _SC_TIMERS, _SC_ASYNCHRONOUS_IO,
_SC_PRIORITIZED_IO, _SC_SYNCHRONIZED_IO, _SC_FSYNC, _SC_MAPPED_FILES,
_SC_MEMLOCK, _SC_MEMLOCK_RANGE, _SC_MEMORY_PROTECTION,
_SC_MESSAGE_PASSING, _SC_SEMAPHORES, _SC_SHARED_MEMORY_OBJECTS,
_SC_THREADS, _SC_THREAD_SAFE_FUNCTIONS, _SC_THREAD_ATTR_STACKADDR,
_SC_THREAD_ATTR_STACKSIZE, _SC_THREAD_PRIORITY_SCHEDULING,
_SC_THREAD_PRIO_INHERIT, _SC_THREAD_PRIO_PROTECT,
_SC_THREAD_PROCESS_SHARED>: Return _POSIX_* value instead of 1.
* sysdeps/unix/sysv/linux/sysconf.c (__sysconf)
<case _SC_MONOTONIC_CLOCK>: Return _POSIX_VERSION instead of 1.
2004-05-07 Jeroen Dekkers <jeroen@dekkers.cx>
* sysdeps/mach/hurd/i386/Makefile (CFLAGS-init-first.c): Add
-momit-leaf-frame-pointer.
* inet/test-ifaddrs.c (addr_string): Surround AF_PACKET case with
#ifdef AF_PACKET.
* sysdeps/mach/hurd/getcwd.c
(_hurd_canonicalize_directory_name_intern): Only realloc when
size is <= 0.
* sysdeps/mach/hurd/mmap.c (__mmap): Fail when addr or offset
isn't page aligned.
* sysdeps/mach/hurd/spawni.c (EXPAND_DTABLE): Set dtablesize to
new size.
* sysdeps/mach/hurd/Versions (GLIBC_PRIVATE): Add __libc_read,
__libc_write and __libc_lseek64.
2004-06-01 18:53:04 +00:00
|
|
|
/* 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);
|
|
|
|
|
1999-07-11 11:44:31 +00:00
|
|
|
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. */
|
1999-07-20 21:07:23 +00:00
|
|
|
err = __vm_allocate (__mach_task_self (), &mapaddr, len,
|
|
|
|
!(flags & MAP_FIXED));
|
1999-07-11 11:44:31 +00:00
|
|
|
|
|
|
|
if (err == KERN_NO_SPACE && (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)
|
1999-07-20 21:07:23 +00:00
|
|
|
err = __vm_allocate (__mach_task_self (), &mapaddr, len, 0);
|
1999-07-11 11:44:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return err ? (__ptr_t) (long int) __hurd_fail (err) : (__ptr_t) mapaddr;
|
|
|
|
}
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
vmprot = VM_PROT_NONE;
|
|
|
|
if (prot & PROT_READ)
|
|
|
|
vmprot |= VM_PROT_READ;
|
|
|
|
if (prot & PROT_WRITE)
|
|
|
|
vmprot |= VM_PROT_WRITE;
|
|
|
|
if (prot & PROT_EXEC)
|
|
|
|
vmprot |= VM_PROT_EXECUTE;
|
|
|
|
|
|
|
|
switch (flags & MAP_TYPE)
|
|
|
|
{
|
|
|
|
default:
|
1997-10-15 05:34:02 +00:00
|
|
|
return (__ptr_t) (long int) __hurd_fail (EINVAL);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
case MAP_ANON:
|
|
|
|
memobj = MACH_PORT_NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MAP_FILE:
|
1995-08-25 19:23:32 +00:00
|
|
|
case 0: /* Allow, e.g., just MAP_SHARED. */
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
|
|
|
mach_port_t robj, wobj;
|
|
|
|
if (err = HURD_DPORT_USE (fd, __io_map (port, &robj, &wobj)))
|
2003-09-05 21:25:15 +00:00
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
switch (prot & (PROT_READ|PROT_WRITE))
|
|
|
|
{
|
|
|
|
case PROT_READ:
|
|
|
|
memobj = robj;
|
1995-11-22 10:00:23 +00:00
|
|
|
if (wobj != MACH_PORT_NULL)
|
|
|
|
__mach_port_deallocate (__mach_task_self (), wobj);
|
1995-02-18 01:27:10 +00:00
|
|
|
break;
|
|
|
|
case PROT_WRITE:
|
|
|
|
memobj = wobj;
|
1995-11-22 10:00:23 +00:00
|
|
|
if (robj != MACH_PORT_NULL)
|
|
|
|
__mach_port_deallocate (__mach_task_self (), robj);
|
1995-02-18 01:27:10 +00:00
|
|
|
break;
|
|
|
|
case PROT_READ|PROT_WRITE:
|
|
|
|
if (robj == wobj)
|
1995-11-22 10:00:23 +00:00
|
|
|
{
|
|
|
|
memobj = wobj;
|
|
|
|
/* Remove extra reference. */
|
|
|
|
__mach_port_deallocate (__mach_task_self (), memobj);
|
|
|
|
}
|
|
|
|
else if (wobj == MACH_PORT_NULL && /* Not writable by mapping. */
|
1997-07-19 21:18:32 +00:00
|
|
|
!(flags & MAP_SHARED))
|
1995-11-22 10:00:23 +00:00
|
|
|
/* 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. */
|
|
|
|
memobj = robj;
|
1995-02-18 01:27:10 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
__mach_port_deallocate (__mach_task_self (), wobj);
|
1997-10-15 05:34:02 +00:00
|
|
|
return (__ptr_t) (long int) __hurd_fail (EACCES);
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
|
|
|
break;
|
2002-06-15 22:19:53 +00:00
|
|
|
default: /* impossible */
|
|
|
|
return 0;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
/* XXX handle MAP_NOEXTEND */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Regenerated
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
1995-12-12 02:42:14 +00:00
|
|
|
/* XXX handle MAP_INHERIT */
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
err = __vm_map (__mach_task_self (),
|
|
|
|
&mapaddr, (vm_size_t) len, (vm_address_t) 0,
|
1995-08-25 19:23:32 +00:00
|
|
|
! (flags & MAP_FIXED),
|
1995-02-18 01:27:10 +00:00
|
|
|
memobj, (vm_offset_t) offset,
|
Regenerated
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
1995-12-12 02:42:14 +00:00
|
|
|
! (flags & MAP_SHARED),
|
1995-02-18 01:27:10 +00:00
|
|
|
vmprot, VM_PROT_ALL,
|
Regenerated
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
1995-12-12 02:42:14 +00:00
|
|
|
(flags & MAP_SHARED) ? VM_INHERIT_SHARE : VM_INHERIT_COPY);
|
|
|
|
|
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/error.c, locale/error.h: Files removed.
* locale/Makefile (distribute): Remove error.h.
(lib-modules): Remove error.
* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): For "tty"
magic, return ENXIO if no ctty.
* sysdeps/mach/hurd/mmap.c: For MAP_FIXED, deallocate a previous
mapping if vm_map fails for that reason.
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
* elf/elf.h (ET_NUM, SHT_NUM, STB_NUM, STT_NUM, PT_NUM): New macros.
* sysdeps/unix/sysv/linux/sys/mman.h: Include <linux/mman.h> to
define all the bit values.
(MAP_*, MCL_*): Macros removed.
1995-12-09 10:00:22 +00:00
|
|
|
if (err == KERN_NO_SPACE && (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_map (__mach_task_self (),
|
|
|
|
&mapaddr, (vm_size_t) len, (vm_address_t) 0,
|
|
|
|
0, memobj, (vm_offset_t) offset,
|
1996-07-16 21:19:13 +00:00
|
|
|
! (flags & MAP_SHARED),
|
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/error.c, locale/error.h: Files removed.
* locale/Makefile (distribute): Remove error.h.
(lib-modules): Remove error.
* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): For "tty"
magic, return ENXIO if no ctty.
* sysdeps/mach/hurd/mmap.c: For MAP_FIXED, deallocate a previous
mapping if vm_map fails for that reason.
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
* elf/elf.h (ET_NUM, SHT_NUM, STB_NUM, STT_NUM, PT_NUM): New macros.
* sysdeps/unix/sysv/linux/sys/mman.h: Include <linux/mman.h> to
define all the bit values.
(MAP_*, MCL_*): Macros removed.
1995-12-09 10:00:22 +00:00
|
|
|
vmprot, VM_PROT_ALL,
|
1996-07-16 21:19:13 +00:00
|
|
|
(flags & MAP_SHARED) ? VM_INHERIT_SHARE
|
|
|
|
: VM_INHERIT_COPY);
|
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/error.c, locale/error.h: Files removed.
* locale/Makefile (distribute): Remove error.h.
(lib-modules): Remove error.
* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): For "tty"
magic, return ENXIO if no ctty.
* sysdeps/mach/hurd/mmap.c: For MAP_FIXED, deallocate a previous
mapping if vm_map fails for that reason.
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
* elf/elf.h (ET_NUM, SHT_NUM, STB_NUM, STT_NUM, PT_NUM): New macros.
* sysdeps/unix/sysv/linux/sys/mman.h: Include <linux/mman.h> to
define all the bit values.
(MAP_*, MCL_*): Macros removed.
1995-12-09 10:00:22 +00:00
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
if (memobj != MACH_PORT_NULL)
|
|
|
|
__mach_port_deallocate (__mach_task_self (), memobj);
|
|
|
|
|
Regenerated
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
1995-12-12 02:42:14 +00:00
|
|
|
if (err)
|
1997-10-15 05:34:02 +00:00
|
|
|
return (__ptr_t) (long int) __hurd_fail (err);
|
Regenerated
Fri Dec 8 13:04:51 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE,
GLOB_TILDE, GLOB_NOMAGIC.
(glob): Use stat instead of lstat to determine directoriness.
* posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE):
New flag bits.
(__GLOB_FLAGS): Include them.
(glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat,
gl_stat.
1995-12-12 02:42:14 +00:00
|
|
|
|
1997-10-15 05:34:02 +00:00
|
|
|
return (__ptr_t) mapaddr;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
1995-03-06 00:27:08 +00:00
|
|
|
|
|
|
|
weak_alias (__mmap, mmap)
|