diff options
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/Makefile | 2 | ||||
| -rw-r--r-- | hurd/fchroot.c | 10 | ||||
| -rw-r--r-- | hurd/hurdlookup.c | 5 | ||||
| -rw-r--r-- | hurd/hurdmsg.c | 7 |
4 files changed, 11 insertions, 13 deletions
diff --git a/hurd/Makefile b/hurd/Makefile index fe9e43e..9683e7f 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -51,7 +51,7 @@ routines = hurdstartup hurdinit \ fopenport \ vpprintf \ ports-get ports-set hurdports hurdmsg \ - $(sig) $(dtable) hurdinline port-cleanup # report-wait + $(sig) $(dtable) hurdinline port-cleanup report-wait sig = hurdsig hurdfault faultexc siginfo hurd-raise preempt-sig \ trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \ thread-self thread-cancel intr-msg catch-signal diff --git a/hurd/fchroot.c b/hurd/fchroot.c index 26ff6d9..8c8a3b8 100644 --- a/hurd/fchroot.c +++ b/hurd/fchroot.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 95, 96 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 @@ -29,9 +29,11 @@ DEFUN(fchroot, (fd), int fd) error_t err; file_t dir; - err = HURD_DPORT_USE (fd, (dir = __file_name_lookup_under (port, "", - O_EXEC, 0), - errno)); + err = HURD_DPORT_USE (fd, + ({ + dir = __file_name_lookup_under (port, "", O_EXEC, 0); + dir == MACH_PORT_NULL ? errno : 0; + })); if (! err) _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], dir); diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c index 227f20e..41ea327 100644 --- a/hurd/hurdlookup.c +++ b/hurd/hurdlookup.c @@ -133,7 +133,10 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port) #endif /* An empty RETRYNAME indicates we have the final port. */ - if (retryname[0] == '\0') + if (retryname[0] == '\0' && + /* If reauth'd, we must do one more retry on "" to give the new + translator a chance to make a new port for us. */ + doretry == FS_RETRY_NORMAL) { /* We got a successful translation. Now apply any open-time action flags we were passed. */ diff --git a/hurd/hurdmsg.c b/hurd/hurdmsg.c index ba19a45..acec1f5 100644 --- a/hurd/hurdmsg.c +++ b/hurd/hurdmsg.c @@ -449,10 +449,3 @@ _S_msg_set_dtable (mach_port_t process, kern_return_t _S_msg_startup_dosync (mach_port_t process) { return EOPNOTSUPP; } - -kern_return_t -_S_msg_report_wait (mach_port_t process, - mach_port_t thread, - string_t wait_desc, - int *wait_rpc) -{ return EOPNOTSUPP; } |