From 3a0a028c8c549e1aa38b7c39d371c696dc3d6a07 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 1 Dec 2001 17:41:25 +0000 Subject: [PATCH] Reflect renaming to, and new usage of these macros: HELP_OPTION_DESCRIPTION and VERSION_OPTION_DESCRIPTION. --- src/cat.c | 4 ++-- src/cksum.c | 4 ++-- src/comm.c | 4 ++-- src/csplit.c | 4 ++-- src/cut.c | 4 ++-- src/expand.c | 4 ++-- src/fmt.c | 4 ++-- src/fold.c | 4 ++-- src/head.c | 4 ++-- src/join.c | 4 ++-- src/md5sum.c | 4 ++-- src/nl.c | 4 ++-- src/od.c | 4 ++-- src/paste.c | 4 ++-- src/pr.c | 4 ++-- src/ptx.c | 4 ++-- src/sort.c | 4 ++-- src/split.c | 4 ++-- src/sum.c | 4 ++-- src/tac.c | 4 ++-- src/tail.c | 4 ++-- src/tr.c | 4 ++-- src/tsort.c | 4 ++-- src/unexpand.c | 4 ++-- src/uniq.c | 4 ++-- src/wc.c | 4 ++-- 26 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/cat.c b/src/cat.c index 494c594..e996163 100644 --- a/src/cat.c +++ b/src/cat.c @@ -109,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 9dfd96e..25db656 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -286,8 +286,8 @@ Usage: %s [FILE]...\n\ Print CRC checksum and byte counts of each FILE.\n\ \n\ "), stdout); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/src/comm.c b/src/comm.c index 8882f81..183ce35 100644 --- a/src/comm.c +++ b/src/comm.c @@ -83,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/src/csplit.c b/src/csplit.c index 7815ade..8ed954a 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -1514,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 24e95d6..be16403 100644 --- a/src/cut.c +++ b/src/cut.c @@ -191,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 24cd936..4d02ef2 100644 --- a/src/expand.c +++ b/src/expand.c @@ -125,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 3fadc55..ec0ce24 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -288,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ \n\ In -wNUMBER, the letter `w' may be omitted.\n"), diff --git a/src/fold.c b/src/fold.c index b78e9a4..8854171 100644 --- a/src/fold.c +++ b/src/fold.c @@ -80,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/src/head.c b/src/head.c index 3848205..02501d1 100644 --- a/src/head.c +++ b/src/head.c @@ -102,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 0a4ea68..94b76af 100644 --- a/src/join.c +++ b/src/join.c @@ -168,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ \n\ "), stdout); diff --git a/src/md5sum.c b/src/md5sum.c index a746400..bed2c21 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -145,8 +145,8 @@ The following two options are useful only when verifying checksums:\n\ -w, --warn warn about improperly formated checksum lines\n\ \n\ "), stdout); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ \n\ "), stdout); diff --git a/src/nl.c b/src/nl.c index 1754b9f..41b4559 100644 --- a/src/nl.c +++ b/src/nl.c @@ -202,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 72981e7..44c1e31 100644 --- a/src/od.c +++ b/src/od.c @@ -298,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 cc802d4..3194ef8 100644 --- a/src/paste.c +++ b/src/paste.c @@ -417,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); /* FIXME: add a couple of examples. */ fputs (_("\ \n\ diff --git a/src/pr.c b/src/pr.c index 700d6c9..c8b19ef 100644 --- a/src/pr.c +++ b/src/pr.c @@ -2847,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 b72a350..1955cd0 100644 --- a/src/ptx.c +++ b/src/ptx.c @@ -1893,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 346e2c3..b1adfdb 100644 --- a/src/sort.c +++ b/src/sort.c @@ -330,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 3345e8f..a4f7e98 100644 --- a/src/split.c +++ b/src/split.c @@ -104,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 847b704..ced371e 100644 --- a/src/sum.c +++ b/src/sum.c @@ -67,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 3a3ab3c..de85794 100644 --- a/src/tac.c +++ b/src/tac.c @@ -141,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/src/tail.c b/src/tail.c index 49c03e4..04a5e6e 100644 --- a/src/tail.c +++ b/src/tail.c @@ -278,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 8d4b3e3..a39e50f 100644 --- a/src/tr.c +++ b/src/tr.c @@ -337,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 3501c8c..f08795f 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -100,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); puts (_("\nReport bugs to .")); } diff --git a/src/unexpand.c b/src/unexpand.c index 2938d23..f5a81ba 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -389,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 e43c613..d452f2a 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -160,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_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 14645fe..7996f77 100644 --- a/src/wc.c +++ b/src/wc.c @@ -137,8 +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); - EMIT_HELP_DESCRIPTION (stdout); - EMIT_VERSION_DESCRIPTION (stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); puts (_("\nReport bugs to .")); } exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); -- 2.7.4