From: Pádraig Brady Date: Thu, 1 Jan 2026 16:31:44 +0000 (+0000) Subject: doc: all: use option highlighting and more standard alignment X-Git-Tag: v9.10~53 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dad24adc0fb4f89002d95a26c8ae7b6fd1daf95;p=thirdparty%2Fcoreutils.git doc: all: use option highlighting and more standard alignment Adjust all utils to: - Have a separate translation per option - Use either oputs() or oprintf(), instead of fputs() or printf(). - Use more standard alignment as discussed in previous commits. - Various tweaks to descriptions. --- diff --git a/src/basename.c b/src/basename.c index dff06fef15..777ee9867e 100644 --- a/src/basename.c +++ b/src/basename.c @@ -56,13 +56,20 @@ If specified, also remove a trailing SUFFIX.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -a, --multiple support multiple arguments and treat each as a NAME\n\ - -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n\ - -z, --zero end each output line with NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -a, --multiple\n\ + support multiple arguments and treat each as a NAME\n\ +")); + oputs (_("\ + -s, --suffix=SUFFIX\n\ + remove a trailing SUFFIX; implies -a\n\ +")); + oputs (_("\ + -z, --zero\n\ + end each output line with NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); printf (_("\ \n\ Examples:\n\ diff --git a/src/basenc.c b/src/basenc.c index 1804fc83fa..4e0eb92fb4 100644 --- a/src/basenc.c +++ b/src/basenc.c @@ -117,46 +117,62 @@ Base%d encode or decode FILE, or standard input, to standard output.\n\ emit_stdin_note (); emit_mandatory_arg_note (); #if BASE_TYPE == 42 - fputs (_("\ - --base64 same as 'base64' program (RFC4648 section 4)\n\ -"), stdout); - fputs (_("\ - --base64url file- and url-safe base64 (RFC4648 section 5)\n\ -"), stdout); - fputs (_("\ - --base58 visually unambiguous base58 encoding\n\ -"), stdout); - fputs (_("\ - --base32 same as 'base32' program (RFC4648 section 6)\n\ -"), stdout); - fputs (_("\ - --base32hex extended hex alphabet base32 (RFC4648 section 7)\n\ -"), stdout); - fputs (_("\ - --base16 hex encoding (RFC4648 section 8)\n\ -"), stdout); - fputs (_("\ - --base2msbf bit string with most significant bit (msb) first\n\ -"), stdout); - fputs (_("\ - --base2lsbf bit string with least significant bit (lsb) first\n\ -"), stdout); + oputs (_("\ + --base64\n\ + same as 'base64' program (RFC4648 section 4)\n\ +")); + oputs (_("\ + --base64url\n\ + file- and url-safe base64 (RFC4648 section 5)\n\ +")); + oputs (_("\ + --base58\n\ + visually unambiguous base58 encoding\n\ +")); + oputs (_("\ + --base32\n\ + same as 'base32' program (RFC4648 section 6)\n\ +")); + oputs (_("\ + --base32hex\n\ + extended hex alphabet base32 (RFC4648 section 7)\n\ +")); + oputs (_("\ + --base16\n\ + hex encoding (RFC4648 section 8)\n\ +")); + oputs (_("\ + --base2msbf\n\ + bit string with most significant bit (msb) first\n\ +")); + oputs (_("\ + --base2lsbf\n\ + bit string with least significant bit (lsb) first\n\ +")); #endif - fputs (_("\ - -d, --decode decode data\n\ - -i, --ignore-garbage when decoding, ignore non-alphabet characters\n\ - -w, --wrap=COLS wrap encoded lines after COLS character (default 76).\n\ - Use 0 to disable line wrapping\n\ -"), stdout); + oputs (_("\ + -d, --decode\n\ + decode data\n\ +")); + oputs (_("\ + -i, --ignore-garbage\n\ + when decoding, ignore non-alphabet characters\n\ +")); + oputs (_("\ + -w, --wrap=COLS\n\ + wrap encoded lines after COLS character (default 76).\n\ + Use 0 to disable line wrapping\n\ +")); #if BASE_TYPE == 42 - fputs (_("\ - --z85 ascii85-like encoding (ZeroMQ spec:32/Z85);\n\ - when encoding, input length must be a multiple of 4;\n\ - when decoding, input length must be a multiple of 5\n\ -"), stdout); + oputs (_("\ + --z85\n\ + ascii85-like encoding (ZeroMQ spec:32/Z85);\n\ + when encoding, input length must be a multiple of 4;\n\ + when decoding, input length must be a multiple of 5\n\ +")); #endif - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); #if BASE_TYPE == 42 fputs (_("\ \n\ diff --git a/src/cat.c b/src/cat.c index 6c37b9a982..f9c92005c8 100644 --- a/src/cat.c +++ b/src/cat.c @@ -96,23 +96,38 @@ Concatenate FILE(s) to standard output.\n\ emit_stdin_note (); - fputs (_("\ -\n\ + oputs (_("\ -A, --show-all equivalent to -vET\n\ +")); + oputs (_("\ -b, --number-nonblank number nonempty output lines, overrides -n\n\ +")); + oputs (_("\ -e equivalent to -vE\n\ +")); + oputs (_("\ -E, --show-ends display $ or ^M$ at end of each line\n\ +")); + oputs (_("\ -n, --number number all output lines\n\ +")); + oputs (_("\ -s, --squeeze-blank suppress repeated empty output lines\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -t equivalent to -vT\n\ +")); + oputs (_("\ -T, --show-tabs display TAB characters as ^I\n\ +")); + oputs (_("\ -u (ignored)\n\ +")); + oputs (_("\ -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); printf (_("\ \n\ Examples:\n\ diff --git a/src/chcon.c b/src/chcon.c index 1f0ecdb754..91b78148d0 100644 --- a/src/chcon.c +++ b/src/chcon.c @@ -364,34 +364,54 @@ With --reference, change the security context of each FILE to that of RFILE.\n\ emit_mandatory_arg_note (); - fputs (_("\ - --dereference affect the referent of each symbolic link (this is\n\ - the default), rather than the symbolic link itself\n\ - -h, --no-dereference affect symbolic links instead of any referenced file\n\ -"), stdout); - fputs (_("\ - -u, --user=USER set user USER in the target security context\n\ - -r, --role=ROLE set role ROLE in the target security context\n\ - -t, --type=TYPE set type TYPE in the target security context\n\ - -l, --range=RANGE set range RANGE in the target security context\n\ -"), stdout); - fputs (_("\ - --no-preserve-root do not treat '/' specially (the default)\n\ - --preserve-root fail to operate recursively on '/'\n\ -"), stdout); - fputs (_("\ - --reference=RFILE use RFILE's security context rather than specifying\n\ - a CONTEXT value\n\ -"), stdout); - fputs (_("\ - -R, --recursive operate on files and directories recursively\n\ -"), stdout); - fputs (_("\ - -v, --verbose output a diagnostic for every file processed\n\ -"), stdout); + oputs (_("\ + --dereference\n\ + affect the referent of each symbolic link (this is\n\ + the default), rather than the symbolic link itself\n\ +")); + oputs (_("\ + -h, --no-dereference\n\ + affect symbolic links instead of any referenced file\n\ +")); + oputs (_("\ + -u, --user=USER\n\ + set user USER in the target security context\n\ +")); + oputs (_("\ + -r, --role=ROLE\n\ + set role ROLE in the target security context\n\ +")); + oputs (_("\ + -t, --type=TYPE\n\ + set type TYPE in the target security context\n\ +")); + oputs (_("\ + -l, --range=RANGE\n\ + set range RANGE in the target security context\n\ +")); + oputs (_("\ + --no-preserve-root\n\ + do not treat '/' specially (the default)\n\ +")); + oputs (_("\ + --preserve-root\n\ + fail to operate recursively on '/'\n\ +")); + oputs (_("\ + --reference=RFILE\n\ + use RFILE's security context rather than specifying a CONTEXT value\n\ +")); + oputs (_("\ + -R, --recursive\n\ + operate on files and directories recursively\n\ +")); + oputs (_("\ + -v, --verbose\n\ + output a diagnostic for every file processed\n\ +")); emit_symlink_recurse_options ("-P"); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/chmod.c b/src/chmod.c index 1e52dc3df6..6dd9f0b06c 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -421,30 +421,47 @@ Change the mode of each FILE to MODE.\n\ With --reference, change the mode of each FILE to that of RFILE.\n\ \n\ "), stdout); - fputs (_("\ - -c, --changes like verbose but report only when a change is made\n\ - -f, --silent, --quiet suppress most error messages\n\ - -v, --verbose output a diagnostic for every file processed\n\ -"), stdout); - fputs (_("\ - --dereference affect the referent of each symbolic link,\n\ - rather than the symbolic link itself\n\ - -h, --no-dereference affect each symbolic link, rather than the referent\n\ -"), stdout); - fputs (_("\ - --no-preserve-root do not treat '/' specially (the default)\n\ - --preserve-root fail to operate recursively on '/'\n\ -"), stdout); - fputs (_("\ - --reference=RFILE use RFILE's mode instead of specifying MODE values.\n\ - RFILE is always dereferenced if a symbolic link.\n\ -"), stdout); - fputs (_("\ - -R, --recursive change files and directories recursively\n\ -"), stdout); + oputs (_("\ + -c, --changes\n\ + like verbose but report only when a change is made\n\ +")); + oputs (_("\ + -f, --silent, --quiet\n\ + suppress most error messages\n\ +")); + oputs (_("\ + -v, --verbose\n\ + output a diagnostic for every file processed\n\ +")); + oputs (_("\ + --dereference\n\ + affect the referent of each symbolic link,\n\ + rather than the symbolic link itself\n\ +")); + oputs (_("\ + -h, --no-dereference\n\ + affect each symbolic link, rather than the referent\n\ +")); + oputs (_("\ + --no-preserve-root\n\ + do not treat '/' specially (the default)\n\ +")); + oputs (_("\ + --preserve-root\n\ + fail to operate recursively on '/'\n\ +")); + oputs (_("\ + --reference=RFILE\n\ + use RFILE's mode instead of specifying MODE values.\n\ + RFILE is always dereferenced if a symbolic link.\n\ +")); + oputs (_("\ + -R, --recursive\n\ + change files and directories recursively\n\ +")); emit_symlink_recurse_options ("-H"); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n\ diff --git a/src/chown.c b/src/chown.c index e9f3919e88..5f9997d680 100644 --- a/src/chown.c +++ b/src/chown.c @@ -95,41 +95,55 @@ Change the group of each FILE to GROUP.\n\ With --reference, change the group of each FILE to that of RFILE.\n\ \n\ "), stdout); - fputs (_("\ - -c, --changes like verbose but report only when a change is made\n\ - -f, --silent, --quiet suppress most error messages\n\ - -v, --verbose output a diagnostic for every file processed\n\ -"), stdout); - fputs (_("\ - --dereference affect the referent of each symbolic link (this is\n\ - the default), rather than the symbolic link itself\n\ - -h, --no-dereference affect symbolic links instead of any referenced file\n\ -"), stdout); - fputs (_("\ - (useful only on systems that can change the\n\ - ownership of a symlink)\n\ -"), stdout); - fputs (_("\ + oputs (_("\ + -c, --changes\n\ + like verbose but report only when a change is made\n\ +")); + oputs (_("\ + -f, --silent, --quiet\n\ + suppress most error messages\n\ +")); + oputs (_("\ + -v, --verbose\n\ + output a diagnostic for every file processed\n\ +")); + oputs (_("\ + --dereference\n\ + affect the referent of each symbolic link (this is\n\ + the default), rather than the symbolic link itself\n\ +")); + oputs (_("\ + -h, --no-dereference\n\ + affect symbolic links instead of any referenced file;\n\ + useful only on systems that can change the ownership of a symlink\n\ +")); + oputs (_("\ --from=CURRENT_OWNER:CURRENT_GROUP\n\ - change the ownership of each file only if\n\ - its current owner and/or group match those specified\n\ - here. Either may be omitted, in which case a match\n\ - is not required for the omitted attribute\n\ -"), stdout); - fputs (_("\ - --no-preserve-root do not treat '/' specially (the default)\n\ - --preserve-root fail to operate recursively on '/'\n\ -"), stdout); - fputs (_("\ - --reference=RFILE use RFILE's ownership rather than specifying values.\n\ - RFILE is always dereferenced if a symbolic link.\n\ -"), stdout); - fputs (_("\ - -R, --recursive operate on files and directories recursively\n\ -"), stdout); + change the ownership of each file only if its\n\ + current owner and/or group match those specified here.\n\ + Either may be omitted, in which case a match\n\ + is not required for the omitted attribute\n\ +")); + oputs (_("\ + --no-preserve-root\n\ + do not treat '/' specially (the default)\n\ +")); + oputs (_("\ + --preserve-root\n\ + fail to operate recursively on '/'\n\ +")); + oputs (_("\ + --reference=RFILE\n\ + use RFILE's ownership rather than specifying values.\n\ + RFILE is always dereferenced if a symbolic link.\n\ +")); + oputs (_("\ + -R, --recursive\n\ + operate on files and directories recursively\n\ +")); emit_symlink_recurse_options ("-P"); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); if (chown_mode == CHOWN_CHOWN) fputs (_("\ \n\ diff --git a/src/chroot.c b/src/chroot.c index 48ef38d73c..9a52625594 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -190,18 +190,21 @@ Run COMMAND with root directory set to NEWROOT.\n\ \n\ "), stdout); - fputs (_("\ - --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n\ -"), stdout); - fputs (_("\ - --userspec=USER:GROUP specify user and group (ID or name) to use\n\ -"), stdout); - printf (_("\ - --skip-chdir do not change working directory to %s\n\ + oputs (_("\ + --groups=G_LIST\n\ + specify supplementary groups as g1,g2,..,gN\n\ +")); + oputs (_("\ + --userspec=USER:GROUP\n\ + specify user and group (ID or name) to use\n\ +")); + oprintf (_("\ + --skip-chdir\n\ + do not change working directory to %s\n\ "), quoteaf ("/")); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ If no command is given, run '\"$SHELL\" -i' (default: '/bin/sh -i').\n\ diff --git a/src/cksum.c b/src/cksum.c index 3abc71dcad..bab319bdbe 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -523,26 +523,29 @@ Legacy interface to the cksum utility.\n\ emit_stdin_note (); #if HASH_ALGO_SUM - fputs (_("\ -\n\ - -r use BSD sum algorithm (the default), use 1K blocks\n\ - -s, --sysv use System V sum algorithm, use 512 bytes blocks\n\ -"), stdout); + oputs (_("\ + -r\n\ + use BSD sum algorithm (the default), use 1K blocks\n\ +")); + oputs (_("\ + -s, --sysv\n\ + use System V sum algorithm, use 512 bytes blocks\n\ +")); #endif #if HASH_ALGO_BLAKE2 || HASH_ALGO_CKSUM emit_mandatory_arg_note (); #endif #if HASH_ALGO_CKSUM if (! legacy_mode) - fputs (_("\ - -a, --algorithm=TYPE select the digest type to use. See DIGEST below\ -\n\ -"), stdout); + oputs (_("\ + -a, --algorithm=TYPE\n\ + select the digest type to use. See DIGEST below\n\ +")); if (! legacy_mode) - fputs (_("\ - --base64 emit base64-encoded digests, not hexadecimal\ -\n\ -"), stdout); + oputs (_("\ + --base64\n\ + emit base64-encoded digests, not hexadecimal\n\ +")); #endif #if !HASH_ALGO_SUM # if HASH_ALGO_CKSUM @@ -550,91 +553,116 @@ Legacy interface to the cksum utility.\n\ { # endif if (O_BINARY) - fputs (_("\ - -b, --binary read in binary mode (default unless reading tty stdin)\ -\n\ -"), stdout); + oputs (_("\ + -b, --binary\n\ + read in binary mode (default unless reading tty stdin)\n\ +")); else - fputs (_("\ - -b, --binary read in binary mode\n\ -"), stdout); + oputs (_("\ + -b, --binary\n\ + read in binary mode\n\ +")); # if HASH_ALGO_CKSUM } # endif - fputs (_("\ - -c, --check read checksums from the FILEs and check them\n\ -"), stdout); + oputs (_("\ + -c, --check\n\ + read checksums from the FILEs and check them\n\ +")); # if HASH_ALGO_BLAKE2 || HASH_ALGO_CKSUM # if HASH_ALGO_CKSUM if (! legacy_mode) # endif - fputs (_("\ - -l, --length=BITS digest length in bits; must not exceed the max size\n\ - and must be a multiple of 8 for blake2b;\n\ - must be 224, 256, 384, or 512 for sha2 or sha3\n\ -"), stdout); + oputs (_("\ + -l, --length=BITS\n\ + digest length in bits; must not exceed the max size\n\ + and must be a multiple of 8 for blake2b;\n\ + must be 224, 256, 384, or 512 for sha2 or sha3\n\ +")); # endif # if HASH_ALGO_CKSUM if (! legacy_mode) - fputs (_("\ - --raw emit a raw binary digest, not hexadecimal\ -\n\ -"), stdout); + oputs (_("\ + --raw\n\ + emit a raw binary digest, not hexadecimal\n\ +")); if (legacy_mode) - fputs (_("\ - --tag create a BSD-style checksum\n\ -"), stdout); + oputs (_("\ + --tag\n\ + create a BSD-style checksum\n\ +")); else - fputs (_("\ - --tag create a BSD-style checksum (the default)\n\ -"), stdout); + oputs (_("\ + --tag\n\ + create a BSD-style checksum (the default)\n\ +")); if (! legacy_mode) - fputs (_("\ - --untagged create a reversed style checksum, without digest type\n\ -"), stdout); + oputs (_("\ + --untagged\n\ + create a reversed style checksum, without digest type\n\ +")); # else - fputs (_("\ - --tag create a BSD-style checksum\n\ -"), stdout); + oputs (_("\ + --tag\n\ + create a BSD-style checksum\n\ +")); # endif # if HASH_ALGO_CKSUM if (legacy_mode) { # endif if (O_BINARY) - fputs (_("\ - -t, --text read in text mode (default if reading tty stdin)\n\ -"), stdout); + oputs (_("\ + -t, --text\n\ + read in text mode (default if reading tty stdin)\n\ +")); else - fputs (_("\ - -t, --text read in text mode (default)\n\ -"), stdout); + oputs (_("\ + -t, --text\n\ + read in text mode (default)\n\ +")); # if HASH_ALGO_CKSUM } # endif - fputs (_("\ - -z, --zero end each output line with NUL, not newline,\n\ - and disable file name escaping\n\ -"), stdout); + oputs (_("\ + -z, --zero\n\ + end each output line with NUL, not newline,\n\ + and disable file name escaping\n\ +")); fputs (_("\ \n\ The following five options are useful only when verifying checksums:\n\ - --ignore-missing don't fail or report status for missing files\n\ - --quiet don't print OK for each successfully verified file\n\ - --status don't output anything, status code shows success\n\ - --strict exit non-zero for improperly formatted checksum lines\n\ - -w, --warn warn about improperly formatted checksum lines\n\ -\n\ "), stdout); + oputs (_("\ + --ignore-missing\n\ + don't fail or report status for missing files\n\ +")); + oputs (_("\ + --quiet\n\ + don't print OK for each successfully verified file\n\ +")); + oputs (_("\ + --status\n\ + don't output anything, status code shows success\n\ +")); + oputs (_("\ + --strict\n\ + exit non-zero for improperly formatted checksum lines\n\ +")); + oputs (_("\ + -w, --warn\n\ + warn about improperly formatted checksum lines\n\ +")); #endif #if HASH_ALGO_CKSUM if (! legacy_mode) - fputs (_("\ - --debug indicate which implementation used\n\ -"), stdout); + oputs (_("\ + --debug\n\ + indicate which implementation used\n\ +")); #endif - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); #if HASH_ALGO_CKSUM if (! legacy_mode) fputs (_("\ diff --git a/src/comm.c b/src/comm.c index a73020061d..87cd65eb5b 100644 --- a/src/comm.c +++ b/src/comm.c @@ -120,29 +120,38 @@ With no options, produce three-column output. Column one contains\n\ lines unique to FILE1, column two contains lines unique to FILE2,\n\ and column three contains lines common to both files.\n\ "), stdout); - fputs (_("\ -\n\ - -1 suppress column 1 (lines unique to FILE1)\n\ - -2 suppress column 2 (lines unique to FILE2)\n\ - -3 suppress column 3 (lines that appear in both files)\n\ -"), stdout); - fputs (_("\ -\n\ - --check-order check that the input is correctly sorted, even\n\ - if all input lines are pairable\n\ - --nocheck-order do not check that the input is correctly sorted\n\ -"), stdout); - fputs (_("\ - --output-delimiter=STR separate columns with STR\n\ -"), stdout); - fputs (_("\ - --total output a summary\n\ -"), stdout); - fputs (_("\ - -z, --zero-terminated line delimiter is NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -1 suppress column 1 (lines unique to FILE1)\n\ +")); + oputs (_("\ + -2 suppress column 2 (lines unique to FILE2)\n\ +")); + oputs (_("\ + -3 suppress column 3 (lines that appear in both files)\n\ +")); + oputs (_("\ + --check-order\n\ + check that the input is correctly sorted,\n\ + even if all input lines are pairable\n\ +")); + oputs (_("\ + --nocheck-order\n\ + do not check that the input is correctly sorted\n\ +")); + oputs (_("\ + --output-delimiter=STR\n\ + separate columns with STR\n\ +")); + oputs (_("\ + --total\n\ + output a summary\n\ +")); + oputs (_("\ + -z, --zero-terminated\n\ + line delimiter is NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Comparisons honor the rules specified by 'LC_COLLATE'.\n\ diff --git a/src/coreutils.c b/src/coreutils.c index 5ff5c3d4cb..180bfd9cee 100644 --- a/src/coreutils.c +++ b/src/coreutils.c @@ -66,8 +66,8 @@ Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n"), fputs (_("\ Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n\ \n"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); #ifdef SINGLE_BINARY /* XXX: Ideally we'd like to present "install" here, not "ginstall". */ diff --git a/src/cp.c b/src/cp.c index bc43850a67..278f7cd345 100644 --- a/src/cp.c +++ b/src/cp.c @@ -169,85 +169,148 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -a, --archive same as -dR --preserve=all\n\ - --attributes-only don't copy the file data, just the attributes\n\ - --backup[=CONTROL] make a backup of each existing destination file\ -\n\ - -b like --backup but does not accept an argument\n\ - --copy-contents copy contents of special files when recursive\n\ - -d same as --no-dereference --preserve=links\n\ -"), stdout); - fputs (_("\ - --debug explain how a file is copied. Implies -v\n\ -"), stdout); - fputs (_("\ - -f, --force if an existing destination file cannot be\n\ - opened, remove it and try again (this option\n\ - is ignored when the -n option is also used)\n\ - -i, --interactive prompt before overwrite (overrides a previous -n\ -\n\ - option)\n\ - -H follow command-line symbolic links in SOURCE\n\ -"), stdout); - fputs (_("\ - -l, --link hard link files instead of copying\n\ - -L, --dereference always follow symbolic links in SOURCE\n\ -"), stdout); - fputs (_("\ - -n, --no-clobber (deprecated) silently skip existing files.\n\ - See also --update\n\ -"), stdout); - fputs (_("\ - -P, --no-dereference never follow symbolic links in SOURCE\n\ -"), stdout); - fputs (_("\ - -p same as --preserve=mode,ownership,timestamps\n\ - --preserve[=ATTR_LIST] preserve the specified attributes\n\ -"), stdout); - fputs (_("\ - --no-preserve=ATTR_LIST don't preserve the specified attributes\n\ - --parents use full source file name under DIRECTORY\n\ -"), stdout); - fputs (_("\ - -R, -r, --recursive copy directories recursively\n\ - --reflink[=WHEN] control clone/CoW copies. See below\n\ - --remove-destination remove each existing destination file before\n\ - attempting to open it (contrast with --force)\ -\n"), stdout); - fputs (_("\ - --sparse=WHEN control creation of sparse files. See below\n\ - --strip-trailing-slashes remove any trailing slashes from each SOURCE\n\ - argument\n\ -"), stdout); - fputs (_("\ - -s, --symbolic-link make symbolic links instead of copying\n\ - -S, --suffix=SUFFIX override the usual backup suffix\n\ - -t, --target-directory=DIRECTORY copy all SOURCE arguments into DIRECTORY\n\ - -T, --no-target-directory treat DEST as a normal file\n\ -"), stdout); - fputs (_("\ - --update[=UPDATE] control which existing files are updated;\n\ - UPDATE={all,none,none-fail,older(default)}\n\ - -u equivalent to --update[=older]. See below\n\ -"), stdout); - fputs (_("\ - -v, --verbose explain what is being done\n\ -"), stdout); - fputs (_("\ - --keep-directory-symlink follow existing symlinks to directories\n\ -"), stdout); - fputs (_("\ - -x, --one-file-system stay on this file system\n\ -"), stdout); - fputs (_("\ - -Z set SELinux security context of destination\n\ - file to default type\n\ - --context[=CTX] like -Z, or if CTX is specified then set the\n\ - SELinux or SMACK security context to CTX\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -a, --archive\n\ + same as -dR --preserve=all\n\ +")); + oputs (_("\ + --attributes-only\n\ + don't copy the file data, just the attributes\n\ +")); + oputs (_("\ + --backup[=CONTROL]\n\ + make a backup of each existing destination file\n\ +")); + oputs (_("\ + -b\n\ + like --backup but does not accept an argument\n\ +")); + oputs (_("\ + --copy-contents\n\ + copy contents of special files when recursive\n\ +")); + oputs (_("\ + -d\n\ + same as --no-dereference --preserve=links\n\ +")); + oputs (_("\ + --debug\n\ + explain how a file is copied. Implies -v\n\ +")); + oputs (_("\ + -f, --force\n\ + if an existing destination file cannot be opened, remove it and try\n\ + again (this option is ignored when the -n option is also used)\n\ +")); + oputs (_("\ + -i, --interactive\n\ + prompt before overwrite (overrides a previous -n option)\n\ +")); + oputs (_("\ + -H\n\ + follow command-line symbolic links in SOURCE\n\ +")); + oputs (_("\ + -l, --link\n\ + hard link files instead of copying\n\ +")); + oputs (_("\ + -L, --dereference\n\ + always follow symbolic links in SOURCE\n\ +")); + oputs (_("\ + -n, --no-clobber\n\ + (deprecated) silently skip existing files. See also --update\n\ +")); + oputs (_("\ + -P, --no-dereference\n\ + never follow symbolic links in SOURCE\n\ +")); + oputs (_("\ + -p\n\ + same as --preserve=mode,ownership,timestamps\n\ +")); + oputs (_("\ + --preserve[=ATTR_LIST]\n\ + preserve the specified attributes\n\ +")); + oputs (_("\ + --no-preserve=ATTR_LIST\n\ + don't preserve the specified attributes\n\ +")); + oputs (_("\ + --parents\n\ + use full source file name under DIRECTORY\n\ +")); + oputs (_("\ + -R, -r, --recursive\n\ + copy directories recursively\n\ +")); + oputs (_("\ + --reflink[=WHEN]\n\ + control clone/CoW copies. See below\n\ +")); + oputs (_("\ + --remove-destination\n\ + remove each existing destination file before attempting to open it\n\ + (contrast with --force)\n\ +")); + oputs (_("\ + --sparse=WHEN\n\ + control creation of sparse files. See below\n\ +")); + oputs (_("\ + --strip-trailing-slashes\n\ + remove any trailing slashes from each SOURCE argument\n\ +")); + oputs (_("\ + -s, --symbolic-link\n\ + make symbolic links instead of copying\n\ +")); + oputs (_("\ + -S, --suffix=SUFFIX\n\ + override the usual backup suffix\n\ +")); + oputs (_("\ + -t, --target-directory=DIRECTORY\n\ + copy all SOURCE arguments into DIRECTORY\n\ +")); + oputs (_("\ + -T, --no-target-directory\n\ + treat DEST as a normal file\n\ +")); + oputs (_("\ + --update[=UPDATE]\n\ + control which existing files are updated;\n\ + UPDATE={all,none,none-fail,older(default)}\n\ +")); + oputs (_("\ + -u\n\ + equivalent to --update[=older]. See below\n\ +")); + oputs (_("\ + -v, --verbose\n\ + explain what is being done\n\ +")); + oputs (_("\ + --keep-directory-symlink\n\ + follow existing symlinks to directories\n\ +")); + oputs (_("\ + -x, --one-file-system\n\ + stay on this file system\n\ +")); + oputs (_("\ + -Z\n\ + set SELinux security context of destination file to default type\n\ +")); + oputs (_("\ + --context[=CTX]\n\ + like -Z, or if CTX is specified then set the\n\ + SELinux or SMACK security context to CTX\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ ATTR_LIST is a comma-separated list of attributes. Attributes are 'mode' for\n\ diff --git a/src/csplit.c b/src/csplit.c index 2fdc5e819f..1f0253c3c1 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -1419,21 +1419,36 @@ Read standard input if FILE is -\n\ emit_mandatory_arg_note (); - fputs (_("\ - -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n\ - -f, --prefix=PREFIX use PREFIX instead of 'xx'\n\ - -k, --keep-files do not remove output files on errors\n\ -"), stdout); - fputs (_("\ - --suppress-matched suppress the lines matching PATTERN\n\ -"), stdout); - fputs (_("\ - -n, --digits=DIGITS use specified number of digits instead of 2\n\ - -s, --quiet, --silent do not print counts of output file sizes\n\ - -z, --elide-empty-files suppress empty output files\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -b, --suffix-format=FORMAT\n\ + use sprintf FORMAT instead of %02d\n\ +")); + oputs (_("\ + -f, --prefix=PREFIX\n\ + use PREFIX instead of 'xx'\n\ +")); + oputs (_("\ + -k, --keep-files\n\ + do not remove output files on errors\n\ +")); + oputs (_("\ + --suppress-matched\n\ + suppress the lines matching PATTERN\n\ +")); + oputs (_("\ + -n, --digits=DIGITS\n\ + use specified number of digits instead of 2\n\ +")); + oputs (_("\ + -s, --quiet, --silent\n\ + do not print counts of output file sizes\n\ +")); + oputs (_("\ + -z, --elide-empty-files\n\ + suppress empty output files\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Each PATTERN may be:\n\ diff --git a/src/cut.c b/src/cut.c index a045e6b8ea..93f2b1f1f5 100644 --- a/src/cut.c +++ b/src/cut.c @@ -139,31 +139,46 @@ Print selected parts of lines from each FILE to standard output.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ - -b, --bytes=LIST select only these bytes\n\ - -c, --characters=LIST select only these characters\n\ - -d, --delimiter=DELIM use DELIM instead of TAB for field delimiter\n\ -"), stdout); - fputs (_("\ - -f, --fields=LIST select only these fields; also print any line\n\ - that contains no delimiter character, unless\n\ - the -s option is specified\n\ - -n (ignored)\n\ -"), stdout); - fputs (_("\ - --complement complement the set of selected bytes, characters\n\ - or fields\n\ -"), stdout); - fputs (_("\ - -s, --only-delimited do not print lines not containing delimiters\n\ - --output-delimiter=STRING use STRING as the output delimiter\n\ - the default is to use the input delimiter\n\ -"), stdout); - fputs (_("\ - -z, --zero-terminated line delimiter is NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -b, --bytes=LIST\n\ + select only these bytes\n\ +")); + oputs (_("\ + -c, --characters=LIST\n\ + select only these characters\n\ +")); + oputs (_("\ + -d, --delimiter=DELIM\n\ + use DELIM instead of TAB for field delimiter\n\ +")); + oputs (_("\ + -f, --fields=LIST\n\ + select only these fields; also print any line that contains\n\ + no delimiter character, unless the -s option is specified\n\ +")); + oputs (_("\ + -n\n\ + (ignored)\n\ +")); + oputs (_("\ + --complement\n\ + complement the set of selected bytes, characters or fields\n\ +")); + oputs (_("\ + -s, --only-delimited\n\ + do not print lines not containing delimiters\n\ +")); + oputs (_("\ + --output-delimiter=STRING\n\ + use STRING as the output delimiter;\n\ + the default is to use the input delimiter\n\ +")); + oputs (_("\ + -z, --zero-terminated\n\ + line delimiter is NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Use one, and only one of -b, -c or -f. Each LIST is made up of one\n\ diff --git a/src/date.c b/src/date.c index 9a05cbc2eb..36c863a422 100644 --- a/src/date.c +++ b/src/date.c @@ -138,48 +138,58 @@ With -s, or with [MMDDhhmm[[CC]YY][.ss]], set the date and time.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -d, --date=STRING display time described by STRING, not 'now'\n\ -"), stdout); - fputs (_("\ - --debug annotate the parsed date, and\n\ - warn about questionable usage to standard error\n\ -"), stdout); - fputs (_("\ - -f, --file=DATEFILE like --date; once for each line of DATEFILE;\n\ - If DATEFILE is -, read names from standard input\ -\n\ -"), stdout); - fputs (_("\ - -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n\ - FMT='date' for date only (the default),\n\ - 'hours', 'minutes', 'seconds', or 'ns'\n\ - for date and time to the indicated precision.\n\ - Example: 2006-08-14T02:34:56-06:00\n\ -"), stdout); - fputs (_("\ - --resolution output the available resolution of timestamps\n\ - Example: 0.000000001\n\ -"), stdout); - fputs (_("\ - -R, --rfc-email output date and time in RFC 5322 format.\n\ - Example: Mon, 14 Aug 2006 02:34:56 -0600\n\ -"), stdout); - fputs (_("\ - --rfc-3339=FMT output date/time in RFC 3339 format.\n\ - FMT='date', 'seconds', or 'ns'\n\ - for date and time to the indicated precision.\n\ - Example: 2006-08-14 02:34:56-06:00\n\ -"), stdout); - fputs (_("\ - -r, --reference=FILE display the last modification time of FILE\n\ -"), stdout); - fputs (_("\ - -s, --set=STRING set time described by STRING\n\ - -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -d, --date=STRING\n\ + display time described by STRING, not 'now'\n\ +")); + oputs (_("\ + --debug\n\ + annotate the parsed date,\n\ + and warn about questionable usage to standard error\n\ +")); + oputs (_("\ + -f, --file=DATEFILE\n\ + like --date; once for each line of DATEFILE;\n\ + if DATEFILE is -, read names from standard input\n\ +")); + oputs (_("\ + -I[FMT], --iso-8601[=FMT]\n\ + output date/time in ISO 8601 format.\n\ + FMT='date' (default), 'hours', 'minutes', 'seconds', or 'ns'\n\ + for date and time to the indicated precision.\n\ + Example: 2006-08-14T02:34:56-06:00\n\ +")); + oputs (_("\ + --resolution\n\ + output the available resolution of timestamps.\n\ + Example: 0.000000001\n\ +")); + oputs (_("\ + -R, --rfc-email\n\ + output date and time in RFC 5322 format.\n\ + Example: Mon, 14 Aug 2006 02:34:56 +0000\n\ +")); + oputs (_("\ + --rfc-3339=FMT\n\ + output date/time in RFC 3339 format.\n\ + FMT='date', 'seconds', or 'ns'\n\ + for date and time to the indicated precision.\n\ + Example: 2006-08-14 02:34:56-06:00\n\ +")); + oputs (_("\ + -r, --reference=FILE\n\ + display the last modification time of FILE\n\ +")); + oputs (_("\ + -s, --set=STRING\n\ + set time described by STRING\n\ +")); + oputs (_("\ + -u, --utc, --universal\n\ + print or set Coordinated Universal Time (UTC)\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ All options that specify the date to display are mutually exclusive.\n\ diff --git a/src/dd.c b/src/dd.c index ff3d420500..a1944fbc05 100644 --- a/src/dd.c +++ b/src/dd.c @@ -531,26 +531,50 @@ Usage: %s [OPERAND]...\n\ fputs (_("\ Copy a file, converting and formatting according to the operands.\n\ \n\ +"), stdout); + oputs (_("\ bs=BYTES read and write up to BYTES bytes at a time (default: 512);\n\ overrides ibs and obs\n\ +")); + oputs (_("\ cbs=BYTES convert BYTES bytes at a time\n\ +")); + oputs (_("\ conv=CONVS convert the file as per the comma separated symbol list\n\ +")); + oputs (_("\ count=N copy only N input blocks\n\ +")); + oputs (_("\ ibs=BYTES read up to BYTES bytes at a time (default: 512)\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ if=FILE read from FILE instead of standard input\n\ +")); + oputs (_("\ iflag=FLAGS read as per the comma separated symbol list\n\ +")); + oputs (_("\ obs=BYTES write BYTES bytes at a time (default: 512)\n\ +")); + oputs (_("\ of=FILE write to FILE instead of standard output\n\ +")); + oputs (_("\ oflag=FLAGS write as per the comma separated symbol list\n\ - seek=N (or oseek=N) skip N obs-sized output blocks\n\ - skip=N (or iseek=N) skip N ibs-sized input blocks\n\ +")); + oputs (_("\ + seek=N (or oseek=N) skip N obs sized output blocks\n\ +")); + oputs (_("\ + skip=N (or iseek=N) skip N ibs sized input blocks\n\ +")); + oputs (_("\ status=LEVEL The LEVEL of information to print to standard error;\n\ 'none' suppresses everything but error messages,\n\ 'noxfer' suppresses the final transfer statistics,\n\ 'progress' shows periodic transfer statistics\n\ -"), stdout); +")); fputs (_("\ \n\ N and BYTES may be followed by the following multiplicative suffixes:\n\ @@ -632,8 +656,8 @@ Options are:\n\ "), SIGINFO == SIGUSR1 ? "USR1" : "INFO"); } - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/df.c b/src/df.c index ae30660ff3..25235a2372 100644 --- a/src/df.c +++ b/src/df.c @@ -1502,43 +1502,75 @@ or all file systems by default.\n\ /* TRANSLATORS: The thousands and decimal separators are best adjusted to an appropriate default for your locale. */ - fputs (_("\ - -a, --all include pseudo, duplicate, inaccessible file systems\n\ - -B, --block-size=SIZE scale sizes by SIZE before printing them; e.g.,\n\ - '-BM' prints sizes in units of 1,048,576 bytes;\n\ - see SIZE format below\n\ - -h, --human-readable print sizes in powers of 1024 (e.g., 1023M)\n\ - -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n\ -"), stdout); - fputs (_("\ - -i, --inodes list inode information instead of block usage\n\ - -k like --block-size=1K\n\ - -l, --local limit listing to local file systems\n\ - --no-sync do not invoke sync before getting usage info (default)\ -\n\ -"), stdout); - fputs (_("\ - --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n\ - or print all fields if FIELD_LIST is omitted\n\ -"), stdout); - fputs (_("\ - -P, --portability use the POSIX output format\n\ -"), stdout); - fputs (_("\ - --sync invoke sync before getting usage info\n\ -"), stdout); - fputs (_("\ - --total elide all entries insignificant to available space,\n\ - and produce a grand total\n\ -"), stdout); - fputs (_("\ - -t, --type=TYPE limit listing to file systems of type TYPE\n\ - -T, --print-type print file system type\n\ - -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n\ - -v (ignored)\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -a, --all\n\ + include pseudo, duplicate, inaccessible file systems\n\ +")); + oputs (_("\ + -B, --block-size=SIZE\n\ + scale sizes by SIZE before printing them; see SIZE format below;\n\ + E.g., '-BM' prints sizes in units of 1,048,576 bytes\n\ +")); + oputs (_("\ + -h, --human-readable\n\ + print sizes in powers of 1024 (e.g., 1023M)\n\ +")); + oputs (_("\ + -H, --si\n\ + print sizes in powers of 1000 (e.g., 1.1G)\n\ +")); + oputs (_("\ + -i, --inodes\n\ + list inode information instead of block usage\n\ +")); + oputs (_("\ + -k\n\ + like --block-size=1K\n\ +")); + oputs (_("\ + -l, --local\n\ + limit listing to local file systems\n\ +")); + oputs (_("\ + --no-sync\n\ + do not invoke sync before getting usage info (default)\n\ +")); + oputs (_("\ + --output[=FIELD_LIST]\n\ + use the output format defined by FIELD_LIST,\n\ + or print all fields if FIELD_LIST is omitted\n\ +")); + oputs (_("\ + -P, --portability\n\ + use the POSIX output format\n\ +")); + oputs (_("\ + --sync\n\ + invoke sync before getting usage info\n\ +")); + oputs (_("\ + --total\n\ + elide all entries insignificant to available space,\n\ + and produce a grand total\n\ +")); + oputs (_("\ + -t, --type=TYPE\n\ + limit listing to file systems of type TYPE\n\ +")); + oputs (_("\ + -T, --print-type\n\ + print file system type\n\ +")); + oputs (_("\ + -x, --exclude-type=TYPE\n\ + limit listing to file systems not of type TYPE\n\ +")); + oputs (_("\ + -v\n\ + (ignored)\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_blocksize_note ("DF"); emit_size_note (); fputs (_("\n\ diff --git a/src/dircolors.c b/src/dircolors.c index b601fadaf1..bd7706f05c 100644 --- a/src/dircolors.c +++ b/src/dircolors.c @@ -104,13 +104,25 @@ usage (int status) Output commands to set the LS_COLORS environment variable.\n\ \n\ Determine format of output:\n\ - -b, --sh, --bourne-shell output Bourne shell code to set LS_COLORS\n\ - -c, --csh, --c-shell output C shell code to set LS_COLORS\n\ - -p, --print-database output defaults\n\ - --print-ls-colors output fully escaped colors for display\n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -b, --sh, --bourne-shell\n\ + output Bourne shell code to set LS_COLORS\n\ +")); + oputs (_("\ + -c, --csh, --c-shell\n\ + output C shell code to set LS_COLORS\n\ +")); + oputs (_("\ + -p, --print-database\n\ + output defaults\n\ +")); + oputs (_("\ + --print-ls-colors\n\ + output fully escaped colors for display\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ If FILE is specified, read it to determine which colors to use for which\n\ diff --git a/src/dirname.c b/src/dirname.c index 603ae820bd..dbd21d683e 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -55,11 +55,12 @@ Output each NAME with its last non-slash component and trailing slashes\n\ removed; if NAME contains no /'s, output '.' (meaning the current directory).\n\ \n\ "), stdout); - fputs (_("\ - -z, --zero end each output line with NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -z, --zero\n\ + end each output line with NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); printf (_("\ \n\ Examples:\n\ diff --git a/src/du.c b/src/du.c index 6a943682d3..8243ef1ac5 100644 --- a/src/du.c +++ b/src/du.c @@ -286,67 +286,126 @@ Summarize device usage of the set of FILEs, recursively for directories.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -0, --null end each output line with NUL, not newline\n\ - -a, --all write counts for all files, not just directories\n\ - -A, --apparent-size print apparent sizes rather than device usage; although\ -\n\ - the apparent size is usually smaller, it may be\n\ - larger due to holes in ('sparse') files, internal\n\ - fragmentation, indirect blocks, and the like\n\ -"), stdout); - fputs (_("\ - -B, --block-size=SIZE scale sizes by SIZE before printing them; e.g.,\n\ - '-BM' prints sizes in units of 1,048,576 bytes;\n\ - see SIZE format below\n\ - -b, --bytes equivalent to '--apparent-size --block-size=1'\n\ - -c, --total produce a grand total\n\ - -D, --dereference-args dereference only symlinks that are listed on the\n\ - command line\n\ - -d, --max-depth=N print the total for a directory (or file, with --all)\n\ - only if it is N or fewer levels below the command\n\ - line argument; --max-depth=0 is the same as\n\ - --summarize\n\ -"), stdout); - fputs (_("\ - --files0-from=F summarize device usage of the\n\ - NUL-terminated file names specified in file F;\n\ - if F is -, read names from standard input\n\ - -H equivalent to --dereference-args (-D)\n\ - -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\ -\n\ - --inodes list inode usage information instead of block usage\n\ -"), stdout); - fputs (_("\ - -k like --block-size=1K\n\ - -L, --dereference dereference all symbolic links\n\ - -l, --count-links count sizes many times if hard linked\n\ - -m like --block-size=1M\n\ -"), stdout); - fputs (_("\ - -P, --no-dereference don't follow any symbolic links (this is the default)\n\ - -S, --separate-dirs for directories do not include size of subdirectories\n\ - --si like -h, but use powers of 1000 not 1024\n\ - -s, --summarize display only a total for each argument\n\ -"), stdout); - fputs (_("\ - -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n\ - or entries greater than SIZE if negative\n\ - --time show time of the last modification of any file in the\n\ - directory, or any of its subdirectories\n\ - --time=WORD show time as WORD instead of modification time:\n\ - atime, access, use, ctime or status\n\ -"), stdout); - fputs (_("\ - --time-style=STYLE time/date format with --time; see TIME_STYLE below\n\ -"), stdout); - fputs (_("\ - -X, --exclude-from=FILE exclude files that match any pattern in FILE\n\ - --exclude=PATTERN exclude files that match PATTERN\n\ - -x, --one-file-system skip directories on different file systems\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -0, --null\n\ + end each output line with NUL, not newline\n\ +")); + oputs (_("\ + -a, --all\n\ + write counts for all files, not just directories\n\ +")); + oputs (_("\ + -A, --apparent-size\n\ + print apparent sizes rather than device usage;\n\ + although the apparent size is usually smaller, it may be\n\ + larger due to holes in ('sparse') files,\n\ + internal fragmentation, indirect blocks, etc.\n\ +")); + oputs (_("\ + -B, --block-size=SIZE\n\ + scale sizes by SIZE before printing them; See SIZE format below;\n\ + E.g., '-BM' prints sizes in units of 1,048,576 bytes\n\ +")); + oputs (_("\ + -b, --bytes\n\ + equivalent to '--apparent-size --block-size=1'\n\ +")); + oputs (_("\ + -c, --total\n\ + produce a grand total\n\ +")); + oputs (_("\ + -D, --dereference-args\n\ + dereference only symlinks that are listed on the command line\n\ +")); + oputs (_("\ + -d, --max-depth=N\n\ + print the total for a directory (or file, with --all)\n\ + only if it is N or fewer levels below the command\n\ + line argument; --max-depth=0 is the same as --summarize\n\ +")); + oputs (_("\ + --files0-from=F\n\ + summarize device usage of the NUL-terminated file names\n\ + specified in file F; if F is -, read names from standard input\n\ +")); + oputs (_("\ + -H\n\ + equivalent to --dereference-args (-D)\n\ +")); + oputs (_("\ + -h, --human-readable\n\ + print sizes in human readable format (e.g., 1K 234M 2G)\n\ +")); + oputs (_("\ + --inodes\n\ + list inode usage information instead of block usage\n\ +")); + oputs (_("\ + -k\n\ + like --block-size=1K\n\ +")); + oputs (_("\ + -L, --dereference\n\ + dereference all symbolic links\n\ +")); + oputs (_("\ + -l, --count-links\n\ + count sizes many times if hard linked\n\ +")); + oputs (_("\ + -m\n\ + like --block-size=1M\n\ +")); + oputs (_("\ + -P, --no-dereference\n\ + don't follow any symbolic links (this is the default)\n\ +")); + oputs (_("\ + -S, --separate-dirs\n\ + for directories do not include size of subdirectories\n\ +")); + oputs (_("\ + --si\n\ + like -h, but use powers of 1000 not 1024\n\ +")); + oputs (_("\ + -s, --summarize\n\ + display only a total for each argument\n\ +")); + oputs (_("\ + -t, --threshold=SIZE\n\ + exclude entries smaller than SIZE if positive,\n\ + or entries greater than SIZE if negative\n\ +")); + oputs (_("\ + --time\n\ + show time of the last modification of any file in the directory,\n\ + or any of its subdirectories\n\ +")); + oputs (_("\ + --time=WORD\n\ + show time as WORD instead of modification time:\n\ + atime, access, use, ctime or status\n\ +")); + oputs (_("\ + --time-style=STYLE\n\ + time/date format with --time; see TIME_STYLE below\n\ +")); + oputs (_("\ + -X, --exclude-from=FILE\n\ + exclude files that match any pattern in FILE\n\ +")); + oputs (_("\ + --exclude=PATTERN\n\ + exclude files that match PATTERN\n\ +")); + oputs (_("\ + -x, --one-file-system\n\ + skip directories on different file systems\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_blocksize_note ("DU"); emit_size_note (); fputs (_("\ diff --git a/src/echo.c b/src/echo.c index beabf589a3..872f11c748 100644 --- a/src/echo.c +++ b/src/echo.c @@ -47,18 +47,26 @@ Usage: %s [SHORT-OPTION]... [STRING]...\n\ fputs (_("\ Echo the STRING(s) to standard output.\n\ \n\ - -n do not output the trailing newline\n\ "), stdout); - fputs (_(DEFAULT_ECHO_TO_XPG + oputs (_("\ + -n do not output the trailing newline\n\ +")); + oputs (_(DEFAULT_ECHO_TO_XPG ? N_("\ - -e enable interpretation of backslash escapes (default)\n\ - -E disable interpretation of backslash escapes\n") + -e enable interpretation of backslash escapes (default)\n\ +") : N_("\ - -e enable interpretation of backslash escapes\n\ - -E disable interpretation of backslash escapes (default)\n")), - stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + -e enable interpretation of backslash escapes\n\ +"))); + oputs (_(DEFAULT_ECHO_TO_XPG + ? N_("\ + -E disable interpretation of backslash escapes\n\ +") + : N_("\ + -E disable interpretation of backslash escapes (default)\n\ +"))); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ If -e is in effect, the following sequences are recognized:\n\ diff --git a/src/env.c b/src/env.c index 070d9f1119..d5acab7bda 100644 --- a/src/env.c +++ b/src/env.c @@ -119,39 +119,53 @@ Set each NAME to VALUE in the environment and run COMMAND.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -a, --argv0=ARG pass ARG as the zeroth argument of COMMAND\n\ -"), stdout); - fputs (_("\ - -i, --ignore-environment start with an empty environment\n\ - -0, --null end each output line with NUL, not newline\n\ - -u, --unset=NAME remove variable from the environment\n\ -"), stdout); - fputs (_("\ - -C, --chdir=DIR change working directory to DIR\n\ -"), stdout); - fputs (_("\ - -S, --split-string=S process and split S into separate arguments;\n\ - used to pass multiple arguments on shebang lines\n\ -"), stdout); - fputs (_("\ - --block-signal[=SIG] block delivery of SIG signal(s) to COMMAND\n\ -"), stdout); - fputs (_("\ - --default-signal[=SIG] reset handling of SIG signal(s) to the default\n\ -"), stdout); - fputs (_("\ - --ignore-signal[=SIG] set handling of SIG signal(s) to do nothing\n\ -"), stdout); - fputs (_("\ - --list-signal-handling list non default signal handling to \ -standard error\n\ -"), stdout); - fputs (_("\ - -v, --debug print verbose information for each processing step\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -a, --argv0=ARG\n\ + pass ARG as the zeroth argument of COMMAND\n\ +")); + oputs (_("\ + -i, --ignore-environment\n\ + start with an empty environment\n\ +")); + oputs (_("\ + -0, --null\n\ + end each output line with NUL, not newline\n\ +")); + oputs (_("\ + -u, --unset=NAME\n\ + remove variable from the environment\n\ +")); + oputs (_("\ + -C, --chdir=DIR\n\ + change working directory to DIR\n\ +")); + oputs (_("\ + -S, --split-string=S\n\ + process and split S into separate arguments;\n\ + used to pass multiple arguments on shebang lines\n\ +")); + oputs (_("\ + --block-signal[=SIG]\n\ + block delivery of SIG signal(s) to COMMAND\n\ +")); + oputs (_("\ + --default-signal[=SIG]\n\ + reset handling of SIG signal(s) to the default\n\ +")); + oputs (_("\ + --ignore-signal[=SIG]\n\ + set handling of SIG signal(s) to do nothing\n\ +")); + oputs (_("\ + --list-signal-handling\n\ + list non default signal handling to standard error\n\ +")); + oputs (_("\ + -v, --debug\n\ + print verbose information for each processing step\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ A mere - implies -i. If no COMMAND, print the resulting environment.\n\ diff --git a/src/expand-common.c b/src/expand-common.c index 0d4f8955a0..92e7695ab3 100644 --- a/src/expand-common.c +++ b/src/expand-common.c @@ -399,17 +399,18 @@ cleanup_file_list_stdin (void) /* Emit the --help output for --tabs=LIST option accepted by expand and unexpand. */ extern void -emit_tab_list_info (void) +emit_tab_list_info (char const* program) { /* suppress syntax check for emit_mandatory_arg_note() */ + oputs_ (program, _("\ + -t, --tabs=LIST\n\ + use comma separated list of tab positions.\n\ +")); fputs (_("\ - -t, --tabs=LIST use comma separated list of tab positions.\n\ -"), stdout); - fputs (_("\ - The last specified position can be prefixed with '/'\n\ - to specify a tab size to use after the last\n\ - explicitly specified tab stop. Also a prefix of '+'\n\ - can be used to align remaining tab stops relative to\n\ - the last specified tab stop instead of the first column\n\ + The last specified position can be prefixed with '/'\n\ + to specify a tab size to use after the last\n\ + explicitly specified tab stop. Also a prefix of '+'\n\ + can be used to align remaining tab stops relative to\n\ + the last specified tab stop instead of the first column\n\ "), stdout); } diff --git a/src/expand-common.h b/src/expand-common.h index af8fd5182f..49cae1116f 100644 --- a/src/expand-common.h +++ b/src/expand-common.h @@ -73,4 +73,4 @@ cleanup_file_list_stdin (void); /* Emit the --help output for --tabs=LIST option accepted by expand and unexpand. */ extern void -emit_tab_list_info (void); +emit_tab_list_info (char const *program); diff --git a/src/expand.c b/src/expand.c index ef74ab0f64..cbf659c17e 100644 --- a/src/expand.c +++ b/src/expand.c @@ -74,13 +74,17 @@ Convert tabs in each FILE to spaces, writing to standard output.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ - -i, --initial do not convert tabs after non blanks\n\ - -t, --tabs=N have tabs N characters apart, not 8\n\ -"), stdout); - emit_tab_list_info (); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -i, --initial\n\ + do not convert tabs after non blanks\n\ +")); + oputs (_("\ + -t, --tabs=N\n\ + have tabs N characters apart, not 8\n\ +")); + emit_tab_list_info (PROGRAM_NAME); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/expr.c b/src/expr.c index b6e8230587..021db1f1ea 100644 --- a/src/expr.c +++ b/src/expr.c @@ -237,8 +237,8 @@ Usage: %s EXPRESSION\n\ "), program_name, program_name); putchar ('\n'); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Print the value of EXPRESSION to standard output. A blank line below\n\ diff --git a/src/factor.c b/src/factor.c index 13dba11bdb..06f7b31a23 100644 --- a/src/factor.c +++ b/src/factor.c @@ -1953,11 +1953,12 @@ Print the prime factors of each specified integer NUMBER. If none\n\ are specified on the command line, read them from standard input.\n\ \n\ "), stdout); - fputs ("\ - -h, --exponents print repeated factors in form p^e unless e is 1\n\ -", stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -h, --exponents\n\ + print repeated factors in form p^e unless e is 1\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/fmt.c b/src/fmt.c index e7edb5735c..53250527f3 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -274,23 +274,39 @@ The option -WIDTH is an abbreviated form of --width=DIGITS.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ - -c, --crown-margin preserve indentation of first two lines\n\ - -p, --prefix=STRING reformat only lines beginning with STRING,\n\ - reattaching the prefix to reformatted lines\n\ - -s, --split-only split long lines, but do not refill\n\ -"), - stdout); + oputs (_("\ + -c, --crown-margin\n\ + preserve indentation of first two lines\n\ +")); + oputs (_("\ + -p, --prefix=STRING\n\ + reformat only lines beginning with STRING,\n\ + reattaching the prefix to reformatted lines\n\ +")); + oputs (_("\ + -s, --split-only\n\ + split long lines, but do not refill\n\ +")); /* Tell xgettext that the "% o" below is not a printf-style format string: xgettext:no-c-format */ - fputs (_("\ - -t, --tagged-paragraph indentation of first line different from second\n\ - -u, --uniform-spacing one space between words, two after sentences\n\ - -w, --width=WIDTH maximum line width (default of 75 columns)\n\ - -g, --goal=WIDTH goal width (default of 93% of width)\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -t, --tagged-paragraph\n\ + indentation of first line different from second\n\ +")); + oputs (_("\ + -u, --uniform-spacing\n\ + one space between words, two after sentences\n\ +")); + oputs (_("\ + -w, --width=WIDTH\n\ + maximum line width (default of 75 columns)\n\ +")); + oputs (_("\ + -g, --goal=WIDTH\n\ + goal width (default of 93% of width)\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/fold.c b/src/fold.c index 1a6432dea7..ff6fea247c 100644 --- a/src/fold.c +++ b/src/fold.c @@ -84,14 +84,24 @@ Wrap input lines in each FILE, writing to standard output.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ - -b, --bytes count bytes rather than columns\n\ - -c, --characters count characters rather than columns\n\ - -s, --spaces break after blanks, or in words greater than WIDTH\n\ - -w, --width=WIDTH use WIDTH columns instead of 80\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -b, --bytes\n\ + count bytes rather than columns\n\ +")); + oputs (_("\ + -c, --characters\n\ + count characters rather than columns\n\ +")); + oputs (_("\ + -s, --spaces\n\ + break after blanks, or in words greater than WIDTH\n\ +")); + oputs (_("\ + -w, --width=WIDTH\n\ + use WIDTH columns instead of 80\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/groups.c b/src/groups.c index a45dcbf435..faed5c810c 100644 --- a/src/groups.c +++ b/src/groups.c @@ -56,8 +56,8 @@ Print group memberships for each USERNAME or, if no USERNAME is specified, for\ \n\ the current process (which may differ if the groups database has changed).\n"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/head.c b/src/head.c index 4bc6110880..704be33be7 100644 --- a/src/head.c +++ b/src/head.c @@ -117,23 +117,30 @@ With more than one FILE, precede each with a header giving the file name.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - printf (_("\ - -c, --bytes=[-]NUM print the first NUM bytes of each file;\n\ - with the leading '-', print all but the last\n\ - NUM bytes of each file\n\ - -n, --lines=[-]NUM print the first NUM lines instead of the first %d;\n\ - with the leading '-', print all but the last\n\ - NUM lines of each file\n\ + oputs (_("\ + -c, --bytes=[-]NUM\n\ + print the first NUM bytes of each file;\n\ + with the leading '-', print all but the last NUM bytes of each file\n\ +")); + oprintf (_("\ + -n, --lines=[-]NUM\n\ + print the first NUM lines instead of the first %d;\n\ + with the leading '-', print all but the last NUM lines of each file\n\ "), DEFAULT_NUMBER); - fputs (_("\ - -q, --quiet, --silent never print headers giving file names\n\ - -v, --verbose always print headers giving file names\n\ -"), stdout); - fputs (_("\ - -z, --zero-terminated line delimiter is NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -q, --quiet, --silent\n\ + never print headers giving file names\n\ +")); + oputs (_("\ + -v, --verbose\n\ + always print headers giving file names\n\ +")); + oputs (_("\ + -z, --zero-terminated\n\ + line delimiter is NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ NUM may have a multiplier suffix:\n\ diff --git a/src/hostid.c b/src/hostid.c index f282e3cebe..e20c686f17 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -42,8 +42,8 @@ Usage: %s [OPTION]\n\ Print the numeric identifier (in hexadecimal) for the current host.\n\ \n\ "), program_name); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/hostname.c b/src/hostname.c index 4d6b094db0..cd18ef6d9a 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -62,8 +62,8 @@ Print or set the hostname of the current system.\n\ \n\ "), program_name, program_name); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/id.c b/src/id.c index 63a0d9e51d..9ba880ad88 100644 --- a/src/id.c +++ b/src/id.c @@ -97,19 +97,41 @@ Print user and group information for each specified USER,\n\ or (when USER omitted) for the current process.\n\ \n"), stdout); - fputs (_("\ - -a ignore, for compatibility with other versions\n\ - -Z, --context print only the security context of the process\n\ - -g, --group print only the effective group ID\n\ - -G, --groups print all group IDs\n\ - -n, --name print a name instead of a number, for -u,-g,-G\n\ - -r, --real print the real ID instead of the effective ID, with -u,-g,-G\n\ - -u, --user print only the effective user ID\n\ - -z, --zero delimit entries with NUL characters, not whitespace;\n\ - not permitted in default format\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -a\n\ + ignore, for compatibility with other versions\n\ +")); + oputs (_("\ + -Z, --context\n\ + print only the security context of the process\n\ +")); + oputs (_("\ + -g, --group\n\ + print only the effective group ID\n\ +")); + oputs (_("\ + -G, --groups\n\ + print all group IDs\n\ +")); + oputs (_("\ + -n, --name\n\ + print a name instead of a number, for -u,-g,-G\n\ +")); + oputs (_("\ + -r, --real\n\ + print the real ID instead of the effective ID, with -u,-g,-G\n\ +")); + oputs (_("\ + -u, --user\n\ + print only the effective user ID\n\ +")); + oputs (_("\ + -z, --zero\n\ + delimit entries with NUL characters, not whitespace;\n\ + not permitted in default format\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Without any OPTION, print some useful set of identified information.\n\ diff --git a/src/install.c b/src/install.c index 498d79f617..359eb657ee 100644 --- a/src/install.c +++ b/src/install.c @@ -609,51 +609,97 @@ In the 4th form, create all components of the given DIRECTORY(ies).\n\ emit_mandatory_arg_note (); - fputs (_("\ - --backup[=CONTROL] make a backup of each existing destination file\n\ - -b like --backup but does not accept an argument\n\ - -c (ignored)\n\ - -C, --compare compare content of source and destination files, and\n\ - if no change to content, ownership, and permissions,\n\ - do not modify the destination at all\n\ - -d, --directory treat all arguments as directory names; create all\n\ - components of the specified directories\n\ -"), stdout); - fputs (_("\ - -D create all leading components of DEST except the last,\n\ - or all components of --target-directory,\n\ - then copy SOURCE to DEST\n\ -"), stdout); - fputs (_("\ - --debug explain how a file is copied. Implies -v\n\ -"), stdout); - fputs (_("\ - -g, --group=GROUP set group ownership, instead of process' current group\n\ - -m, --mode=MODE set permission mode (as in chmod), instead of rwxr-xr-x\n\ - -o, --owner=OWNER set ownership (super-user only)\n\ -"), stdout); - fputs (_("\ - -p, --preserve-timestamps apply access/modification times of SOURCE files\n\ - to corresponding destination files\n\ - -s, --strip strip symbol tables\n\ - --strip-program=PROGRAM program used to strip binaries\n\ - -S, --suffix=SUFFIX override the usual backup suffix\n\ - -t, --target-directory=DIRECTORY copy all SOURCE arguments into DIRECTORY\n\ - -T, --no-target-directory treat DEST as a normal file\n\ -"), stdout); - fputs (_("\ - -v, --verbose print the name of each created file or directory\n\ -"), stdout); - fputs (_("\ - --preserve-context preserve SELinux security context\n\ - -Z set SELinux security context of destination\n\ - file and each created directory to default type\n\ - --context[=CTX] like -Z, or if CTX is specified then set the\n\ - SELinux or SMACK security context to CTX\n\ -"), stdout); - - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + --backup[=CONTROL]\n\ + make a backup of each existing destination file\n\ +")); + oputs (_("\ + -b\n\ + like --backup but does not accept an argument\n\ +")); + oputs (_("\ + -c\n\ + (ignored)\n\ +")); + oputs (_("\ + -C, --compare\n\ + compare content of source and destination files,\n\ + and if no change to content, ownership, and permissions,\n\ + do not modify the destination at all\n\ +")); + oputs (_("\ + -d, --directory\n\ + treat all arguments as directory names;\n\ + create all components of the specified directories\n\ +")); + oputs (_("\ + -D\n\ + create all leading components of DEST except the last,\n\ + or all components of --target-directory,\n\ + then copy SOURCE to DEST\n\ +")); + oputs (_("\ + --debug\n\ + explain how a file is copied. Implies -v\n\ +")); + oputs (_("\ + -g, --group=GROUP\n\ + set group ownership, instead of process' current group\n\ +")); + oputs (_("\ + -m, --mode=MODE\n\ + set permission mode (as in chmod), instead of rwxr-xr-x\n\ +")); + oputs (_("\ + -o, --owner=OWNER\n\ + set ownership (super-user only)\n\ +")); + oputs (_("\ + -p, --preserve-timestamps\n\ + apply access/modification times of SOURCE files\n\ + to corresponding destination files\n\ +")); + oputs (_("\ + -s, --strip\n\ + strip symbol tables\n\ +")); + oputs (_("\ + --strip-program=PROGRAM\n\ + program used to strip binaries\n\ +")); + oputs (_("\ + -S, --suffix=SUFFIX\n\ + override the usual backup suffix\n\ +")); + oputs (_("\ + -t, --target-directory=DIRECTORY\n\ + copy all SOURCE arguments into DIRECTORY\n\ +")); + oputs (_("\ + -T, --no-target-directory\n\ + treat DEST as a normal file\n\ +")); + oputs (_("\ + -v, --verbose\n\ + print the name of each created file or directory\n\ +")); + oputs (_("\ + --preserve-context\n\ + preserve SELinux security context\n\ +")); + oputs (_("\ + -Z\n\ + set SELinux security context of destination file\n\ + and each created directory, to default type\n\ +")); + oputs (_("\ + --context[=CTX]\n\ + like -Z, or if CTX is specified then set the\n\ + SELinux or SMACK security context to CTX\n\ +")); + + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_backup_suffix_note (); emit_ancillary_info (PROGRAM_NAME); } diff --git a/src/join.c b/src/join.c index 46e47037da..0801987239 100644 --- a/src/join.c +++ b/src/join.c @@ -205,37 +205,65 @@ standard output. The default join field is the first, delimited by blanks.\ \n\ When FILE1 or FILE2 (not both) is -, read standard input.\n\ "), stdout); - fputs (_("\ -\n\ - -a FILENUM also print unpairable lines from file FILENUM, where\n\ - FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n\ -"), stdout); - fputs (_("\ - -e STRING replace missing (empty) input fields with STRING;\n\ - I.e., missing fields specified with '-12jo' options\ -\n\ -"), stdout); - fputs (_("\ - -i, --ignore-case ignore differences in case when comparing fields\n\ - -j FIELD equivalent to '-1 FIELD -2 FIELD'\n\ - -o FORMAT obey FORMAT while constructing output line\n\ - -t CHAR use CHAR as input and output field separator\n\ -"), stdout); - fputs (_("\ - -v FILENUM like -a FILENUM, but suppress joined output lines\n\ - -1 FIELD join on this FIELD of file 1\n\ - -2 FIELD join on this FIELD of file 2\n\ - --check-order check that the input is correctly sorted, even\n\ - if all input lines are pairable\n\ - --nocheck-order do not check that the input is correctly sorted\n\ - --header treat the first line in each file as field headers,\n\ - print them without trying to pair them\n\ -"), stdout); - fputs (_("\ - -z, --zero-terminated line delimiter is NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + + oputs (_("\ + -a FILENUM\n\ + also print unpairable lines from file FILENUM,\n\ + where FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n\ +")); + oputs (_("\ + -e STRING\n\ + replace missing (empty) input fields with STRING;\n\ + I.e., missing fields specified with '-12jo' options\n\ +")); + oputs (_("\ + -i, --ignore-case\n\ + ignore differences in case when comparing fields\n\ +")); + oputs (_("\ + -j FIELD\n\ + equivalent to '-1 FIELD -2 FIELD'\n\ +")); + oputs (_("\ + -o FORMAT\n\ + obey FORMAT while constructing output line\n\ +")); + oputs (_("\ + -t CHAR\n\ + use CHAR as input and output field separator\n\ +")); + oputs (_("\ + -v FILENUM\n\ + like -a FILENUM, but suppress joined output lines\n\ +")); + oputs (_("\ + -1 FIELD\n\ + join on this FIELD of file 1\n\ +")); + oputs (_("\ + -2 FIELD\n\ + join on this FIELD of file 2\n\ +")); + oputs (_("\ + --check-order\n\ + check that the input is correctly sorted, even\n\ + if all input lines are pairable\n\ +")); + oputs (_("\ + --nocheck-order\n\ + do not check that the input is correctly sorted\n\ +")); + oputs (_("\ + --header\n\ + treat the first line in each file as field headers,\n\ + print them without trying to pair them\n\ +")); + oputs (_("\ + -z, --zero-terminated\n\ + line delimiter is NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Unless -t CHAR is given, leading blanks separate fields and are ignored,\n\ diff --git a/src/kill.c b/src/kill.c index 742009a255..651f597ce6 100644 --- a/src/kill.c +++ b/src/kill.c @@ -68,14 +68,20 @@ Send signals to processes, or list signals.\n\ emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -s, --signal=SIGNAL, -SIGNAL\n\ - specify the name or number of the signal to be sent\n\ - -l, --list list signal names, or convert signal names to/from numbers\n\ - -t, --table print a table of signal information\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + specify the name or number of the signal to be sent\n\ +")); + oputs (_("\ + -l, --list\n\ + list signal names, or convert signal names to/from numbers\n\ +")); + oputs (_("\ + -t, --table\n\ + print a table of signal information\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\n\ SIGNAL may be a signal name like 'HUP', or a signal number like '1',\n\ or the exit status of a process terminated by a signal.\n\ diff --git a/src/link.c b/src/link.c index 1125084b78..59c3628ec3 100644 --- a/src/link.c +++ b/src/link.c @@ -46,8 +46,8 @@ Usage: %s FILE1 FILE2\n\ fputs (_("Call the link function to create a link named FILE2\ to an existing FILE1.\n\n"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/ln.c b/src/ln.c index 979071bcd8..a68e05e659 100644 --- a/src/ln.c +++ b/src/ln.c @@ -438,32 +438,66 @@ interpreted in relation to its parent directory.\n\ emit_mandatory_arg_note (); - fputs (_("\ - --backup[=CONTROL] make a backup of each existing destination file\n\ - -b like --backup but does not accept an argument\n\ - -d, -F, --directory allow the superuser to attempt to hard link\n\ - directories (this will probably fail due to\n\ - system restrictions, even for the superuser)\n\ - -f, --force remove existing destination files\n\ -"), stdout); - fputs (_("\ - -i, --interactive prompt whether to remove destinations\n\ - -L, --logical dereference TARGETs that are symbolic links\n\ - -n, --no-dereference treat LINK_NAME as a normal file if\n\ - it is a symbolic link to a directory\n\ - -P, --physical make hard links directly to symbolic links\n\ - -r, --relative with -s, create links relative to link location\n\ - -s, --symbolic make symbolic links instead of hard links\n\ -"), stdout); - fputs (_("\ - -S, --suffix=SUFFIX override the usual backup suffix\n\ - -t, --target-directory=DIRECTORY specify the DIRECTORY in which to create\n\ - the links\n\ - -T, --no-target-directory treat LINK_NAME as a normal file always\n\ - -v, --verbose print name of each linked file\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + --backup[=CONTROL]\n\ + make a backup of each existing destination file\n\ +")); + oputs (_("\ + -b\n\ + like --backup but does not accept an argument\n\ +")); + oputs (_("\ + -d, -F, --directory\n\ + allow the superuser to attempt to hard link directories,\n\ + if supported by the system\n\ +")); + oputs (_("\ + -f, --force\n\ + remove existing destination files\n\ +")); + oputs (_("\ + -i, --interactive\n\ + prompt whether to remove destinations\n\ +")); + oputs (_("\ + -L, --logical\n\ + dereference TARGETs that are symbolic links\n\ +")); + oputs (_("\ + -n, --no-dereference\n\ + treat LINK_NAME as a normal file\n\ + if it is a symbolic link to a directory\n\ +")); + oputs (_("\ + -P, --physical\n\ + make hard links directly to symbolic links\n\ +")); + oputs (_("\ + -r, --relative\n\ + with -s, create links relative to link location\n\ +")); + oputs (_("\ + -s, --symbolic\n\ + make symbolic links instead of hard links\n\ +")); + oputs (_("\ + -S, --suffix=SUFFIX\n\ + override the usual backup suffix\n\ +")); + oputs (_("\ + -t, --target-directory=DIRECTORY\n\ + specify the DIRECTORY in which to create the links\n\ +")); + oputs (_("\ + -T, --no-target-directory\n\ + treat LINK_NAME as a normal file always\n\ +")); + oputs (_("\ + -v, --verbose\n\ + print name of each linked file\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_backup_suffix_note (); printf (_("\ \n\ diff --git a/src/logname.c b/src/logname.c index 824a77ace0..31d5e9bcfb 100644 --- a/src/logname.c +++ b/src/logname.c @@ -39,8 +39,8 @@ usage (int status) Print the user's login name.\n\ \n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/mkdir.c b/src/mkdir.c index 38a696eeef..d52a498e75 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -61,20 +61,31 @@ Create the DIRECTORY(ies), if they do not already exist.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n\ - -p, --parents no error if existing, make parent directories as needed,\n\ - with their file modes unaffected by any -m option\n\ - -v, --verbose print a message for each created directory\n\ -"), stdout); - fputs (_("\ - -Z set SELinux security context of each created directory\n\ - to the default type\n\ - --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n\ - or SMACK security context to CTX\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -m, --mode=MODE\n\ + set file mode (as in chmod), not a=rwx - umask\n\ +")); + oputs (_("\ + -p, --parents\n\ + no error if existing, make parent directories as needed,\n\ + with their file modes unaffected by any -m option\n\ +")); + oputs (_("\ + -v, --verbose\n\ + print a message for each created directory\n\ +")); + oputs (_("\ + -Z\n\ + set SELinux security context of each created directory\n\ + to the default type\n\ +")); + oputs (_("\ + --context[=CTX]\n\ + like -Z, or if CTX is specified then set the\n\ + SELinux or SMACK security context to CTX\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/mkfifo.c b/src/mkfifo.c index fc97013e6a..12d9a423ed 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -56,16 +56,21 @@ Create named pipes (FIFOs) with the given NAMEs.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n\ -"), stdout); - fputs (_("\ - -Z set the SELinux security context to default type\n\ - --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n\ - or SMACK security context to CTX\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -m, --mode=MODE\n\ + set file permission bits to MODE, not a=rw - umask\n\ +")); + oputs (_("\ + -Z\n\ + set the SELinux security context to default type\n\ +")); + oputs (_("\ + --context[=CTX]\n\ + like -Z, or if CTX is specified then set the\n\ + SELinux or SMACK security context to CTX\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/mknod.c b/src/mknod.c index 3789300377..59b844fcd5 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -58,16 +58,21 @@ Create the special file NAME of the given TYPE.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n\ -"), stdout); - fputs (_("\ - -Z set the SELinux security context to default type\n\ - --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n\ - or SMACK security context to CTX\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -m, --mode=MODE\n\ + set file permission bits to MODE, not a=rw - umask\n\ +")); + oputs (_("\ + -Z\n\ + set the SELinux security context to default type\n\ +")); + oputs (_("\ + --context[=CTX]\n\ + like -Z, or if CTX is specified then set the\n\ + SELinux or SMACK security context to CTX\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n\ diff --git a/src/mktemp.c b/src/mktemp.c index ce8f5dd951..72523be642 100644 --- a/src/mktemp.c +++ b/src/mktemp.c @@ -72,29 +72,39 @@ If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n\ Files are created u+rw, and directories u+rwx, minus umask restrictions.\n\ "), stdout); fputs ("\n", stdout); - fputs (_("\ - -d, --directory create a directory, not a file\n\ - -u, --dry-run do not create anything; merely print a name (unsafe)\n\ - -q, --quiet suppress diagnostics about file/dir-creation failure\n\ -"), stdout); - fputs (_("\ - --suffix=SUFF append SUFF to TEMPLATE; SUFF must not contain a slash.\n\ - This option is implied if TEMPLATE does not end in X\n\ -"), stdout); - fputs (_("\ - -p DIR, --tmpdir[=DIR] interpret TEMPLATE relative to DIR; if DIR is not\n\ - specified, use $TMPDIR if set, else /tmp. With\n\ - this option, TEMPLATE must not be an absolute name;\n\ - unlike with -t, TEMPLATE may contain slashes, but\n\ - mktemp creates only the final component\n\ -"), stdout); - fputs (_("\ - -t interpret TEMPLATE as a single file name component,\n\ - relative to a directory: $TMPDIR, if set; else the\n\ - directory specified via -p; else /tmp [deprecated]\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -d, --directory\n\ + create a directory, not a file\n\ +")); + oputs (_("\ + -u, --dry-run\n\ + do not create anything; merely print a name (unsafe)\n\ +")); + oputs (_("\ + -q, --quiet\n\ + suppress diagnostics about file/dir-creation failure\n\ +")); + oputs (_("\ + --suffix=SUFF\n\ + append SUFF to TEMPLATE; SUFF must not contain a slash.\n\ + This option is implied if TEMPLATE does not end in X\n\ +")); + oputs (_("\ + -p DIR, --tmpdir[=DIR]\n\ + interpret TEMPLATE relative to DIR;\n\ + if DIR is not specified, use $TMPDIR if set, else /tmp.\n\ + With this option, TEMPLATE must not be an absolute name;\n\ + unlike with -t, TEMPLATE may contain slashes,\n\ + but mktemp creates only the final component\n\ +")); + oputs (_("\ + -t\n\ + interpret TEMPLATE as a single file name component,\n\ + relative to a directory: $TMPDIR, if set;\n\ + else the directory specified via -p; else /tmp [deprecated]\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } diff --git a/src/mv.c b/src/mv.c index ec0347692b..cd6aab473a 100644 --- a/src/mv.c +++ b/src/mv.c @@ -262,45 +262,76 @@ Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n\ emit_mandatory_arg_note (); + oputs (_("\ + --backup[=CONTROL]\n\ + make a backup of each existing destination file\n\ +")); + oputs (_("\ + -b\n\ + like --backup but does not accept an argument\n\ +")); + oputs (_("\ + --debug\n\ + explain how a file is copied. Implies -v\n\ +")); + oputs (_("\ + --exchange\n\ + exchange source and destination\n\ +")); + oputs (_("\ + -f, --force\n\ + do not prompt before overwriting\n\ +")); + oputs (_("\ + -i, --interactive\n\ + prompt before overwrite\n\ +")); + oputs (_("\ + -n, --no-clobber\n\ + do not overwrite an existing file\n\ +")); fputs (_("\ - --backup[=CONTROL] make a backup of each existing destination file\ -\n\ - -b like --backup but does not accept an argument\n\ -"), stdout); - fputs (_("\ - --debug explain how a file is copied. Implies -v\n\ -"), stdout); - fputs (_("\ - --exchange exchange source and destination\n\ -"), stdout); - fputs (_("\ - -f, --force do not prompt before overwriting\n\ - -i, --interactive prompt before overwrite\n\ - -n, --no-clobber do not overwrite an existing file\n\ If you specify more than one of -i, -f, -n, only the final one takes effect.\n\ "), stdout); - fputs (_("\ - --no-copy do not copy if renaming fails\n\ - --strip-trailing-slashes remove any trailing slashes from each SOURCE\n\ - argument\n\ - -S, --suffix=SUFFIX override the usual backup suffix\n\ -"), stdout); - fputs (_("\ - -t, --target-directory=DIRECTORY move all SOURCE arguments into DIRECTORY\n\ - -T, --no-target-directory treat DEST as a normal file\n\ -"), stdout); - fputs (_("\ - --update[=UPDATE] control which existing files are updated;\n\ - UPDATE={all,none,none-fail,older(default)}\n\ - -u equivalent to --update[=older]. See below\n\ -"), stdout); - fputs (_("\ - -v, --verbose explain what is being done\n\ - -Z, --context set SELinux security context of destination\n\ - file to default type\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + --no-copy\n\ + do not copy if renaming fails\n\ +")); + oputs (_("\ + --strip-trailing-slashes\n\ + remove any trailing slashes from each SOURCE argument\n\ +")); + oputs (_("\ + -S, --suffix=SUFFIX\n\ + override the usual backup suffix\n\ +")); + oputs (_("\ + -t, --target-directory=DIRECTORY\n\ + move all SOURCE arguments into DIRECTORY\n\ +")); + oputs (_("\ + -T, --no-target-directory\n\ + treat DEST as a normal file\n\ +")); + oputs (_("\ + --update[=UPDATE]\n\ + control which existing files are updated;\n\ + UPDATE={all,none,none-fail,older(default)}\n\ +")); + oputs (_("\ + -u\n\ + equivalent to --update[=older]. See below\n\ +")); + oputs (_("\ + -v, --verbose\n\ + explain what is being done\n\ +")); + oputs (_("\ + -Z, --context\n\ + set SELinux security context of destination file to default type\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_update_parameters_note (); emit_backup_suffix_note (); emit_ancillary_info (PROGRAM_NAME); diff --git a/src/nice.c b/src/nice.c index 4b4b853619..71ebe2dadd 100644 --- a/src/nice.c +++ b/src/nice.c @@ -79,11 +79,12 @@ With no COMMAND, print the current niceness. Niceness values range from\n\ emit_mandatory_arg_note (); - fputs (_("\ - -n, --adjustment=N add integer N to the niceness (default 10)\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -n, --adjustment=N\n\ + add integer N to the niceness (default 10)\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); emit_exec_status (PROGRAM_NAME); emit_ancillary_info (PROGRAM_NAME); diff --git a/src/nl.c b/src/nl.c index 43967a90a1..805de34911 100644 --- a/src/nl.c +++ b/src/nl.c @@ -185,25 +185,41 @@ Write each FILE to standard output, with line numbers added.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -b, --body-numbering=STYLE use STYLE for numbering body lines\n\ +")); + oputs (_("\ -d, --section-delimiter=CC use CC for logical page delimiters\n\ +")); + oputs (_("\ -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -h, --header-numbering=STYLE use STYLE for numbering header lines\n\ +")); + oputs (_("\ -i, --line-increment=NUMBER line number increment at each line\n\ +")); + oputs (_("\ -l, --join-blank-lines=NUMBER group of NUMBER empty lines counted as one\n\ +")); + oputs (_("\ -n, --number-format=FORMAT insert line numbers according to FORMAT\n\ +")); + oputs (_("\ -p, --no-renumber do not reset line numbers for each section\n\ +")); + oputs (_("\ -s, --number-separator=STRING add STRING after (possible) line number\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -v, --starting-line-number=NUMBER first line number for each section\n\ +")); + oputs (_("\ -w, --number-width=NUMBER use NUMBER columns for line numbers\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Default options are: -bt -d'\\:' -fn -hn -i1 -l1 -n'rn' -s -v1 -w6\n\ diff --git a/src/nohup.c b/src/nohup.c index 666c67ff2c..c711ccd8e1 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -56,8 +56,8 @@ Usage: %s COMMAND [ARG]...\n\ Run COMMAND, ignoring hangup signals.\n\ \n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); printf (_("\n\ If standard input is a terminal, redirect it from an unreadable file.\n\ If standard output is a terminal, append output to 'nohup.out' if possible,\n\ diff --git a/src/nproc.c b/src/nproc.c index 68e9dc6e45..0ff44a6b9a 100644 --- a/src/nproc.c +++ b/src/nproc.c @@ -59,13 +59,17 @@ Print the number of processing units available to the current process,\n\ which may be less than the number of online processors\n\ \n\ "), stdout); - fputs (_("\ - --all print the number of installed processors\n\ - --ignore=N if possible, exclude N processing units\n\ -"), stdout); - - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + --all\n\ + print the number of installed processors\n\ +")); + oputs (_("\ + --ignore=N\n\ + if possible, exclude N processing units\n\ +")); + + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/numfmt.c b/src/numfmt.c index dbb0080270..5484056361 100644 --- a/src/numfmt.c +++ b/src/numfmt.c @@ -922,69 +922,84 @@ Usage: %s [OPTION]... [NUMBER]...\n\ Reformat NUMBER(s), or the numbers from standard input if none are specified.\n\ "), stdout); emit_mandatory_arg_note (); - fputs (_("\ - --debug print warnings about invalid input\n\ -"), stdout); - fputs (_("\ - -d, --delimiter=X use X instead of whitespace for field delimiter\n\ -"), stdout); - fputs (_("\ - --field=FIELDS replace the numbers in these input fields (default=1);\n\ - see FIELDS below\n\ -"), stdout); - fputs (_("\ - --format=FORMAT use printf style floating-point FORMAT;\n\ - see FORMAT below for details\n\ -"), stdout); - fputs (_("\ - --from=UNIT auto-scale input numbers to UNITs; default is 'none';\n\ - see UNIT below\n\ -"), stdout); - fputs (_("\ - --from-unit=N specify the input unit size (instead of the default 1)\n\ -"), stdout); - fputs (_("\ - --grouping use locale-defined grouping of digits, e.g. 1,000,000\n\ - (which means it has no effect in the C/POSIX locale)\n\ -"), stdout); - fputs (_("\ - --header[=N] print (without converting) the first N header lines;\n\ - N defaults to 1 if not specified\n\ -"), stdout); - fputs (_("\ - --invalid=MODE failure mode for invalid numbers: MODE can be:\n\ - abort (default), fail, warn, ignore\n\ -"), stdout); - fputs (_("\ - --padding=N pad the output to N characters; positive N will\n\ - right-align; negative N will left-align;\n\ - padding is ignored if the output is wider than N;\n\ - the default is to automatically pad if a whitespace\n\ - is found\n\ -"), stdout); - fputs (_("\ - --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n\ - up, down, from-zero (default), towards-zero, nearest\n\ -"), stdout); - fputs (_("\ - --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n\ - SUFFIX in input numbers\n\ -"), stdout); - fputs (_("\ - --unit-separator=SEP insert SEP between number and unit on output,\n\ - and accept optional SEP in input numbers\n\ -"), stdout); - fputs (_("\ - --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n\ -"), stdout); - fputs (_("\ - --to-unit=N the output unit size (instead of the default 1)\n\ -"), stdout); - fputs (_("\ - -z, --zero-terminated line delimiter is NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + --debug\n\ + print warnings about invalid input\n\ +")); + oputs (_("\ + -d, --delimiter=X\n\ + use X instead of whitespace for field delimiter\n\ +")); + oputs (_("\ + --field=FIELDS\n\ + replace the numbers in these input fields (default=1);\n\ + see FIELDS below for details\n\ +")); + oputs (_("\ + --format=FORMAT\n\ + use printf style floating-point FORMAT;\n\ + see FORMAT below for details\n\ +")); + oputs (_("\ + --from=UNIT\n\ + auto-scale input numbers to UNITs; default is 'none';\n\ + see UNIT below for details\n\ +")); + oputs (_("\ + --from-unit=N\n\ + specify the input unit size (instead of the default 1)\n\ +")); + oputs (_("\ + --grouping\n\ + use locale-defined grouping of digits, e.g. 1,000,000.\n\ + This has no effect in the C/POSIX locale\n\ +")); + oputs (_("\ + --header[=N]\n\ + print (without converting) the first N header lines;\n\ + N defaults to 1 if not specified\n\ +")); + oputs (_("\ + --invalid=MODE\n\ + failure mode for invalid numbers;\n\ + MODE can be: abort (default), fail, warn, ignore\n\ +")); + oputs (_("\ + --padding=N\n\ + pad the output to N characters;\n\ + positive N will right-align, negative N will left-align;\n\ + padding is ignored if the output is wider than N;\n\ + the default is to automatically pad if a whitespace is found\n\ +")); + oputs (_("\ + --round=METHOD\n\ + use METHOD for rounding when scaling; METHOD can be:\n\ + up, down, from-zero (default), towards-zero, nearest\n\ +")); + oputs (_("\ + --suffix=SUFFIX\n\ + add SUFFIX to output numbers,\n\ + and accept an optional SUFFIX in input numbers\n\ +")); + oputs (_("\ + --unit-separator=SEP\n\ + insert SEP between number and unit on output,\n\ + and accept an optional SEP in input numbers\n\ +")); + oputs (_("\ + --to=UNIT\n\ + auto-scale output numbers to UNITs; see UNIT below\n\ +")); + oputs (_("\ + --to-unit=N\n\ + the output unit size (instead of the default 1)\n\ +")); + oputs (_("\ + -z, --zero-terminated\n\ + line delimiter is NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ diff --git a/src/od.c b/src/od.c index 725fa72781..e749a6b086 100644 --- a/src/od.c +++ b/src/od.c @@ -380,41 +380,82 @@ suffixes may be . for octal and b for multiply by 512.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -A, --address-radix=RADIX output format for file offsets; RADIX is one\n\ - of [doxn], for Decimal, Octal, Hex or None\n\ - --endian={big|little} swap input bytes according the specified order\n\ - -j, --skip-bytes=BYTES skip BYTES input bytes first\n\ -"), stdout); - fputs (_("\ - -N, --read-bytes=BYTES limit dump to BYTES input bytes\n\ - -S BYTES, --strings[=BYTES] show only NUL terminated strings\n\ - of at least BYTES (3) printable characters\n\ - -t, --format=TYPE select output format or formats\n\ - -v, --output-duplicates do not use * to mark line suppression\n\ - -w[BYTES], --width[=BYTES] output BYTES bytes per output line;\n\ - 32 is implied when BYTES is not specified\n\ - --traditional accept arguments in third form above\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -A, --address-radix=RADIX\n\ + output format for file offsets;\n\ + RADIX is one of [doxn], for Decimal, Octal, Hex or None\n\ +")); + oputs (_("\ + --endian={big|little}\n\ + swap input bytes according the specified order\n\ +")); + oputs (_("\ + -j, --skip-bytes=BYTES\n\ + skip BYTES input bytes first\n\ +")); + oputs (_("\ + -N, --read-bytes=BYTES\n\ + limit dump to BYTES input bytes\n\ +")); + oputs (_("\ + -S BYTES, --strings[=BYTES]\n\ + show only NUL terminated strings\n\ + of at least BYTES (default 3) printable characters\n\ +")); + oputs (_("\ + -t, --format=TYPE\n\ + select output format or formats\n\ +")); + oputs (_("\ + -v, --output-duplicates\n\ + do not use * to mark line suppression\n\ +")); + oputs (_("\ + -w[BYTES], --width[=BYTES]\n\ + output BYTES bytes per output line;\n\ + 32 is implied when BYTES is not specified\n\ +")); + oputs (_("\ + --traditional\n\ + accept arguments in third form above\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ \n\ Traditional format specifications may be intermixed; they accumulate:\n\ +"), stdout); + oputs (_("\ -a same as -t a, select named characters, ignoring high-order bit\n\ +")); + oputs (_("\ -b same as -t o1, select octal bytes\n\ +")); + oputs (_("\ -c same as -t c, select printable characters or backslash escapes\n\ +")); + oputs (_("\ -d same as -t u2, select unsigned decimal 2-byte units\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -f same as -t fF, select floats\n\ +")); + oputs (_("\ -i same as -t dI, select decimal ints\n\ +")); + oputs (_("\ -l same as -t dL, select decimal longs\n\ +")); + oputs (_("\ -o same as -t o2, select octal 2-byte units\n\ +")); + oputs (_("\ -s same as -t d2, select decimal 2-byte units\n\ +")); + oputs (_("\ -x same as -t x2, select hexadecimal 2-byte units\n\ -"), stdout); +")); fputs (_("\ \n\ \n\ diff --git a/src/paste.c b/src/paste.c index 8e433be102..e8d32f15c6 100644 --- a/src/paste.c +++ b/src/paste.c @@ -464,23 +464,23 @@ is replaced with a TAB.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -d, --delimiters=LIST\n\ reuse characters from LIST instead of TABs;\n\ backslash escapes are supported\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -s, --serial\n\ paste one file at a time instead of in parallel; the newline of\n\ every line except the last line in each file is replaced with a TAB\ \n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -z, --zero-terminated\n\ line delimiter is NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); /* FIXME: add a couple of examples. */ emit_ancillary_info (PROGRAM_NAME); } diff --git a/src/pathchk.c b/src/pathchk.c index f9a60fe669..7774e04a48 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -88,12 +88,19 @@ usage (int status) fputs (_("\ Diagnose invalid or non-portable file names.\n\ \n\ - -p check for most POSIX systems\n\ - -P check for empty names and leading \"-\"\n\ - --portability check for all POSIX systems (equivalent to -p -P)\n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -p check for most POSIX systems\n\ +")); + oputs (_("\ + -P check for empty names and leading \"-\"\n\ +")); + oputs (_("\ + --portability\n\ + check for all POSIX systems (equivalent to -p -P)\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/pinky.c b/src/pinky.c index bcc936ac8b..4d63011eb1 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -491,24 +491,40 @@ usage (int status) printf (_("Usage: %s [OPTION]... [USER]...\n"), program_name); fputs (_("\ \n\ - -l produce long format output for the specified USERs\n\ - -b omit the user's home directory and shell in long format\n\ - -h omit the user's project file in long format\n\ - -p omit the user's plan file in long format\n\ - -s do short format output, this is the default\n\ "), stdout); - fputs (_("\ - -f omit the line of column headings in short format\n\ - -w omit the user's full name in short format\n\ - -i omit the user's full name and remote host in short format\n\ - -q omit the user's full name, remote host and idle time\n\ - in short format\n\ -"), stdout); - fputs (_("\ - --lookup attempt to canonicalize hostnames via DNS\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -l produce long format output for the specified USERs\n\ +")); + oputs (_("\ + -b omit the user's home directory and shell in long format\n\ +")); + oputs (_("\ + -h omit the user's project file in long format\n\ +")); + oputs (_("\ + -p omit the user's plan file in long format\n\ +")); + oputs (_("\ + -s do short format output, this is the default\n\ +")); + oputs (_("\ + -f omit the line of column headings in short format\n\ +")); + oputs (_("\ + -w omit the user's full name in short format\n\ +")); + oputs (_("\ + -i omit the user's full name and remote host in short format\n\ +")); + oputs (_("\ + -q omit the user's full name, remote host and idle time in short format\n\ +")); + oputs (_("\ + --lookup\n\ + attempt to canonicalize hostnames via DNS\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); printf (_("\ \n\ A lightweight 'finger' program; print user information.\n\ diff --git a/src/pr.c b/src/pr.c index fa395dc9cd..d76a2c39f0 100644 --- a/src/pr.c +++ b/src/pr.c @@ -2776,100 +2776,120 @@ Paginate or columnate FILE(s) for printing.\n\ fputs (_("\ +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n\ - begin [stop] printing with page FIRST_[LAST_]PAGE\n\ + begin [stop] printing with page FIRST_[LAST_]PAGE\n\ -COLUMN, --columns=COLUMN\n\ - output COLUMN columns and print columns down,\n\ - unless -a is used. Balance number of lines in the\n\ - columns on each page\n\ + output COLUMN columns and print columns down, unless -a is used.\n\ + Balance number of lines in the columns on each page\n\ "), stdout); - fputs (_("\ - -a, --across print columns across rather than down, used together\n\ - with -COLUMN\n\ + oputs (_("\ + -a, --across\n\ + print columns across rather than down, used together with -COLUMN\n\ +")); + oputs (_("\ -c, --show-control-chars\n\ - use hat notation (^G) and octal backslash notation\n\ + use hat notation (^G) and octal backslash notation\n\ +")); + oputs (_("\ -d, --double-space\n\ - double space the output\n\ -"), stdout); - fputs (_("\ + double space the output\n\ +")); + oputs (_("\ -D, --date-format=FORMAT\n\ - use FORMAT for the header date\n\ + use FORMAT for the header date\n\ +")); + oputs (_("\ -e[CHAR[WIDTH]], --expand-tabs[=CHAR[WIDTH]]\n\ - expand input CHARs (TABs) to tab WIDTH (8)\n\ + expand input CHARs (TABs) to tab WIDTH (8)\n\ +")); + oputs (_("\ -F, -f, --form-feed\n\ - use form feeds instead of newlines to separate pages\n\ - (by a 3-line page header with -F or a 5-line header\n\ - and trailer without -F)\n\ -"), stdout); - fputs (_("\ + use form feeds instead of newlines to separate pages\n\ + (by a 3-line page header with -F or a 5-line header\n\ + and trailer without -F)\n\ +")); + oputs (_("\ -h, --header=HEADER\n\ - use a centered HEADER instead of filename in page header,\n\ - -h \"\" prints a blank line, don't use -h\"\"\n\ + use a centered HEADER instead of filename in page header,\n\ + -h \"\" prints a blank line, don't use -h\"\"\n\ +")); + oputs (_("\ -i[CHAR[WIDTH]], --output-tabs[=CHAR[WIDTH]]\n\ - replace spaces with CHARs (TABs) to tab WIDTH (8)\n\ + replace spaces with CHARs (TABs) to tab WIDTH (8)\n\ +")); + oputs (_("\ -J, --join-lines merge full lines, turns off -W line truncation, no column\n\ - alignment, --sep-string[=STRING] sets separators\n\ -"), stdout); - fputs (_("\ + alignment, --sep-string[=STRING] sets separators\n\ +")); + oputs (_("\ -l, --length=PAGE_LENGTH\n\ - set the page length to PAGE_LENGTH (66) lines\n\ - (default number of lines of text 56, and with -F 63).\n\ - implies -t if PAGE_LENGTH <= 10\n\ -"), stdout); - fputs (_("\ - -m, --merge print all files in parallel, one in each column,\n\ - truncate lines, but join lines of full length with -J\n\ -"), stdout); - fputs (_("\ + set the page length to PAGE_LENGTH (66) lines\n\ + (default number of lines of text 56, and with -F 63).\n\ + implies -t if PAGE_LENGTH <= 10\n\ +")); + oputs (_("\ + -m, --merge\n\ + print all files in parallel, one in each column,\n\ + truncate lines, but join lines of full length with -J\n\ +")); + oputs (_("\ -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n\ - number lines, use DIGITS (5) digits, then SEP (TAB),\n\ - default counting starts with 1st line of input file\n\ + number lines, use DIGITS (5) digits, then SEP (TAB),\n\ + default counting starts with 1st line of input file\n\ +")); + oputs (_("\ -N, --first-line-number=NUMBER\n\ - start counting with NUMBER at 1st line of first\n\ - page printed (see +FIRST_PAGE)\n\ -"), stdout); - fputs (_("\ + start counting with NUMBER at 1st line of first\n\ + page printed (see +FIRST_PAGE)\n\ +")); + oputs (_("\ -o, --indent=MARGIN\n\ - offset each line with MARGIN (zero) spaces, do not\n\ - affect -w or -W, MARGIN will be added to PAGE_WIDTH\n\ + offset each line with MARGIN (zero) spaces, do not\n\ + affect -w or -W, MARGIN will be added to PAGE_WIDTH\n\ +")); + oputs (_("\ -r, --no-file-warnings\n\ - omit warning when a file cannot be opened\n\ -"), stdout); - fputs (_("\ + omit warning when a file cannot be opened\n\ +")); + oputs (_("\ -s[CHAR], --separator[=CHAR]\n\ - separate columns by a single character, default for CHAR\n\ - is the character without -w and \'no char\' with -w.\ + separate columns by a single character, default for CHAR\n\ + is the character without -w and \'no char\' with -w.\ \n\ - -s[CHAR] turns off line truncation of all 3 column\n\ - options (-COLUMN|-a -COLUMN|-m) except -w is set\n\ -"), stdout); - fputs (_("\ + -s[CHAR] turns off line truncation of all 3 column\n\ + options (-COLUMN|-a -COLUMN|-m) except -w is set\n\ +")); + oputs (_("\ -S[STRING], --sep-string[=STRING]\n\ - separate columns by STRING,\n\ - without -S: Default separator with -J and \n\ - otherwise (same as -S\" \"), no effect on column options\n\ -"), stdout); - fputs (_("\ - -t, --omit-header omit page headers and trailers;\n\ - implied if PAGE_LENGTH <= 10\n\ -"), stdout); - fputs (_("\ + separate columns by STRING,\n\ + without -S: Default separator with -J and \n\ + otherwise (same as -S\" \"), no effect on column options\n\ +")); + oputs (_("\ + -t, --omit-header\n\ + omit page headers and trailers; implied if PAGE_LENGTH <= 10\n\ +")); + oputs (_("\ -T, --omit-pagination\n\ - omit page headers and trailers, eliminate any pagination\n\ - by form feeds set in input files\n\ + omit page headers and trailers,\n\ + eliminate any pagination by form feeds set in input files\n\ +")); + oputs (_("\ -v, --show-nonprinting\n\ - use octal backslash notation\n\ + use octal backslash notation\n\ +")); + oputs (_("\ -w, --width=PAGE_WIDTH\n\ - set page width to PAGE_WIDTH (72) characters for\n\ - multiple text-column output only, -s[char] turns off (72)\n\ -"), stdout); - fputs (_("\ + set page width to PAGE_WIDTH (72) characters for\n\ + multiple text-column output only, -s[char] turns off (72)\n\ +")); + oputs (_("\ -W, --page-width=PAGE_WIDTH\n\ - set page width to PAGE_WIDTH (72) characters always,\n\ - truncate lines, except -J option is set, no interference\n\ - with -S or -s\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + set page width to PAGE_WIDTH (72) characters always,\n\ + truncate lines, except -J option is set,\n\ + no interference with -S or -s\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/printenv.c b/src/printenv.c index 2f2b54b9e8..a808a3313f 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -66,11 +66,12 @@ If no VARIABLE is specified, print name and value pairs for them all.\n\ \n\ "), program_name); - fputs (_("\ - -0, --null end each output line with NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -0, --null\n\ + end each output line with NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); emit_ancillary_info (PROGRAM_NAME); } diff --git a/src/printf.c b/src/printf.c index 7d261ff02d..8894ad27a9 100644 --- a/src/printf.c +++ b/src/printf.c @@ -59,8 +59,8 @@ Usage: %s FORMAT [ARGUMENT]...\n\ Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n\ \n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ FORMAT controls the output as in C printf. Interpreted sequences are:\n\ diff --git a/src/ptx.c b/src/ptx.c index 5b6b30cf5b..8c7d1535af 100644 --- a/src/ptx.c +++ b/src/ptx.c @@ -1680,36 +1680,60 @@ Output a permuted index, including context, of the words in the input files.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -A, --auto-reference output automatically generated references\n\ +")); + oputs (_("\ -G, --traditional behave more like System V 'ptx'\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -F, --flag-truncation=STRING use STRING for flagging line truncations.\n\ The default is '/'\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -M, --macro-name=STRING macro name to use instead of 'xx'\n\ +")); + oputs (_("\ -O, --format=roff generate output as roff directives\n\ +")); + oputs (_("\ -R, --right-side-refs put references at right, not counted in -w\n\ +")); + oputs (_("\ -S, --sentence-regexp=REGEXP for end of lines or end of sentences\n\ +")); + oputs (_("\ -T, --format=tex generate output as TeX directives\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -W, --word-regexp=REGEXP use REGEXP to match each keyword\n\ +")); + oputs (_("\ -b, --break-file=FILE word break characters in this FILE\n\ +")); + oputs (_("\ -f, --ignore-case fold lower case to upper case for sorting\n\ +")); + oputs (_("\ -g, --gap-size=NUMBER gap size in columns between output fields\n\ +")); + oputs (_("\ -i, --ignore-file=FILE read ignore word list from FILE\n\ +")); + oputs (_("\ -o, --only-file=FILE read only word list from this FILE\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -r, --references first field of each line is a reference\n\ +")); + oputs (_("\ -t, --typeset-mode change the default width from 72 to 100\n\ +")); + oputs (_("\ -w, --width=NUMBER output width in columns, reference excluded\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/pwd.c b/src/pwd.c index 5276553e89..4f30d07653 100644 --- a/src/pwd.c +++ b/src/pwd.c @@ -57,14 +57,16 @@ usage (int status) Print the full filename of the current working directory.\n\ \n\ "), stdout); - fputs (_("\ - -L, --logical use PWD from environment, even if it contains symlinks\n\ -"), stdout); - fputs (_("\ - -P, --physical resolve all symlinks\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -L, --logical\n\ + use PWD from environment, even if it contains symlinks\n\ +")); + oputs (_("\ + -P, --physical\n\ + resolve all symlinks\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\n\ If no option is specified, -P is assumed.\n\ "), stdout); diff --git a/src/readlink.c b/src/readlink.c index ea76fb3fbf..3a2d6aaed1 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -61,31 +61,47 @@ usage (int status) printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); fputs (_("Print value of a symbolic link or canonical file name\n\n"), stdout); - fputs (_("\ - -f, --canonicalize canonicalize by following every symlink in\n\ - every component of the given name recursively;\ -\n\ - all but the last component must exist\n\ - -e, --canonicalize-existing canonicalize by following every symlink in\n\ - every component of the given name recursively,\ -\n\ - all components must exist\n\ -"), stdout); - fputs (_("\ - -m, --canonicalize-missing canonicalize by following every symlink in\n\ - every component of the given name recursively,\ -\n\ - without requirements on components existence\n\ - -n, --no-newline do not output the trailing delimiter\n\ + oputs (_("\ + -f, --canonicalize\n\ + canonicalize by following every symlink\n\ + in every component of the given name recursively;\n\ + all but the last component must exist\n\ +")); + oputs (_("\ + -e, --canonicalize-existing\n\ + canonicalize by following every symlink\n\ + in every component of the given name recursively;\n\ + all components must exist\n\ +")); + oputs (_("\ + -m, --canonicalize-missing\n\ + canonicalize by following every symlink\n\ + in every component of the given name recursively,\n\ + without requirements on components existence\n\ +")); + oputs (_("\ + -n, --no-newline\n\ + do not output the trailing delimiter\n\ +")); + oputs (_("\ -q, --quiet\n\ - -s, --silent suppress most error messages (on by default\n\ - if POSIXLY_CORRECT is not set)\n\ - -v, --verbose report error messages (on by default if\n\ - POSIXLY_CORRECT is set)\n\ - -z, --zero end each output line with NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (_("\ + -s, --silent\n\ + suppress most error messages\n\ + (on by default if POSIXLY_CORRECT is not set)\n\ +")); + oputs (_("\ + -v, --verbose\n\ + report error messages\n\ + (on by default if POSIXLY_CORRECT is set)\n\ +")); + oputs (_("\ + -z, --zero\n\ + end each output line with NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/realpath.c b/src/realpath.c index 2a28708bef..8ad0ba68a8 100644 --- a/src/realpath.c +++ b/src/realpath.c @@ -71,22 +71,40 @@ usage (int status) fputs (_("\ Print the resolved absolute file name.\n\ "), stdout); - fputs (_("\ + oputs (_("\ -E, --canonicalize all but the last component must exist (default)\ \n\ +")); + oputs (_("\ -e, --canonicalize-existing all components of the path must exist\n\ +")); + oputs (_("\ -m, --canonicalize-missing no path components need exist or be a directory\ \n\ +")); + oputs (_("\ -L, --logical resolve '..' components before symlinks\n\ +")); + oputs (_("\ -P, --physical resolve symlinks as encountered (default)\n\ +")); + oputs (_("\ -q, --quiet suppress most error messages\n\ +")); + oputs (_("\ --relative-to=DIR print the resolved path relative to DIR\n\ +")); + oputs (_("\ --relative-base=DIR print absolute paths unless paths below DIR\n\ +")); + oputs (_("\ -s, --strip, --no-symlinks don't expand symlinks\n\ +")); + oputs (_("\ -z, --zero end each output line with NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/rm.c b/src/rm.c index 9b06c45926..e85caec5a1 100644 --- a/src/rm.c +++ b/src/rm.c @@ -132,34 +132,56 @@ usage (int status) fputs (_("\ Remove (unlink) the FILE(s).\n\ \n\ - -f, --force ignore nonexistent files and arguments, never prompt\n\ - -i prompt before every removal\n\ "), stdout); - fputs (_("\ - -I prompt once before removing more than three files, or\n\ - when removing recursively; less intrusive than -i,\n\ - while still giving protection against most mistakes\n\ - --interactive[=WHEN] prompt according to WHEN: never, once (-I), or\n\ - always (-i); without WHEN, prompt always\n\ -"), stdout); - fputs (_("\ - --one-file-system when removing a hierarchy recursively, skip any\n\ - directory that is on a file system different from\n\ - that of the corresponding command line argument\n\ -"), stdout); - fputs (_("\ - --no-preserve-root do not treat '/' specially\n\ - --preserve-root[=all] do not remove '/' (default);\n\ - with 'all', reject any command line argument\n\ - on a separate device from its parent\n\ -"), stdout); - fputs (_("\ - -r, -R, --recursive remove directories and their contents recursively\n\ - -d, --dir remove empty directories\n\ - -v, --verbose explain what is being done\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -f, --force\n\ + ignore nonexistent files and arguments, never prompt\n\ +")); + oputs (_("\ + -i\n\ + prompt before every removal\n\ +")); + oputs (_("\ + -I\n\ + prompt once before removing more than three files,\n\ + or when removing recursively; less intrusive than -i,\n\ + while still giving protection against most mistakes\n\ +")); + oputs (_("\ + --interactive[=WHEN]\n\ + prompt according to WHEN: never, once (-I), or always (-i);\n\ + without WHEN, prompt always\n\ +")); + oputs (_("\ + --one-file-system\n\ + when removing a hierarchy recursively,\n\ + skip any directory that is on a file system different\n\ + from that of the corresponding command line argument\n\ +")); + oputs (_("\ + --no-preserve-root\n\ + do not treat '/' specially\n\ +")); + oputs (_("\ + --preserve-root[=all]\n\ + do not remove '/' (default);\n\ + with 'all', reject any command line argument\n\ + on a separate device from its parent\n\ +")); + oputs (_("\ + -r, -R, --recursive\n\ + remove directories and their contents recursively\n\ +")); + oputs (_("\ + -d, --dir\n\ + remove empty directories\n\ +")); + oputs (_("\ + -v, --verbose\n\ + explain what is being done\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ By default, rm does not remove directories. Use the --recursive (-r or -R)\n\ diff --git a/src/rmdir.c b/src/rmdir.c index 60b62861a2..97f5f059a0 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -174,20 +174,21 @@ usage (int status) Remove the DIRECTORY(ies), if they are empty.\n\ \n\ "), stdout); - fputs (_("\ + oputs (_("\ --ignore-fail-on-non-empty\n\ - ignore each failure to remove a non-empty directory\n\ -"), stdout); - fputs (_("\ - -p, --parents remove DIRECTORY and its ancestors;\n\ - e.g., 'rmdir -p a/b' is similar to 'rmdir a/b a'\n\ -\n\ -"), stdout); - fputs (_("\ - -v, --verbose output a diagnostic for every directory processed\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + ignore each failure to remove a non-empty directory\n\ +")); + oputs (_("\ + -p, --parents\n\ + remove DIRECTORY and its ancestors;\n\ + e.g., 'rmdir -p a/b' is similar to 'rmdir a/b a'\n\ +")); + oputs (_("\ + -v, --verbose\n\ + output a diagnostic for every directory processed\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/runcon.c b/src/runcon.c index 9cd2292576..272f4b5309 100644 --- a/src/runcon.c +++ b/src/runcon.c @@ -86,14 +86,24 @@ With neither CONTEXT nor COMMAND, print the current security context.\n\ fputs (_("\ CONTEXT Complete security context\n\ +"), stdout); + oputs (_("\ -c, --compute compute process transition context before modifying\n\ +")); + oputs (_("\ -t, --type=TYPE type (for same role as parent)\n\ +")); + oputs (_("\ -u, --user=USER user identity\n\ +")); + oputs (_("\ -r, --role=ROLE role\n\ +")); + oputs (_("\ -l, --range=RANGE levelrange\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_exec_status (PROGRAM_NAME); emit_ancillary_info (PROGRAM_NAME); } diff --git a/src/seq.c b/src/seq.c index 2d3ff322d9..0ea37b844d 100644 --- a/src/seq.c +++ b/src/seq.c @@ -88,13 +88,20 @@ Print numbers from FIRST to LAST, in steps of INCREMENT.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -f, --format=FORMAT use printf style floating-point FORMAT\n\ - -s, --separator=STRING use STRING to separate numbers (default: \\n)\n\ - -w, --equal-width equalize width by padding with leading zeroes\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -f, --format=FORMAT\n\ + use printf style floating-point FORMAT\n\ +")); + oputs (_("\ + -s, --separator=STRING\n\ + use STRING to separate numbers (default: \\n)\n\ +")); + oputs (_("\ + -w, --equal-width\n\ + equalize width by padding with leading zeroes\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n\ diff --git a/src/shred.c b/src/shred.c index c963e51a1d..38e99720c4 100644 --- a/src/shred.c +++ b/src/shred.c @@ -179,28 +179,45 @@ If FILE is -, shred standard output.\n\ emit_mandatory_arg_note (); - printf (_("\ - -f, --force change permissions to allow writing if necessary\n\ - -n, --iterations=N overwrite N times instead of the default (%d)\n\ - --random-source=FILE get random bytes from FILE\n\ - -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n\ + oputs (_("\ + -f, --force\n\ + change permissions to allow writing if necessary\n\ +")); + oprintf (_("\ + -n, --iterations=N\n\ + overwrite N times instead of the default (%d)\n\ "), DEFAULT_PASSES); - fputs (_("\ - -u deallocate and remove file after overwriting\n\ - --remove[=HOW] like -u but give control on HOW to delete; See below\n\ -"), stdout); - fputs (_("\ - -v, --verbose show details of data and metadata operations performed\n\ -"), stdout); - fputs (_("\ - -x, --exact do not round file sizes up to the next full block;\n\ - this is the default for non-regular files\n\ -"), stdout); - fputs (_("\ - -z, --zero add a final overwrite with zeros to hide shredding\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + --random-source=FILE\n\ + get random bytes from FILE\n\ +")); + oputs (_("\ + -s, --size=N\n\ + shred this many bytes (suffixes like K, M, G accepted)\n\ +")); + oputs (_("\ + -u\n\ + deallocate and remove file after overwriting\n\ +")); + oputs (_("\ + --remove[=HOW]\n\ + like -u but give control on HOW to delete; See below\n\ +")); + oputs (_("\ + -v, --verbose\n\ + show details of data and metadata operations performed\n\ +")); + oputs (_("\ + -x, --exact\n\ + do not round file sizes up to the next full block;\n\ + this is the default for non-regular files\n\ +")); + oputs (_("\ + -z, --zero\n\ + add a final overwrite with zeros to hide shredding\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n\ diff --git a/src/shuf.c b/src/shuf.c index 9a8c558353..f87b85dd0f 100644 --- a/src/shuf.c +++ b/src/shuf.c @@ -66,19 +66,29 @@ Write a random permutation of the input lines to standard output.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -e, --echo treat each ARG as an input line\n\ +")); + oputs (_("\ -i, --input-range=LO-HI treat each number LO through HI as an input line\n\ +")); + oputs (_("\ -n, --head-count=COUNT output at most COUNT lines\n\ +")); + oputs (_("\ -o, --output=FILE write result to FILE instead of standard output\n\ +")); + oputs (_("\ --random-source=FILE get random bytes from FILE\n\ +")); + oputs (_("\ -r, --repeat output lines can be repeated\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -z, --zero-terminated line delimiter is NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } diff --git a/src/sleep.c b/src/sleep.c index eb86de95b1..60996ceca2 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -48,8 +48,8 @@ With multiple arguments, pause for the sum of their values.\n\ \n\ "), program_name, program_name); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/sort.c b/src/sort.c index c5bf44d31c..eaf06d25c6 100644 --- a/src/sort.c +++ b/src/sort.c @@ -433,82 +433,137 @@ Write sorted concatenation of all FILE(s) to standard output.\n\ Ordering options:\n\ \n\ "), stdout); + oputs (_("\ + -b, --ignore-leading-blanks\n\ + ignore leading blanks when finding sort keys in each line\n\ +")); + oputs (_("\ + -d, --dictionary-order\n\ + consider only blanks and alphanumeric characters\n\ +")); + oputs (_("\ + -f, --ignore-case\n\ + fold lower case to upper case characters\n\ +")); + oputs (_("\ + -g, --general-numeric-sort\n\ + compare according to general numerical value\n\ +")); + oputs (_("\ + -i, --ignore-nonprinting\n\ + consider only printable characters\n\ +")); + oputs (_("\ + -M, --month-sort\n\ + compare (unknown) < 'JAN' < ... < 'DEC'\n\ +")); + oputs (_("\ + -h, --human-numeric-sort\n\ + compare human readable numbers (e.g., 2K 1G)\n\ +")); + oputs (_("\ + -n, --numeric-sort\n\ + compare according to string numerical value;\n\ + see full documentation for supported strings\n\ +")); + oputs (_("\ + -R, --random-sort\n\ + shuffle, but group identical keys. See also shuf(1)\n\ +")); + oputs (_("\ + --random-source=FILE\n\ + get random bytes from FILE\n\ +")); + oputs (_("\ + -r, --reverse\n\ + reverse the result of comparisons\n\ +")); + oputs (_("\ + --sort=WORD\n\ + sort according to WORD:\n\ + general-numeric -g, human-numeric -h, month -M,\n\ + numeric -n, random -R, version -V\n\ +")); + oputs (_("\ + -V, --version-sort\n\ + natural sort of (version) numbers within text\n\ +")); fputs (_("\ - -b, --ignore-leading-blanks ignore leading blanks\n\ - -d, --dictionary-order consider only blanks and alphanumeric characters\ \n\ - -f, --ignore-case fold lower case to upper case characters\n\ -"), stdout); - fputs (_("\ - -g, --general-numeric-sort compare according to general numerical value\n\ - -i, --ignore-nonprinting consider only printable characters\n\ - -M, --month-sort compare (unknown) < 'JAN' < ... < 'DEC'\n\ -"), stdout); - fputs (_("\ - -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n\ -"), stdout); - fputs (_("\ - -n, --numeric-sort compare according to string numerical value;\n\ - see full documentation for supported strings\n\ -"), stdout); - fputs (_("\ - -R, --random-sort shuffle, but group identical keys. See shuf(1)\n\ - --random-source=FILE get random bytes from FILE\n\ - -r, --reverse reverse the result of comparisons\n\ -"), stdout); - fputs (_("\ - --sort=WORD sort according to WORD:\n\ - general-numeric -g, human-numeric -h, month -M,\ -\n\ - numeric -n, random -R, version -V\n\ - -V, --version-sort natural sort of (version) numbers within text\n\ -\n\ -"), stdout); - fputs (_("\ Other options:\n\ \n\ "), stdout); - fputs (_("\ - --batch-size=NMERGE merge at most NMERGE inputs at once;\n\ - for more use temp files\n\ -"), stdout); - fputs (_("\ - -c, --check, --check=diagnose-first check for sorted input; do not sort\n\ - -C, --check=quiet, --check=silent like -c, but do not report first bad line\ -\n\ - --compress-program=PROG compress temporaries with PROG;\n\ - decompress them with PROG -d\n\ -"), stdout); - fputs (_("\ - --debug annotate the part of the line used to sort, and\n\ - warn about questionable usage to standard error\n\ - --files0-from=F read input from the files specified by\n\ - NUL-terminated names in file F;\n\ - If F is -, read names from standard input\n\ -"), stdout); - fputs (_("\ - -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n\ - -m, --merge merge already sorted files; do not sort\n\ -"), stdout); - fputs (_("\ - -o, --output=FILE write result to FILE instead of standard output\n\ - -s, --stable stabilize sort by disabling last-resort comparison\ + oputs (_("\ + --batch-size=NMERGE\n\ + merge at most NMERGE inputs at once; for more use temp files\n\ +")); + oputs (_("\ + -c, --check, --check=diagnose-first\n\ + check for sorted input; do not sort\n\ +")); + oputs (_("\ + -C, --check=quiet, --check=silent\n\ + like -c, but do not report first bad line\n\ +")); + oputs (_("\ + --compress-program=PROG\n\ + compress temporaries with PROG; decompress them with PROG -d\n\ +")); + oputs (_("\ + --debug\n\ + annotate the part of the line used to sort,\n\ + and warn about questionable usage to standard error\n\ +")); + oputs (_("\ + --files0-from=F\n\ + read input from the files specified by NUL-terminated names in file F;\ \n\ - -S, --buffer-size=SIZE use SIZE for main memory buffer\n\ -"), stdout); - printf (_("\ - -t, --field-separator=SEP use SEP instead of non-blank to blank transition\n\ - -T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or %s;\n\ - multiple options specify multiple directories\n\ - --parallel=N change the number of sorts run concurrently to N\n\ - -u, --unique output only the first of lines with equal keys;\n\ - with -c, check for strict ordering\n\ + If F is -, read names from standard input\n\ +")); + oputs (_("\ + -k, --key=KEYDEF\n\ + sort via a key; KEYDEF gives location and type\n\ +")); + oputs (_("\ + -m, --merge\n\ + merge already sorted files; do not sort\n\ +")); + oputs (_("\ + -o, --output=FILE\n\ + write result to FILE instead of standard output\n\ +")); + oputs (_("\ + -s, --stable\n\ + stabilize sort by disabling last-resort comparison\n\ +")); + oputs (_("\ + -S, --buffer-size=SIZE\n\ + use SIZE for main memory buffer\n\ +")); + oputs (_("\ + -t, --field-separator=SEP\n\ + use SEP instead of non-blank to blank transition\n\ +")); + oprintf (_("\ + -T, --temporary-directory=DIR\n\ + use DIR for temporaries, not $TMPDIR or %s;\n\ + multiple options specify multiple directories\n\ "), DEFAULT_TMPDIR); - fputs (_("\ - -z, --zero-terminated line delimiter is NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + --parallel=N\n\ + change the number of sorts run concurrently to N\n\ +")); + oputs (_("\ + -u, --unique\n\ + output only the first of lines with equal keys;\n\ + with -c, check for strict ordering\n\ +")); + oputs (_("\ + -z, --zero-terminated\n\ + line delimiter is NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is a\n\ diff --git a/src/split.c b/src/split.c index 9878c09f38..aca6432dd2 100644 --- a/src/split.c +++ b/src/split.c @@ -234,30 +234,69 @@ default size is 1000 lines, and default PREFIX is 'x'.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fprintf (stdout, _("\ - -a, --suffix-length=N generate suffixes of length N (default %d)\n\ - --additional-suffix=SUFFIX append an additional SUFFIX to file names\n\ - -b, --bytes=SIZE put SIZE bytes per output file\n\ - -C, --line-bytes=SIZE put at most SIZE bytes of records per output file\n\ - -d use numeric suffixes starting at 0, not alphabetic\n\ - --numeric-suffixes[=FROM] same as -d, but allow setting the start value\ -\n\ - -x use hex suffixes starting at 0, not alphabetic\n\ - --hex-suffixes[=FROM] same as -x, but allow setting the start value\n\ - -e, --elide-empty-files do not generate empty output files with '-n'\n\ - --filter=COMMAND write to shell COMMAND; file name is $FILE\n\ - -l, --lines=NUMBER put NUMBER lines/records per output file\n\ - -n, --number=CHUNKS generate CHUNKS output files; see explanation below\n\ - -t, --separator=SEP use SEP instead of newline as the record separator;\n\ - '\\0' (zero) specifies the NUL character\n\ - -u, --unbuffered immediately copy input to output with '-n r/...'\n\ + oprintf (_("\ + -a, --suffix-length=N\n\ + generate suffixes of length N (default %d)\n\ "), DEFAULT_SUFFIX_LENGTH); - fputs (_("\ - --verbose print a diagnostic just before each\n\ - output file is opened\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + --additional-suffix=SUFFIX\n\ + append an additional SUFFIX to file names\n\ +")); + oputs (_("\ + -b, --bytes=SIZE\n\ + put SIZE bytes per output file\n\ +")); + oputs (_("\ + -C, --line-bytes=SIZE\n\ + put at most SIZE bytes of records per output file\n\ +")); + oputs (_("\ + -d\n\ + use numeric suffixes starting at 0, not alphabetic\n\ +")); + oputs (_("\ + --numeric-suffixes[=FROM]\n\ + same as -d, but allow setting the start value\n\ +")); + oputs (_("\ + -x\n\ + use hex suffixes starting at 0, not alphabetic\n\ +")); + oputs (_("\ + --hex-suffixes[=FROM]\n\ + same as -x, but allow setting the start value\n\ +")); + oputs (_("\ + -e, --elide-empty-files\n\ + do not generate empty output files with '-n'\n\ +")); + oputs (_("\ + --filter=COMMAND\n\ + write to shell COMMAND; file name is $FILE\n\ +")); + oputs (_("\ + -l, --lines=NUMBER\n\ + put NUMBER lines/records per output file\n\ +")); + oputs (_("\ + -n, --number=CHUNKS\n\ + generate CHUNKS output files; see explanation below\n\ +")); + oputs (_("\ + -t, --separator=SEP\n\ + use SEP instead of newline as the record separator;\n\ + '\\0' (zero) specifies the NUL character\n\ +")); + oputs (_("\ + -u, --unbuffered\n\ + immediately copy input to output with '-n r/...'\n\ +")); + oputs (_("\ + --verbose\n\ + print a diagnostic just before each output file is opened\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_size_note (); fputs (_("\n\ CHUNKS may be:\n\ diff --git a/src/stat.c b/src/stat.c index 5c265f903e..fcca0a769a 100644 --- a/src/stat.c +++ b/src/stat.c @@ -1757,24 +1757,36 @@ Display file or file system status.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -L, --dereference follow links\n\ - -f, --file-system display file system status instead of file status\n\ -"), stdout); - fputs (_("\ - --cached=MODE specify how to use cached attributes;\n\ - useful on remote file systems. See MODE below\n\ -"), stdout); - fputs (_("\ - -c --format=FORMAT use the specified FORMAT instead of the default;\n\ - output a newline after each use of FORMAT\n\ - --printf=FORMAT like --format, but interpret backslash escapes,\n\ - and do not output a mandatory trailing newline;\n\ - if you want a newline, include \\n in FORMAT\n\ - -t, --terse print the information in terse form\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -L, --dereference\n\ + follow links\n\ +")); + oputs (_("\ + -f, --file-system\n\ + display file system status instead of file status\n\ +")); + oputs (_("\ + --cached=MODE\n\ + specify how to use cached attributes;\n\ + useful on remote file systems. See MODE below\n\ +")); + oputs (_("\ + -c --format=FORMAT\n\ + use the specified FORMAT instead of the default;\n\ + output a newline after each use of FORMAT\n\ +")); + oputs (_("\ + --printf=FORMAT\n\ + like --format, but interpret backslash escapes,\n\ + and do not output a mandatory trailing newline;\n\ + if you want a newline, include \\n in FORMAT\n\ +")); + oputs (_("\ + -t, --terse\n\ + print the information in terse form\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\n\ The MODE argument of --cached can be: always, never, or default.\n\ diff --git a/src/stdbuf.c b/src/stdbuf.c index 7e0a43912b..ff19c60562 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -94,13 +94,17 @@ Run COMMAND, with modified buffering operations for its standard streams.\n\ emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -i, --input=MODE adjust standard input stream buffering\n\ +")); + oputs (_("\ -o, --output=MODE adjust standard output stream buffering\n\ +")); + oputs (_("\ -e, --error=MODE adjust standard error stream buffering\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\n\ If MODE is 'L' the corresponding stream will be line buffered.\n\ This option is invalid with standard input.\n"), stdout); diff --git a/src/stty.c b/src/stty.c index 3e5c306ab6..d2de216980 100644 --- a/src/stty.c +++ b/src/stty.c @@ -551,13 +551,17 @@ Print or change terminal characteristics.\n\ emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -a, --all print all current settings in human-readable form\n\ +")); + oputs (_("\ -g, --save print all current settings in a stty-readable form\n\ +")); + oputs (_("\ -F, --file=DEVICE open and use DEVICE instead of standard input\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ Optional - before SETTING indicates negation. An * marks non-POSIX\n\ diff --git a/src/sync.c b/src/sync.c index a74bd86f6c..5f94d643f5 100644 --- a/src/sync.c +++ b/src/sync.c @@ -67,15 +67,14 @@ or their containing file systems.\n\ \n\ "), stdout); - fputs (_("\ + oputs (_("\ -d, --data sync only file data, no unneeded metadata\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -f, --file-system sync the file systems that contain the files\n\ -"), stdout); - - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/tac.c b/src/tac.c index 635dd909d5..161a5ea4ee 100644 --- a/src/tac.c +++ b/src/tac.c @@ -126,13 +126,17 @@ Write each FILE to standard output, last line first.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -b, --before attach the separator before instead of after\n\ +")); + oputs (_("\ -r, --regex interpret the separator as a regular expression\n\ +")); + oputs (_("\ -s, --separator=STRING use STRING as the separator instead of newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\n\ Non-seekable input is buffered to $TMPDIR, defaulting to /tmp.\n\ "), stdout); diff --git a/src/tail.c b/src/tail.c index 75463c43b0..e549f5df02 100644 --- a/src/tail.c +++ b/src/tail.c @@ -292,53 +292,67 @@ With more than one FILE, precede each with a header giving the file name.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ - -c, --bytes=[+]NUM output the last NUM bytes; or use -c +NUM to\n\ - output starting with byte NUM of each file\n\ -"), stdout); - fputs (_("\ - --debug indicate which --follow implementation is used\n\ -"), stdout); - fputs (_("\ + oputs (_("\ + -c, --bytes=[+]NUM\n\ + output the last NUM bytes;\n\ + or use -c +NUM to output starting with byte NUM of each file\n\ +")); + oputs (_("\ + --debug\n\ + indicate which --follow implementation is used\n\ +")); + oputs (_("\ -f, --follow[={name|descriptor}]\n\ - output appended data as the file grows;\n\ - an absent option argument means 'descriptor'\n\ - -F same as --follow=name --retry\n\ -"), stdout); - printf (_("\ - -n, --lines=[+]NUM output the last NUM lines, instead of the last %d;\n\ - or use -n +NUM to skip NUM-1 lines at the start\n\ -"), - DEFAULT_N_LINES - ); - printf (_("\ + output appended data as the file grows;\n\ + an absent option argument means 'descriptor'\n\ +")); + oputs (_("\ + -F\n\ + same as --follow=name --retry\n\ +")); + oprintf (_("\ + -n, --lines=[+]NUM\n\ + output the last NUM lines, instead of the last %d;\n\ + or use -n +NUM to skip NUM-1 lines at the start\n\ +"), DEFAULT_N_LINES); + oprintf (_("\ --max-unchanged-stats=N\n\ - with --follow=name, reopen a FILE which has not\n\ - changed size after N (default %d) iterations\n\ - to see if it has been unlinked or renamed\n\ - (this is the usual case of rotated log files);\n\ - with inotify, this option is rarely useful\n\ -"), - DEFAULT_MAX_N_UNCHANGED_STATS_BETWEEN_OPENS - ); - fputs (_("\ - --pid=PID with -f, exit after PID no longer exists;\n\ - can be repeated to watch multiple processes\n\ - -q, --quiet, --silent never output headers giving file names\n\ - --retry keep trying to open a file if it is inaccessible\n\ -"), stdout); - fputs (_("\ - -s, --sleep-interval=N with -f, sleep for approximately N seconds\n\ - (default 1.0) between iterations;\n\ - with inotify and --pid=P, check process P at\n\ - least once every N seconds\n\ - -v, --verbose always output headers giving file names\n\ -"), stdout); - fputs (_("\ - -z, --zero-terminated line delimiter is NUL, not newline\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + with --follow=name, reopen a FILE which has not\n\ + changed size after N (default %d) iterations\n\ + to see if it has been unlinked or renamed\n\ + (this is the usual case of rotated log files);\n\ + with inotify, this option is rarely useful\n\ +"), DEFAULT_MAX_N_UNCHANGED_STATS_BETWEEN_OPENS); + oputs (_("\ + --pid=PID\n\ + with -f, exit after PID no longer exists;\n\ + can be repeated to watch multiple processes\n\ +")); + oputs (_("\ + -q, --quiet, --silent\n\ + never output headers giving file names\n\ +")); + oputs (_("\ + --retry\n\ + keep trying to open a file if it is inaccessible\n\ +")); + oputs (_("\ + -s, --sleep-interval=N\n\ + with -f, sleep for approximately N seconds\n\ + (default 1.0) between iterations;\n\ + with inotify and --pid=P,\n\ + check process P at least once every N seconds\n\ +")); + oputs (_("\ + -v, --verbose\n\ + always output headers giving file names\n\ +")); + oputs (_("\ + -z, --zero-terminated\n\ + line delimiter is NUL, not newline\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ NUM may have a multiplier suffix:\n\ diff --git a/src/tee.c b/src/tee.c index a647954b28..3adbe1804c 100644 --- a/src/tee.c +++ b/src/tee.c @@ -88,15 +88,25 @@ usage (int status) fputs (_("\ Copy standard input to each FILE, and also to standard output.\n\ \n\ - -a, --append append to the given FILEs, do not overwrite\n\ - -i, --ignore-interrupts ignore interrupt signals\n\ "), stdout); - fputs (_("\ - -p operate in a more appropriate MODE with pipes\n\ - --output-error[=MODE] set behavior on write error. See MODE below\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -a, --append\n\ + append to the given FILEs, do not overwrite\n\ +")); + oputs (_("\ + -i, --ignore-interrupts\n\ + ignore interrupt signals\n\ +")); + oputs (_("\ + -p\n\ + operate in a more appropriate MODE with pipes\n\ +")); + oputs (_("\ + --output-error[=MODE]\n\ + set behavior on write error. See MODE below\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ MODE determines behavior with write errors on the outputs:\n\ diff --git a/src/test.c b/src/test.c index c540c62faa..088172ed33 100644 --- a/src/test.c +++ b/src/test.c @@ -675,8 +675,8 @@ Usage: test EXPRESSION\n\ Exit with the status determined by EXPRESSION.\n\ \n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ An omitted EXPRESSION defaults to false. Otherwise,\n\ @@ -691,9 +691,17 @@ EXPRESSION is true or false and sets exit status. It is one of:\n\ "), stdout); fputs (_("\ \n\ +"), stdout); + oputs (_("\ -n STRING the length of STRING is nonzero\n\ +")); + fputs (_("\ STRING equivalent to -n STRING\n\ +"), stdout); + oputs (_("\ -z STRING the length of STRING is zero\n\ +")); + fputs (_("\ STRING1 = STRING2 the strings are equal\n\ STRING1 != STRING2 the strings are not equal\n\ STRING1 > STRING2 STRING1 is greater than STRING2 in the current locale\n\ @@ -701,48 +709,100 @@ EXPRESSION is true or false and sets exit status. It is one of:\n\ "), stdout); fputs (_("\ \n\ +"), stdout); + oputs (_("\ INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n\ +")); + oputs (_("\ INTEGER1 -ge INTEGER2 INTEGER1 is greater than or equal to INTEGER2\n\ +")); + oputs (_("\ INTEGER1 -gt INTEGER2 INTEGER1 is greater than INTEGER2\n\ +")); + oputs (_("\ INTEGER1 -le INTEGER2 INTEGER1 is less than or equal to INTEGER2\n\ +")); + oputs (_("\ INTEGER1 -lt INTEGER2 INTEGER1 is less than INTEGER2\n\ +")); + oputs (_("\ INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n\ -"), stdout); +")); fputs (_("\ \n\ +"), stdout); + oputs (_("\ FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n\ +")); + oputs (_("\ FILE1 -nt FILE2 FILE1 is newer (modification date) than FILE2\n\ +")); + oputs (_("\ FILE1 -ot FILE2 FILE1 is older than FILE2\n\ -"), stdout); +")); fputs (_("\ \n\ +"), stdout); + oputs (_("\ -b FILE FILE exists and is block special\n\ +")); + oputs (_("\ -c FILE FILE exists and is character special\n\ +")); + oputs (_("\ -d FILE FILE exists and is a directory\n\ +")); + oputs (_("\ -e FILE FILE exists\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -f FILE FILE exists and is a regular file\n\ +")); + oputs (_("\ -g FILE FILE exists and is set-group-ID\n\ +")); + oputs (_("\ -G FILE FILE exists and is owned by the effective group ID\n\ +")); + oputs (_("\ -h FILE FILE exists and is a symbolic link (same as -L)\n\ +")); + oputs (_("\ -k FILE FILE exists and has its sticky bit set\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -L FILE FILE exists and is a symbolic link (same as -h)\n\ +")); + oputs (_("\ -N FILE FILE exists and has been modified since it was last read\n\ +")); + oputs (_("\ -O FILE FILE exists and is owned by the effective user ID\n\ +")); + oputs (_("\ -p FILE FILE exists and is a named pipe\n\ +")); + oputs (_("\ -r FILE FILE exists and the user has read access\n\ +")); + oputs (_("\ -s FILE FILE exists and has a size greater than zero\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -S FILE FILE exists and is a socket\n\ +")); + oputs (_("\ -t FD file descriptor FD is opened on a terminal\n\ +")); + oputs (_("\ -u FILE FILE exists and its set-user-ID bit is set\n\ +")); + oputs (_("\ -w FILE FILE exists and the user has write access\n\ +")); + oputs (_("\ -x FILE FILE exists and the user has execute (or search) access\n\ -"), stdout); +")); fputs (_("\ \n\ Except for -h and -L, all FILE-related tests dereference symbolic links.\n\ diff --git a/src/timeout.c b/src/timeout.c index 41e67ce71f..65dedb7fe0 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -276,34 +276,35 @@ Start COMMAND, and kill it if still running after DURATION.\n\ emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -f, --foreground\n\ - when not running timeout directly from a shell prompt,\n\ - allow COMMAND to read from the TTY and get TTY signals;\n\ - in this mode, children of COMMAND will not be timed out\n\ -"), stdout); - fputs (_("\ + when not running timeout directly from a shell prompt,\n\ + allow COMMAND to read from the TTY and get TTY signals;\n\ + in this mode, children of COMMAND will not be timed out\n\ +")); + oputs (_("\ -k, --kill-after=DURATION\n\ - also send a KILL signal if COMMAND is still running\n\ - this long after the initial signal was sent\n\ -"), stdout); - fputs (_("\ + also send a KILL signal if COMMAND is still running\n\ + this long after the initial signal was sent\n\ +")); + oputs (_("\ -p, --preserve-status\n\ - exit with the same status as COMMAND,\n\ - even when the command times out\n\ -"), stdout); - fputs (_("\ + exit with the same status as COMMAND,\n\ + even when the command times out\n\ +")); + oputs (_("\ -s, --signal=SIGNAL\n\ - specify the signal to be sent on timeout;\n\ - SIGNAL may be a name like 'HUP' or a number;\n\ - see 'kill -l' for a list of signals\n\ -"), stdout); - fputs (_("\ - -v, --verbose diagnose to standard error any signal sent upon timeout\n\ -"), stdout); - - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + specify the signal to be sent on timeout;\n\ + SIGNAL may be a name like 'HUP' or a number;\n\ + see 'kill -l' for a list of signals\n\ +")); + oputs (_("\ + -v, --verbose\n\ + diagnose to standard error any signal sent upon timeout\n\ +")); + + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\n\ DURATION is a floating point number with an optional suffix:\n\ diff --git a/src/touch.c b/src/touch.c index 3090340c07..d92a77a171 100644 --- a/src/touch.c +++ b/src/touch.c @@ -226,30 +226,48 @@ change the times of the file associated with standard output.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -a change only the access time\n\ - -c, --no-create do not create any files\n\ - -d, --date=STRING parse STRING and use it instead of current time\n\ - -f (ignored)\n\ -"), stdout); - fputs (_("\ - -h, --no-dereference affect each symbolic link instead of any referenced\n\ - file (useful only on systems that can change the\n\ - timestamps of a symlink)\n\ - -m change only the modification time\n\ -"), stdout); - fputs (_("\ - -r, --reference=FILE use this file's times instead of current time\n\ - -t [[CC]YY]MMDDhhmm[.ss] use specified time instead of current time,\n\ - with a date-time format that differs from -d's\n\ -"), stdout); - fputs (_("\ - --time=WORD specify which time to change:\n\ - access time (-a): 'access', 'atime', 'use';\n\ - modification time (-m): 'modify', 'mtime'\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -a\n\ + change only the access time\n\ +")); + oputs (_("\ + -c, --no-create\n\ + do not create any files\n\ +")); + oputs (_("\ + -d, --date=STRING\n\ + parse STRING and use it instead of current time\n\ +")); + oputs (_("\ + -f\n\ + (ignored)\n\ +")); + oputs (_("\ + -h, --no-dereference\n\ + affect each symbolic link instead of any referenced file;\n\ + useful only on systems that can change the timestamps of a symlink\n\ +")); + oputs (_("\ + -m\n\ + change only the modification time\n\ +")); + oputs (_("\ + -r, --reference=FILE\n\ + use this file's times instead of current time\n\ +")); + oputs (_("\ + -t [[CC]YY]MMDDhhmm[.ss]\n\ + use specified time instead of current time,\n\ + with a date-time format that differs from -d's\n\ +")); + oputs (_("\ + --time=WORD\n\ + specify which time to change:\n\ + access time (-a): 'access', 'atime', 'use';\n\ + modification time (-m): 'modify', 'mtime'\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/tr.c b/src/tr.c index 72ffffc771..df3904f4c7 100644 --- a/src/tr.c +++ b/src/tr.c @@ -291,15 +291,27 @@ Translate, squeeze, and/or delete characters from standard input,\n\ writing to standard output. STRING1 and STRING2 specify arrays of\n\ characters ARRAY1 and ARRAY2 that control the action.\n\ \n\ - -c, -C, --complement use the complement of ARRAY1\n\ - -d, --delete delete characters in ARRAY1, do not translate\n\ - -s, --squeeze-repeats replace each sequence of a repeated character\n\ - that is listed in the last specified ARRAY,\n\ - with a single occurrence of that character\n\ - -t, --truncate-set1 first truncate ARRAY1 to length of ARRAY2\n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -c, -C, --complement\n\ + use the complement of ARRAY1\n\ +")); + oputs (_("\ + -d, --delete\n\ + delete characters in ARRAY1, do not translate\n\ +")); + oputs (_("\ + -s, --squeeze-repeats\n\ + replace each sequence of a repeated character\n\ + that is listed in the last specified ARRAY,\n\ + with a single occurrence of that character\n\ +")); + oputs (_("\ + -t, --truncate-set1\n\ + first truncate ARRAY1 to length of ARRAY2\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ ARRAYs are specified as strings of characters. Most represent themselves.\n\ diff --git a/src/true.c b/src/true.c index f5d71bb6b9..6603177f4c 100644 --- a/src/true.c +++ b/src/true.c @@ -44,8 +44,8 @@ Usage: %s [ignored command line arguments]\n\ _(EXIT_STATUS == EXIT_SUCCESS ? N_("Exit with a status code indicating success.") : N_("Exit with a status code indicating failure."))); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); emit_ancillary_info (PROGRAM_NAME); exit (status); diff --git a/src/truncate.c b/src/truncate.c index 43134c921a..77133382ef 100644 --- a/src/truncate.c +++ b/src/truncate.c @@ -78,17 +78,20 @@ reads as zero bytes.\n\ emit_mandatory_arg_note (); - fputs (_("\ + oputs (_("\ -c, --no-create do not create any files\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -r, --reference=RFILE base size on RFILE\n\ - -s, --size=SIZE set or adjust the file size by SIZE bytes\n"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (_("\ + -s, --size=SIZE set or adjust the file size by SIZE bytes\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_size_note (); fputs (_("\n\ SIZE may also be prefixed by one of the following modifying characters:\n\ diff --git a/src/tsort.c b/src/tsort.c index f73529e802..6ac4589242 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -88,8 +88,8 @@ Write totally ordered list consistent with the partial ordering in FILE.\n\ fputs (_("\ \n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } diff --git a/src/tty.c b/src/tty.c index ae002f4475..24c98f75cd 100644 --- a/src/tty.c +++ b/src/tty.c @@ -66,10 +66,13 @@ usage (int status) fputs (_("\ Print the file name of the terminal connected to standard input.\n\ \n\ - -s, --silent, --quiet print nothing, only return an exit status\n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -s, --silent, --quiet\n\ + print nothing, only return an exit status\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/uname.c b/src/uname.c index 09495ad9b4..5f7a35dd6e 100644 --- a/src/uname.c +++ b/src/uname.c @@ -118,19 +118,35 @@ usage (int status) fputs (_("\ Print certain system information. With no OPTION, same as -s.\n\ \n\ +"), stdout); + oputs (_("\ -a, --all print all information, in the following order,\n\ - except omit -p and -i if unknown:\n\ + except omit -p and -i if unknown\n\ +")); + oputs (_("\ -s, --kernel-name print the kernel name\n\ +")); + oputs (_("\ -n, --nodename print the network node hostname\n\ +")); + oputs (_("\ -r, --kernel-release print the kernel release\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -v, --kernel-version print the kernel version\n\ +")); + oputs (_("\ -m, --machine print the machine hardware name\n\ +")); + oputs (_("\ -p, --processor print the processor type (non-portable)\n\ +")); + oputs (_("\ -i, --hardware-platform print the hardware platform (non-portable)\n\ +")); + oputs (_("\ -o, --operating-system print the operating system\n\ -"), stdout); +")); } else { @@ -140,8 +156,8 @@ Print machine architecture.\n\ "), stdout); } - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/unexpand.c b/src/unexpand.c index d7954bbb61..b92a9517a1 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -83,14 +83,21 @@ Convert blanks in each FILE to tabs, writing to standard output.\n\ emit_stdin_note (); emit_mandatory_arg_note (); - fputs (_("\ - -a, --all convert all blanks, instead of just initial blanks\n\ - --first-only convert only leading sequences of blanks (overrides -a)\n\ - -t, --tabs=N have tabs N characters apart instead of 8 (enables -a)\n\ -"), stdout); - emit_tab_list_info (); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -a, --all\n\ + convert all blanks, instead of just initial blanks\n\ +")); + oputs (_("\ + --first-only\n\ + convert only leading sequences of blanks (overrides -a)\n\ +")); + oputs (_("\ + -t, --tabs=N\n\ + have tabs N characters apart instead of 8 (enables -a)\n\ +")); + emit_tab_list_info (PROGRAM_NAME); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/uniq.c b/src/uniq.c index ab6238878c..eebff4b7b2 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -168,36 +168,54 @@ With no options, matching lines are merged to the first occurrence.\n\ emit_mandatory_arg_note (); - fputs (_("\ - -c, --count prefix lines by the number of occurrences\n\ - -d, --repeated only print duplicate lines, one for each group\n\ -"), stdout); - fputs (_("\ - -D print all duplicate lines\n\ - --all-repeated[=METHOD] like -D, but allow separating groups\n\ - with an empty line;\n\ - METHOD={none(default),prepend,separate}\n\ -"), stdout); - fputs (_("\ - -f, --skip-fields=N avoid comparing the first N fields\n\ -"), stdout); - fputs (_("\ - --group[=METHOD] show all items, separating groups with an empty line;\n\ - METHOD={separate(default),prepend,append,both}\n\ -"), stdout); - fputs (_("\ - -i, --ignore-case ignore differences in case when comparing\n\ - -s, --skip-chars=N avoid comparing the first N characters\n\ - -u, --unique only print unique lines\n\ -"), stdout); - fputs (_("\ - -z, --zero-terminated line delimiter is NUL, not newline\n\ -"), stdout); - fputs (_("\ - -w, --check-chars=N compare no more than N characters in lines\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -c, --count\n\ + prefix lines by the number of occurrences\n\ +")); + oputs (_("\ + -d, --repeated\n\ + only print duplicate lines, one for each group\n\ +")); + oputs (_("\ + -D\n\ + print all duplicate lines\n\ +")); + oputs (_("\ + --all-repeated[=METHOD]\n\ + like -D, but allow separating groups with an empty line;\n\ + METHOD={none(default),prepend,separate}\n\ +")); + oputs (_("\ + -f, --skip-fields=N\n\ + avoid comparing the first N fields\n\ +")); + oputs (_("\ + --group[=METHOD]\n\ + show all items, separating groups with an empty line;\n\ + METHOD={separate(default),prepend,append,both}\n\ +")); + oputs (_("\ + -i, --ignore-case\n\ + ignore differences in case when comparing\n\ +")); + oputs (_("\ + -s, --skip-chars=N\n\ + avoid comparing the first N characters\n\ +")); + oputs (_("\ + -u, --unique\n\ + only print unique lines\n\ +")); + oputs (_("\ + -z, --zero-terminated\n\ + line delimiter is NUL, not newline\n\ +")); + oputs (_("\ + -w, --check-chars=N\n\ + compare no more than N characters in lines\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); fputs (_("\ \n\ A field is a run of blanks (usually spaces and/or TABs), then non-blank\n\ diff --git a/src/unlink.c b/src/unlink.c index 0d1b0f6ea4..a0ea98704c 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -45,8 +45,8 @@ Usage: %s FILE\n\ or: %s OPTION\n"), program_name, program_name); fputs (_("Call the unlink function to remove the specified FILE.\n\n"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/uptime.c b/src/uptime.c index a52b9567dc..4de00a8cb8 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -166,8 +166,8 @@ an uninterruptible sleep state also contribute to the load average.\n")); If FILE is not specified, use %s. %s as FILE is common.\n\ \n"), UTMP_FILE, WTMP_FILE); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/users.c b/src/users.c index 4267126b8b..b563f37428 100644 --- a/src/users.c +++ b/src/users.c @@ -106,8 +106,8 @@ If FILE is not specified, use %s. %s as FILE is common.\n\ \n\ "), UTMP_FILE, WTMP_FILE); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/wc.c b/src/wc.c index a1c7ca872d..76f8d21a48 100644 --- a/src/wc.c +++ b/src/wc.c @@ -183,26 +183,44 @@ space delimited by white space characters or by start or end of input.\n\ \n\ The options below may be used to select which counts are printed, always in\n\ the following order: newline, word, character, byte, maximum line length.\n\ - -c, --bytes print the byte counts\n\ - -m, --chars print the character counts\n\ - -l, --lines print the newline counts\n\ "), stdout); - fputs (_("\ - --debug indicate what line count acceleration is used\n\ -"), stdout); - fputs (_("\ - --files0-from=F read input from the files specified by\n\ - NUL-terminated names in file F;\n\ - If F is -, read names from standard input\n\ - -L, --max-line-length print the maximum display width\n\ - -w, --words print the word counts\n\ -"), stdout); - fputs (_("\ - --total=WHEN when to print a line with total counts;\n\ - WHEN can be: auto, always, only, never\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (_("\ + -c, --bytes\n\ + print the byte counts\n\ +")); + oputs (_("\ + -m, --chars\n\ + print the character counts\n\ +")); + oputs (_("\ + -l, --lines\n\ + print the newline counts\n\ +")); + oputs (_("\ + --debug\n\ + indicate what line count acceleration is used\n\ +")); + oputs (_("\ + --files0-from=F\n\ + read input from the files specified by\n\ + NUL-terminated names in file F;\n\ + If F is -, read names from standard input\n\ +")); + oputs (_("\ + -L, --max-line-length\n\ + print the maximum display width\n\ +")); + oputs (_("\ + -w, --words\n\ + print the word counts\n\ +")); + oputs (_("\ + --total=WHEN\n\ + when to print a line with total counts;\n\ + WHEN can be: auto, always, only, never\n\ +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/who.c b/src/who.c index 3326e697f6..dbf67297f7 100644 --- a/src/who.c +++ b/src/who.c @@ -638,33 +638,57 @@ Print information about users who are currently logged in.\n\ "), stdout); fputs (_("\ \n\ +"), stdout); + oputs (_("\ -a, --all same as -b -d --login -p -r -t -T -u\n\ +")); + oputs (_("\ -b, --boot time of last system boot\n\ +")); + oputs (_("\ -d, --dead print dead processes\n\ +")); + oputs (_("\ -H, --heading print line of column headings\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -l, --login print system login processes\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ --lookup attempt to canonicalize hostnames via DNS\n\ +")); + oputs (_("\ -m only hostname and user associated with standard input\n\ +")); + oputs (_("\ -p, --process print active processes spawned by init\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -q, --count all login names and number of users logged on\n\ +")); + oputs (_("\ -r, --runlevel print current runlevel\n\ +")); + oputs (_("\ -s, --short print only name, line, and time (default)\n\ +")); + oputs (_("\ -t, --time print last system clock change\n\ -"), stdout); - fputs (_("\ +")); + oputs (_("\ -T, -w, --mesg add user's message status as +, - or ?\n\ +")); + oputs (_("\ -u, --users list users logged in\n\ +")); + oputs (_("\ --message same as -T\n\ +")); + oputs (_("\ --writable same as -T\n\ -"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); +")); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); printf (_("\ \n\ If FILE is not specified, use %s. %s as FILE is common.\n\ diff --git a/src/whoami.c b/src/whoami.c index 31a98f31ab..fe690fb3a7 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -45,8 +45,8 @@ Print the user name associated with the current effective user ID.\n\ Same as id -un.\n\ \n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status); diff --git a/src/yes.c b/src/yes.c index 0634d939c0..66b6243db4 100644 --- a/src/yes.c +++ b/src/yes.c @@ -47,8 +47,8 @@ Usage: %s [STRING]...\n\ Repeatedly output a line with all specified STRING(s), or 'y'.\n\ \n\ "), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); + oputs (HELP_OPTION_DESCRIPTION); + oputs (VERSION_OPTION_DESCRIPTION); emit_ancillary_info (PROGRAM_NAME); } exit (status);