From 5d4f09d83a7c69110b4db97443759e9046c149e1 Mon Sep 17 00:00:00 2001 From: Pádraig Brady
Date: Fri, 18 Sep 2009 23:06:21 +0100
Subject: 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 7b7ce7a4b..3b19c6402 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 c7cf034da..0bca87ce4 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 4300d4983..3e6d93233 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 41b2637f2..d93968198 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 7e8250d3d..fb68402ce 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 0102ef098..71582b509 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 282eadaff..e6f2b0b64 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 35488d90e..12df06117 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 3fa26f8da..5e8cb9c6a 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 25cdb4789..f847d0ebe 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 63b6b0c26..e9a66b49c 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 2ba1dbf09..4b5934eb5 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 ba93d2b59..8cc06b6ee 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 448e7ed7a..119fb57bc 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 cbc53e6a5..75cf092b7 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 76a31e981..6f5e826f7 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 6cda35e75..aef7b2d54 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 b72415592..f28487ea3 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 53d0bdc7d..f47233415 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 321d30feb..de0cdbdd5 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 210352ca7..90b978646 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 c22981ba3..90edc5a33 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 c8648335a..074f7789c 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 11bf7ed47..aab09a1f1 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 fc7835694..f48a72084 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 c12072c58..81a708e19 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 52322657a..df771711c 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 82cd34531..a4e1d9b10 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 27e872406..f522ac4c4 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 f01438809..9080168bc 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 7c93f2e76..2b606a7ca 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 110014b3f..9726bd5f1 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 ec255e2f8..1016ec3a6 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 fafa21a3c..03cb9ed7a 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 73e1f37bb..d734a91ea 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 3429cb19d..bff8c6c14 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 ead3ac2f5..9e49a755b 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 6a1dc3207..0c35338f2 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 8abb535f0..0a739cc50 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 b62ea128c..f0443cdd9 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 c8e01efb8..06a46bbce 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 4ae487593..756cc4079 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 5ea3e3b82..f3767e015 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 94e4471ef..cf59c2bdd 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 d5a68cf47..808efa914 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 97e9dd401..58dddda41 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 4a3c09212..6cd5f3133 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 773740fa5..c3a26a52b 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 f4b1b2342..99bb86547 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 085d6406c..2682857f3 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 730a28873..c3293f748 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 04b70a389..cf7b8eb67 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 f75002e1f..393a20bb4 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 f584fdd30..c1a66a970 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -314,6 +314,7 @@
#include