diff options
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/dirfd.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/euidaccess.c | 8 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/trampoline.c | 17 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/opendir.c | 11 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/readdir.c | 3 |
5 files changed, 26 insertions, 17 deletions
diff --git a/sysdeps/mach/hurd/dirfd.c b/sysdeps/mach/hurd/dirfd.c index 366a34079b..9e713fc4ca 100644 --- a/sysdeps/mach/hurd/dirfd.c +++ b/sysdeps/mach/hurd/dirfd.c @@ -19,6 +19,8 @@ Cambridge, MA 02139, USA. */ #include <dirent.h> #include <dirstream.h> +#include <hurd/fd.h> +#include <errno.h> int dirfd (DIR *dirp) @@ -30,7 +32,7 @@ dirfd (DIR *dirp) break; if (fd == _hurd_dtablesize) { - errno = EINVAL + errno = EINVAL; fd = -1; } __mutex_unlock (&_hurd_dtable_lock); diff --git a/sysdeps/mach/hurd/euidaccess.c b/sysdeps/mach/hurd/euidaccess.c index 5ba2af4965..bbd2d21afe 100644 --- a/sysdeps/mach/hurd/euidaccess.c +++ b/sysdeps/mach/hurd/euidaccess.c @@ -20,6 +20,7 @@ Cambridge, MA 02139, USA. */ #include <errno.h> #include <stddef.h> #include <unistd.h> +#include <fcntl.h> #include <hurd.h> int @@ -27,6 +28,7 @@ euidaccess (file, type) const char *file; int type; { + error_t err; file_t port; int allowed, flags; @@ -35,8 +37,8 @@ euidaccess (file, type) return -1; /* Find out what types of access we are allowed to this file. */ - err = __file_check_access (file, &allowed); - __mach_port_deallocate (__mach_task_self (), file); + err = __file_check_access (port, &allowed); + __mach_port_deallocate (__mach_task_self (), port); if (err) return __hurd_fail (err); @@ -54,5 +56,3 @@ euidaccess (file, type) return 0; } - -weak_alias (__access, access) diff --git a/sysdeps/mach/hurd/i386/trampoline.c b/sysdeps/mach/hurd/i386/trampoline.c index eabf940b44..75f11457cd 100644 --- a/sysdeps/mach/hurd/i386/trampoline.c +++ b/sysdeps/mach/hurd/i386/trampoline.c @@ -1,5 +1,5 @@ /* Set thread_state for sighandler, and sigcontext to recover. i386 version. -Copyright (C) 1994 Free Software Foundation, Inc. +Copyright (C) 1994, 1995 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 @@ -51,6 +51,8 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, int signo; long int sigcode; struct sigcontext *scp; /* Points to ctx, below. */ + void *sigreturn_addr; + void *sigreturn_returns_here; struct sigcontext *return_scp; /* Same; arg to sigreturn. */ struct sigcontext ctx; } *stackframe; @@ -120,6 +122,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, stackframe->signo = signo; stackframe->sigcode = sigcode; stackframe->scp = stackframe->return_scp = scp = &stackframe->ctx; + stackframe->sigreturn_addr = &__sigreturn; /* Set up the sigcontext from the current state of the thread. */ @@ -224,11 +227,13 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, 8(%esp) SCP */ asm volatile - ("call %*%%edx\n" /* Call the handler function. */ - "addl $12, %%esp\n" /* Pop its args. */ - "call %P0\n" /* Call __sigreturn (SCP); never returns. */ - "hlt" /* Just in case. */ - : : "i" (&__sigreturn)); + ("call *%edx\n" /* Call the handler function. */ + "addl $12, %esp\n" /* Pop its args. */ + /* The word at the top of stack is &__sigreturn; following are a dummy + word to fill the slot for the address for __sigreturn to return to, + and a copy of SCP for __sigreturn's argument. "Return" to calling + __sigreturn (SCP); this call never returns. */ + "ret"); /* NOTREACHED */ return NULL; diff --git a/sysdeps/mach/hurd/opendir.c b/sysdeps/mach/hurd/opendir.c index 001016d087..40cb9d0dc0 100644 --- a/sysdeps/mach/hurd/opendir.c +++ b/sysdeps/mach/hurd/opendir.c @@ -28,6 +28,7 @@ Cambridge, MA 02139, USA. */ #include <unistd.h> #include <stdio.h> #include <hurd.h> +#include <hurd/fd.h> /* Open a directory stream on NAME. */ @@ -35,8 +36,8 @@ DIR * DEFUN(opendir, (name), CONST char *name) { DIR *dirp; - file_t port; int fd; + struct hurd_fd *d; fd = __open (name, O_RDONLY); if (fd < 0) @@ -51,13 +52,13 @@ DEFUN(opendir, (name), CONST char *name) /* Extract the pointer to the descriptor structure. */ __mutex_lock (&_hurd_dtable_lock); - dirp->__fd = _hurd_dtable[fd]; + d = dirp->__fd = _hurd_dtable[fd]; __mutex_unlock (&_hurd_dtable_lock); /* Set the descriptor to close on exec. */ - __spin_lock (&dirp->__fd->port.lock); - dirp->__fd->flags |= FD_CLOEXEC; - __spin_unlock (&dirp->__fd->port.lock); + __spin_lock (&d->port.lock); + d->flags |= FD_CLOEXEC; + __spin_unlock (&d->port.lock); dirp->__data = dirp->__ptr = NULL; dirp->__entry_data = dirp->__entry_ptr = 0; diff --git a/sysdeps/mach/hurd/readdir.c b/sysdeps/mach/hurd/readdir.c index 9e9f1ae3bd..746b11e523 100644 --- a/sysdeps/mach/hurd/readdir.c +++ b/sysdeps/mach/hurd/readdir.c @@ -25,6 +25,7 @@ Cambridge, MA 02139, USA. */ #include <unistd.h> #include <sys/types.h> #include <hurd.h> +#include <hurd/fd.h> /* Read a directory entry from DIRP. */ @@ -50,7 +51,7 @@ DEFUN(readdir, (dirp), DIR *dirp) error_t err; if (err = HURD_FD_PORT_USE (dirp->__fd, - __dir_readdir (dirp->__port, + __dir_readdir (port, &data, &dirp->__size, dirp->__entry_ptr, -1, 0, &nentries))) |