From db11c38c4df163b2857f1e51f751ead085a83986 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Fri, 19 Jan 2001 09:37:23 +0000 Subject: * 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 * 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. --- sysdeps/mach/hurd/chroot.c | 50 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 11 deletions(-) (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/hurd/chroot.c b/sysdeps/mach/hurd/chroot.c index d607146ddf..918a36363a 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,99 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,93,94,95,97,99,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 @@ -16,20 +16,48 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include +#include #include + #include -#include #include -/* Change the current root to FILE_NAME. */ - -/* XXX shouldn't this be __chroot? */ +/* Make PATH be the root directory (the starting point for absolute + paths). Note that while on traditional UNIX systems this call is + restricted to the super-user, it isn't on the Hurd. */ int -chroot (file_name) - const char *file_name; +chroot (const char *path) { - return _hurd_change_directory_port_from_name (&_hurd_ports[INIT_PORT_CRDIR], - file_name); + const char *lookup; + size_t len; + file_t dir, root; + error_t err; + + /* Append trailing "/." to directory name to force ENOTDIR if it's not a + directory and EACCES if we don't have search permission. */ + len = strlen (path); + if (path[len - 2] == '/' && path[len - 1] == '.') + lookup = path; + else + { + char *n = alloca (len + 2); + memcpy (n, path, len); + n[len] = '/'; + n[len + 1] = '.'; + n[len + 2] = '\0'; + lookup = n; + } + + dir = __file_name_lookup (lookup, 0, 0); + 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; } -- cgit v1.2.3