diff options
author | Roland McGrath <roland@gnu.org> | 1996-05-04 09:46:57 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-05-04 09:46:57 +0000 |
commit | 8f0c527e13b836a44fedbf6abc84e1901e2cc10d (patch) | |
tree | 2ef83b10742b3fa4e7dd89b7b55229ebf48c6818 /hurd/path-lookup.c | |
parent | Fri May 3 13:32:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> (diff) | |
download | glibc-8f0c527e13b836a44fedbf6abc84e1901e2cc10d.tar.gz glibc-8f0c527e13b836a44fedbf6abc84e1901e2cc10d.tar.bz2 glibc-8f0c527e13b836a44fedbf6abc84e1901e2cc10d.zip |
Sat May 4 05:44:25 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* 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 <roland@delasyd.gnu.ai.mit.edu>
* 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.
Diffstat (limited to 'hurd/path-lookup.c')
-rw-r--r-- | hurd/path-lookup.c | 120 |
1 files changed, 120 insertions, 0 deletions
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 <miles@gnu.ai.mit.edu> + + 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 <string.h> +#include <hurd.h> +#include <hurd/lookup.h> + +/* 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; +} |