From 180c9ab7e35dfd7f3fc730594431999bd6befde3 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 20 Jul 1999 21:07:23 +0000 Subject: 1999-07-20 Mark Kettenis * sysdeps/mach/hurd/mmap.c (__mmap): Use correct arguments in __vm_allocate calls. 1999-07-20 Mark Kettenis * sysdeps/mach/hurd/sysd-stdio.c (__stdio_read): Call _hurd_fd_read with new OFFSET argument set to -1. (__stdio_write): Call _hurd_fd_write with new OFFSET argument set to -1. 1999-07-17 Roland McGrath * hurd/hurdexec.c (_hurd_exec): Prune trailing null ports from the descriptor table sent in the RPC. --- sysdeps/mach/hurd/mmap.c | 5 +++-- sysdeps/mach/hurd/sysd-stdio.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c index 403678af9c..0e6a6e09f3 100644 --- a/sysdeps/mach/hurd/mmap.c +++ b/sysdeps/mach/hurd/mmap.c @@ -46,7 +46,8 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset) && prot == (PROT_READ|PROT_WRITE)) /* cf VM_PROT_DEFAULT */ { /* vm_allocate has (a little) less overhead in the kernel too. */ - err = __vm_allocate (&mapaddr, len, !(flags & MAP_FIXED)); + err = __vm_allocate (__mach_task_self (), &mapaddr, len, + !(flags & MAP_FIXED)); if (err == KERN_NO_SPACE && (flags & MAP_FIXED)) { @@ -54,7 +55,7 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset) /* The region is already allocated; deallocate it first. */ err = __vm_deallocate (__mach_task_self (), mapaddr, len); if (!err) - err = __vm_allocate (&mapaddr, len, 0); + err = __vm_allocate (__mach_task_self (), &mapaddr, len, 0); } return err ? (__ptr_t) (long int) __hurd_fail (err) : (__ptr_t) mapaddr; diff --git a/sysdeps/mach/hurd/sysd-stdio.c b/sysdeps/mach/hurd/sysd-stdio.c index d12804a4a0..fea9b56a96 100644 --- a/sysdeps/mach/hurd/sysd-stdio.c +++ b/sysdeps/mach/hurd/sysd-stdio.c @@ -61,7 +61,7 @@ __stdio_read (cookie, buf, n) if (! fd) return __hurd_fail (EBADF); - if (err = _hurd_fd_read (fd, buf, &n)) + if (err = _hurd_fd_read (fd, buf, &n, -1)) return fd_fail (fd, err); return n; @@ -86,7 +86,7 @@ __stdio_write (cookie, buf, n) do { wrote = nleft; - if (err = _hurd_fd_write (fd, buf, &wrote)) + if (err = _hurd_fd_write (fd, buf, &wrote, -1)) return fd_fail (fd, err); buf += wrote; nleft -= wrote; -- cgit 1.4.1