summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-11-02 21:53:20 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-11-02 21:53:20 +0000
commitb38883ea2fc4353a24995f66c5b553a24bfae1e1 (patch)
treefda907ffd29cd1db267a4426f067fd595a7a1360
parentce1d20289c37b14a8ead7d859f26b9e9bee3be71 (diff)
downloadcoreutils-b38883ea2fc4353a24995f66c5b553a24bfae1e1.tar.xz
(usage): Don't mention rm -d.
-rw-r--r--src/rm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/rm.c b/src/rm.c
index f83831d17..4b1999970 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -137,9 +137,6 @@ usage (int status)
fputs (_("\
Remove (unlink) the FILE(s).\n\
\n\
- -d, --directory unlink FILE, even if it is a non-empty directory\n\
- (super-user only; this works only if your system\n\
- supports `unlink' for nonempty directories)\n\
-f, --force ignore nonexistent files, never prompt\n\
-i, --interactive prompt before any removal\n\
"), stdout);
@@ -179,7 +176,6 @@ truly unrecoverable, consider using shred.\n\
static void
rm_option_init (struct rm_options *x)
{
- x->unlink_dirs = false;
x->ignore_missing_files = false;
x->interactive = false;
x->recursive = false;
@@ -214,7 +210,10 @@ main (int argc, char **argv)
switch (c)
{
case 'd':
- x.unlink_dirs = true;
+ /* Ignore this option, for backward compatibility with
+ coreutils 5.92. Some time after 2005, we'll change this
+ to report an error (or perhaps behave like FreeBSD does)
+ instead of ignoring the option. */
break;
case 'f':