diff options
author | 2002-05-11 21:56:54 +0000 | |
---|---|---|
committer | 2002-05-11 21:56:54 +0000 | |
commit | 1b6fe90834996653f7d31b7530db23753f3e848c (patch) | |
tree | e8fc36eee8461f8dd9342890f99c2445f83e06c3 | |
parent | Deal with unknown command line options more sanely. (diff) | |
download | wireguard-openbsd-1b6fe90834996653f7d31b7530db23753f3e848c.tar.xz wireguard-openbsd-1b6fe90834996653f7d31b7530db23753f3e848c.zip |
Kill -V (version) option since it has no relation to reality any more.
-rw-r--r-- | usr.bin/at/at.1 | 9 | ||||
-rw-r--r-- | usr.bin/at/at.c | 26 | ||||
-rw-r--r-- | usr.bin/at/panic.c | 14 |
3 files changed, 17 insertions, 32 deletions
diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1 index ccbcbea9af6..c3bf2157869 100644 --- a/usr.bin/at/at.1 +++ b/usr.bin/at/at.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: at.1,v 1.19 2002/05/11 18:41:20 millert Exp $ +.\" $OpenBSD: at.1,v 1.20 2002/05/11 21:56:54 millert Exp $ .\" $FreeBSD: at.man,v 1.6 1997/02/22 19:54:05 peter Exp $ .Dd April 12, 1995 .Dt AT 1 @@ -11,24 +11,19 @@ .Nd queue, examine or delete jobs for later execution .Sh SYNOPSIS .Nm at -.Op Fl V .Op Fl q Ar queue .Op Fl f Ar file .Op Fl mldbv .Ar time .Nm at -.Op Fl V .Fl c Ar job Op Ar job ... .Nm atq -.Op Fl V .Op Fl q Ar queue .Op Fl v .Nm atrm -.Op Fl V .Ar job .Op Ar job ... .Nm batch -.Op Fl V .Op Fl q Ar queue .Op Fl f Ar file .Op Fl mv @@ -59,8 +54,6 @@ the load average drops below 1.5, or the value specified in the invocation of .Pp The options are as follows: .Bl -tag -width indent -.It Fl V -Prints the version number to standard error. .It Fl q Ar queue Uses the specified queue. A queue designation consists of a single letter. diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c index 00a2329575f..d232097df1b 100644 --- a/usr.bin/at/at.c +++ b/usr.bin/at/at.c @@ -1,4 +1,4 @@ -/* $OpenBSD: at.c,v 1.23 2002/05/11 21:37:13 millert Exp $ */ +/* $OpenBSD: at.c,v 1.24 2002/05/11 21:56:54 millert Exp $ */ /* $NetBSD: at.c,v 1.4 1995/03/25 18:13:31 glass Exp $ */ /* @@ -74,7 +74,7 @@ enum { ATQ, ATRM, AT, BATCH, CAT }; /* what program we want to run */ /* File scope variables */ #ifndef lint -static char rcsid[] = "$OpenBSD: at.c,v 1.23 2002/05/11 21:37:13 millert Exp $"; +static char rcsid[] = "$OpenBSD: at.c,v 1.24 2002/05/11 21:56:54 millert Exp $"; #endif char *no_export[] = @@ -572,8 +572,7 @@ main(argc, argv) ATQ, ATRM, AT, BATCH, CAT }; /* what program we want to run */ int program = AT; /* our default program */ - char *options = "q:f:mvldbVc"; /* default options for at */ - int disp_version = 0; + char *options = "q:f:mvldbc"; /* default options for at */ time_t timer; RELINQUISH_PRIVS @@ -589,13 +588,13 @@ main(argc, argv) /* find out what this program is supposed to do */ if (strcmp(pgm, "atq") == 0) { program = ATQ; - options = "q:vV"; + options = "q:v"; } else if (strcmp(pgm, "atrm") == 0) { program = ATRM; - options = "V"; + options = ""; } else if (strcmp(pgm, "batch") == 0) { program = BATCH; - options = "f:q:mvV"; + options = "f:q:mv"; } /* process whatever options we can process */ @@ -630,7 +629,7 @@ main(argc, argv) usage(); program = ATRM; - options = "V"; + options = ""; break; case 'l': @@ -638,7 +637,7 @@ main(argc, argv) usage(); program = ATQ; - options = "q:vV"; + options = "q:v"; break; case 'b': @@ -646,11 +645,7 @@ main(argc, argv) usage(); program = BATCH; - options = "f:q:mvV"; - break; - - case 'V': - disp_version = 1; + options = "f:q:mv"; break; case 'c': @@ -664,9 +659,6 @@ main(argc, argv) } /* end of options eating */ - if (disp_version) - (void)fprintf(stderr, "%s version %.1f\n", namep, AT_VERSION); - if (!check_permission()) errx(EXIT_FAILURE, "You do not have permission to use %s.", namep); diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c index 03e839c11c6..fb3e90026c8 100644 --- a/usr.bin/at/panic.c +++ b/usr.bin/at/panic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: panic.c,v 1.5 2000/11/17 18:40:50 deraadt Exp $ */ +/* $OpenBSD: panic.c,v 1.6 2002/05/11 21:56:54 millert Exp $ */ /* $NetBSD: panic.c,v 1.2 1995/03/25 18:13:33 glass Exp $ */ /* @@ -42,7 +42,7 @@ /* File scope variables */ #ifndef lint -static char rcsid[] = "$OpenBSD: panic.c,v 1.5 2000/11/17 18:40:50 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: panic.c,v 1.6 2002/05/11 21:56:54 millert Exp $"; #endif /* External variables */ @@ -96,10 +96,10 @@ usage(void) { /* Print usage and exit. */ (void)fprintf(stderr, - "Usage: at [-V] [-q queue] [-f file] [-mldbv] time\n" - " at [-V] -c job [job ...]\n" - " atq [-V] [-q queue] [-v]\n" - " atrm [-V] job [job ...]\n" - " batch [-V] [-q queue] [-f file] [-mv]\n"); + "Usage: at [-q queue] [-f file] [-mldbv] time\n" + " at -c job [job ...]\n" + " atq [-q queue] [-v]\n" + " atrm job [job ...]\n" + " batch [-q queue] [-f file] [-mv]\n"); exit(EXIT_FAILURE); } |