diff options
| -rw-r--r-- | cfg.mk | 2 | ||||
| -rw-r--r-- | src/du.c | 2 | ||||
| -rw-r--r-- | src/nohup.c | 5 | ||||
| -rw-r--r-- | src/sort.c | 3 | ||||
| -rw-r--r-- | src/split.c | 3 | ||||
| -rw-r--r-- | src/stdbuf.c | 2 | ||||
| -rw-r--r-- | src/wc.c | 2 | ||||
| -rwxr-xr-x | tests/du/files0-from.pl | 4 | ||||
| -rwxr-xr-x | tests/sort/sort-files0-from.pl | 4 | ||||
| -rwxr-xr-x | tests/wc/wc-files0-from.pl | 4 |
10 files changed, 18 insertions, 13 deletions
@@ -341,6 +341,8 @@ sc_standard_outputs: $(ALL_MANS) && { echo 1>&2 '$@: use "standard ....." in user docs'; exit 1; } || : @grep -E '[Ss]tandard (in|out|err)([^op]|$$)' man/*.1 doc/*.texi \ && { echo 1>&2 '$@: use "standard ..put" in user docs'; exit 1; } || : + @grep -E '_\("[^"]*std(in|out|err)' src/*.c \ + && { echo 1>&2 '$@: use "standard ..put" in messages'; exit 1; } || : # Option descriptions should not start with a capital letter. # One could grep source directly as follows: @@ -1070,7 +1070,7 @@ main (int argc, char **argv) { /* Give a better diagnostic in an unusual case: printf - | du --files0-from=- */ - error (0, 0, _("when reading file names from stdin, " + error (0, 0, _("when reading file names from standard input, " "no file name of %s allowed"), quoteaf (file_name)); skip_file = true; diff --git a/src/nohup.c b/src/nohup.c index 5b590fbb5..d062d2cb8 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -191,8 +191,9 @@ main (int argc, char **argv) if (!redirecting_stdout) error (0, 0, _(ignoring_input - ? N_("ignoring input and redirecting stderr to stdout") - : N_("redirecting stderr to stdout"))); + ? N_("ignoring input and redirecting standard error " + "to standard output") + : N_("redirecting standard error to standard output"))); if (dup2 (out_fd, STDERR_FILENO) < 0) error (exit_internal_failure, errno, diff --git a/src/sort.c b/src/sort.c index 7f1b51dd5..8363d2d1d 100644 --- a/src/sort.c +++ b/src/sort.c @@ -4760,7 +4760,8 @@ main (int argc, char **argv) for (size_t i = 0; i < nfiles; i++) { if (STREQ (files[i], "-")) - error (SORT_FAILURE, 0, _("when reading file names from stdin, " + error (SORT_FAILURE, 0, _("when reading file names from " + "standard input, " "no file name of %s allowed"), quoteaf (files[i])); else if (files[i][0] == '\0') diff --git a/src/split.c b/src/split.c index 22a83ad5c..e5f6947f8 100644 --- a/src/split.c +++ b/src/split.c @@ -1558,7 +1558,8 @@ main (int argc, char **argv) if (k_units != 0 && filter_command) { - error (0, 0, _("--filter does not process a chunk extracted to stdout")); + error (0, 0, _("--filter does not process a chunk extracted to " + "standard output")); usage (EXIT_FAILURE); } diff --git a/src/stdbuf.c b/src/stdbuf.c index 9fa9d01f4..b61ddf6a4 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -343,7 +343,7 @@ main (int argc, char **argv) /* -oL will be by far the most common use of this utility, but one could easily think -iL might have the same affect, so disallow it as it could be confusing. */ - error (0, 0, _("line buffering stdin is meaningless")); + error (0, 0, _("line buffering standard input is meaningless")); usage (EXIT_CANCELED); } @@ -876,7 +876,7 @@ main (int argc, char **argv) { /* Give a better diagnostic in an unusual case: printf - | wc --files0-from=- */ - error (0, 0, _("when reading file names from stdin, " + error (0, 0, _("when reading file names from standard input, " "no file name of %s allowed"), quoteaf (file_name)); skip_file = true; diff --git a/tests/du/files0-from.pl b/tests/du/files0-from.pl index 77057aa46..fe053f648 100755 --- a/tests/du/files0-from.pl +++ b/tests/du/files0-from.pl @@ -42,8 +42,8 @@ my @Tests = # input file name of '-' ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>1}, - {ERR => "$prog: when reading file names from stdin, no file name of" - . " '-' allowed\n"}], + {ERR => "$prog: when reading file names from standard input, " + . "no file name of '-' allowed\n"}], # empty input, regular file ['empty', '--files0-from=@AUX@', {AUX=>''}], diff --git a/tests/sort/sort-files0-from.pl b/tests/sort/sort-files0-from.pl index eb36e2118..d91924aac 100755 --- a/tests/sort/sort-files0-from.pl +++ b/tests/sort/sort-files0-from.pl @@ -42,8 +42,8 @@ my @Tests = # input file name of '-' ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>2}, - {ERR => "$prog: when reading file names from stdin, no file name of" - . " '-' allowed\n"}], + {ERR => "$prog: when reading file names from standard input, " + . "no file name of '-' allowed\n"}], # empty input, regular file ['empty', '--files0-from=@AUX@', {AUX=>''}, {EXIT=>2}, diff --git a/tests/wc/wc-files0-from.pl b/tests/wc/wc-files0-from.pl index bf6b6f85b..5d803083e 100755 --- a/tests/wc/wc-files0-from.pl +++ b/tests/wc/wc-files0-from.pl @@ -42,8 +42,8 @@ my @Tests = # input file name of '-' ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>1}, - {ERR => "$prog: when reading file names from stdin, no file name of" - . " '-' allowed\n"}], + {ERR => "$prog: when reading file names from standard input, " + . "no file name of '-' allowed\n"}], # empty input, regular file ['empty', '--files0-from=@AUX@', {AUX=>''}], |