summaryrefslogtreecommitdiff
path: root/tests/rm
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-09-04 14:40:11 +0200
committerJim Meyering <meyering@redhat.com>2012-09-05 12:10:38 +0200
commit57dd06703cb89ba53d05af95c11e89a2ca51af5c (patch)
treeecc69c1fe877140a51d52c0d58fb018071faf107 /tests/rm
parentd5719921a8968f5dc21149020450cca9b3d6c646 (diff)
downloadcoreutils-57dd06703cb89ba53d05af95c11e89a2ca51af5c.tar.xz
rm: avoid bogus diagnostic for a slash-decorated symlink-to-dir
These commands would evoke an invalid diagnostic: $ mkdir d && ln -s d s && env rm -r s/ rm: cannot remove 's': Too many levels of symbolic links remove.c was stripping trailing slashes from "s/" before passing the name to "rm". But a trailing slash may change the semantics, and thus should not be stripped. * src/remove.c (rm_fts): Do not strip trailing slashes. * tests/rm/v-slash.sh: Adapt to new expected output. * gnulib: Update to latest, for an improved fts.c that merely normalizes trailing slashes. Reported by Paul Eggert in discussion of http://bugs.gnu.org/12339
Diffstat (limited to 'tests/rm')
-rwxr-xr-xtests/rm/v-slash.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rm/v-slash.sh b/tests/rm/v-slash.sh
index 504f4ffb8..ec77bd063 100755
--- a/tests/rm/v-slash.sh
+++ b/tests/rm/v-slash.sh
@@ -26,7 +26,7 @@ touch a/x || framework_failure_
rm --verbose -r a/// > out || fail=1
cat <<\EOF > exp || fail=1
removed 'a/x'
-removed directory: 'a'
+removed directory: 'a/'
EOF
compare exp out || fail=1