summaryrefslogtreecommitdiff
path: root/hurd
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@gnu.org>2001-01-19 09:37:23 +0000
committerMark Kettenis <kettenis@gnu.org>2001-01-19 09:37:23 +0000
commitdb11c38c4df163b2857f1e51f751ead085a83986 (patch)
tree3fa731ad907294d321fb44eb926c43a82751c68a /hurd
parent4e56fdbce36cc1d2bbd853589809b4f7ad634fc3 (diff)
downloadglibc-db11c38c4df163b2857f1e51f751ead085a83986.tar.gz
* sysdeps/mach/hurd/chroot.c (chroot): Revert 1999-02-27 changes, but change looking up the initial directory port in a similar way as done by _hurd_change_directory_port_from_name. * hurd/fchroot.c (fchroot): Likewise.
2001-01-19 Mark Kettenis <kettenis@gnu.org> * sysdeps/mach/hurd/chroot.c (chroot): Revert 1999-02-27 changes, but change looking up the initial directory port in a similar way as done by _hurd_change_directory_port_from_name. * hurd/fchroot.c (fchroot): Likewise.
Diffstat (limited to 'hurd')
-rw-r--r--hurd/fchroot.c28
1 files changed, 24 insertions, 4 deletions
diff --git a/hurd/fchroot.c b/hurd/fchroot.c
index cfb8ae339d..ad9fdc46b5 100644
--- a/hurd/fchroot.c
+++ b/hurd/fchroot.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001 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
@@ -17,14 +17,34 @@
Boston, MA 02111-1307, USA. */
#include <unistd.h>
+
#include <hurd.h>
#include <hurd/fd.h>
-#include <fcntl.h>
+#include <hurd/port.h>
/* Change the current root directory to FD. */
int
fchroot (int fd)
{
- return _hurd_change_directory_port_from_fd (&_hurd_ports[INIT_PORT_CRDIR],
- fd);
+ error_t err;
+ file_t dir;
+
+ err = HURD_DPORT_USE (fd,
+ ({
+ dir = __file_name_lookup_under (port, ".", 0, 0);
+ dir == MACH_PORT_NULL ? errno : 0;
+ }));
+
+ if (! err)
+ {
+ file_t root;
+
+ /* Prevent going through DIR's .. */
+ err = __file_reparent (dir, MACH_PORT_NULL, &root);
+ __mach_port_deallocate (__mach_task_self (), dir);
+ if (! err)
+ _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], root);
+ }
+
+ return err ? __hurd_fail (err) : 0;
}