summaryrefslogtreecommitdiff
path: root/src/mv.c
diff options
context:
space:
mode:
authorKrzysztof Goj <krzysztof.goj@gmail.com>2012-01-22 01:39:59 +0100
committerJim Meyering <meyering@redhat.com>2012-08-14 18:54:16 +0200
commitfdc2da7165d93c8065365999341173ad2a818833 (patch)
tree25ef66176016b61abb71b56175b6cdb42fb54ee4 /src/mv.c
parent46afefaaa8ea95b5eb63a62792774cd18738234a (diff)
downloadcoreutils-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/mv.c')
-rw-r--r--src/mv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mv.c b/src/mv.c
index ee2f5a10c..4f5708eb2 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -73,6 +73,7 @@ static void
rm_option_init (struct rm_options *x)
{
x->ignore_missing_files = false;
+ x->remove_empty_directories = true;
x->recursive = true;
x->one_file_system = false;