diff options
author | Jim Meyering <meyering@redhat.com> | 2008-10-08 08:51:38 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-12-01 17:03:37 +0100 |
commit | 7ef56a26fd911e551f1bd9d2783afb7fbed6c669 (patch) | |
tree | ef8066ff8bf3e91ca25c94933d3dc6b99a97b142 /src/cp.c | |
parent | aa2617b9086ca7ffaf49fd22c0b54ab58c2107fd (diff) | |
download | coreutils-7ef56a26fd911e551f1bd9d2783afb7fbed6c669.tar.xz |
cp, mv: remove 3-year-deprecated+warned-about --reply option
* src/cp.c (reply_args, reply_vals): Remove globals.
[REPLY_OPTION]: Remove enum.
(long_opts) ["reply"]: Remove initializer.
(main): Remove case stmt.
* src/mv.c: Likewise.
Don't include "argmatch.h". No longer used.
* NEWS (Changes in behavior): Mention this.
* tests/Makefile.am (TESTS): Remove mv/reply-no.
* tests/mv/reply-no: Remove file.
* tests/mv/i-link-no: Update, now that --reply= is gone.
Diffstat (limited to 'src/cp.c')
-rw-r--r-- | src/cp.c | 22 |
1 files changed, 0 insertions, 22 deletions
@@ -76,7 +76,6 @@ enum NO_PRESERVE_ATTRIBUTES_OPTION, PARENTS_OPTION, PRESERVE_ATTRIBUTES_OPTION, - REPLY_OPTION, SPARSE_OPTION, STRIP_TRAILING_SLASHES_OPTION, UNLINK_DEST_BEFORE_OPENING @@ -108,18 +107,6 @@ static enum Sparse_type const sparse_type[] = }; ARGMATCH_VERIFY (sparse_type_string, sparse_type); -/* Valid arguments to the `--reply' option. */ -static char const* const reply_args[] = -{ - "yes", "no", "query", NULL -}; -/* The values that correspond to the above strings. */ -static int const reply_vals[] = -{ - I_ALWAYS_YES, I_ALWAYS_NO, I_ASK_USER -}; -ARGMATCH_VERIFY (reply_args, reply_vals); - static struct option const long_opts[] = { {"archive", no_argument, NULL, 'a'}, @@ -138,8 +125,6 @@ static struct option const long_opts[] = {"preserve", optional_argument, NULL, PRESERVE_ATTRIBUTES_OPTION}, {"recursive", no_argument, NULL, 'R'}, {"remove-destination", no_argument, NULL, UNLINK_DEST_BEFORE_OPENING}, - {"reply", required_argument, NULL, REPLY_OPTION}, /* Deprecated 2005-07-03, - remove in 2008. */ {"sparse", required_argument, NULL, SPARSE_OPTION}, {"strip-trailing-slashes", no_argument, NULL, STRIP_TRAILING_SLASHES_OPTION}, {"suffix", required_argument, NULL, 'S'}, @@ -1001,13 +986,6 @@ main (int argc, char **argv) x.recursive = true; break; - case REPLY_OPTION: /* Deprecated */ - x.interactive = XARGMATCH ("--reply", optarg, - reply_args, reply_vals); - error (0, 0, - _("the --reply option is deprecated; use -i or -f instead")); - break; - case UNLINK_DEST_BEFORE_OPENING: x.unlink_dest_before_opening = true; break; |