From 2948fc64a6dd7aa23757daf2c5256dfe07f4c61a Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 16 Oct 1995 02:51:06 +0000 Subject: * 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. --- sysdeps/mach/hurd/chdir.c | 8 +++----- sysdeps/mach/hurd/chroot.c | 10 ++++------ sysdeps/mach/hurd/fchdir.c | 20 ++++++++------------ 3 files changed, 15 insertions(+), 23 deletions(-) (limited to 'sysdeps/mach') 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; diff --git a/sysdeps/mach/hurd/chroot.c b/sysdeps/mach/hurd/chroot.c index 415a068004..f010c368ed 100644 --- a/sysdeps/mach/hurd/chroot.c +++ b/sysdeps/mach/hurd/chroot.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 @@ -29,16 +29,14 @@ int DEFUN(chroot, (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_CRDIR], dir); return 0; diff --git a/sysdeps/mach/hurd/fchdir.c b/sysdeps/mach/hurd/fchdir.c index 088bba9d16..f643092377 100644 --- a/sysdeps/mach/hurd/fchdir.c +++ b/sysdeps/mach/hurd/fchdir.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,18 +28,14 @@ int DEFUN(fchdir, (fd), int fd) { error_t err; - file_t cwdir; + file_t dir; - err = __USEPORT (CRDIR, - ({ file_t crdir = port; - HURD_DPORT_USE (fd, - __hurd_file_name_lookup (crdir, port, "", - 0, 0, &cwdir)); - })); + 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_CWDIR], dir); - _hurd_port_set (&_hurd_ports[INIT_PORT_CWDIR], cwdir); - return 0; + return err ? __hurd_fail (err) : 0; } -- cgit v1.2.3