diff options
| author | Krzysztof Goj <krzysztof.goj@gmail.com> | 2012-01-22 01:39:59 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-08-14 18:54:16 +0200 |
| commit | fdc2da7165d93c8065365999341173ad2a818833 (patch) | |
| tree | 25ef66176016b61abb71b56175b6cdb42fb54ee4 /src/remove.h | |
| parent | 46afefaaa8ea95b5eb63a62792774cd18738234a (diff) | |
| download | coreutils-fdc2da7165d93c8065365999341173ad2a818833.tar.xz | |
rm: new option --dir (-d) to remove empty directories
Add new option to rm (-d/--dir), which allows removal of
empty directories, while still safely disallowing removal
of non-empty ones.
This improves compatibility with Mac OS X and BSD systems,
which honor the -d option.
* src/remove.c (rm_fts): Remove empty directories when requested.
* src/remove.h (rm_options) [remove_empty_directories]: New member.
* src/rm.c (long_opts, usage, main): Update usage and option parsing.
(rm_option_init): Initialize the new member.
* src/mv.c (rm_option_init): Initialize the new member.
* tests/rm/d-1: New test case - successfully delete empty dir.
* tests/rm/d-2: New test case - refuse to delete nonempty dir.
* tests/Makefile.am (TESTS): Add them.
Diffstat (limited to 'src/remove.h')
| -rw-r--r-- | src/remove.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/remove.h b/src/remove.h index 4eab2821f..f994517af 100644 --- a/src/remove.h +++ b/src/remove.h @@ -49,6 +49,9 @@ struct rm_options /* If true, recursively remove directories. */ bool recursive; + /* If true, remove empty directories. */ + bool remove_empty_directories; + /* Pointer to the device and inode numbers of '/', when --recursive and preserving '/'. Otherwise NULL. */ struct dev_ino *root_dev_ino; |