From 5d4f09d83a7c69110b4db97443759e9046c149e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Fri, 18 Sep 2009 23:06:21 +0100 Subject: [PATCH] doc: mention the texinfo documentation in --help * src/system.h: Rename emit_bug_reporting_address() to emit_ancillary_info() and update it to not print the translation project address in en_* locales, and _do_ print it in the 'C' (and other) locales so that it's included in the default man page. Also mention how to invoke the texinfo documentation for each command. Also move the "hard-locale.h" include to the 8 files that now use it. * man/help2man: Strip the newly added texinfo reference from the --help output as a more verbose version is already added by help2man. Suggestion from C de-Avillez --- man/help2man | 6 ++++++ src/base64.c | 2 +- src/basename.c | 2 +- src/cat.c | 2 +- src/chcon.c | 2 +- src/chgrp.c | 2 +- src/chmod.c | 2 +- src/chown.c | 2 +- src/chroot.c | 2 +- src/cksum.c | 2 +- src/comm.c | 3 ++- src/cp.c | 2 +- src/csplit.c | 2 +- src/cut.c | 2 +- src/date.c | 2 +- src/dd.c | 2 +- src/df.c | 2 +- src/dircolors.c | 2 +- src/dirname.c | 2 +- src/du.c | 2 +- src/echo.c | 2 +- src/env.c | 2 +- src/expand.c | 2 +- src/expr.c | 2 +- src/factor.c | 2 +- src/fmt.c | 2 +- src/fold.c | 2 +- src/getlimits.c | 2 +- src/groups.c | 2 +- src/head.c | 2 +- src/hostid.c | 2 +- src/hostname.c | 2 +- src/id.c | 2 +- src/install.c | 2 +- src/join.c | 3 ++- src/kill.c | 2 +- src/link.c | 2 +- src/ln.c | 2 +- src/logname.c | 2 +- src/ls.c | 3 ++- src/md5sum.c | 2 +- src/mkdir.c | 2 +- src/mkfifo.c | 2 +- src/mknod.c | 2 +- src/mktemp.c | 2 +- src/mv.c | 2 +- src/nice.c | 2 +- src/nl.c | 2 +- src/nohup.c | 2 +- src/od.c | 2 +- src/paste.c | 2 +- src/pathchk.c | 2 +- src/pinky.c | 3 ++- src/pr.c | 3 ++- src/printenv.c | 2 +- src/printf.c | 2 +- src/ptx.c | 2 +- src/pwd.c | 2 +- src/readlink.c | 2 +- src/rm.c | 2 +- src/rmdir.c | 2 +- src/runcon.c | 2 +- src/seq.c | 2 +- src/setuidgid.c | 2 +- src/shred.c | 2 +- src/shuf.c | 2 +- src/sleep.c | 2 +- src/sort.c | 3 ++- src/split.c | 2 +- src/stat.c | 2 +- src/stdbuf.c | 2 +- src/stty.c | 2 +- src/su.c | 2 +- src/sum.c | 2 +- src/sync.c | 2 +- src/system.h | 11 +++++++---- src/tac.c | 2 +- src/tail.c | 2 +- src/tee.c | 2 +- src/test.c | 2 +- src/timeout.c | 2 +- src/touch.c | 2 +- src/tr.c | 2 +- src/true.c | 2 +- src/truncate.c | 2 +- src/tsort.c | 2 +- src/tty.c | 2 +- src/uname.c | 2 +- src/unexpand.c | 2 +- src/uniq.c | 3 ++- src/unlink.c | 2 +- src/uptime.c | 2 +- src/users.c | 2 +- src/wc.c | 2 +- src/who.c | 3 ++- src/whoami.c | 2 +- src/yes.c | 2 +- 97 files changed, 116 insertions(+), 99 deletions(-) diff --git a/man/help2man b/man/help2man index 7b7ce7a4b0..3b19c6402c 100755 --- a/man/help2man +++ b/man/help2man @@ -373,6 +373,7 @@ my $PAT_AUTHOR = _('Written +by'); my $PAT_OPTIONS = _('Options'); my $PAT_EXAMPLES = _('Examples'); my $PAT_FREE_SOFTWARE = _('This +is +free +software'); +my $PAT_INFO = _('For +complete +documentation'); # Start a new paragraph (if required) for these. s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR)/$1\n\n$2/og; @@ -392,6 +393,11 @@ while (length) $sect = _('EXAMPLES'); next; } + # Skip any texinfo reference as that's handled separately + if (s/($PAT_INFO).*\n//o) + { + next; + } # Copyright section if (/^Copyright +[(\xa9]/) diff --git a/src/base64.c b/src/base64.c index c7cf034da4..0bca87ce49 100644 --- a/src/base64.c +++ b/src/base64.c @@ -81,7 +81,7 @@ When decoding, the input may contain newlines in addition to the bytes of\n\ the formal base64 alphabet. Use --ignore-garbage to attempt to recover\n\ from any other non-alphabet bytes in the encoded stream.\n"), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); diff --git a/src/basename.c b/src/basename.c index 4300d49836..3e6d93233a 100644 --- a/src/basename.c +++ b/src/basename.c @@ -66,7 +66,7 @@ Examples:\n\ %s include/stdio.h .h Output \"stdio\".\n\ "), program_name, program_name); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/cat.c b/src/cat.c index 41b2637f21..d93968198f 100644 --- a/src/cat.c +++ b/src/cat.c @@ -119,7 +119,7 @@ Examples:\n\ %s Copy standard input to standard output.\n\ "), program_name, program_name); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/chcon.c b/src/chcon.c index 7e8250d3da..fb68402ce6 100644 --- a/src/chcon.c +++ b/src/chcon.c @@ -380,7 +380,7 @@ one takes effect.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/chgrp.c b/src/chgrp.c index 0102ef0981..71582b5096 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -158,7 +158,7 @@ Examples:\n\ %s -hR staff /u Change the group of /u and subfiles to \"staff\".\n\ "), program_name, program_name); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/chmod.c b/src/chmod.c index 282eadaffb..e6f2b0b642 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -379,7 +379,7 @@ Change the mode of each FILE to MODE.\n\ \n\ Each MODE is of the form `[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/chown.c b/src/chown.c index 35488d90e8..12df06117a 100644 --- a/src/chown.c +++ b/src/chown.c @@ -153,7 +153,7 @@ Examples:\n\ %s -hR root /u Change the owner of /u and subfiles to \"root\".\n\ "), program_name, program_name, program_name); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/chroot.c b/src/chroot.c index 3fa26f8da7..5e8cb9c6a7 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -142,7 +142,7 @@ Run COMMAND with root directory set to NEWROOT.\n\ \n\ If no command is given, run ``${SHELL} -i'' (default: /bin/sh).\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/cksum.c b/src/cksum.c index 25cdb4789b..f847d0ebef 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -269,7 +269,7 @@ Print CRC checksum and byte counts of each FILE.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/comm.c b/src/comm.c index 63b6b0c269..e9a66b49cf 100644 --- a/src/comm.c +++ b/src/comm.c @@ -23,6 +23,7 @@ #include "system.h" #include "linebuffer.h" #include "error.h" +#include "hard-locale.h" #include "quote.h" #include "stdio--.h" #include "memcmp2.h" @@ -140,7 +141,7 @@ Examples:\n\ %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n\ "), program_name, program_name); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/cp.c b/src/cp.c index 2ba1dbf09a..4b5934eb5e 100644 --- a/src/cp.c +++ b/src/cp.c @@ -257,7 +257,7 @@ As a special case, cp makes a backup of SOURCE when the force and backup\n\ options are given and SOURCE and DEST are the same name for an existing,\n\ regular file.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/csplit.c b/src/csplit.c index ba93d2b593..8cc06b6ee0 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -1481,7 +1481,7 @@ Read standard input if FILE is -. Each PATTERN may be:\n\ \n\ A line OFFSET is a required `+' or `-' followed by a positive integer.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/cut.c b/src/cut.c index 448e7ed7a0..119fb57bc9 100644 --- a/src/cut.c +++ b/src/cut.c @@ -235,7 +235,7 @@ Each range is one of:\n\ \n\ With no FILE, or when FILE is -, read standard input.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/date.c b/src/date.c index cbc53e6a51..75cf092b73 100644 --- a/src/date.c +++ b/src/date.c @@ -236,7 +236,7 @@ then an optional modifier, which is either\n\ E to use the locale's alternate representations if available, or\n\ O to use the locale's alternate numeric symbols if available.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/dd.c b/src/dd.c index 76a31e9816..6f5e826f72 100644 --- a/src/dd.c +++ b/src/dd.c @@ -575,7 +575,7 @@ Options are:\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/df.c b/src/df.c index 6cda35e75c..aef7b2d54a 100644 --- a/src/df.c +++ b/src/df.c @@ -835,7 +835,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (VERSION_OPTION_DESCRIPTION, stdout); emit_blocksize_note ("DF"); emit_size_note (); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/dircolors.c b/src/dircolors.c index b724155921..f28487ea36 100644 --- a/src/dircolors.c +++ b/src/dircolors.c @@ -112,7 +112,7 @@ If FILE is specified, read it to determine which colors to use for which\n\ file types and extensions. Otherwise, a precompiled database is used.\n\ For details on the format of these files, run `dircolors --print-database'.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); diff --git a/src/dirname.c b/src/dirname.c index 53d0bdc7d9..f472334156 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -61,7 +61,7 @@ Examples:\n\ %s stdio.h Output \".\".\n\ "), program_name, program_name); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/du.c b/src/du.c index 321d30feb4..de0cdbdd5b 100644 --- a/src/du.c +++ b/src/du.c @@ -332,7 +332,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (VERSION_OPTION_DESCRIPTION, stdout); emit_blocksize_note ("DU"); emit_size_note (); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/echo.c b/src/echo.c index 210352ca77..90b9786461 100644 --- a/src/echo.c +++ b/src/echo.c @@ -77,7 +77,7 @@ If -e is in effect, the following sequences are recognized:\n\ \\v vertical tab\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/env.c b/src/env.c index c22981ba3f..90edc5a336 100644 --- a/src/env.c +++ b/src/env.c @@ -125,7 +125,7 @@ Set each NAME to VALUE in the environment and run COMMAND.\n\ \n\ A mere - implies -i. If no COMMAND, print the resulting environment.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/expand.c b/src/expand.c index c8648335a3..074f7789cd 100644 --- a/src/expand.c +++ b/src/expand.c @@ -121,7 +121,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/expr.c b/src/expr.c index 11bf7ed477..aab09a1f1e 100644 --- a/src/expr.c +++ b/src/expr.c @@ -265,7 +265,7 @@ Pattern matches return the string matched between \\( and \\) or null; if\n\ Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is null\n\ or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/factor.c b/src/factor.c index fc78356945..f48a720842 100644 --- a/src/factor.c +++ b/src/factor.c @@ -502,7 +502,7 @@ are specified on the command line, read them from standard input.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/fmt.c b/src/fmt.c index c12072c58e..81a708e193 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -293,7 +293,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ \n\ With no FILE, or when FILE is -, read standard input.\n"), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/fold.c b/src/fold.c index 52322657ad..df771711ce 100644 --- a/src/fold.c +++ b/src/fold.c @@ -82,7 +82,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/getlimits.c b/src/getlimits.c index 82cd34531e..a4e1d9b108 100644 --- a/src/getlimits.c +++ b/src/getlimits.c @@ -73,7 +73,7 @@ Output platform dependent limits in a format useful for shell scripts.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/groups.c b/src/groups.c index 27e8724066..f522ac4c4a 100644 --- a/src/groups.c +++ b/src/groups.c @@ -58,7 +58,7 @@ the current process (which may differ if the groups database has changed).\n"), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/head.c b/src/head.c index f014388097..9080168bc0 100644 --- a/src/head.c +++ b/src/head.c @@ -138,7 +138,7 @@ K may have a multiplier suffix:\n\ b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n\ GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/hostid.c b/src/hostid.c index 7c93f2e768..2b606a7ca9 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -48,7 +48,7 @@ Print the numeric identifier (in hexadecimal) for the current host.\n\ "), program_name); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/hostname.c b/src/hostname.c index 110014b3fc..9726bd5f19 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -63,7 +63,7 @@ Print or set the hostname of the current system.\n\ program_name, program_name); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/id.c b/src/id.c index ec255e2f86..1016ec3a62 100644 --- a/src/id.c +++ b/src/id.c @@ -98,7 +98,7 @@ or (when USERNAME omitted) for the current user.\n\ \n\ Without any OPTION, print some useful set of identified information.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/install.c b/src/install.c index fafa21a3cf..03cb9ed7ac 100644 --- a/src/install.c +++ b/src/install.c @@ -1005,7 +1005,7 @@ the VERSION_CONTROL environment variable. Here are the values:\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ simple, never always make simple backups\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/join.c b/src/join.c index 73e1f37bb4..d734a91ea2 100644 --- a/src/join.c +++ b/src/join.c @@ -24,6 +24,7 @@ #include "system.h" #include "error.h" +#include "hard-locale.h" #include "linebuffer.h" #include "memcasecmp.h" #include "quote.h" @@ -208,7 +209,7 @@ Note, comparisons honor the rules specified by `LC_COLLATE'.\n\ If the input is not sorted and some lines cannot be joined, a\n\ warning message will be given.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/kill.c b/src/kill.c index 3429cb19d0..bff8c6c147 100644 --- a/src/kill.c +++ b/src/kill.c @@ -111,7 +111,7 @@ or the exit status of a process terminated by a signal.\n\ PID is an integer; if negative it identifies a process group.\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/link.c b/src/link.c index ead3ac2f57..9e49a755b8 100644 --- a/src/link.c +++ b/src/link.c @@ -51,7 +51,7 @@ Usage: %s FILE1 FILE2\n\ stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/ln.c b/src/ln.c index 6a1dc32077..0c35338f2e 100644 --- a/src/ln.c +++ b/src/ln.c @@ -397,7 +397,7 @@ the VERSION_CONTROL environment variable. Here are the values:\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ simple, never always make simple backups\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/logname.c b/src/logname.c index 8abb535f0d..0a739cc501 100644 --- a/src/logname.c +++ b/src/logname.c @@ -44,7 +44,7 @@ Print the name of the current user.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/ls.c b/src/ls.c index b62ea128c9..f0443cdd90 100644 --- a/src/ls.c +++ b/src/ls.c @@ -93,6 +93,7 @@ #include "dev-ino.h" #include "error.h" #include "filenamecat.h" +#include "hard-locale.h" #include "hash.h" #include "human.h" #include "filemode.h" @@ -4681,7 +4682,7 @@ Exit status:\n\ 1 if minor problems (e.g., cannot access subdirectory),\n\ 2 if serious trouble (e.g., cannot access command-line argument).\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/md5sum.c b/src/md5sum.c index c8e01efb84..06a46bbcef 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -195,7 +195,7 @@ should be a former output of this program. The default mode is to print\n\ a line with checksum, a character indicating type (`*' for binary, ` ' for\n\ text), and name for each FILE.\n"), DIGEST_REFERENCE); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); diff --git a/src/mkdir.c b/src/mkdir.c index 4ae4875935..756cc4079c 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -71,7 +71,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/mkfifo.c b/src/mkfifo.c index 5ea3e3b829..f3767e0152 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -65,7 +65,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/mknod.c b/src/mknod.c index 94e4471ef2..cf59c2bdd8 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -81,7 +81,7 @@ otherwise, as decimal. TYPE may be:\n\ p create a FIFO\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/mktemp.c b/src/mktemp.c index d5a68cf478..808efa9148 100644 --- a/src/mktemp.c +++ b/src/mktemp.c @@ -95,7 +95,7 @@ If TEMPLATE is not specified, use tmp.XXXXXXXXXX.\n\ fputs ("\n", stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); diff --git a/src/mv.c b/src/mv.c index 97e9dd4013..58dddda41b 100644 --- a/src/mv.c +++ b/src/mv.c @@ -330,7 +330,7 @@ the VERSION_CONTROL environment variable. Here are the values:\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ simple, never always make simple backups\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/nice.c b/src/nice.c index 4a3c092122..6cd5f31333 100644 --- a/src/nice.c +++ b/src/nice.c @@ -81,7 +81,7 @@ With no COMMAND, print the current niceness. Nicenesses range from\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/nl.c b/src/nl.c index 773740fa59..c3a26a52b1 100644 --- a/src/nl.c +++ b/src/nl.c @@ -231,7 +231,7 @@ FORMAT is one of:\n\ rz right justified, leading zeros\n\ \n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/nohup.c b/src/nohup.c index f4b1b23423..99bb86547c 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -71,7 +71,7 @@ If standard error is a terminal, redirect it to standard output.\n\ To save output to FILE, use `%s COMMAND > FILE'.\n"), program_name); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/od.c b/src/od.c index 085d6406cf..2682857f3d 100644 --- a/src/od.c +++ b/src/od.c @@ -394,7 +394,7 @@ output line.\n\ Option --string without a number implies 3; option --width without a number\n\ implies 32. By default, od uses -A o -t oS -w16.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/paste.c b/src/paste.c index 730a288732..c3293f7484 100644 --- a/src/paste.c +++ b/src/paste.c @@ -450,7 +450,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); /* FIXME: add a couple of examples. */ - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/pathchk.c b/src/pathchk.c index 04b70a3898..cf7b8eb672 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -104,7 +104,7 @@ Diagnose invalid or unportable file names.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/pinky.c b/src/pinky.c index f75002e1f0..393a20bb4e 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -26,6 +26,7 @@ #include "canon-host.h" #include "error.h" +#include "hard-locale.h" #include "readutmp.h" /* The official name of this program (e.g., no `g' prefix). */ @@ -526,7 +527,7 @@ usage (int status) A lightweight `finger' program; print user information.\n\ The utmp file will be %s.\n\ "), UTMP_FILE); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/pr.c b/src/pr.c index f584fdd30b..c1a66a9705 100644 --- a/src/pr.c +++ b/src/pr.c @@ -314,6 +314,7 @@ #include #include "system.h" #include "error.h" +#include "hard-locale.h" #include "mbswidth.h" #include "quote.h" #include "stat-time.h" @@ -2870,7 +2871,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -t is implied if PAGE_LENGTH <= 10. With no FILE, or when\n\ FILE is -, read standard input.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/printenv.c b/src/printenv.c index 69e2a6639b..8185da6f8b 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -66,7 +66,7 @@ If no VARIABLE is specified, print name and value pairs for them all.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/printf.c b/src/printf.c index 5fa25dee82..f6f86a5735 100644 --- a/src/printf.c +++ b/src/printf.c @@ -130,7 +130,7 @@ and all C format specifications ending with one of diouxXfeEgGcs, with\n\ ARGUMENTs converted to proper type first. Variable widths are handled.\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/ptx.c b/src/ptx.c index 806908eeeb..49cbe89c98 100644 --- a/src/ptx.c +++ b/src/ptx.c @@ -1923,7 +1923,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ \n\ With no FILE or if FILE is -, read Standard Input. `-F /' by default.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/pwd.c b/src/pwd.c index b74ba47071..cfbf5b733f 100644 --- a/src/pwd.c +++ b/src/pwd.c @@ -66,7 +66,7 @@ Print the full filename of the current working directory.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/readlink.c b/src/readlink.c index a6f42f5c0e..7e98126029 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -82,7 +82,7 @@ usage (int status) "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/rm.c b/src/rm.c index 6c32551986..64e095d9e4 100644 --- a/src/rm.c +++ b/src/rm.c @@ -180,7 +180,7 @@ Note that if you use rm to remove a file, it is usually possible to recover\n\ the contents of that file. If you want more assurance that the contents are\n\ truly unrecoverable, consider using shred.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/rmdir.c b/src/rmdir.c index 826cebcfa4..899964c2ea 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -177,7 +177,7 @@ Remove the DIRECTORY(ies), if they are empty.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/runcon.c b/src/runcon.c index 7bf256821d..e0019da2a8 100644 --- a/src/runcon.c +++ b/src/runcon.c @@ -99,7 +99,7 @@ With neither CONTEXT nor COMMAND, print the current security context.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/seq.c b/src/seq.c index ef777bcfda..b82a3c7289 100644 --- a/src/seq.c +++ b/src/seq.c @@ -94,7 +94,7 @@ FORMAT must be suitable for printing one argument of type `double';\n\ it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n\ decimal numbers with maximum precision PREC, and to %g otherwise.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/setuidgid.c b/src/setuidgid.c index 43aa16480f..7176b1ae73 100644 --- a/src/setuidgid.c +++ b/src/setuidgid.c @@ -67,7 +67,7 @@ This program is useful only when run by root (user ID zero).\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/shred.c b/src/shred.c index 2f3178993f..fdf098ac4c 100644 --- a/src/shred.c +++ b/src/shred.c @@ -229,7 +229,7 @@ In addition, file system backups and remote mirrors may contain copies\n\ of the file that cannot be removed, and that will allow a shredded file\n\ to be recovered later.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/shuf.c b/src/shuf.c index 0e61e32dd6..0bb11abc16 100644 --- a/src/shuf.c +++ b/src/shuf.c @@ -71,7 +71,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ \n\ With no FILE, or when FILE is -, read standard input.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); diff --git a/src/sleep.c b/src/sleep.c index 4c203e6214..64e237b1d3 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -56,7 +56,7 @@ specified by the sum of their values.\n\ program_name, program_name); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/sort.c b/src/sort.c index b9ae19883c..57ee145a2a 100644 --- a/src/sort.c +++ b/src/sort.c @@ -30,6 +30,7 @@ #include "argmatch.h" #include "error.h" #include "filevercmp.h" +#include "hard-locale.h" #include "hash.h" #include "md5.h" #include "physmem.h" @@ -414,7 +415,7 @@ The locale specified by the environment affects sort order.\n\ Set LC_ALL=C to get the traditional sort order that uses\n\ native byte values.\n\ "), stdout ); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); diff --git a/src/split.c b/src/split.c index e02f7433a4..d1a0e0d54c 100644 --- a/src/split.c +++ b/src/split.c @@ -127,7 +127,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); emit_size_note (); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/stat.c b/src/stat.c index 3302270279..7d42598f16 100644 --- a/src/stat.c +++ b/src/stat.c @@ -983,7 +983,7 @@ Valid format sequences for file systems:\n\ %T Type in human readable form\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/stdbuf.c b/src/stdbuf.c index 007cc21946..afb7821f7f 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -125,7 +125,7 @@ for e.g.) then that will override corresponding settings changed by `stdbuf'.\n\ Also some filters (like `dd' and `cat' etc.) don't use streams for I/O,\n\ and are thus unaffected by `stdbuf' settings.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/stty.c b/src/stty.c index 7b25b0bf8f..2f34fcc0aa 100644 --- a/src/stty.c +++ b/src/stty.c @@ -724,7 +724,7 @@ prints baud rate, line discipline, and deviations from stty sane. In\n\ settings, CHAR is taken literally, or coded as in ^c, 0x37, 0177 or\n\ 127; special values ^- or undef used to disable special characters.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/su.c b/src/su.c index ec9c6001ca..ec50a3b5a0 100644 --- a/src/su.c +++ b/src/su.c @@ -395,7 +395,7 @@ Change the effective user id and group id to that of USER.\n\ \n\ A mere - implies -l. If USER not given, assume root.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/sum.c b/src/sum.c index e53bad2ca6..91d7f34ba7 100644 --- a/src/sum.c +++ b/src/sum.c @@ -72,7 +72,7 @@ Print checksum and block counts for each FILE.\n\ \n\ With no FILE, or when FILE is -, read standard input.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/sync.c b/src/sync.c index 593071347b..543cbde9be 100644 --- a/src/sync.c +++ b/src/sync.c @@ -45,7 +45,7 @@ Force changed blocks to disk, update the super block.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/system.h b/src/system.h index a15c298b8b..ce7114891b 100644 --- a/src/system.h +++ b/src/system.h @@ -635,9 +635,8 @@ Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n\ "), program); } -#include "hard-locale.h" static inline void -emit_bug_reporting_address (void) +emit_ancillary_info (void) { printf (_("\nReport %s bugs to %s\n"), last_component (program_name), PACKAGE_BUGREPORT); @@ -646,8 +645,10 @@ emit_bug_reporting_address (void) PACKAGE_NAME, PACKAGE); fputs (_("General help using GNU software: \n"), stdout); - - if (hard_locale (LC_MESSAGES)) + /* Don't output this redundant message for English locales. + Note we still output for 'C' so that it gets included in the man page. */ + const char *lc_messages = setlocale (LC_MESSAGES, NULL); + if (lc_messages && strncmp (lc_messages, "en_", 3)) { /* TRANSLATORS: Replace LANG_CODE in this URL with your language code to form one of @@ -657,6 +658,8 @@ emit_bug_reporting_address (void) "\n"), last_component (program_name)); } + printf (_("For complete documentation, run: " + "info coreutils '%s invocation'\n"), last_component (program_name)); } #include "inttostr.h" diff --git a/src/tac.c b/src/tac.c index e1f71945fb..c6ba4e2f45 100644 --- a/src/tac.c +++ b/src/tac.c @@ -149,7 +149,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/tail.c b/src/tail.c index 81cbae037e..3eb27dbd29 100644 --- a/src/tail.c +++ b/src/tail.c @@ -317,7 +317,7 @@ rotation). Use --follow=name in that case. That causes tail to track the\n\ named file by reopening it periodically to see if it has been removed and\n\ recreated by some other program.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/tee.c b/src/tee.c index 03a33b0602..b8996e6a56 100644 --- a/src/tee.c +++ b/src/tee.c @@ -72,7 +72,7 @@ Copy standard input to each FILE, and also to standard output.\n\ \n\ If a FILE is -, copy again to standard output.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/test.c b/src/test.c index f7c689cf9c..2b04e433ef 100644 --- a/src/test.c +++ b/src/test.c @@ -770,7 +770,7 @@ NOTE: [ honors the --help and --version options, but test does not.\n\ test treats each of those as it treats any other nonempty STRING.\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, _("test and/or [")); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/timeout.c b/src/timeout.c index e4b1704457..7069f2c1ab 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -158,7 +158,7 @@ with the status of COMMAND. If no signal is specified, send the TERM\n\ signal upon timeout. The TERM signal kills any process that does not\n\ block or catch that signal. For other processes, it may be necessary to\n\ use the KILL (9) signal, since this signal cannot be caught.\n"), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/touch.c b/src/touch.c index ed9847175c..d7ae9b6baa 100644 --- a/src/touch.c +++ b/src/touch.c @@ -263,7 +263,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ \n\ Note that the -d and -t options accept different time-date formats.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/tr.c b/src/tr.c index 0b985f801a..c5f18f9838 100644 --- a/src/tr.c +++ b/src/tr.c @@ -346,7 +346,7 @@ only be used in pairs to specify case conversion. -s uses SET1 if not\n\ translating nor deleting; else squeezing uses SET2 and occurs after\n\ translation or deletion.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/true.c b/src/true.c index 66d1e01116..f3e937f5a9 100644 --- a/src/true.c +++ b/src/true.c @@ -47,7 +47,7 @@ Usage: %s [ignored command line arguments]\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_bug_reporting_address (); + emit_ancillary_info (); exit (status); } diff --git a/src/truncate.c b/src/truncate.c index 77783794ea..7f96483daf 100644 --- a/src/truncate.c +++ b/src/truncate.c @@ -133,7 +133,7 @@ SIZE may also be prefixed by one of the following modifying characters:\n\ \n\ Note that the -r and -s options are mutually exclusive.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/tsort.c b/src/tsort.c index d74b620919..09067f2674 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -87,7 +87,7 @@ With no FILE, or when FILE is -, read standard input.\n\ "), program_name); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); diff --git a/src/tty.c b/src/tty.c index cc15cfe4af..37443d22c7 100644 --- a/src/tty.c +++ b/src/tty.c @@ -70,7 +70,7 @@ Print the file name of the terminal connected to standard input.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/uname.c b/src/uname.c index 63b3374e39..adce750dca 100644 --- a/src/uname.c +++ b/src/uname.c @@ -150,7 +150,7 @@ Print machine architecture.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/unexpand.c b/src/unexpand.c index bfe22964ea..ff969ee12d 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -130,7 +130,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/uniq.c b/src/uniq.c index 13aaebccc3..7509bfce9c 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -26,6 +26,7 @@ #include "argmatch.h" #include "linebuffer.h" #include "error.h" +#include "hard-locale.h" #include "posixver.h" #include "quote.h" #include "xmemcoll.h" @@ -174,7 +175,7 @@ Note: 'uniq' does not detect repeated lines unless they are adjacent.\n\ You may want to sort the input first, or use `sort -u' without `uniq'.\n\ Also, comparisons honor the rules specified by `LC_COLLATE'.\n\ "), stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/unlink.c b/src/unlink.c index 47cbfb2e31..209d0b6da1 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -50,7 +50,7 @@ Usage: %s FILE\n\ stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/uptime.c b/src/uptime.c index 175fe8f73b..0449c6d564 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -216,7 +216,7 @@ If FILE is not specified, use %s. %s as FILE is common.\n\ UTMP_FILE, WTMP_FILE); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/users.c b/src/users.c index d5115c6911..fd1cbaaeeb 100644 --- a/src/users.c +++ b/src/users.c @@ -112,7 +112,7 @@ If FILE is not specified, use %s. %s as FILE is common.\n\ UTMP_FILE, WTMP_FILE); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/wc.c b/src/wc.c index 0f7a368889..15a723acbe 100644 --- a/src/wc.c +++ b/src/wc.c @@ -131,7 +131,7 @@ read standard input.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/who.c b/src/who.c index f162fab58a..0ac9710319 100644 --- a/src/who.c +++ b/src/who.c @@ -34,6 +34,7 @@ #include "canon-host.h" #include "readutmp.h" #include "error.h" +#include "hard-locale.h" #include "quote.h" /* The official name of this program (e.g., no `g' prefix). */ @@ -665,7 +666,7 @@ Print information about users who are currently logged in.\n\ If FILE is not specified, use %s. %s as FILE is common.\n\ If ARG1 ARG2 given, -m presumed: `am i' or `mom likes' are usual.\n\ "), UTMP_FILE, WTMP_FILE); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/whoami.c b/src/whoami.c index 928f69e455..d064cc2ef1 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -51,7 +51,7 @@ Same as id -un.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } diff --git a/src/yes.c b/src/yes.c index e974de29fb..b45f969254 100644 --- a/src/yes.c +++ b/src/yes.c @@ -51,7 +51,7 @@ Repeatedly output a line with all specified STRING(s), or `y'.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_bug_reporting_address (); + emit_ancillary_info (); } exit (status); } -- 2.47.2