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. --- src/remove.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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"), -- cgit v1.2.3-54-g00ecf