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 /sysdeps/mach/hurd/chdir.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 'sysdeps/mach/hurd/chdir.c')
| -rw-r--r-- | sysdeps/mach/hurd/chdir.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sysdeps/mach/hurd/chdir.c b/sysdeps/mach/hurd/chdir.c index 912ca08683..07ad0fea16 100644 --- a/sysdeps/mach/hurd/chdir.c +++ b/sysdeps/mach/hurd/chdir.c @@ -27,16 +27,14 @@ int DEFUN(__chdir, (file_name), CONST char *file_name) { file_t file, dir; - error_t err; file = __file_name_lookup (file_name, O_EXEC, 0); if (file == MACH_PORT_NULL) return -1; - err = __USEPORT (CRDIR, __hurd_file_name_lookup (port, file, "", - O_EXEC, 0, &dir)); + dir = __file_name_lookup_under (file, "", O_EXEC, 0); __mach_port_deallocate (__mach_task_self (), file); - if (err) - return __hurd_fail (err); + if (dir == MACH_PORT_NULL) + return -1; _hurd_port_set (&_hurd_ports[INIT_PORT_CWDIR], dir); return 0; |