diff options
| author | Jim Meyering <jim@meyering.net> | 2006-10-25 00:01:33 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-10-25 00:01:33 +0200 |
| commit | 5e42576c017905627e209acc20bf6e6abd1db6ef (patch) | |
| tree | dec84f1b293d51189d9ab440710d8ca16bc91c4c /src/remove.c | |
| parent | ba6b1acefd8c9d9a4c506806d68e891879706a2c (diff) | |
| download | coreutils-5e42576c017905627e209acc20bf6e6abd1db6ef.tar.xz | |
new feature: rm accepts new option: --one-file-system
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.
Diffstat (limited to 'src/remove.c')
| -rw-r--r-- | src/remove.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/remove.c b/src/remove.c index d362db0ee..add85dd7b 100644 --- a/src/remove.c +++ b/src/remove.c @@ -1298,6 +1298,7 @@ remove_dir (int fd_cwd, Dirstack_state *ds, char const *dir, struct rm_options const *x, int *cwd_errno) { enum RM_status status; + dev_t current_dev = dir_st->st_dev; /* There is a race condition in that an attacker could replace the nonempty directory, DIR, with a symlink between the preceding call to rmdir @@ -1359,15 +1360,31 @@ remove_dir (int fd_cwd, Dirstack_state *ds, char const *dir, } if (subdir) { - AD_push (dirfd (dirp), ds, subdir, &subdir_sb); - AD_INIT_OTHER_MEMBERS (); + if ( ! x->one_file_system + || subdir_sb.st_dev == current_dev) + { + AD_push (dirfd (dirp), ds, subdir, &subdir_sb); + AD_INIT_OTHER_MEMBERS (); + free (subdir); + continue; + } + /* Here, --one-file-system is in effect, and with remove_cwd_entries' + traversal into the current directory, (known as SUBDIR, from ..), + DIRP's device number is different from CURRENT_DEV. Arrange not + to do anything more with this hierarchy. */ + error (0, errno, _("skipping %s, since it's on a different device"), + quote (full_filename (subdir))); free (subdir); - continue; + AD_mark_current_as_unremovable (ds); + tmp_status = RM_ERROR; + UPDATE_STATUS (status, tmp_status); } /* Execution reaches this point when we've removed the last - removable entry from the current directory. */ + removable entry from the current directory -- or, with + --one-file-system, when the current directory is on a + different file system. */ { /* The name of the directory that we have just processed, nominally removing all of its contents. */ |