CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-21 11:16:16 +02:00
Code Issues Projects Releases Wiki Activity

new feature: rm accepts new option: --one-file-system

Browse Source 
Suggested by Steve McIntyre in <http://bugs.debian.org/392925>.
* src/remove.h (struct rm_options) [one_file_system]: New member.
* src/rm.c (rm_option_init): Initialize it.
(usage): Document the option.
* src/mv.c (rm_option_init): Likewise.
* src/remove.c (remove_dir): With --one-file-system and --recursive,
for each directory command line argument, do not affect a file system
different from that of the starting directory.  And give a diagnostic.
* src/rm.c (ONE_FILE_SYSTEM): New enum.
(main): Handle new option.
* tests/rm/one-file-system: Test the above.
* tests/rm/Makefile.am (TESTS): Add one-file-system.
* tests/Makefile.am (check-root): Add the rm/one-file-system
test to the list.
(EXTRA_DIST): Add other-fs-tmpdir.

* tests/mv/setup: Removed.  Renamed to...
* tests/other-fs-tmpdir: ...this new file.
* tests/mv/Makefile.am (EXTRA_DIST): Remove setup.
* tests/mv/acl: Reflect renaming: use ../other-fs-tmpdir.
* tests/mv/backup-is-src: Likewise.
* tests/mv/hard-link-1: Likewise.
* tests/mv/leak-fd: Likewise.
* tests/mv/mv-special-1: Likewise.
* tests/mv/part-fail: Likewise.
* tests/mv/part-hardlink: Likewise.
* tests/mv/part-rename: Likewise.
* tests/mv/part-symlink: Likewise.
* tests/mv/partition-perm: Likewise.
* tests/mv/to-symlink: Likewise.
* tests/mv/into-self-2: Likewise.

[doc/ChangeLog]
* coreutils.texi (rm invocation): Describe --one-file-system.
This commit is contained in:
Jim Meyering
2006-10-25 00:01:33 +02:00
parent ba6b1acefd
commit 5e42576c01
25 changed files with 189 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/mv/Makefile.am
View File

@@ -43,7 +43,7 @@ TESTS = \
i-1 hard-link-1 force partition-perm to-symlink dir-file diag \
part-symlink part-rename trailing-slash
EXTRA_DIST = $(TESTS) setup vfat
EXTRA_DIST = $(TESTS) vfat
TESTS_ENVIRONMENT = \
PERL="$(PERL)" \
PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \

2
tests/mv/acl
View File

@@ -20,7 +20,7 @@
# 02110-1301, USA.
. $srcdir/../acl
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
# Make sure we get English translations.
. $srcdir/../lang-default

2
tests/mv/backup-is-src
View File

@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
if test -z "$other_partition_tmpdir"; then

2
tests/mv/hard-link-1
View File

@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
# Make sure we get English translations.
. $srcdir/../lang-default

2
tests/mv/into-self-2
View File

@@ -25,7 +25,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
if test -z "$other_partition_tmpdir"; then

2
tests/mv/leak-fd
View File

@@ -30,7 +30,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check

2
tests/mv/mv-special-1
View File

@@ -29,7 +29,7 @@ tmp=mv-spec.$$
trap 'status=$?; cd "$pwd" && exec 1>&2; rm -rf $tmp $other_partition_tmpdir && exit $status' 0
trap '(exit $?); exit' 1 2 13 15
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
# Make sure we get English translations.
. $srcdir/../lang-default

2
tests/mv/part-fail
View File

@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
. $srcdir/../lang-default
PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check

2
tests/mv/part-hardlink
View File

@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
pwd=`pwd`

2
tests/mv/part-rename
View File

@@ -25,7 +25,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
pwd=`pwd`

2
tests/mv/part-symlink
View File

@@ -32,7 +32,7 @@ trap '(exit $?); exit' 1 2 13 15
pwd_tmp=$pwd/$tmp
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
# Make sure the programs use C-locale formats/translations.
. $srcdir/../lang-default

2
tests/mv/partition-perm
View File

@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
. $srcdir/../lang-default

61
tests/mv/setup
View File

@@ -1,61 +0,0 @@
#! /bin/sh
# Use stat to find a writable directory on a file system different from that
# of the current directory. If one is found, create a temporary directory
# inside it.
# Copyright (C) 1998, 1999, 2001, 2002, 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 of the License, 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 Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
test "${CANDIDATE_TMP_DIRS+set}" = set \
|| CANDIDATE_TMP_DIRS="$TMPDIR /tmp /var/tmp /usr/tmp $HOME"
other_partition_tmpdir=
dot_mount_point=`stat -c %d .`
for d in $CANDIDATE_TMP_DIRS; do
# Skip nonexistent directories.
test -d $d || continue
d_mount_point=`stat -L -c %d $d`
# Same partition? Skip it.
test x$d_mount_point = x$dot_mount_point && continue
# See if we can create a directory in it.
if mkdir "$d/tmp$$" > /dev/null 2>&1; then
other_partition_tmpdir="$d/tmp$$"
break
fi
done
if test -z "$other_partition_tmpdir"; then
cat <<EOF 1>&2
**************************************
This test requires a writable directory on a different
disk partition, and I couldn't find one. I tried these:
$CANDIDATE_TMP_DIRS
Set your environment variable CANDIDATE_TMP_DIRS to make
this test use a different list.
**************************************
EOF
#'
fi
test "$VERBOSE" = yes && set -x

2
tests/mv/to-symlink
View File

@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
. $srcdir/setup
. $srcdir/../other-fs-tmpdir
. $srcdir/../envvar-check
if test -z "$other_partition_tmpdir"; then