From afa12bc91246072ba505a8a1d57eba1486f33ee2 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 1 Dec 2001 17:21:56 +0000 Subject: (usage): Use new macros, EMIT_HELP_DESCRIPTION and EMIT_VERSION_DESCRIPTION instead of hard-coding --help and --version descriptions. --- src/cat.c | 6 ++---- src/cksum.c | 6 ++---- src/comm.c | 6 ++---- src/csplit.c | 6 ++---- src/cut.c | 6 ++---- src/expand.c | 6 ++---- src/fmt.c | 6 ++---- src/fold.c | 6 ++---- src/head.c | 6 ++---- src/join.c | 6 ++---- src/md5sum.c | 6 ++---- src/nl.c | 6 ++---- src/od.c | 6 ++---- src/paste.c | 6 ++---- src/pr.c | 6 ++---- src/ptx.c | 6 ++---- src/sort.c | 6 ++---- src/split.c | 6 ++---- src/sum.c | 6 ++---- src/tac.c | 6 ++---- src/tail.c | 6 ++---- src/tr.c | 6 ++---- src/tsort.c | 6 ++---- src/unexpand.c | 6 ++---- src/uniq.c | 6 ++---- src/wc.c | 6 ++---- 26 files changed, 52 insertions(+), 104 deletions(-) (limited to 'src') diff --git a/src/cat.c b/src/cat.c index 3b5d7ed57..494c59417 100644 --- a/src/cat.c +++ b/src/cat.c @@ -109,10 +109,8 @@ Concatenate FILE(s), or standard input, to standard output.\n\ -u (ignored)\n\ -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ With no FILE, or when FILE is -, read standard input.\n\ diff --git a/src/cksum.c b/src/cksum.c index 5c5b5164e..9dfd96e6d 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -286,10 +286,8 @@ Usage: %s [FILE]...\n\ Print CRC checksum and byte counts of each FILE.\n\ \n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/src/comm.c b/src/comm.c index dc05124d5..8882f8145 100644 --- a/src/comm.c +++ b/src/comm.c @@ -83,10 +83,8 @@ Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n\ -2 suppress lines unique to right file\n\ -3 suppress lines that appear in both files\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/src/csplit.c b/src/csplit.c index 3af18c928..7815adea5 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -1514,10 +1514,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -s, --quiet, --silent do not print counts of output file sizes\n\ -z, --elide-empty-files remove empty output files\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ Read standard input if FILE is -. Each PATTERN may be:\n\ diff --git a/src/cut.c b/src/cut.c index 206bbd293..24e95d646 100644 --- a/src/cut.c +++ b/src/cut.c @@ -191,10 +191,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ --output-delimiter=STRING use STRING as the output delimiter\n\ the default is to use the input delimiter\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ Use one, and only one of -b, -c or -f. Each LIST is made up of one\n\ diff --git a/src/expand.c b/src/expand.c index 38624c7e7..24cd936c3 100644 --- a/src/expand.c +++ b/src/expand.c @@ -125,10 +125,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (_("\ -t, --tabs=LIST use comma separated list of explicit tab positions\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ Instead of -t NUMBER or -t LIST, -NUMBER or -LIST may be used.\n\ diff --git a/src/fmt.c b/src/fmt.c index d9aefac27..3fadc55bc 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -288,10 +288,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -u, --uniform-spacing one space between words, two after sentences\n\ -w, --width=NUMBER maximum line width (default of 75 columns)\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ In -wNUMBER, the letter `w' may be omitted.\n"), diff --git a/src/fold.c b/src/fold.c index d2503a95d..b78e9a40c 100644 --- a/src/fold.c +++ b/src/fold.c @@ -80,10 +80,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -s, --spaces break at spaces\n\ -w, --width=WIDTH use WIDTH columns instead of 80\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/src/head.c b/src/head.c index 85e53b7b3..384820564 100644 --- a/src/head.c +++ b/src/head.c @@ -102,10 +102,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -q, --quiet, --silent never print headers giving file names\n\ -v, --verbose always print headers giving file names\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n\ diff --git a/src/join.c b/src/join.c index aebecf666..0a4ea68d6 100644 --- a/src/join.c +++ b/src/join.c @@ -168,10 +168,8 @@ by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n\ -1 FIELD join on this FIELD of file 1\n\ -2 FIELD join on this FIELD of file 2\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ "), stdout); diff --git a/src/md5sum.c b/src/md5sum.c index 2014d89fd..a746400f3 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -145,10 +145,8 @@ The following two options are useful only when verifying checksums:\n\ -w, --warn warn about improperly formated checksum lines\n\ \n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ "), stdout); diff --git a/src/nl.c b/src/nl.c index a3706b969..1754b9f6a 100644 --- a/src/nl.c +++ b/src/nl.c @@ -202,10 +202,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -v, --first-page=NUMBER first line number on each logical page\n\ -w, --number-width=NUMBER use NUMBER columns for line numbers\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n\ diff --git a/src/od.c b/src/od.c index a393eeba4..72981e763 100644 --- a/src/od.c +++ b/src/od.c @@ -298,10 +298,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -w, --width[=BYTES] output BYTES bytes per output line\n\ --traditional accept arguments in pre-POSIX form\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ Pre-POSIX format specifications may be intermixed, they accumulate:\n\ diff --git a/src/paste.c b/src/paste.c index f8ef2ddb2..cc802d4d6 100644 --- a/src/paste.c +++ b/src/paste.c @@ -417,10 +417,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -d, --delimiters=LIST reuse characters from LIST instead of TABs\n\ -s, --serial paste one file at a time instead of in parallel\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); /* FIXME: add a couple of examples. */ fputs (_("\ \n\ diff --git a/src/pr.c b/src/pr.c index e6d66f2c1..700d6c912 100644 --- a/src/pr.c +++ b/src/pr.c @@ -2847,10 +2847,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ truncate lines, except -J option is set, no interference\n\ with -S or -s\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ -T implied by -l nn when nn <= 10 or <= 3 with -F. With no FILE, or when\n\ diff --git a/src/ptx.c b/src/ptx.c index 27a311736..b72a3500b 100644 --- a/src/ptx.c +++ b/src/ptx.c @@ -1893,10 +1893,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -t, --typeset-mode - not implemented -\n\ -w, --width=NUMBER output width in columns, reference excluded\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ With no FILE or if FILE is -, read Standard Input. `-F /' by default.\n\ diff --git a/src/sort.c b/src/sort.c index f693cff2c..346e2c38c 100644 --- a/src/sort.c +++ b/src/sort.c @@ -330,10 +330,8 @@ Other options:\n\ +POS1 [-POS2] start a key at POS1, end it before POS2 (origin 0)\n\ Warning: this option is obsolescent\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ POS is F[.C][OPTS], where F is the field number and C the character position\n\ diff --git a/src/split.c b/src/split.c index 7ffa8417e..3345e8f29 100644 --- a/src/split.c +++ b/src/split.c @@ -104,10 +104,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ --verbose print a diagnostic to standard error just\n\ before each output file is opened\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n\ diff --git a/src/sum.c b/src/sum.c index 342be7002..847b704f7 100644 --- a/src/sum.c +++ b/src/sum.c @@ -67,10 +67,8 @@ Print checksum and block counts for each FILE.\n\ -r defeat -s, use BSD sum algorithm, use 1K blocks\n\ -s, --sysv use System V sum algorithm, use 512 bytes blocks\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ With no FILE, or when FILE is -, read standard input.\n\ diff --git a/src/tac.c b/src/tac.c index 1f5668e52..3a3ab3c95 100644 --- a/src/tac.c +++ b/src/tac.c @@ -141,10 +141,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -r, --regex interpret the separator as a regular expression\n\ -s, --separator=STRING use STRING as the separator instead of newline\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/src/tail.c b/src/tail.c index 41e51121a..49c03e49a 100644 --- a/src/tail.c +++ b/src/tail.c @@ -278,10 +278,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ (default 1) seconds\n\ -v, --verbose always output headers giving file names\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ If the first character of N (the number of bytes or lines) is a `+',\n\ diff --git a/src/tr.c b/src/tr.c index c166bcda8..8d4b3e37b 100644 --- a/src/tr.c +++ b/src/tr.c @@ -337,10 +337,8 @@ writing to standard output.\n\ -s, --squeeze-repeats replace sequence of characters with one\n\ -t, --truncate-set1 first truncate SET1 to length of SET2\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ SETs are specified as strings of characters. Most represent themselves.\n\ diff --git a/src/tsort.c b/src/tsort.c index 1d60c182f..3501c8c13 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -100,10 +100,8 @@ Write totally ordered list consistent with the partial ordering in FILE.\n\ With no FILE, or when FILE is -, read standard input.\n\ \n\ "), program_name); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); puts (_("\nReport bugs to .")); } diff --git a/src/unexpand.c b/src/unexpand.c index 9bab4bc68..2938d2370 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -389,10 +389,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -t, --tabs=NUMBER have tabs NUMBER characters apart instead of 8\n\ -t, --tabs=LIST use comma separated list of explicit tab positions\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ Instead of -t NUMBER or -t LIST, -NUMBER or -LIST may be used.\n\ diff --git a/src/uniq.c b/src/uniq.c index f81e51aee..e43c61309 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -160,10 +160,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -N same as -f N\n\ +N same as -s N (obsolescent; will be withdrawn)\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); fputs (_("\ \n\ A field is a run of whitespace, then non-whitespace characters.\n\ diff --git a/src/wc.c b/src/wc.c index fe9c24873..14645fefd 100644 --- a/src/wc.c +++ b/src/wc.c @@ -137,10 +137,8 @@ read standard input.\n\ -L, --max-line-length print the length of the longest line\n\ -w, --words print the word counts\n\ "), stdout); - fputs (_("\ - --help display this help and exit\n\ - --version output version information and exit\n\ -"), stdout); + EMIT_HELP_DESCRIPTION (stdout); + EMIT_VERSION_DESCRIPTION (stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); -- cgit v1.2.3-54-g00ecf