about summary refs log tree commit diff
path: root/sysdeps/mach/hurd
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/mach/hurd')
-rw-r--r--sysdeps/mach/hurd/chdir.c16
-rw-r--r--sysdeps/mach/hurd/chroot.c23
-rw-r--r--sysdeps/mach/hurd/fchdir.c18
3 files changed, 9 insertions, 48 deletions
diff --git a/sysdeps/mach/hurd/chdir.c b/sysdeps/mach/hurd/chdir.c
index 7e056b58f9..389aa2af0d 100644
--- a/sysdeps/mach/hurd/chdir.c
+++ b/sysdeps/mach/hurd/chdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,97,99 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
@@ -26,18 +26,8 @@ int
 __chdir (file_name)
      const char *file_name;
 {
-  file_t file, dir;
-
-  file = __file_name_lookup (file_name, O_EXEC, 0);
-  if (file == MACH_PORT_NULL)
-    return -1;
-  dir = __file_name_lookup_under (file, "", O_EXEC, 0);
-  __mach_port_deallocate (__mach_task_self (), file);
-  if (dir == MACH_PORT_NULL)
-    return -1;
-
-  _hurd_port_set (&_hurd_ports[INIT_PORT_CWDIR], dir);
-  return 0;
+  return _hurd_change_directory_port_from_name (&_hurd_ports[INIT_PORT_CWDIR],
+						file_name);
 }
 
 weak_alias (__chdir, chdir)
diff --git a/sysdeps/mach/hurd/chroot.c b/sysdeps/mach/hurd/chroot.c
index 03a3823681..d607146ddf 100644
--- a/sysdeps/mach/hurd/chroot.c
+++ b/sysdeps/mach/hurd/chroot.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,97,99 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
@@ -30,23 +30,6 @@ int
 chroot (file_name)
      const char *file_name;
 {
-  error_t err;
-  file_t file, dir, root;
-
-  file = __file_name_lookup (file_name, O_EXEC, 0);
-  if (file == MACH_PORT_NULL)
-    return -1;
-  dir = __file_name_lookup_under (file, "", O_EXEC, 0);
-  __mach_port_deallocate (__mach_task_self (), file);
-  if (dir == MACH_PORT_NULL)
-    return -1;
-
-  /* Prevent going through DIR's .. */
-  err = __file_reparent (dir, MACH_PORT_NULL, &root);
-  __mach_port_deallocate (__mach_task_self (), dir);
-  if (err)
-    return __hurd_fail (err);
-
-  _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], root);
-  return 0;
+  return _hurd_change_directory_port_from_name (&_hurd_ports[INIT_PORT_CRDIR],
+						file_name);
 }
diff --git a/sysdeps/mach/hurd/fchdir.c b/sysdeps/mach/hurd/fchdir.c
index 71c8a5c265..bce8206ee6 100644
--- a/sysdeps/mach/hurd/fchdir.c
+++ b/sysdeps/mach/hurd/fchdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,99 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
@@ -21,7 +21,6 @@
 #include <hurd.h>
 #include <hurd/port.h>
 #include <hurd/fd.h>
-#include <fcntl.h>
 
 /* Change the current directory to FD.  */
 
@@ -29,18 +28,7 @@ int
 __fchdir (fd)
      int fd;
 {
-  error_t err;
-  file_t dir;
-
-  err = HURD_DPORT_USE (fd,
-			({
-			  dir = __file_name_lookup_under (port, "", O_EXEC, 0);
-			  dir == MACH_PORT_NULL ? errno : 0;
-			}));
-
-  if (! err)
-    _hurd_port_set (&_hurd_ports[INIT_PORT_CWDIR], dir);
-
-  return err ? __hurd_fail (err) : 0;
+  return _hurd_change_directory_port_from_fd (&_hurd_ports[INIT_PORT_CWDIR],
+					      fd);
 }
 weak_alias (__fchdir, fchdir)