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.h | |
| parent | Don't let a failure in one test stop "make -k". (diff) | |
| download | coreutils-5e42576c017905627e209acc20bf6e6abd1db6ef.tar.gz coreutils-5e42576c017905627e209acc20bf6e6abd1db6ef.zip | |
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.h')
| -rw-r--r-- | src/remove.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/remove.h b/src/remove.h index d3609d768..2dc617618 100644 --- a/src/remove.h +++ b/src/remove.h @@ -30,6 +30,14 @@ struct rm_options /* If true, query the user about whether to remove each file. */ bool interactive; + /* If true, do not traverse into (or remove) any directory that is + on a file system (i.e., that has a different device number) other + than that of the corresponding command line argument. Note that + even without this option, rm will fail in the end, due to its + probable inability to remove the mount point. But there, the + diagnostic comes too late -- after removing all contents. */ + bool one_file_system; + /* If true, recursively remove directories. */ bool recursive; |