diff options
| author | Roland McGrath <roland@gnu.org> | 1995-10-16 02:51:06 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-10-16 02:51:06 +0000 |
| commit | 2948fc64a6dd7aa23757daf2c5256dfe07f4c61a (patch) | |
| tree | 972fdf14f283ebcd6f8fd3811c540ae3cf059a16 /hurd/fchroot.c | |
| parent | 6cab5056c4b54a9bc92fe960e399b970ff2357ff (diff) | |
* hurd/hurd/lookup.h: New file.
* hurd/hurdlookup.c (__file_name_lookup_under): New function.
(__hurd_file_name_lookup, __hurd_file_name_lookup_retry,
__hurd_file_name_split): Rewritten to take callback functions for
using any needed init or dtable port, instead of passing in crdir
and cwdir ports.
(__file_name_lookup, __file_name_split): Use new calling
convention; pass _hurd_ports_use and __getdport as the callback
functions.
* sysdeps/mach/hurd/chroot.c: Use __file_name_lookup_under instead
of __hurd_file_name_lookup.
* sysdeps/mach/hurd/chdir.c: Likewise.
* sysdeps/mach/hurd/fchdir.c: Likewise.
* hurd/fchroot.c: Likewise.
Diffstat (limited to 'hurd/fchroot.c')
| -rw-r--r-- | hurd/fchroot.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/hurd/fchroot.c b/hurd/fchroot.c index cccf1391be..37163c0277 100644 --- a/hurd/fchroot.c +++ b/hurd/fchroot.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 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 @@ -28,16 +28,12 @@ DEFUN(fchroot, (fd), int fd) error_t err; file_t dir; - err = __USEPORT (CRDIR, - ({ file_t crdir = port; - HURD_DPORT_USE (fd, - __hurd_file_name_lookup (crdir, port, "", - 0, 0, &dir)); - })); + err = HURD_DPORT_USE (fd, (dir = __file_name_lookup_under (port, "", + O_EXEC, 0), + errno)); - if (err) - return __hurd_fail (err); + if (! err) + _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], dir); - _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], dir); - return 0; + return err ? __hurd_fail (err) : 0; } |