Reflect renaming to, and new usage of these macros:

HELP_OPTION_DESCRIPTION and VERSION_OPTION_DESCRIPTION.

diff --git a/src/cat.c b/src/cat.c
index 494c59417da13fb0e16e390db94d0251792446a1..e996163094359b335c6770cddfa49274e5aa7777 100644 (file)
--- 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 9dfd96e6d078a023b6f9866416c96d4c973c6bdc..25db656467422d1f3b7db37f999babf77127b256 100644 (file)
--- 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 <bug-textutils@gnu.org>."));
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);

diff --git a/src/comm.c b/src/comm.c
index 8882f81455c3f51fdd525e059ef7b05219ff46ff..183ce35b1712d36b9c32ec5e564f6f6328515da8 100644 (file)
--- 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 <bug-textutils@gnu.org>."));
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);

diff --git a/src/csplit.c b/src/csplit.c
index 7815adea5e78156e932f3603f4b84694fccd565a..8ed954a8650082d3423ded4e5c76f550b267c96d 100644 (file)
--- 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 24e95d646b64919e2a014ef7ffd2cc07818fc6dc..be164030e23440dc748772cadeb4ee1ef3054b20 100644 (file)
--- 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 24cd936c3c9daf159767691cf386dc314a2d3835..4d02ef22795240c1b60edeaecb7206a1628619c0 100644 (file)
--- 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 3fadc55bc7db65d2ddecfef3dfce0ed5b5590286..ec0ce24535a4731e50e34b44229878693ee0c527 100644 (file)
--- 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 b78e9a40cbcf5dc7a907b2ca20a5747f220cb2e3..8854171dfafc2eb2eb18b88413da6338e7b2be60 100644 (file)
--- 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 <bug-textutils@gnu.org>."));
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);

diff --git a/src/head.c b/src/head.c
index 3848205640389fb3ecfc93381f1f1265d8f132e9..02501d1d89c096da8cb06620682f558455e86110 100644 (file)
--- 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 0a4ea68d66fcdbbb5ce4632e0f5448051111af39..94b76afdb0c0dd8fee957ec22dad467deb2493fa 100644 (file)
--- 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 a746400f3ee279a40f3f5f15be3418391b1b8b6c..bed2c21f0bfb246c06ef1d717a0620107f4539cb 100644 (file)
--- 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 1754b9f6a32c8e46987fd668e80ff514a2bc15ac..41b4559f9c4e7955265ce3a5f7b325f8c8f6ec34 100644 (file)
--- 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 72981e7637599caec82bec1288d998843533001f..44c1e31ab57dc89ed9e0f26b43655480b7b866dc 100644 (file)
--- 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 cc802d4d605d544fe2dd03805546598fff5768a0..3194ef8ef8e73d76b3a63d74f9e7f14f419ed52a 100644 (file)
--- 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 700d6c91217bf4ac3808bfa29dbebdeb3aafd2c4..c8b19ef17f8980ba0e75330f249e020fb99918f9 100644 (file)
--- 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 b72a3500b4a21723e44a64e9fb7216858a7b6560..1955cd0f760bb3f6fae2189192cd1506f6c95c76 100644 (file)
--- 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 346e2c38c1c52ee1828506e5544518fe5283f167..b1adfdbca15f183c697373c95831598d0d7a1d43 100644 (file)
--- 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 3345e8f298e542840f5d4078edadc67c529d76ac..a4f7e98228766b165a2c5b4203e975de04a28cb0 100644 (file)
--- 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 847b704f71f2f435df7b9d20ed65d7801cee3bf6..ced371e8c4b82b3defea0bff2717931fe3ab08cf 100644 (file)
--- 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 3a3ab3c95999ee8a1d0637ca4b69f319aea3418c..de85794516eb55016adebfd3bd44b84017731fbc 100644 (file)
--- 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 <bug-textutils@gnu.org>."));
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);

diff --git a/src/tail.c b/src/tail.c
index 49c03e49aa1055c055efd0bdeb877073bdd053e0..04a5e6e8933d5cdc8a2bf1540c72b926f606e92b 100644 (file)
--- 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 8d4b3e37b1109bfbdb6fc689b6f474b43c020994..a39e50fa8b93966103a5dbc04d689e1b24102e3d 100644 (file)
--- 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 3501c8c138feaecd3d68b3904af9bc82995a0ca1..f08795fda606a2f23329224b3f9851b3d194df04 100644 (file)
--- 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 <bug-textutils@gnu.org>."));
     }
 

diff --git a/src/unexpand.c b/src/unexpand.c
index 2938d2370a8ae4e755ae6e2c2685f23b6b0b40da..f5a81ba7c9879da9a77d9af737f8e2a1c0eb4930 100644 (file)
--- 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 e43c613094b5d6df6d78b9d9ee231163f9fcfcac..d452f2afb3dcf00ad8861b9a86aef4350dd2c413 100644 (file)
--- 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 14645fefd43e731f72b4b7c2c77ccf3a7811ed94..7996f7757165ccd48d81e21cf89571c3d554568d 100644 (file)
--- 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 <bug-textutils@gnu.org>."));
     }
   exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);