From: Paul Eggert Date: Sun, 15 May 2005 06:11:32 +0000 (+0000) Subject: New unlinkdir module. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a335d096a69ab6b41b879cc15c720e37991a93a;p=pspp New unlinkdir module. * MODULES.html.sh (File system functions): Add unlinkdir. * lib/unlinkdir.c, lib/unlinkdir.h, m4/unlinkdir.m4, modules/unlinkdir: New file. --- diff --git a/ChangeLog b/ChangeLog index 5982c7a563..62cf854a6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2005-05-14 Paul Eggert + Sync from coreutils. + * modules/unlinkdir: New file. * modules/yesno (Depends-on): Add getline. + * MODULES.html.sh (File system functions): Add unlinkdir. 2005-05-13 Paul Eggert diff --git a/MODULES.html b/MODULES.html index 1011942a9c..d13ee51915 100644 --- a/MODULES.html +++ b/MODULES.html @@ -2,7 +2,7 @@ Gnulib Module List - +

Gnulib Module List

@@ -723,6 +723,10 @@ directory. savedir Return the entries of a directory (just the names) as an argz string. + + unlinkdir + Determine (and maybe change) whether we can unlink directories. + utimecmp compare file time stamps @@ -2596,6 +2600,13 @@ variables. savedir.m4
gl_SAVEDIR xalloc + + unlinkdir + #include "unlinkdir.h" + unlinkdir.c + unlinkdir.m4
gl_UNLINKDIR + stdbool + utimecmp #include "utimecmp.h" @@ -2948,7 +2959,7 @@ variables. #include "yesno.h" yesno.c yesno.m4
gl_YESNO - rpmatch
stdbool + getline
rpmatch
stdbool ucs4-utf8 @@ -3315,6 +3326,6 @@ variables.

A testsuite

- Generated from MODULES.html.sh on 10 May 2005. + Generated from MODULES.html.sh on 14 May 2005. diff --git a/MODULES.html.sh b/MODULES.html.sh index 46088be83a..4525ae4346 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1826,6 +1826,7 @@ func_all_modules () func_module same func_module save-cwd func_module savedir + func_module unlinkdir func_module utimecmp func_module utimens func_module xgetcwd diff --git a/lib/ChangeLog b/lib/ChangeLog index 51c1d8c3ef..58f3ed7fcc 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,6 +1,7 @@ 2005-05-14 Paul Eggert Sync from coreutils. + * unlinkdir.c, unlinkdir.h: New files. * gethrxtime.c, gethrxtime.h, getpass.h, mountlist.h, path-concat.c, regex.h, strtoll.c, unlocked-io.h, xtime.h: White space changes only. diff --git a/lib/unlinkdir.c b/lib/unlinkdir.c new file mode 100644 index 0000000000..b12d2a4925 --- /dev/null +++ b/lib/unlinkdir.c @@ -0,0 +1,70 @@ +/* unlinkdir.c - determine (and maybe change) whether we can unlink directories + + Copyright (C) 2005 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert and Jim Meyering. */ + +#include + +#include "unlinkdir.h" + +#if HAVE_PRIV_H +# include +#endif +#if HAVE_UNISTD_H +# include +#endif + +#if ! UNLINK_CANNOT_UNLINK_DIR + +/* Return true if we cannot unlink directories, false if we might be + able to unlink directories. If possible, tell the kernel we don't + want to be able to unlink directories, so that we can return true. */ + +bool +cannot_unlink_dir (void) +{ + static bool initialized; + static bool cannot; + + if (! initialized) + { +# if defined PRIV_EFFECTIVE && defined PRIV_SYS_LINKDIR + /* We might be able to unlink directories if we cannot + determine our privileges, or if we have the + PRIV_SYS_LINKDIR privilege and cannot delete it. */ + priv_set_t *pset = priv_allocset (); + if (pset) + { + cannot = + (getppriv (PRIV_EFFECTIVE, pset) == 0 + && (! priv_ismember (pset, PRIV_SYS_LINKDIR) + || (priv_delset (pset, PRIV_SYS_LINKDIR) == 0 + && setppriv (PRIV_SET, PRIV_EFFECTIVE, pset) == 0))); + priv_freeset (pset); + } +# else + /* In traditional Unix, only root can unlink directories. */ + cannot = (geteuid () != 0); +# endif + initialized = true; + } + + return cannot; +} + +#endif diff --git a/lib/unlinkdir.h b/lib/unlinkdir.h new file mode 100644 index 0000000000..f705f12336 --- /dev/null +++ b/lib/unlinkdir.h @@ -0,0 +1,27 @@ +/* unlinkdir.h - determine (and maybe change) whether we can unlink directories + + Copyright (C) 2005 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert and Jim Meyering. */ + +#include + +#if UNLINK_CANNOT_UNLINK_DIR +static bool cannot_unlink_dir (void) { return true; } +#else +bool cannot_unlink_dir (void); +#endif diff --git a/m4/ChangeLog b/m4/ChangeLog index 74f758d9bd..3e78d2c334 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2005-05-14 Paul Eggert + + Sync from coreutils. + * unlinkdir.m4: New file. + 2005-05-10 Derek Price * getopt.m4 (gl_GETOPT): Check for Solaris 10 bug, not decl, when diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 new file mode 100644 index 0000000000..5e22e5dc59 --- /dev/null +++ b/m4/unlinkdir.m4 @@ -0,0 +1,34 @@ +#serial 2 + +# Copyright (C) 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Written by Paul Eggert. + +AC_DEFUN([gl_UNLINKDIR], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_CHECK_HEADERS_ONCE(priv.h unistd.h) + + AC_LIBSOURCES([unlinkdir.c, unlinkdir.h]) + AC_LIBOBJ([unlinkdir]) + + # The Hurd, the Linux kernel, the FreeBSD kernel version 2.2 and later, + # and Cygwin never let anyone (even root) unlink directories. + # If anyone knows of another system for which unlink can never + # remove a directory, please report it to . + # Unfortunately this is difficult to test for, since it requires root access + # and might create garbage in the file system, + # so the code below simply relies on the kernel name and version number. + case $host in + *-*-gnu[0-9]* | \ + *-*-linux-* | *-*-linux | \ + *-*-freebsd2.2* | *-*-freebsd[3-9]* | *-*-freebsd[1-9][0-9]* | \ + *-cygwin) + AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], 1, + [Define to 1 if unlink (dir) cannot possibly succeed.]);; + esac +]) diff --git a/modules/unlinkdir b/modules/unlinkdir new file mode 100644 index 0000000000..e8c68a6f6b --- /dev/null +++ b/modules/unlinkdir @@ -0,0 +1,24 @@ +Description: +Determine (and maybe change) whether we can unlink directories. + +Files: +lib/unlinkdir.h +lib/unlinkdir.c +m4/unlinkdir.m4 + +Depends-on: +stdbool + +configure.ac: +gl_UNLINKDIR + +Makefile.am: + +Include: +"unlinkdir.h" + +License: +GPL + +Maintainer: +Paul Eggert, Jim Meyering