diff options
| -rw-r--r-- | src/cp.c | 10 | ||||
| -rw-r--r-- | src/install.c | 10 | ||||
| -rw-r--r-- | src/ln.c | 10 | ||||
| -rw-r--r-- | src/mv.c | 10 |
4 files changed, 4 insertions, 36 deletions
@@ -138,7 +138,6 @@ static struct option const long_opts[] = {"target-directory", required_argument, NULL, 't'}, {"update", no_argument, NULL, 'u'}, {"verbose", no_argument, NULL, 'v'}, - {"version-control", required_argument, NULL, 'V'}, /* Deprecated. FIXME. */ {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} @@ -814,7 +813,7 @@ main (int argc, char **argv) we'll actually use backup_suffix_string. */ backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); - while ((c = getopt_long (argc, argv, "abdfHilLprst:uvxPRS:TV:", + while ((c = getopt_long (argc, argv, "abdfHilLprst:uvxPRS:T", long_opts, NULL)) != -1) { @@ -835,13 +834,6 @@ main (int argc, char **argv) x.recursive = true; break; - case 'V': /* FIXME: this is deprecated. Remove it in 2001. */ - error (0, 0, - _("warning: --version-control (-V) is obsolete; support for\ - it\nwill be removed in some future release. Use --backup=%s instead." - ), optarg); - /* Fall through. */ - case 'b': make_backups = true; if (optarg) diff --git a/src/install.c b/src/install.c index b3d41293b..49cc8d0ea 100644 --- a/src/install.c +++ b/src/install.c @@ -117,7 +117,6 @@ static struct option const long_options[] = {"strip", no_argument, NULL, 's'}, {"suffix", required_argument, NULL, 'S'}, {"target-directory", required_argument, NULL, 't'}, - {"version-control", required_argument, NULL, 'V'}, /* Deprecated. FIXME. */ {"verbose", no_argument, NULL, 'v'}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, @@ -217,18 +216,11 @@ main (int argc, char **argv) we'll actually use backup_suffix_string. */ backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); - while ((optc = getopt_long (argc, argv, "bcsDdg:m:o:pt:TvV:S:", long_options, + while ((optc = getopt_long (argc, argv, "bcsDdg:m:o:pt:TvS:", long_options, NULL)) != -1) { switch (optc) { - case 'V': /* FIXME: this is deprecated. Remove it in 2001. */ - error (0, 0, - _("warning: --version-control (-V) is obsolete; support for\ - it\nwill be removed in some future release. Use --backup=%s instead." - ), optarg); - /* Fall through. */ - case 'b': make_backups = true; if (optarg) @@ -120,7 +120,6 @@ static struct option const long_options[] = {"target-directory", required_argument, NULL, 't'}, {"symbolic", no_argument, NULL, 's'}, {"verbose", no_argument, NULL, 'v'}, - {"version-control", required_argument, NULL, 'V'}, /* Deprecated. FIXME. */ {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} @@ -420,18 +419,11 @@ main (int argc, char **argv) symbolic_link = remove_existing_files = interactive = verbose = hard_dir_link = false; - while ((c = getopt_long (argc, argv, "bdfinst:vFS:TV:", long_options, NULL)) + while ((c = getopt_long (argc, argv, "bdfinst:vFS:T", long_options, NULL)) != -1) { switch (c) { - case 'V': /* FIXME: this is deprecated. Remove it in 2001. */ - error (0, 0, - _("warning: --version-control (-V) is obsolete; support for\ - it\nwill be removed in some future release. Use --backup=%s instead." - ), optarg); - /* Fall through. */ - case 'b': make_backups = true; if (optarg) @@ -83,7 +83,6 @@ static struct option const long_options[] = {"target-directory", required_argument, NULL, 't'}, {"update", no_argument, NULL, 'u'}, {"verbose", no_argument, NULL, 'v'}, - {"version-control", required_argument, NULL, 'V'}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} @@ -379,18 +378,11 @@ main (int argc, char **argv) we'll actually use backup_suffix_string. */ backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); - while ((c = getopt_long (argc, argv, "bfit:uvS:TV:", long_options, NULL)) + while ((c = getopt_long (argc, argv, "bfit:uvS:T", long_options, NULL)) != -1) { switch (c) { - case 'V': /* FIXME: this is deprecated. Remove it in 2001. */ - error (0, 0, - _("warning: --version-control (-V) is obsolete; support for\ - it\nwill be removed in some future release. Use --backup=%s instead." - ), optarg); - /* Fall through. */ - case 'b': make_backups = true; if (optarg) |