3 files changed, 15 insertions, 23 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;
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;
 }