From 0491ba1f6311b421efbea894a9c8c6c704b48cac Mon Sep 17 00:00:00 2001 From: ru Date: Sat, 21 May 2005 09:55:10 +0000 Subject: Sync program's usage() with manpage's SYNOPSIS. --- usr.bin/asa/asa.c | 2 +- usr.bin/brandelf/brandelf.c | 3 ++- usr.bin/c89/c89.1 | 15 +++++---------- usr.bin/c89/c89.c | 4 ++-- usr.bin/c99/c99.1 | 9 ++++----- usr.bin/c99/c99.c | 7 +++---- usr.bin/catman/catman.c | 3 ++- usr.bin/colldef/parse.y | 2 +- usr.bin/dirname/dirname.c | 2 +- usr.bin/du/du.1 | 2 +- usr.bin/finger/finger.c | 3 ++- usr.bin/from/from.1 | 2 +- usr.bin/fstat/fstat.c | 2 +- usr.bin/ktrdump/ktrdump.c | 6 ++++-- usr.bin/lastcomm/lastcomm.c | 2 +- usr.bin/mesg/mesg.c | 2 +- usr.bin/newkey/newkey.c | 4 ++-- usr.bin/nice/nice.c | 3 ++- usr.bin/pathchk/pathchk.c | 2 +- usr.bin/printf/printf.c | 2 +- usr.bin/renice/renice.c | 2 +- usr.bin/rsh/rsh.c | 2 +- usr.bin/rup/rup.c | 2 +- usr.bin/ruptime/ruptime.c | 2 +- usr.bin/rusers/rusers.c | 2 +- usr.bin/rwall/rwall.c | 2 +- usr.bin/showmount/showmount.c | 2 +- usr.bin/time/time.c | 2 +- usr.bin/truncate/truncate.c | 2 +- usr.bin/ul/ul.1 | 2 +- usr.bin/ul/ul.c | 2 +- usr.bin/unifdef/unifdef.1 | 5 ++++- usr.bin/unifdef/unifdef.c | 2 +- usr.bin/vmstat/vmstat.c | 4 ++-- usr.bin/write/write.1 | 2 +- usr.bin/xargs/xargs.1 | 2 +- usr.bin/xstr/xstr.1 | 5 ++--- usr.bin/ypcat/ypcat.c | 2 +- usr.bin/ypmatch/ypmatch.c | 2 +- 39 files changed, 62 insertions(+), 61 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c index 95cb588..692b8375 100644 --- a/usr.bin/asa/asa.c +++ b/usr.bin/asa/asa.c @@ -86,7 +86,7 @@ static void usage(void) { - fprintf(stderr, "usage: asa [file...]\n"); + fprintf(stderr, "usage: asa [file ...]\n"); exit(1); } diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c index 9ba8382..9cd391e 100644 --- a/usr.bin/brandelf/brandelf.c +++ b/usr.bin/brandelf/brandelf.c @@ -164,7 +164,8 @@ fail: static void usage(void) { -fprintf(stderr, "usage: brandelf [-f ELF ABI number] [-v] [-l] [-t string] file ...\n"); + (void)fprintf(stderr, + "usage: brandelf [-lv] [-f ELF_ABI_number] [-t string] file ...\n"); exit(1); } diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1 index 1d75d30..7d1a9d1 100644 --- a/usr.bin/c89/c89.1 +++ b/usr.bin/c89/c89.1 @@ -33,17 +33,12 @@ .Nd POSIX.2 C language compiler .Sh SYNOPSIS .Nm -.Op Fl c -.Op Fl D Ar name Ns Op = Ns Ar value -.Ar ... -.Op Fl E -.Op Fl g -.Op Fl I Ar directory ... -.Op Fl L Ar directory ... +.Op Fl cEgOs +.Oo Fl D Ar name Ns Oo = Ns Ar value Oc Oc ... +.Oo Fl I Ar directory Oc ... +.Oo Fl L Ar directory Oc ... .Op Fl o Ar outfile -.Op Fl O -.Op Fl s -.Op Fl U Ar name ... +.Oo Fl U Ar name Oc ... .Ar operand ... .Sh DESCRIPTION This is the name of the C language compiler as required by the diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c index 82d6427..a1dc9b2 100644 --- a/usr.bin/c89/c89.c +++ b/usr.bin/c89/c89.c @@ -102,8 +102,8 @@ static void usage(void) { fprintf(stderr, -"usage: c89 [-c] [-D name[=value]] [...] [-E] [-g] [-I directory ...]\n" -" [-L directory ...] [-o outfile] [-O] [-s] [-U name ...] operand ...\n" +"usage: c89 [-cEgOs] [-D name[=value]] ... [-I directory] ... [-L directory] ...\n" +" [-o outfile] [-U name] ... operand ...\n" "\n" " where operand is one or more of file.c, file.o, file.a\n" " or -llibrary\n"); diff --git a/usr.bin/c99/c99.1 b/usr.bin/c99/c99.1 index c1d902b..615d277 100644 --- a/usr.bin/c99/c99.1 +++ b/usr.bin/c99/c99.1 @@ -35,13 +35,12 @@ .Sh SYNOPSIS .Nm .Op Fl cEgs -.Op Fl D Ar name Ns Op = Ns Ar value -.Ar ... -.Op Fl I Ar directory ... -.Op Fl L Ar directory ... +.Oo Fl D Ar name Ns Oo = Ns Ar value Oc Oc ... +.Oo Fl I Ar directory Oc ... +.Oo Fl L Ar directory Oc ... .Op Fl o Ar outfile .Op Fl O Ar optlevel -.Op Fl U Ar name ... +.Oo Fl U Ar name Oc ... .Ar operand ... .Sh DESCRIPTION This is the name of the C language compiler as required by the diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c index 17dc27e..553099f 100644 --- a/usr.bin/c99/c99.c +++ b/usr.bin/c99/c99.c @@ -126,9 +126,8 @@ addlib(const char *lib) void usage(void) { - fprintf(stderr, -"usage: c99 [-cEgs] [-D name[=value]] [-I directory] ... [-L directory] ...\n"); - fprintf(stderr, -" [-o outfile] [-O optlevel] [-U name]... operand ...\n"); + (void)fprintf(stderr, "%s\n%s\n", +"usage: c99 [-cEgs] [-D name[=value]] ... [-I directory] ... [-L directory] ...", +" [-o outfile] [-O optlevel] [-U name] ... operand ..."); exit(1); } diff --git a/usr.bin/catman/catman.c b/usr.bin/catman/catman.c index 2171a0e..6fcd975 100644 --- a/usr.bin/catman/catman.c +++ b/usr.bin/catman/catman.c @@ -741,7 +741,8 @@ determine_locale(void) static void usage(void) { - fprintf(stderr, "usage: %s [-fLnrv] [directories...]\n", getprogname()); + fprintf(stderr, "usage: %s [-fLnrv] [directories ...]\n", + getprogname()); exit(1); } diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y index 584f282..375aed8 100644 --- a/usr.bin/colldef/parse.y +++ b/usr.bin/colldef/parse.y @@ -342,7 +342,7 @@ main(int ac, char **av) static void usage(void) { - fprintf(stderr, "usage: colldef [-o out_file] [-I map_dir] [filename]\n"); + fprintf(stderr, "usage: colldef [-I map_dir] [-o out_file] [filename]\n"); exit(EX_USAGE); } diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c index dc18ed2..3018f2f 100644 --- a/usr.bin/dirname/dirname.c +++ b/usr.bin/dirname/dirname.c @@ -79,6 +79,6 @@ void usage(void) { - (void)fprintf(stderr, "usage: dirname path\n"); + (void)fprintf(stderr, "usage: dirname string\n"); exit(1); } diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1 index 401a042..81e7d49 100644 --- a/usr.bin/du/du.1 +++ b/usr.bin/du/du.1 @@ -41,11 +41,11 @@ .Sh SYNOPSIS .Nm .Op Fl H | L | P -.Op Fl I Ar mask .Op Fl a | s | d Ar depth .Op Fl c .Op Fl h | k | m .Op Fl x +.Op Fl I Ar mask .Op Ar .Sh DESCRIPTION The diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c index 70d4d1a..bcba85f 100644 --- a/usr.bin/finger/finger.c +++ b/usr.bin/finger/finger.c @@ -154,7 +154,8 @@ option(int argc, char **argv) static void usage(void) { - (void)fprintf(stderr, "usage: finger [-46klmpshoT] [login ...]\n"); + (void)fprintf(stderr, + "usage: finger [-46gklmpshoT] [user ...] [user@host ...]\n"); exit(1); } diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1 index 827d628..2052623 100644 --- a/usr.bin/from/from.1 +++ b/usr.bin/from/from.1 @@ -41,8 +41,8 @@ .Sh SYNOPSIS .Nm .Op Fl c -.Op Fl s Ar sender .Op Fl f Ar file +.Op Fl s Ar sender .Op Ar user .Sh DESCRIPTION The diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index 64b2f19..b835a93 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -927,6 +927,6 @@ void usage(void) { (void)fprintf(stderr, - "usage: fstat [-fmnv] [-p pid] [-u user] [-N system] [-M core] [file ...]\n"); + "usage: fstat [-fmnv] [-M core] [-N system] [-p pid] [-u user] [file ...]\n"); exit(1); } diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c index c0bb3ad..084b0a4 100644 --- a/usr.bin/ktrdump/ktrdump.c +++ b/usr.bin/ktrdump/ktrdump.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #define SBUFLEN 128 #define USAGE \ - "usage: ktrdump [-c] [-f] [-q] [-r] [-t] [-e execfile] [-i ktrfile ] [-m corefile] [-o outfile]" + "usage: ktrdump [-cfqrt] [-e execfile] [-i ktrfile] [-m corefile] [-o outfile]" extern char *optarg; extern int optind; @@ -285,5 +285,7 @@ main(int ac, char **av) static void usage(void) { - errx(1, USAGE); + + fprintf(stderr, USAGE); + exit(1); } diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index 377de60..6672e8f 100644 --- a/usr.bin/lastcomm/lastcomm.c +++ b/usr.bin/lastcomm/lastcomm.c @@ -279,6 +279,6 @@ static void usage(void) { (void)fprintf(stderr, -"usage: lastcomm [-EScesu] [ -f file ] [command ...] [user ...] [tty ...]\n"); +"usage: lastcomm [-EScesu] [-f file] [command ...] [user ...] [terminal ...]\n"); exit(1); } diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c index 8b39ec7..270c1c5 100644 --- a/usr.bin/mesg/mesg.c +++ b/usr.bin/mesg/mesg.c @@ -111,6 +111,6 @@ main(int argc, char *argv[]) static void usage(void) { - (void)fprintf(stderr, "usage: mesg [y | n]\n"); + (void)fprintf(stderr, "usage: mesg [n | y]\n"); exit(2); } diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c index f492b6a..22d34e7 100644 --- a/usr.bin/newkey/newkey.c +++ b/usr.bin/newkey/newkey.c @@ -170,8 +170,8 @@ static void usage(void) { (void)fprintf(stderr, "%s\n%s\n", - "usage: newkey [-u username]", - " newkey [-h hostname]"); + "usage: newkey -h hostname", + " newkey -u username"); exit(1); } diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c index 93f6a98..1aed481 100644 --- a/usr.bin/nice/nice.c +++ b/usr.bin/nice/nice.c @@ -109,6 +109,7 @@ void usage(void) { - (void)fprintf(stderr, "usage: nice [-n incr] utility [arguments]\n"); + (void)fprintf(stderr, + "usage: nice [-n increment] utility [argument ...]\n"); exit(1); } diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c index 2b31099..dd9768a 100644 --- a/usr.bin/pathchk/pathchk.c +++ b/usr.bin/pathchk/pathchk.c @@ -85,7 +85,7 @@ static void usage(void) { - fprintf(stderr, "usage: pathchk [-p] pathname...\n"); + fprintf(stderr, "usage: pathchk [-p] pathname ...\n"); exit(1); } diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index cacddd0..b527c42 100644 --- a/usr.bin/printf/printf.c +++ b/usr.bin/printf/printf.c @@ -552,5 +552,5 @@ asciicode(void) static void usage(void) { - (void)fprintf(stderr, "usage: printf format [arg ...]\n"); + (void)fprintf(stderr, "usage: printf format [arguments ...]\n"); } diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c index 333f4cd..21bb4c2 100644 --- a/usr.bin/renice/renice.c +++ b/usr.bin/renice/renice.c @@ -180,7 +180,7 @@ static void usage() { fprintf(stderr, "%s\n%s\n", -"usage: renice priority [[-p] pid ...] [[-g] pgrp ...] [[-u] user ...]", +"usage: renice priority [[-p] pid ...] [[-g] pgrp ...] [[-u] user ...]", " renice -n increment [[-p] pid ...] [[-g] pgrp ...] [[-u] user ...]"); exit(1); } diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c index 51aa24b..a366830 100644 --- a/usr.bin/rsh/rsh.c +++ b/usr.bin/rsh/rsh.c @@ -371,6 +371,6 @@ usage(void) { (void)fprintf(stderr, - "usage: rsh [-46dn] [-l login] [-t timeout] host [command]\n"); + "usage: rsh [-46dn] [-l username] [-t timeout] host [command]\n"); exit(1); } diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c index d2d1f85..26037a6 100644 --- a/usr.bin/rup/rup.c +++ b/usr.bin/rup/rup.c @@ -213,7 +213,7 @@ allhosts(void) static void usage(void) { - fprintf(stderr, "usage: rup [hosts ...]\n"); + fprintf(stderr, "usage: rup [host ...]\n"); exit(1); } diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c index 32f85aa..045a125 100644 --- a/usr.bin/ruptime/ruptime.c +++ b/usr.bin/ruptime/ruptime.c @@ -298,6 +298,6 @@ tcmp(const void *a1, const void *a2) void usage(void) { - (void)fprintf(stderr, "usage: ruptime [-alrut]\n"); + (void)fprintf(stderr, "usage: ruptime [-alrtu] [host ...]\n"); exit(1); } diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c index 87f4660..705c887 100644 --- a/usr.bin/rusers/rusers.c +++ b/usr.bin/rusers/rusers.c @@ -218,7 +218,7 @@ static void usage(void) { - fprintf(stderr, "usage: rusers [-la] [hosts ...]\n"); + fprintf(stderr, "usage: rusers [-al] [host ...]\n"); exit(1); } diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c index d5a1c1d..042b72f 100644 --- a/usr.bin/rwall/rwall.c +++ b/usr.bin/rwall/rwall.c @@ -117,7 +117,7 @@ main(int argc, char *argv[]) static void usage(void) { - fprintf(stderr, "usage: rwall hostname [file]\n"); + fprintf(stderr, "usage: rwall host [file]\n"); exit(1); } diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c index 703089b..b9ea200 100644 --- a/usr.bin/showmount/showmount.c +++ b/usr.bin/showmount/showmount.c @@ -372,7 +372,7 @@ xdr_exports(xdrsp, exp) static void usage() { - fprintf(stderr, "usage: showmount [-a | -d] [-e3] host\n"); + fprintf(stderr, "usage: showmount [-a | -d] [-e3] [host]\n"); exit(1); } diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c index ac15416..53f9636 100644 --- a/usr.bin/time/time.c +++ b/usr.bin/time/time.c @@ -233,7 +233,7 @@ static void usage(void) { fprintf(stderr, - "usage: time [-al] [-h|-p] [-o file] utility [argument ...]\n"); + "usage: time [-al] [-h | -p] [-o file] utility [argument ...]\n"); exit(1); } diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c index 6011935..364f400 100644 --- a/usr.bin/truncate/truncate.c +++ b/usr.bin/truncate/truncate.c @@ -204,7 +204,7 @@ static void usage(void) { fprintf(stderr, "%s\n%s\n", - "usage: truncate [-c] -s [+|-]size[K|M|G] file ...", + "usage: truncate [-c] -s [+|-]size[K|k|M|m|G|g] file ...", " truncate [-c] -r rfile file ..."); exit(EXIT_FAILURE); } diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1 index 823bd12..242fb7e 100644 --- a/usr.bin/ul/ul.1 +++ b/usr.bin/ul/ul.1 @@ -42,7 +42,7 @@ .Nm .Op Fl i .Op Fl t Ar terminal -.Op Ar name Ar ... +.Op Ar .Sh DESCRIPTION The .Nm diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c index c7006a9..77559cf 100644 --- a/usr.bin/ul/ul.c +++ b/usr.bin/ul/ul.c @@ -165,7 +165,7 @@ main(int argc, char **argv) static void usage(void) { - fprintf(stderr, "usage: ul [-i] [-t terminal] file...\n"); + fprintf(stderr, "usage: ul [-i] [-t terminal] [file ...]\n"); exit(1); } diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1 index 4a53ed1..02cbfeb 100644 --- a/usr.bin/unifdef/unifdef.1 +++ b/usr.bin/unifdef/unifdef.1 @@ -41,7 +41,7 @@ .Nd remove preprocessor conditionals from code .Sh SYNOPSIS .Nm -.Op Fl ceklnst +.Op Fl cdeklnst .Op Fl I Ns Ar path .Op Fl D Ns Ar sym Ns Op = Ns Ar val .Op Fl U Ns Ar sym @@ -153,6 +153,9 @@ is complemented, i.e., the lines that would have been removed or blanked are retained and vice versa. .Pp +.It Fl d +Turn on printing of degugging messages. +.Pp .It Fl e Because .Nm diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c index d57ea63..dd2f23e 100644 --- a/usr.bin/unifdef/unifdef.c +++ b/usr.bin/unifdef/unifdef.c @@ -300,7 +300,7 @@ main(int argc, char *argv[]) static void usage(void) { - fprintf(stderr, "usage: unifdef [-cdeklnst]" + fprintf(stderr, "usage: unifdef [-cdeklnst] [-Ipath]" " [-Dsym[=val]] [-Usym] [-iDsym[=val]] [-iUsym] ... [file]\n"); exit(2); } diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index bee2ffb..717d528 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1033,7 +1033,7 @@ static void usage(void) { (void)fprintf(stderr, "%s%s", - "usage: vmstat [-aimsz] [-c count] [-M core [-N system]] [-w wait]\n", - " [-n devs] [disks]\n"); + "usage: vmstat [-afimsz] [-c count] [-M core [-N system]] [-w wait]\n", + " [-n devs] [-p type,if,pass] [disks]\n"); exit(1); } diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1 index 6099328..e7b24a1 100644 --- a/usr.bin/write/write.1 +++ b/usr.bin/write/write.1 @@ -44,7 +44,7 @@ .Sh SYNOPSIS .Nm .Ar user -.Op Ar ttyname +.Op Ar tty .Sh DESCRIPTION The .Nm diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1 index 609db3f..e96f9d8 100644 --- a/usr.bin/xargs/xargs.1 +++ b/usr.bin/xargs/xargs.1 @@ -57,7 +57,7 @@ .Fl n Ar number .Op Fl x .Oc -.Op Fl P Ar maxjobs +.Op Fl P Ar maxprocs .Op Fl s Ar size .Op Ar utility Op Ar argument ... .Sh DESCRIPTION diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1 index 278a9e4..befdcab 100644 --- a/usr.bin/xstr/xstr.1 +++ b/usr.bin/xstr/xstr.1 @@ -40,10 +40,9 @@ .Nd "extract strings from C programs to implement shared strings" .Sh SYNOPSIS .Nm -.Op Fl c +.Op Fl cv .Op Fl -.Op Fl v -.Op Ar file +.Op Ar .Sh DESCRIPTION The .Nm diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c index b3225f4..5539043 100644 --- a/usr.bin/ypcat/ypcat.c +++ b/usr.bin/ypcat/ypcat.c @@ -67,7 +67,7 @@ static void usage(void) { fprintf(stderr, "%s\n%s\n", - "usage: ypcat [-k] [-d domainname] [-t] mapname", + "usage: ypcat [-kt] [-d domainname] mapname", " ypcat -x"); exit(1); } diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c index 76d0f59..d0904c5 100644 --- a/usr.bin/ypmatch/ypmatch.c +++ b/usr.bin/ypmatch/ypmatch.c @@ -65,7 +65,7 @@ static void usage(void) { fprintf(stderr, "%s\n%s\n", - "usage: ypmatch [-d domain] [-t] [-k] key [key ...] mname", + "usage: ypmatch [-kt] [-d domainname] key ... mapname", " ypmatch -x"); exit(1); } -- cgit v1.1