From 442fafa54c63cbbf25ffb6a54297c0289e97b34c Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Fri, 23 May 2014 00:45:57 +0100 Subject: doc: clarify --zero-terminated option * src/join.c (usage): Reword to avoid implication that the NUL byte is only generated as the output delimeter. * src/sort.c (usage): Likewise. * src/shuf.c (usage): Likewise. Also since we're changing the translation string take the opportunity to separate out the description to a separate string to reduce translation overhead. * src/uniq.c (usage): Likewise. * src/stty.c (usage): s/null/NUL/ for consistency. * src/basename.c (usage): Reword for accuracy/consistency. * src/dirname.c (usage): Likewise. * src/du.c (usage): Likewise. * src/env.c (usage): Likewise. * src/printenv.c (usage): Likewise. * src/readlink.c (usage): Likewise. * src/realpath.c (usage): Likewise. * doc/coreutils.texi: Consolidate/share the descriptions of --null, --zero and --zero-terminated. --- src/basename.c | 2 +- src/dirname.c | 2 +- src/du.c | 2 +- src/env.c | 2 +- src/join.c | 2 +- src/printenv.c | 2 +- src/readlink.c | 2 +- src/realpath.c | 2 +- src/shuf.c | 4 +++- src/sort.c | 2 +- src/stty.c | 2 +- src/uniq.c | 4 +++- 12 files changed, 16 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/basename.c b/src/basename.c index 05c5c7750..952153994 100644 --- a/src/basename.c +++ b/src/basename.c @@ -60,7 +60,7 @@ If specified, also remove a trailing SUFFIX.\n\ 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 separate output with NUL rather than newline\n\ + -z, --zero end each output line with NUL, not newline\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/dirname.c b/src/dirname.c index fa9f87ec6..e0599a36a 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -57,7 +57,7 @@ removed; if NAME contains no /'s, output '.' (meaning the current directory).\n\ \n\ "), stdout); fputs (_("\ - -z, --zero separate output with NUL rather than newline\n\ + -z, --zero end each output line with NUL, not newline\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/du.c b/src/du.c index 890edb64c..e4509fd78 100644 --- a/src/du.c +++ b/src/du.c @@ -289,7 +289,7 @@ Summarize disk usage of each FILE, recursively for directories.\n\ emit_mandatory_arg_note (); fputs (_("\ - -0, --null end each output line with 0 byte rather than newline\n\ + -0, --null end each output line with NUL, not newline\n\ -a, --all write counts for all files, not just directories\n\ --apparent-size print apparent sizes, rather than disk usage; although\ \n\ diff --git a/src/env.c b/src/env.c index 6a5c246a5..2b37d986e 100644 --- a/src/env.c +++ b/src/env.c @@ -60,7 +60,7 @@ Set each NAME to VALUE in the environment and run COMMAND.\n\ fputs (_("\ -i, --ignore-environment start with an empty environment\n\ - -0, --null end each output line with 0 byte rather than newline\n\ + -0, --null end each output line with NUL, not newline\n\ -u, --unset=NAME remove variable from the environment\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); diff --git a/src/join.c b/src/join.c index fd8f22c60..5c26e78aa 100644 --- a/src/join.c +++ b/src/join.c @@ -218,7 +218,7 @@ by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n\ print them without trying to pair them\n\ "), stdout); fputs (_("\ - -z, --zero-terminated end lines with 0 byte, not newline\n\ + -z, --zero-terminated line delimiter is NUL, not newline\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/printenv.c b/src/printenv.c index f1e65940a..e1faeb5fd 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -67,7 +67,7 @@ If no VARIABLE is specified, print name and value pairs for them all.\n\ "), program_name); fputs (_("\ - -0, --null end each output line with 0 byte rather than newline\n\ + -0, --null end each output line with NUL, not newline\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/readlink.c b/src/readlink.c index 5a4488726..d63f07b40 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -81,7 +81,7 @@ usage (int status) -q, --quiet,\n\ -s, --silent suppress most error messages\n\ -v, --verbose report error messages\n\ - -z, --zero separate output with NUL rather than newline\n\ + -z, --zero end each output line with NUL, not newline\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/realpath.c b/src/realpath.c index 4426572b0..0c5532710 100644 --- a/src/realpath.c +++ b/src/realpath.c @@ -83,7 +83,7 @@ all but the last component must exist\n\ --relative-to=FILE print the resolved path relative to FILE\n\ --relative-base=FILE print absolute paths unless paths below FILE\n\ -s, --strip, --no-symlinks don't expand symlinks\n\ - -z, --zero separate output with NUL rather than newline\n\ + -z, --zero end each output line with NUL, not newline\n\ \n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); diff --git a/src/shuf.c b/src/shuf.c index 6ae075549..915f7b7a5 100644 --- a/src/shuf.c +++ b/src/shuf.c @@ -77,7 +77,9 @@ Write a random permutation of the input lines to standard output.\n\ -o, --output=FILE write result to FILE instead of standard output\n\ --random-source=FILE get random bytes from FILE\n\ -r, --repeat output lines can be repeated\n\ - -z, --zero-terminated end lines with 0 byte, not newline\n\ +"), stdout); + fputs (_("\ + -z, --zero-terminated line delimiter is NUL, not newline\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/sort.c b/src/sort.c index 3380be6c5..49caae525 100644 --- a/src/sort.c +++ b/src/sort.c @@ -504,7 +504,7 @@ Other options:\n\ \n\ "), DEFAULT_TMPDIR); fputs (_("\ - -z, --zero-terminated end lines with 0 byte, not newline\n\ + -z, --zero-terminated line delimiter is NUL, not newline\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); diff --git a/src/stty.c b/src/stty.c index 7bb3f5121..3c4857865 100644 --- a/src/stty.c +++ b/src/stty.c @@ -634,7 +634,7 @@ Output settings:\n\ "), stdout); fputs (_("\ * [-]ocrnl translate carriage return to newline\n\ - * [-]ofdel use delete characters for fill instead of null characters\n\ + * [-]ofdel use delete characters for fill instead of NUL characters\n\ * [-]ofill use fill (padding) characters instead of timing for delays\n\ * [-]olcuc translate lowercase characters to uppercase\n\ * [-]onlcr translate newline to carriage return-newline\n\ diff --git a/src/uniq.c b/src/uniq.c index deba0a3d7..54200ff45 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -200,7 +200,9 @@ With no options, matching lines are merged to the first occurrence.\n\ -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\ - -z, --zero-terminated end lines with 0 byte, not newline\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\ -- cgit v1.2.3-54-g00ecf