From e8f51d56d4c4b5839fee6af97b068f9fa02efd09 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 27 Feb 1999 20:06:34 +0000 Subject: 1999-02-27 Roland McGrath * 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. --- sysdeps/mach/hurd/chdir.c | 16 +++------------- sysdeps/mach/hurd/chroot.c | 23 +++-------------------- sysdeps/mach/hurd/fchdir.c | 18 +++--------------- 3 files changed, 9 insertions(+), 48 deletions(-) (limited to 'sysdeps/mach') 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 #include #include -#include /* 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) -- cgit v1.2.3