mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-07-25 10:16:53 +02:00
(usage): Use new macros, EMIT_HELP_DESCRIPTION and EMIT_VERSION_DESCRIPTION
instead of hard-coding --help and --version descriptions.
This commit is contained in:
@@ -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\
|
||||
|
||||
+2
-4
@@ -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 <bug-textutils@gnu.org>."));
|
||||
}
|
||||
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
||||
|
||||
+2
-4
@@ -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 <bug-textutils@gnu.org>."));
|
||||
}
|
||||
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
||||
|
||||
+2
-4
@@ -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\
|
||||
|
||||
@@ -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\
|
||||
|
||||
+2
-4
@@ -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\
|
||||
|
||||
@@ -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"),
|
||||
|
||||
+2
-4
@@ -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 <bug-textutils@gnu.org>."));
|
||||
}
|
||||
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
||||
|
||||
+2
-4
@@ -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\
|
||||
|
||||
+2
-4
@@ -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);
|
||||
|
||||
+2
-4
@@ -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);
|
||||
|
||||
@@ -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\
|
||||
|
||||
@@ -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\
|
||||
|
||||
+2
-4
@@ -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\
|
||||
|
||||
@@ -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\
|
||||
|
||||
@@ -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\
|
||||
|
||||
+2
-4
@@ -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\
|
||||
|
||||
+2
-4
@@ -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\
|
||||
|
||||
@@ -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\
|
||||
|
||||
@@ -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 <bug-textutils@gnu.org>."));
|
||||
}
|
||||
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
||||
|
||||
+2
-4
@@ -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\
|
||||
|
||||
@@ -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\
|
||||
|
||||
+2
-4
@@ -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 <bug-textutils@gnu.org>."));
|
||||
}
|
||||
|
||||
|
||||
+2
-4
@@ -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\
|
||||
|
||||
+2
-4
@@ -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\
|
||||
|
||||
@@ -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 <bug-textutils@gnu.org>."));
|
||||
}
|
||||
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
||||
|
||||
Reference in New Issue
Block a user