From d64c186d8e28d99ece16e591f6823a1da904ac44 Mon Sep 17 00:00:00 2001 From: Pádraig Brady
Date: Fri, 18 Dec 2009 12:26:04 +0000
Subject: rm: fix --one-file-system regression due to fts conversion
* src/remove.c (rm_fts): Fix incorrect comparison of
device and inode numbers.
* tests/rm/one-file-system2: Add a separate test so
that it can be run as a normal user (It doesn't need to mount).
* tests/Makefile.am: Reference it.
* NEWS: Mention the fix.
Reported by Jan Larres.
---
NEWS | 7 +++++++
src/remove.c | 2 +-
tests/Makefile.am | 1 +
tests/rm/one-file-system2 | 31 +++++++++++++++++++++++++++++++
4 files changed, 40 insertions(+), 1 deletion(-)
create mode 100755 tests/rm/one-file-system2
diff --git a/NEWS b/NEWS
index bef66c87f..f0b71a8c8 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ GNU coreutils NEWS -*- outline -*-
* Noteworthy changes in release ?.? (????-??-??) [?]
+** Bug fixes
+
+ rm -r --one-file-system works once again.
+ The rewrite to make rm use fts introduced a regression whereby
+ a commmand of the above form would fail for all subdirectories.
+ [bug introduced in coreutils-8.0]
+
* Noteworthy changes in release 8.2 (2009-12-11) [stable]
diff --git a/src/remove.c b/src/remove.c
index 584720079..1306e8fbf 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -548,7 +548,7 @@ rm_fts (FTS *fts, FTSENT *ent, struct rm_options const *x)
if (ent->fts_info == FTS_DP
&& x->one_file_system
&& FTS_ROOTLEVEL < ent->fts_level
- && ent->fts_statp->st_ino != fts->fts_dev)
+ && ent->fts_statp->st_dev != fts->fts_dev)
{
mark_ancestor_dirs (ent);
error (0, 0, _("skipping %s, since it's on a different device"),
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fe8f34754..5e44202ba 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -107,6 +107,7 @@ TESTS = \
rm/interactive-always \
rm/interactive-once \
rm/ir-1 \
+ rm/one-file-system2 \
rm/r-1 \
rm/r-2 \
rm/r-3 \
diff --git a/tests/rm/one-file-system2 b/tests/rm/one-file-system2
new file mode 100755
index 000000000..414a57acd
--- /dev/null
+++ b/tests/rm/one-file-system2
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Verify --one-file-system does delete within a file system
+
+# Copyright (C) 2009 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 3 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, see