* 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.

1 files changed, 8 insertions, 12 deletions

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;
 }