diff options
author | Eric Blake <eblake@redhat.com> | 2010-09-16 11:52:27 -0600 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2010-09-17 08:44:31 -0600 |
commit | 95732b834e5dead84fefa7b6d387f61048ed21b3 (patch) | |
tree | 7bb926d1397755b6237077c22618a26a6964b556 /src | |
parent | 3bb942c4261e6c3f362e0d76fcb23f62bdb44c21 (diff) | |
download | coreutils-95732b834e5dead84fefa7b6d387f61048ed21b3.tar.xz |
rm: remove no-op -d option
* src/rm.c (long_opts, main): Resolve a fixme.
* NEWS: Document the change.
Based on a report by William Plusnick.
Diffstat (limited to 'src')
-rw-r--r-- | src/rm.c | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -63,7 +63,6 @@ enum interactive_type static struct option const long_opts[] = { - {"directory", no_argument, NULL, 'd'}, {"force", no_argument, NULL, 'f'}, {"interactive", optional_argument, NULL, INTERACTIVE_OPTION}, @@ -222,17 +221,10 @@ main (int argc, char **argv) /* Try to disable the ability to unlink a directory. */ priv_set_remove_linkdir (); - while ((c = getopt_long (argc, argv, "dfirvIR", long_opts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "firvIR", long_opts, NULL)) != -1) { switch (c) { - case 'd': - /* Ignore this option, for backward compatibility with - coreutils 5.92. FIXME: Some time after 2005, change this - to report an error (or perhaps behave like FreeBSD does) - instead of ignoring the option. */ - break; - case 'f': x.interactive = RMI_NEVER; x.ignore_missing_files = true; |