From 5610a8734d4ad3c583480e14525a317575d6d703 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 3 Jul 2005 16:49:15 +0000 Subject: (main): Using --reply now evokes a warning. (usage): Remove description of --reply. --- src/cp.c | 9 +++++---- src/mv.c | 16 +++++----------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/cp.c b/src/cp.c index a2810c30c..6605ebcf8 100644 --- a/src/cp.c +++ b/src/cp.c @@ -130,7 +130,8 @@ 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}, + {"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'}, @@ -200,8 +201,6 @@ Mandatory arguments to long options are mandatory for short options too.\n\ attempting to open it (contrast with --force)\n\ "), stdout); fputs (_("\ - --reply={yes,no,query} specify how to handle the prompt about an\n\ - existing destination file\n\ --sparse=WHEN control creation of sparse files\n\ --strip-trailing-slashes remove any trailing slashes from each SOURCE\n\ argument\n\ @@ -905,9 +904,11 @@ main (int argc, char **argv) x.recursive = true; break; - case REPLY_OPTION: + 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: diff --git a/src/mv.c b/src/mv.c index a56aa4fd5..28e6a4124 100644 --- a/src/mv.c +++ b/src/mv.c @@ -77,7 +77,8 @@ static struct option const long_options[] = {"force", no_argument, NULL, 'f'}, {"interactive", no_argument, NULL, 'i'}, {"no-target-directory", no_argument, NULL, 'T'}, - {"reply", required_argument, NULL, REPLY_OPTION}, + {"reply", required_argument, NULL, REPLY_OPTION}, /* Deprecated 2005-07-03, + remove in 2008. */ {"strip-trailing-slashes", no_argument, NULL, STRIP_TRAILING_SLASHES_OPTION}, {"suffix", required_argument, NULL, 'S'}, {"target-directory", required_argument, NULL, 't'}, @@ -311,18 +312,9 @@ Mandatory arguments to long options are mandatory for short options too.\n\ --backup[=CONTROL] make a backup of each existing destination file\n\ -b like --backup but does not accept an argument\n\ -f, --force do not prompt before overwriting\n\ - (equivalent to --reply=yes)\n\ -i, --interactive prompt before overwrite\n\ - (equivalent to --reply=query)\n\ "), stdout); fputs (_("\ - --reply={yes,no,query} specify how to handle the prompt about an\n\ - existing destination file. Note that\n\ - --reply=no has an effect only when mv\n\ - would prompt without -i or equivalent, i.e.,\n\ - when a destination file exists and is not\n\ - writable, standard input is a terminal, and\n\ - no -f (or equivalent) option is specified\n\ --strip-trailing-slashes remove any trailing slashes from each SOURCE\n\ argument\n\ -S, --suffix=SUFFIX override the usual backup suffix\n\ @@ -399,9 +391,11 @@ main (int argc, char **argv) case 'i': x.interactive = I_ASK_USER; break; - case REPLY_OPTION: + 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 STRIP_TRAILING_SLASHES_OPTION: remove_trailing_slashes = true; -- cgit v1.2.3-54-g00ecf