summaryrefslogtreecommitdiff
path: root/sysdeps/mach/hurd/chroot.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1999-02-27 20:06:34 +0000
committerRoland McGrath <roland@gnu.org>1999-02-27 20:06:34 +0000
commite8f51d56d4c4b5839fee6af97b068f9fa02efd09 (patch)
treec7eb5d292a6f8196f18e8eb137a1c62d4d307860 /sysdeps/mach/hurd/chroot.c
parent4014b2cf3464ea1b70197446fa49e943323992b2 (diff)
1999-02-27 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/mach/getsysstats.c (__get_nprocs_conf, __get_nprocs, __get_phys_pages): Cast &HBI to silence warning. * hurd/Makefile (routines): Add hurdchdir and hurdfchdir. * hurd/hurdchdir.c: New file. * hurd/hurdfchdir.c: New file. * sysdeps/mach/hurd/chroot.c: Call _hurd_change_directory_port_from_name to do the work. * sysdeps/mach/hurd/chdir.c: Likewise. * sysdeps/mach/hurd/fchdir.c: Call _hurd_change_directory_port_from_fd to do the work. * hurd/fchroot.c: Likewise. * hurd/hurd.h: Declare them.
Diffstat (limited to 'sysdeps/mach/hurd/chroot.c')
-rw-r--r--sysdeps/mach/hurd/chroot.c23
1 files changed, 3 insertions, 20 deletions
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);
}