From 8f0c527e13b836a44fedbf6abc84e1901e2cc10d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 4 May 1996 09:46:57 +0000 Subject: Sat May 4 05:44:25 1996 Roland McGrath * hurd/hurd-raise.c (_hurd_raise_signal): Pass sigcode in msg_sig_post rpc. * hurd/hurdmsg.c (_S_msg_set_environment): Use argz.h functions instead of _hurd_split_args. (_S_msg_*_exec_flags): Functions removed. (_S_msg_startup_dosync): Stub removed. Sat May 4 02:11:55 1996 Roland McGrath * sysdeps/mach/hurd/ptrace.c: Set _hurdsig_traced instead of EXEC_TRACED bit in _hurd_exec_flags. Pass sigcode arg in msg_sig_post_untraced rpc. * sysdeps/mach/hurd/access.c: Don't pass io port in auth_user_authenticate rpc. * posix/sched.h: Fix typos. * sysdeps/mach/hurd/fork.c: Use new critical section lock. Clear _hurdsig_traced instead of EXEC_TRACED. * sysdeps/stub/nanosleep.c (nanosleep): Fix typo. * wcsmbs/wcstol.c: Find strtol.c in ../stdlib. * wcsmbs/wcstof.c: Find strtod.c in ../stdlib. * wcsmbs/wcstod.c: Likewise. * wcsmbs/wcstold.c: Likewise. * wcsmbs/wcwidth.h: Find cname-lookup.h in ../wctype. * string/envz.c (envz_entry): Use const. (envz_get, envz_remove): Likewise. (envz_entry): Return char *, not const char *. * string/envz.h: Fix decl. * string/argz-create.c: Use const in prototype. * string/argz-next.c: Likewise. * sysdeps/mach/hurd/sigprocmask.c: Pass sigcode arg to msg_sig_post. * sysdeps/mach/hurd/i386/sigreturn.c: Likewise. * sysdeps/mach/hurd/sigsuspend.c: Likewise. * sysdeps/mach/hurd/kill.c: Likewise. * hurd/hurdexec.c (_hurd_exec): Use new critical section lock. * hurd/catch-exc.c (_S_catch_exception_raise): Likewise. * hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Likewise. * hurd/thread-cancel.c (hurd_thread_cancel, hurd_check_cancel): Likewise. * sysdeps/mach/hurd/jmp-unwind.c (_longjmp_unwind): Likewise. * sysdeps/mach/hurd/sigaction.c: Likewise. * sysdeps/mach/hurd/errnos.awk: Don't use ARGV in comment; it can change meaninglessly. * hurd/hurd/signal.h (struct hurd_sigstate): Replace critical section flag with a spin lock. (_hurd_critical_section_lock): Use spin_try_lock on that to see if we get it. No need to take SS->lock at all. (_hurd_critical_section_unlock): Unlock SS->critical_section_lock instead of clearing the old flag member. * hurd/hurdsig.c (_hurd_internal_post_signal): Use spin_lock_locked to test the critical section state. * hurd/hurdinit.c (_hurd_init): Set _hurdsig_traced from the intarray. * hurd/hurdkill.c (_hurd_sig_post): Pass 0 sigcode in msg_sig_post. * hurd/hurdsig.c (_hurd_internal_post_signal): Test _hurdsig_traced instead of testing (_hurd_exec_flags & EXEC_TRACED). (_S_msg_sig_post): Take sigcode arg and pass it through. (_S_msg_sig_post_untraced): Likewise. (reauth_proc): Don't pass proc port in auth_user_authenticate. * hurd/setauth.c (_hurd_setauth): Don't pass object ports in auth_user_authenticate RPCs, just the one-off rendezvous port. * hurd/dtable.c (reauth_dtable): Likewise. * hurd/hurdlookup.c (__hurd_file_name_lookup_retry): Likewise. * hurd/hurdexec.c (_hurd_exec): Pass 0 flags to file_exec. Pass sigcode arg to msg_sig_post. * string/argz.h (argz_create): Use const in prototype. * hurd/hurdinit.c (_hurd_proc_init): Test _hurdsig_traced instead of testing (_hurd_exec_flags & EXEC_TRACED). Pass sigcode arg to msg_sig_post. * hurd/hurd.h: Declare _hurdsig_traced. * string/argz.h (__argz_next): Cast ENTRY before returning it. * hurd/hurd/signal.h (_hurd_critical_section_unlock): Pass sigcode arg to msg_sig_post. * hurd/path-lookup.c: New file. * hurd/Makefile (routines): Add path-lookup. * hurd/hurd/lookup.h: Declare file_name_path_scan, hurd_file_name_path_lookup. * hurd/hurd.h: Declare file_name_path_lookup. * sysdeps/mach/hurd/select.c: The io_select rpc no longer has a TAG_ID argument. Instead, use a separate reply port for each RPC and put them all in a port set to wait for slow replies. --- hurd/Makefile | 1 + hurd/catch-exc.c | 4 +- hurd/dtable.c | 10 ++--- hurd/hurd-raise.c | 4 +- hurd/hurd.h | 16 +++++++ hurd/hurd/lookup.h | 31 ++++++++++++- hurd/hurd/signal.h | 38 +++++++--------- hurd/hurdexec.c | 23 ++++------ hurd/hurdinit.c | 8 +++- hurd/hurdkill.c | 2 +- hurd/hurdlookup.c | 2 +- hurd/hurdmsg.c | 53 ++--------------------- hurd/hurdsig.c | 18 ++++---- hurd/path-lookup.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++ hurd/setauth.c | 7 ++- hurd/sigunwind.c | 4 +- hurd/thread-cancel.c | 12 +++--- 17 files changed, 232 insertions(+), 121 deletions(-) create mode 100644 hurd/path-lookup.c (limited to 'hurd') diff --git a/hurd/Makefile b/hurd/Makefile index af3ba2dad1..3a9d08e4a4 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -42,6 +42,7 @@ server-interfaces := hurd/msg routines = hurdstartup hurdinit \ hurdid hurdlookup hurdpid hurdrlimit hurdprio hurdexec \ + path-lookup \ setauth \ pid2task task2pid \ getuids setuids getumask fchroot \ diff --git a/hurd/catch-exc.c b/hurd/catch-exc.c index 72e06db1d3..8ab38a2a61 100644 --- a/hurd/catch-exc.c +++ b/hurd/catch-exc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1995, 1996 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 @@ -64,7 +64,7 @@ _S_catch_exception_raise (mach_port_t port, no code should do anything that can fault while holding the sigstate lock. */ - ss->critical_section = 0; + __spin_unlock (&ss->critical_section_lock); ss->context = NULL; __spin_unlock (&ss->lock); } diff --git a/hurd/dtable.c b/hurd/dtable.c index ea683d0b0d..d1ee999857 100644 --- a/hurd/dtable.c +++ b/hurd/dtable.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996 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 @@ -173,7 +173,7 @@ static void ctty_new_pgrp (void) { int i; - + HURD_CRITICAL_BEGIN; __mutex_lock (&_hurd_dtable_lock); @@ -226,7 +226,7 @@ reauth_dtable (void) { struct hurd_fd *const d = _hurd_dtable[i]; mach_port_t new, newctty, ref; - + if (d == NULL) /* Nothing to do for an unused descriptor cell. */ continue; @@ -235,14 +235,13 @@ reauth_dtable (void) /* Take the descriptor cell's lock. */ __spin_lock (&d->port.lock); - + /* Reauthenticate the descriptor's port. */ if (d->port.port != MACH_PORT_NULL && ! __io_reauthenticate (d->port.port, ref, MACH_MSG_TYPE_MAKE_SEND) && ! __USEPORT (AUTH, __auth_user_authenticate (port, - d->port.port, ref, MACH_MSG_TYPE_MAKE_SEND, &new))) { @@ -254,7 +253,6 @@ reauth_dtable (void) ref, MACH_MSG_TYPE_MAKE_SEND) && ! __USEPORT (AUTH, __auth_user_authenticate (port, - d->ctty.port, ref, MACH_MSG_TYPE_MAKE_SEND, &newctty))) _hurd_port_set (&d->ctty, newctty); diff --git a/hurd/hurd-raise.c b/hurd/hurd-raise.c index ad01ab9f89..59179da5f6 100644 --- a/hurd/hurd-raise.c +++ b/hurd/hurd-raise.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1995, 1996 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 @@ -44,5 +44,5 @@ _hurd_raise_signal (struct hurd_sigstate *ss, /* Send a message to the signal thread so it will wake up and check for pending signals. */ - __msg_sig_post (_hurd_msgport, 0, __mach_task_self ()); + __msg_sig_post (_hurd_msgport, signo, sigcode, __mach_task_self ()); } diff --git a/hurd/hurd.h b/hurd/hurd.h index 55be1579fb..212db45753 100644 --- a/hurd/hurd.h +++ b/hurd/hurd.h @@ -76,6 +76,7 @@ extern int _hurd_exec_flags; /* Flags word passed in exec_startup. */ extern struct hurd_port *_hurd_ports; extern unsigned int _hurd_nports; extern volatile mode_t _hurd_umask; +extern sigset_t _hurdsig_traced; /* Shorthand macro for internal library code referencing _hurd_ports (see ). */ @@ -183,6 +184,21 @@ extern file_t file_name_lookup_under (file_t startdir, const char *file, int flags, mode_t mode); +/* Lookup FILE_NAME and return the node opened with FLAGS & MODE + (see hurd_file_name_lookup for details), but a simple file name (without + any directory prefixes) will be consecutively prefixed with the pathnames + in the `:' separated list PATH until one succeeds in a successful lookup. + If none succeed, then the first error that wasn't ENOENT is returned, or + ENOENT if no other errors were returned. If PREFIXED_NAME is non-NULL, + then if the result is looked up directly, *PREFIXED_NAME is set to NULL, and + if it is looked up using a prefix from PATH, *PREFIXED_NAME is set to + malloc'd storage containing the prefixed name. */ +extern file_t file_name_path_lookup (const char *file_name, const char *path, + int flags, mode_t mode, + char **prefixed_name); + + + /* Open a file descriptor on a port. FLAGS are as for `open'; flags affected by io_set_openmodes are not changed by this. If successful, this consumes a user reference for PORT (which will be deallocated on diff --git a/hurd/hurd/lookup.h b/hurd/hurd/lookup.h index 6911b8f5b9..565ab317c8 100644 --- a/hurd/hurd/lookup.h +++ b/hurd/hurd/lookup.h @@ -1,5 +1,5 @@ /* Declarations of file name translation functions for the GNU Hurd. -Copyright (C) 1995 Free Software Foundation, Inc. +Copyright (C) 1995, 1996 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 @@ -98,4 +98,33 @@ error_t hurd_file_name_lookup_retry (error_t (*use_init_port) file_t *result); +/* If FILE_NAME contains a '/', or PATH is NULL, call FUN with FILE_NAME, and + return the result (if PREFIXED_NAME is non-NULL, setting *PREFIXED_NAME to + NULL). Otherwise, call FUN repeatedly with FILE_NAME prefixed with each + successive `:' separated element of PATH, returning whenever FUN returns + 0 (if PREFIXED_NAME is non-NULL, setting *PREFIXED_NAME to the resulting + prefixed path). If FUN never returns 0, return the first non-ENOENT + return value, or ENOENT if there is none. */ +error_t file_name_path_scan (const char *file_name, const char *path, + error_t (*fun)(const char *name), + char **prefixed_name); + +/* Lookup FILE_NAME and return the node opened with FLAGS & MODE in result + (see hurd_file_name_lookup for details), but a simple filename (without + any directory prefixes) will be consectutively prefixed with the pathnames + in the `:' separated list PATH until one succeeds in a successful lookup. + If none succeed, then the first error that wasn't ENOENT is returned, or + ENOENT if no other errors were returned. If PREFIXED_NAME is non-NULL, + then if RESULT is looked up directly, *PREFIXED_NAME is set to NULL, and + if it is looked up using a prefix from PATH, *PREFIXED_NAME is set to + malloced storage containing the prefixed name. */ +error_t hurd_file_name_path_lookup (error_t (*use_init_port) + (int which, + error_t (*operate) (mach_port_t)), + file_t (*get_dtable_port) (int fd), + const char *file_name, const char *path, + int flags, mode_t mode, + file_t *result, char **prefixed_name); + + #endif /* hurd/lookup.h */ diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 1973bcdb3c..fdaafdf459 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -47,9 +47,9 @@ struct hurd_signal_preempter; /* */ struct hurd_sigstate { - spin_lock_t lock; /* Locks most of the rest of the structure. */ + spin_lock_t critical_section_lock; /* Held if in critical section. */ - int critical_section; /* Nonzero if in critical section. */ + spin_lock_t lock; /* Locks most of the rest of the structure. */ thread_t thread; struct hurd_sigstate *next; /* Linked-list of thread sigstates. */ @@ -159,27 +159,22 @@ _hurd_critical_section_lock (void) (void *) __hurd_threadvar_location (_HURD_THREADVAR_SIGSTATE); struct hurd_sigstate *ss = *location; if (ss == NULL) - /* The thread variable is unset; this must be the first time we've - asked for it. In this case, the critical section flag cannot - possible already be set. Look up our sigstate structure the slow - way; this locks the sigstate lock. */ - ss = *location = _hurd_thread_sigstate (__mach_thread_self ()); - else - __spin_lock (&ss->lock); - - if (ss->critical_section) { - /* We are already in a critical section, so do nothing. */ + /* The thread variable is unset; this must be the first time we've + asked for it. In this case, the critical section flag cannot + possible already be set. Look up our sigstate structure the slow + way; this locks the sigstate lock. */ + ss = *location = _hurd_thread_sigstate (__mach_thread_self ()); __spin_unlock (&ss->lock); - return NULL; } - /* Set the critical section flag so no signal handler will run. */ - ss->critical_section = 1; - __spin_unlock (&ss->lock); + if (! __spin_try_lock (&ss->critical_section_lock)) + /* We are already in a critical section, so do nothing. */ + return NULL; - /* Return our sigstate pointer; this will be passed to - _hurd_critical_section_unlock to clear the critical section flag. */ + /* With the critical section lock held no signal handler will run. + Return our sigstate pointer; this will be passed to + _hurd_critical_section_unlock to unlock it. */ return ss; } @@ -191,19 +186,18 @@ _hurd_critical_section_unlock (void *our_lock) return; else { - /* It was us who acquired the critical section lock. Clear the - critical section flag. */ + /* It was us who acquired the critical section lock. Unlock it. */ struct hurd_sigstate *ss = our_lock; sigset_t pending; __spin_lock (&ss->lock); - ss->critical_section = 0; + __spin_unlock (&ss->critical_section_lock); pending = ss->pending & ~ss->blocked; __spin_unlock (&ss->lock); if (pending) /* There are unblocked signals pending, which weren't delivered because we were in the critical section. Tell the signal thread to deliver them now. */ - __msg_sig_post (_hurd_msgport, 0, __mach_task_self ()); + __msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ()); } } diff --git a/hurd/hurdexec.c b/hurd/hurdexec.c index 7893c9177b..4c0d8ae5e5 100644 --- a/hurd/hurdexec.c +++ b/hurd/hurdexec.c @@ -25,6 +25,7 @@ Cambridge, MA 02139, USA. */ #include #include #include +#include #include /* Overlay TASK, executing FILE with arguments ARGV and environment ENVP. @@ -35,7 +36,7 @@ _hurd_exec (task_t task, file_t file, char *const argv[], char *const envp[]) { error_t err; - char *args, *env, *ap; + char *args, *env; size_t argslen, envlen; int ints[INIT_INT_MAX]; mach_port_t ports[_hurd_nports]; @@ -44,10 +45,10 @@ _hurd_exec (task_t task, file_t file, unsigned int dtablesize, i; struct hurd_port **dtable_cells; struct hurd_userlink *ulink_dtable; - char *const *p; struct hurd_sigstate *ss; mach_port_t *please_dealloc, *pdp; + /* XXX needs to be hurdmalloc XXX */ if (err = __argz_create (argv, &args, &argslen)) return err; if (err = __argz_create (envp, &env, &envlen)) @@ -89,6 +90,10 @@ _hurd_exec (task_t task, file_t file, } ss = _hurd_self_sigstate (); + + assert (! __spin_lock_locked (&ss->critical_section_lock)); + __spin_lock (&ss->critical_section_lock); + __spin_lock (&ss->lock); ints[INIT_SIGMASK] = ss->blocked; ints[INIT_SIGPENDING] = ss->pending; @@ -105,7 +110,6 @@ _hurd_exec (task_t task, file_t file, critical section flag avoids anything we call trying to acquire the sigstate lock. */ - ss->critical_section = 1; __spin_unlock (&ss->lock); /* Pack up the descriptor table to give the new program. */ @@ -192,8 +196,7 @@ _hurd_exec (task_t task, file_t file, *pdp++ = dtable[i]; } - err = __file_exec (file, task, - _hurd_exec_flags & EXEC_INHERITED, + err = __file_exec (file, task, 0, args, argslen, env, envlen, dtable, MACH_MSG_TYPE_COPY_SEND, dtablesize, ports, MACH_MSG_TYPE_COPY_SEND, _hurd_nports, @@ -219,15 +222,7 @@ _hurd_exec (task_t task, file_t file, __mutex_unlock (&_hurd_dtable_lock); /* Safe to let signals happen now. */ - { - sigset_t pending; - __spin_lock (&ss->lock); - ss->critical_section = 0; - pending = ss->pending & ~ss->blocked; - __spin_unlock (&ss->lock); - if (pending) - __msg_sig_post (_hurd_msgport, 0, __mach_task_self ()); - } + _hurd_critical_section_unlock (ss); outargs: free (args); diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c index e7558c3ef7..cd37065f93 100644 --- a/hurd/hurdinit.c +++ b/hurd/hurdinit.c @@ -30,6 +30,7 @@ int _hurd_exec_flags; struct hurd_port *_hurd_ports; unsigned int _hurd_nports; mode_t _hurd_umask; +sigset_t _hurdsig_traced; error_t _hurd_ports_use (int which, error_t (*operate) (mach_port_t)) @@ -78,6 +79,9 @@ _hurd_init (int flags, char **argv, else _hurd_umask = CMASK; + if (intarraysize > INIT_TRACEMASK) + _hurdsig_traced = intarray[INIT_TRACEMASK]; + /* All done with init ints and ports. */ __vm_deallocate (__mach_task_self (), (vm_address_t) intarray, @@ -147,11 +151,11 @@ _hurd_proc_init (char **argv) here, like _hurd_pid, are already initialized. */ RUN_HOOK (_hurd_proc_subinit, ()); - if (_hurd_exec_flags & EXEC_TRACED) + if (_hurdsig_traced) /* This process is "traced", meaning it should stop on signals or exec. We are all set up now to handle signals. Stop ourselves, to inform our parent (presumably a debugger) that the exec has completed. */ - __msg_sig_post (_hurd_msgport, SIGTRAP, __mach_task_self ()); + __msg_sig_post (_hurd_msgport, SIGTRAP, 0, __mach_task_self ()); } /* Called when we get a message telling us to change our proc server port. */ diff --git a/hurd/hurdkill.c b/hurd/hurdkill.c index a8f101d768..4fab0346f6 100644 --- a/hurd/hurdkill.c +++ b/hurd/hurdkill.c @@ -42,7 +42,7 @@ _hurd_sig_post (pid_t pid, int sig, mach_port_t arg_refport) (refport = arg_refport, 0), 0, /* If no message port we cannot send signals. */ msgport == MACH_PORT_NULL ? EPERM : - __msg_sig_post (msgport, sig, refport)); + __msg_sig_post (msgport, sig, 0, refport)); if (! err) delivered = 1; } diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c index 41ea32774e..a5a114aa44 100644 --- a/hurd/hurdlookup.c +++ b/hurd/hurdlookup.c @@ -100,7 +100,7 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port) mach_port_t ref = __mach_reply_port (); error_t reauth (auth_t auth) { - return __auth_user_authenticate (auth, unauth, ref, + return __auth_user_authenticate (auth, ref, MACH_MSG_TYPE_MAKE_SEND, result); } diff --git a/hurd/hurdmsg.c b/hurd/hurdmsg.c index acec1f5fdf..32d1a5c975 100644 --- a/hurd/hurdmsg.c +++ b/hurd/hurdmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1994, 1995, 1996 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 @@ -22,6 +22,7 @@ Cambridge, MA 02139, USA. */ #include #include #include +#include #define AUTHCHECK \ @@ -377,57 +378,15 @@ _S_msg_set_environment (mach_port_t msgport, mach_port_t auth, AUTHCHECK; - envc = _hurd_split_args (data, datalen, NULL); + envc = __argz_count (data, datalen); envp = malloc ((envc + 1) * sizeof (char *)); if (envp == NULL) return errno; - _hurd_split_args (data, datalen, envp); + __argz_extract (data, datalen, envp); __environ = envp; /* XXX cooperate with loadenv et al */ return 0; } -/* Get and frob the exec flags. */ - -kern_return_t -_S_msg_get_exec_flags (mach_port_t process, mach_port_t auth, - int *flags) -{ - AUTHCHECK; - - *flags = _hurd_exec_flags; - return 0; -} - -kern_return_t -_S_msg_set_all_exec_flags (mach_port_t process, mach_port_t auth, - int flags) -{ - AUTHCHECK; - - _hurd_exec_flags = flags; - return 0; -} - -kern_return_t -_S_msg_set_some_exec_flags (mach_port_t process, mach_port_t auth, - int flags) -{ - AUTHCHECK; - - _hurd_exec_flags |= flags; - return 0; -} - -kern_return_t -_S_msg_clear_some_exec_flags (mach_port_t process, mach_port_t auth, - int flags) -{ - AUTHCHECK; - - _hurd_exec_flags &= ~flags; - return 0; -} - /* XXX */ @@ -445,7 +404,3 @@ _S_msg_set_dtable (mach_port_t process, portarray_t dtable, mach_msg_type_number_t dtableCnt) { return EOPNOTSUPP; } - -kern_return_t -_S_msg_startup_dosync (mach_port_t process) -{ return EOPNOTSUPP; } diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index a84e7bc54e..b1a551d7f3 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -564,7 +564,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, { /* No preemption. Do normal handling. */ - if (!untraced && (_hurd_exec_flags & EXEC_TRACED)) + if (!untraced && __sigismember (&_hurdsig_traced, signo)) { /* We are being traced. Stop to tell the debugger of the signal. */ if (_hurd_stopped) @@ -785,7 +785,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, /* The thread was in sigreturn, not in any interruptible RPC. */ wait_for_reply = 0; - assert (! ss->critical_section); + assert (! __spin_lock_locked (&ss->critical_section_lock)); } else { @@ -795,7 +795,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, &reply) != MACH_PORT_NULL); - if (ss->critical_section) + if (__spin_lock_locked (&ss->critical_section_lock)) { /* The thread is in a critical section. Mark the signal as pending. When it finishes the critical section, it will @@ -883,7 +883,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, thread finishes its critical section. */ inline int signals_pending (void) { - if (_hurd_stopped || ss->critical_section) + if (_hurd_stopped || __spin_lock_locked (&ss->critical_section_lock)) return 0; return pending = ss->pending & ~ss->blocked; } @@ -1057,7 +1057,7 @@ signal_allowed (int signo, mach_port_t refport) kern_return_t _S_msg_sig_post (mach_port_t me, mach_port_t reply_port, mach_msg_type_name_t reply_port_type, - int signo, + int signo, natural_t sigcode, mach_port_t refport) { error_t err; @@ -1068,7 +1068,7 @@ _S_msg_sig_post (mach_port_t me, /* Post the signal to the designated signal-receiving thread. This will reply when the signal can be considered delivered. */ _hurd_internal_post_signal (_hurd_thread_sigstate (_hurd_sigthread), - signo, 0, 0, reply_port, reply_port_type, + signo, sigcode, 0, reply_port, reply_port_type, 0); /* Stop if traced. */ return MIG_NO_REPLY; /* Already replied. */ @@ -1081,7 +1081,7 @@ kern_return_t _S_msg_sig_post_untraced (mach_port_t me, mach_port_t reply_port, mach_msg_type_name_t reply_port_type, - int signo, + int signo, natural_t sigcode, mach_port_t refport) { error_t err; @@ -1092,7 +1092,7 @@ _S_msg_sig_post_untraced (mach_port_t me, /* Post the signal to the designated signal-receiving thread. This will reply when the signal can be considered delivered. */ _hurd_internal_post_signal (_hurd_thread_sigstate (_hurd_sigthread), - signo, 0, 0, reply_port, reply_port_type, + signo, sigcode, 0, reply_port, reply_port_type, 1); /* Untraced flag. */ return MIG_NO_REPLY; /* Already replied. */ @@ -1170,7 +1170,7 @@ reauth_proc (mach_port_t new) if (! HURD_PORT_USE (&_hurd_ports[INIT_PORT_PROC], __proc_reauthenticate (port, ref, MACH_MSG_TYPE_MAKE_SEND) || - __auth_user_authenticate (new, port, ref, + __auth_user_authenticate (new, ref, MACH_MSG_TYPE_MAKE_SEND, &ignore)) && ignore != MACH_PORT_NULL) diff --git a/hurd/path-lookup.c b/hurd/path-lookup.c new file mode 100644 index 0000000000..9e0fff4927 --- /dev/null +++ b/hurd/path-lookup.c @@ -0,0 +1,120 @@ +/* Filename lookup using a search path + + Copyright (C) 1995, 1996 Free Software Foundation, Inc. + + Written by Miles Bader + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. + + This program 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 + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#include +#include +#include + +/* If FILE_NAME contains a '/', or PATH is NULL, call FUN with FILE_NAME, and + return the result (if PREFIXED_NAME is non-NULL, setting *PREFIXED_NAME to + NULL). Otherwise, call FUN repeatedly with FILE_NAME prefixed with each + successive `:' separated element of PATH, returning whenever FUN returns + 0 (if PREFIXED_NAME is non-NULL, setting *PREFIXED_NAME to the resulting + prefixed path). If FUN never returns 0, return the first non-ENOENT + return value, or ENOENT if there is none. */ +error_t +file_name_path_scan (const char *file_name, const char *path, + error_t (*fun)(const char *name), + char **prefixed_name) +{ + if (path == NULL || index (file_name, '/')) + { + if (prefixed_name) + *prefixed_name = 0; + return (*fun)(file_name); + } + else + { + error_t real_err = 0; + size_t file_name_len = strlen (file_name); + + for (;;) + { + error_t err; + const char *next = index (path, ':') ?: path + strlen (path); + size_t pfx_len = next - path; + char pfxed_name[pfx_len + 2 + file_name_len + 1]; + + if (pfx_len == 0) + pfxed_name[pfx_len++] = '.'; + else + bcopy (path, pfxed_name, pfx_len); + if (pfxed_name[pfx_len - 1] != '/') + pfxed_name[pfx_len++] = '/'; + bcopy (file_name, pfxed_name + pfx_len, file_name_len + 1); + + err = (*fun)(pfxed_name); + if (err == 0) + { + if (prefixed_name) + *prefixed_name = strdup (pfxed_name); + return 0; + } + if (!real_err && err != ENOENT) + real_err = err; + + if (*next == '\0') + return real_err ?: ENOENT; + else + path = next + 1; + } + } +} + +/* Lookup FILE_NAME and return the node opened with FLAGS & MODE in result + (see hurd_file_name_lookup for details), but a simple filename (without + any directory prefixes) will be consectutively prefixed with the pathnames + in the `:' separated list PATH until one succeeds in a successful lookup. + If none succeed, then the first error that wasn't ENOENT is returned, or + ENOENT if no other errors were returned. If PREFIXED_NAME is non-NULL, + then if RESULT is looked up directly, *PREFIXED_NAME is set to NULL, and + if it is looked up using a prefix from PATH, *PREFIXED_NAME is set to + malloced storage containing the prefixed name. */ +error_t +hurd_file_name_path_lookup (error_t (*use_init_port) + (int which, + error_t (*operate) (mach_port_t)), + file_t (*get_dtable_port) (int fd), + const char *file_name, const char *path, + int flags, mode_t mode, + file_t *result, char **prefixed_name) +{ + error_t lookup (const char *name) + { + return + __hurd_file_name_lookup (use_init_port, get_dtable_port, + name, flags, mode, result); + } + return file_name_path_scan (file_name, path, lookup, prefixed_name); +} + +file_t +file_name_path_lookup (const char *file_name, const char *path, + int flags, mode_t mode, char **prefixed_name) +{ + error_t err; + file_t result; + + err = hurd_file_name_path_lookup (&_hurd_ports_use, &__getdport, + file_name, path, flags, mode, + &result, prefixed_name); + + return err ? (__hurd_fail (err), MACH_PORT_NULL) : result; +} diff --git a/hurd/setauth.c b/hurd/setauth.c index 34ce7f63bb..3591968978 100644 --- a/hurd/setauth.c +++ b/hurd/setauth.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996 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 @@ -73,7 +73,6 @@ _hurd_setauth (auth_t new) ! HURD_PORT_USE (&_hurd_ports[INIT_PORT_AUTH], __auth_user_authenticate (port, - _hurd_init_dtable[d], ref, MACH_MSG_TYPE_MAKE_SEND, &new))) { @@ -88,7 +87,7 @@ _hurd_setauth (auth_t new) if (__USEPORT (CRDIR, ! __io_reauthenticate (port, ref, MACH_MSG_TYPE_MAKE_SEND) && - ! __auth_user_authenticate (new, port, + ! __auth_user_authenticate (new, ref, MACH_MSG_TYPE_MAKE_SEND, &newport))) _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], newport); @@ -98,7 +97,7 @@ _hurd_setauth (auth_t new) if (__USEPORT (CWDIR, ! __io_reauthenticate (port, ref, MACH_MSG_TYPE_MAKE_SEND) && - ! __auth_user_authenticate (new, port, + ! __auth_user_authenticate (new, ref, MACH_MSG_TYPE_MAKE_SEND, &newport))) _hurd_port_set (&_hurd_ports[INIT_PORT_CWDIR], newport); diff --git a/hurd/sigunwind.c b/hurd/sigunwind.c index f6d29e1ab0..28c0d941b5 100644 --- a/hurd/sigunwind.c +++ b/hurd/sigunwind.c @@ -56,7 +56,7 @@ _hurdsig_longjmp_from_handler (void *data, jmp_buf env, int val) __spin_lock (&ss->lock); /* We should only ever be called from _longjmp_unwind (in jmp-unwind.c), which calls us inside a critical section. */ - assert (ss->critical_section); + assert (__spin_lock_locked (&ss->critical_section_lock)); /* Are we on the alternate signal stack now? */ onstack = (ss->sigaltstack.ss_flags & SA_ONSTACK); __spin_unlock (&ss->lock); @@ -122,7 +122,7 @@ _hurdsig_longjmp_from_handler (void *data, jmp_buf env, int val) having run all the unwind forms back to ENV's frame, but our SP is still inside those unwound frames. */ __spin_lock (&ss->lock); - ss->critical_section = 0; + __spin_unlock (&ss->critical_section_lock); ss->blocked = ~(sigset_t) 0 & ~_SIG_CANT_MASK; __spin_unlock (&ss->lock); diff --git a/hurd/thread-cancel.c b/hurd/thread-cancel.c index 81828457d5..85ba010407 100644 --- a/hurd/thread-cancel.c +++ b/hurd/thread-cancel.c @@ -1,5 +1,5 @@ /* Thread cancellation support. -Copyright (C) 1995 Free Software Foundation, Inc. +Copyright (C) 1995, 1996 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 @@ -25,7 +25,7 @@ Cambridge, MA 02139, USA. */ /* See hurdsig.c. */ extern mach_port_t _hurdsig_abort_rpcs (struct hurd_sigstate *ss, - int signo, int sigthread, + int signo, int sigthread, struct machine_thread_all_state *, int *state_change, mach_port_t *reply_port, @@ -45,9 +45,9 @@ hurd_thread_cancel (thread_t thread) if (ss == _hurd_self_sigstate ()) return EINTR; /* Bozo. */ + assert (! __spin_lock_locked (&ss->critical_section_lock)); + __spin_lock (&ss->critical_section_lock); __spin_lock (&ss->lock); - assert (! ss->critical_section); - ss->critical_section = 1; err = __thread_suspend (thread); __spin_unlock (&ss->lock); @@ -59,7 +59,7 @@ hurd_thread_cancel (thread_t thread) /* Interrupt any interruptible RPC now in progress. */ state.set = 0; _hurdsig_abort_rpcs (ss, 0, 0, &state, &state_change, NULL, 0, 0); - if (state_change) + if (state_change) err = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR, (natural_t *) &state.basic, MACHINE_THREAD_STATE_COUNT); @@ -85,7 +85,7 @@ hurd_check_cancel (void) int cancel; __spin_lock (&ss->lock); - assert (! ss->critical_section); + assert (! __spin_lock_locked (&ss->critical_section_lock)); cancel = ss->cancel; ss->cancel = 0; __spin_unlock (&ss->lock); -- cgit v1.2.1