diff options
| -rw-r--r-- | lib/long-options.c | 15 | ||||
| -rw-r--r-- | lib/long-options.h | 4 | ||||
| -rw-r--r-- | lib/version-etc.c | 104 | ||||
| -rw-r--r-- | lib/version-etc.h | 8 | ||||
| -rw-r--r-- | src/basename.c | 2 | ||||
| -rw-r--r-- | src/cat.c | 2 | ||||
| -rw-r--r-- | src/chroot.c | 2 | ||||
| -rw-r--r-- | src/cksum.c | 2 | ||||
| -rw-r--r-- | src/comm.c | 2 | ||||
| -rw-r--r-- | src/cp.c | 2 | ||||
| -rw-r--r-- | src/csplit.c | 2 | ||||
| -rw-r--r-- | src/cut.c | 2 | ||||
| -rw-r--r-- | src/dd.c | 4 | ||||
| -rw-r--r-- | src/df.c | 2 | ||||
| -rw-r--r-- | src/dirname.c | 4 | ||||
| -rw-r--r-- | src/du.c | 2 | ||||
| -rw-r--r-- | src/echo.c | 2 | ||||
| -rw-r--r-- | src/env.c | 2 | ||||
| -rw-r--r-- | src/expr.c | 2 | ||||
| -rw-r--r-- | src/factor.c | 2 | ||||
| -rw-r--r-- | src/head.c | 2 | ||||
| -rw-r--r-- | src/hostid.c | 2 | ||||
| -rw-r--r-- | src/hostname.c | 2 | ||||
| -rw-r--r-- | src/id.c | 2 | ||||
| -rw-r--r-- | src/link.c | 2 | ||||
| -rw-r--r-- | src/ln.c | 2 | ||||
| -rw-r--r-- | src/logname.c | 2 | ||||
| -rw-r--r-- | src/ls.c | 2 | ||||
| -rw-r--r-- | src/md5sum.c | 2 | ||||
| -rw-r--r-- | src/mv.c | 2 | ||||
| -rw-r--r-- | src/nice.c | 2 | ||||
| -rw-r--r-- | src/nl.c | 2 | ||||
| -rw-r--r-- | src/nohup.c | 2 | ||||
| -rw-r--r-- | src/paste.c | 2 | ||||
| -rw-r--r-- | src/pathchk.c | 4 | ||||
| -rw-r--r-- | src/pinky.c | 2 | ||||
| -rw-r--r-- | src/pr.c | 2 | ||||
| -rw-r--r-- | src/printenv.c | 4 | ||||
| -rw-r--r-- | src/printf.c | 2 | ||||
| -rw-r--r-- | src/pwd.c | 2 | ||||
| -rw-r--r-- | src/rm.c | 2 | ||||
| -rw-r--r-- | src/setuidgid.c | 2 | ||||
| -rw-r--r-- | src/sleep.c | 4 | ||||
| -rw-r--r-- | src/sort.c | 2 | ||||
| -rw-r--r-- | src/split.c | 2 | ||||
| -rw-r--r-- | src/stty.c | 2 | ||||
| -rw-r--r-- | src/sum.c | 2 | ||||
| -rw-r--r-- | src/sync.c | 2 | ||||
| -rw-r--r-- | src/sys2.h | 2 | ||||
| -rw-r--r-- | src/tac.c | 2 | ||||
| -rw-r--r-- | src/tail.c | 2 | ||||
| -rw-r--r-- | src/tee.c | 2 | ||||
| -rw-r--r-- | src/test.c | 4 | ||||
| -rw-r--r-- | src/touch.c | 2 | ||||
| -rw-r--r-- | src/true.c | 2 | ||||
| -rw-r--r-- | src/tsort.c | 2 | ||||
| -rw-r--r-- | src/uniq.c | 2 | ||||
| -rw-r--r-- | src/unlink.c | 2 | ||||
| -rw-r--r-- | src/uptime.c | 4 | ||||
| -rw-r--r-- | src/users.c | 4 | ||||
| -rw-r--r-- | src/wc.c | 2 | ||||
| -rw-r--r-- | src/who.c | 2 | ||||
| -rw-r--r-- | src/whoami.c | 2 | ||||
| -rw-r--r-- | src/yes.c | 2 |
64 files changed, 89 insertions, 178 deletions
diff --git a/lib/long-options.c b/lib/long-options.c index 94fea1587..58bc93c1d 100644 --- a/lib/long-options.c +++ b/lib/long-options.c @@ -25,10 +25,9 @@ #include "long-options.h" -#include <stdarg.h> #include <stdio.h> -#include <stdlib.h> #include <getopt.h> +#include <stdlib.h> #include "version-etc.h" @@ -48,8 +47,8 @@ parse_long_options (int argc, const char *command_name, const char *package, const char *version, - void (*usage_func)(), - ...) + const char *authors, + void (*usage_func)()) { int c; int saved_opterr; @@ -68,12 +67,8 @@ parse_long_options (int argc, (*usage_func) (0); case 'v': - { - va_list args; - va_start (args, usage_func); - version_etc_va (stdout, command_name, package, version, args); - exit (0); - } + version_etc (stdout, command_name, package, version, authors); + exit (0); default: /* Don't process any other long-named options. */ diff --git a/lib/long-options.h b/lib/long-options.h index 78a33a389..e89b3512d 100644 --- a/lib/long-options.h +++ b/lib/long-options.h @@ -22,5 +22,5 @@ void parse_long_options (int _argc, const char *_command_name, const char *_package, const char *_version, - void (*_usage) (int), - ...); + const char *_authors, + void (*_usage) (int)); diff --git a/lib/version-etc.c b/lib/version-etc.c index 031c2e921..663aa8dcf 100644 --- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -21,13 +21,9 @@ # include <config.h> #endif -#include <stdarg.h> #include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "unlocked-io.h" #include "version-etc.h" -#include "xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -39,77 +35,26 @@ char* version_etc_copyright = "Copyright (C) 2003 Free Software Foundation, Inc."; -/* Like version_etc, below, but with the NULL-terminated author list - provided via a variable of type va_list. */ -void -version_etc_va (FILE *stream, - char const *command_name, char const *package, - char const *version, va_list authors) -{ - unsigned int n_authors; - va_list saved_authors; +/* Display the --version information the standard way. -#ifdef __va_copy - __va_copy (saved_authors, authors); -#else - saved_authors = authors; -#endif + If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of + the program. The formats are therefore: - for (n_authors = 0; va_arg (authors, char const *); ++n_authors) - { - /* empty */ - } - va_end (authors); + PACKAGE VERSION - if (n_authors == 0) - abort (); + or + COMMAND_NAME (PACKAGE) VERSION. */ +void +version_etc (FILE *stream, + const char *command_name, const char *package, + const char *version, const char *authors) +{ if (command_name) fprintf (stream, "%s (%s) %s\n", command_name, package, version); else fprintf (stream, "%s %s\n", package, version); - - switch (n_authors) - { - case 1: - vfprintf (stream, _("Written by %s.\n"), saved_authors); - break; - case 2: - vfprintf (stream, _("Written by %s and %s.\n"), saved_authors); - break; - case 3: - vfprintf (stream, _("Written by %s, %s, and %s.\n"), saved_authors); - break; - case 4: - vfprintf (stream, _("Written by %s, %s, %s, and %s.\n"), saved_authors); - break; - default: - { - - /* Note that the following must have one `%s' and one `%%s'. */ -#define FMT_TEMPLATE _("Written by %sand %%s.\n") - - /* for the string "%s, %s, ..., %s, " */ - size_t s_len = (n_authors - 1) * strlen ("%s, "); - char *s_fmt = xmalloc (s_len + 1); - - /* This could be a few bytes tighter, but don't bother because - that'd just make it a little more fragile. */ - char *full_fmt = xmalloc (strlen (FMT_TEMPLATE) + s_len + 1); - - unsigned int i; - char *s = s_fmt; - for (i = 0; i < n_authors - 1; i++) - s = stpcpy (s, "%s, "); - sprintf (full_fmt, FMT_TEMPLATE, s_fmt); - free (s_fmt); - - vfprintf (stream, full_fmt, saved_authors); - free (full_fmt); - } - break; - } - va_end (saved_authors); + fprintf (stream, _("Written by %s.\n"), authors); putc ('\n', stream); fputs (version_etc_copyright, stream); @@ -120,28 +65,3 @@ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"), stream); } - - -/* Display the --version information the standard way. - - If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of - the program. The formats are therefore: - - PACKAGE VERSION - - or - - COMMAND_NAME (PACKAGE) VERSION. - - There must be one or more author names (each as a separate string) - after the VERSION argument, and the final argument must be `NULL'. */ -void -version_etc (FILE *stream, - char const *command_name, char const *package, - char const *version, ...) -{ - va_list authors; - - va_start (authors, version); - version_etc_va (stream, command_name, package, version, authors); -} diff --git a/lib/version-etc.h b/lib/version-etc.h index 7056aaaeb..e2ef98185 100644 --- a/lib/version-etc.h +++ b/lib/version-etc.h @@ -24,12 +24,8 @@ extern char *version_etc_copyright; -void version_etc_va (FILE *stream, - char const *command_name, char const *package, - char const *version, va_list authors); - void version_etc (FILE *stream, - char const *command_name, char const *package, - char const *version, ...); + const char *command_name, const char *package, + const char *version, const char *authors); #endif /* VERSION_ETC_H */ diff --git a/src/basename.c b/src/basename.c index 9ba33c357..805ee25ca 100644 --- a/src/basename.c +++ b/src/basename.c @@ -100,7 +100,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) @@ -38,7 +38,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cat" -#define AUTHORS "Torbjorn Granlund", "Richard M. Stallman" +#define AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman") /* Undefine, to avoid warning about redefinition on some systems. */ #undef max diff --git a/src/chroot.c b/src/chroot.c index d808908b4..78836c8a5 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -72,7 +72,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); if (argc <= 1) { error (0, 0, _("too few arguments")); diff --git a/src/cksum.c b/src/cksum.c index c991181d5..4d0fec187 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -309,7 +309,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); have_read_stdin = 0; diff --git a/src/comm.c b/src/comm.c index 0541d9710..efa5ee431 100644 --- a/src/comm.c +++ b/src/comm.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "comm" -#define AUTHORS "Richard Stallman", "David MacKenzie" +#define AUTHORS N_ ("Richard Stallman and David MacKenzie") /* Undefine, to avoid warning about redefinition on some systems. */ #undef min @@ -47,7 +47,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cp" -#define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering" +#define AUTHORS N_ ("Torbjorn Granlund, David MacKenzie, and Jim Meyering") #ifndef _POSIX_VERSION uid_t geteuid (); diff --git a/src/csplit.c b/src/csplit.c index 7ea8fc4fd..e6bdb558c 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "csplit" -#define AUTHORS "Stuart Kemp", "David MacKenzie" +#define AUTHORS N_ ("Stuart Kemp and David MacKenzie") #ifndef TRUE # define FALSE 0 @@ -39,7 +39,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cut" -#define AUTHORS "David Ihnat", "David MacKenzie", "Jim Meyering" +#define AUTHORS N_ ("David Ihnat, David MacKenzie, and Jim Meyering") #define FATAL_ERROR(Message) \ do \ @@ -39,7 +39,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "dd" -#define AUTHORS "Paul Rubin", "David MacKenzie", "Stuart Kemp" +#define AUTHORS N_ ("Paul Rubin, David MacKenzie, and Stuart Kemp") #ifndef SIGINFO # define SIGINFO SIGUSR1 @@ -1161,7 +1161,7 @@ main (int argc, char **argv) atexit (close_stdout_wrapper); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* Don't close stdout on exit from here on. */ closeout_func = NULL; @@ -42,7 +42,7 @@ #define PROGRAM_NAME "df" #define AUTHORS \ - "Torbjorn Granlund", "David MacKenzie", "Paul Eggert" + N_ ("Torbjorn Granlund, David MacKenzie, and Paul Eggert") /* Name this program was run with. */ char *program_name; diff --git a/src/dirname.c b/src/dirname.c index 9eee8221b..ec4e353f7 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -29,7 +29,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "dirname" -#define AUTHORS "David MacKenzie", "Jim Meyering" +#define AUTHORS N_ ("David MacKenzie and Jim Meyering") /* The name this program was run with. */ char *program_name; @@ -75,7 +75,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) @@ -46,7 +46,7 @@ #define PROGRAM_NAME "du" #define AUTHORS \ - "Torbjorn Granlund", "David MacKenzie", "Paul Eggert", "Jim Meyering" + N_ ("Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering") /* Initial size of the hash table. */ #define INITIAL_TABLE_SIZE 103 diff --git a/src/echo.c b/src/echo.c index aaeb0eee8..e1629a638 100644 --- a/src/echo.c +++ b/src/echo.c @@ -127,7 +127,7 @@ main (int argc, char **argv) /* Don't recognize --help or --version if POSIXLY_CORRECT is set. */ if (getenv ("POSIXLY_CORRECT") == NULL) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); else allow_options = 0; @@ -89,7 +89,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "env" -#define AUTHORS "Richard Mlynarik", "David MacKenzie" +#define AUTHORS N_ ("Richard Mlynarik and David MacKenzie") int putenv (); diff --git a/src/expr.c b/src/expr.c index 8b7562162..b6132755a 100644 --- a/src/expr.c +++ b/src/expr.c @@ -188,7 +188,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) diff --git a/src/factor.c b/src/factor.c index 03be10609..f27c1c08d 100644 --- a/src/factor.c +++ b/src/factor.c @@ -202,7 +202,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) diff --git a/src/head.c b/src/head.c index ead59aec4..cf28bbe94 100644 --- a/src/head.c +++ b/src/head.c @@ -44,7 +44,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "head" -#define AUTHORS "David MacKenzie", "Jim Meyering" +#define AUTHORS N_("David MacKenzie and Jim Meyering") /* Number of lines/chars/blocks to head. */ #define DEFAULT_NUMBER 10 diff --git a/src/hostid.c b/src/hostid.c index 1f89fda70..3119aadff 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -69,7 +69,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); if (argc > 1) { diff --git a/src/hostname.c b/src/hostname.c index 5aedf29e7..8f97a7aff 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -91,7 +91,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); #ifdef HAVE_SETHOSTNAME if (argc == 2) @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "id" -#define AUTHORS "Arnold Robbins", "David MacKenzie" +#define AUTHORS N_ ("Arnold Robbins and David MacKenzie") #ifndef _POSIX_VERSION struct passwd *getpwuid (); diff --git a/src/link.c b/src/link.c index d0ae1ed4d..20cf42b53 100644 --- a/src/link.c +++ b/src/link.c @@ -73,7 +73,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "ln" -#define AUTHORS "Mike Parker", "David MacKenzie" +#define AUTHORS N_ ("Mike Parker and David MacKenzie") #ifndef ENABLE_HARD_LINK_TO_SYMLINK_WARNING # define ENABLE_HARD_LINK_TO_SYMLINK_WARNING 0 diff --git a/src/logname.c b/src/logname.c index a10de9f7a..4ff863924 100644 --- a/src/logname.c +++ b/src/logname.c @@ -72,7 +72,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { @@ -119,7 +119,7 @@ int wcwidth (); : (ls_mode == LS_MULTI_COL \ ? "dir" : "vdir")) -#define AUTHORS "Richard Stallman", "David MacKenzie" +#define AUTHORS N_ ("Richard Stallman and David MacKenzie") #define obstack_chunk_alloc malloc #define obstack_chunk_free free diff --git a/src/md5sum.c b/src/md5sum.c index 570dde9f1..c1685a509 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME (algorithm == ALG_MD5 ? "md5sum" : "shasum") -#define AUTHORS "Ulrich Drepper", "Scott Miller" +#define AUTHORS N_ ("Ulrich Drepper and Scott Miller") /* Most systems do not distinguish between external and internal text representations. */ @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "mv" -#define AUTHORS "Mike Parker", "David MacKenzie", "Jim Meyering" +#define AUTHORS N_ ("Mike Parker, David MacKenzie, and Jim Meyering") /* Initial number of entries in each hash table entry's table of inodes. */ #define INITIAL_HASH_MODULE 100 diff --git a/src/nice.c b/src/nice.c index 003fa1f8e..487fb5510 100644 --- a/src/nice.c +++ b/src/nice.c @@ -99,7 +99,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); for (i = 1; i < argc; /* empty */) { @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "nl" -#define AUTHORS "Scott Bartram", "David MacKenzie" +#define AUTHORS N_ ("Scott Bartram and David MacKenzie") #ifndef TRUE # define TRUE 1 diff --git a/src/nohup.c b/src/nohup.c index a8772f84d..9a7221f8c 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -86,7 +86,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* The above handles --help and --version. Now, handle `--'. */ diff --git a/src/paste.c b/src/paste.c index 451c2b069..a41709381 100644 --- a/src/paste.c +++ b/src/paste.c @@ -46,7 +46,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "paste" -#define AUTHORS "David M. Ihnat", "David MacKenzie" +#define AUTHORS N_ ("David M. Ihnat and David MacKenzie") /* Indicates that no delimiter should be added in the current position. */ #define EMPTY_DELIM '\0' diff --git a/src/pathchk.c b/src/pathchk.c index 17638de66..f29627224 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -50,7 +50,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pathchk" -#define AUTHORS "David MacKenzie", "Jim Meyering" +#define AUTHORS N_ ("David MacKenzie and Jim Meyering") #define NEED_PATHCONF_WRAPPER 0 #if HAVE_PATHCONF @@ -166,7 +166,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); while ((optc = getopt_long (argc, argv, "p", longopts, NULL)) != -1) { diff --git a/src/pinky.c b/src/pinky.c index 37ad56dfc..77aad7e5f 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pinky" -#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi" +#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi") #ifndef MAXHOSTNAMELEN # define MAXHOSTNAMELEN 64 @@ -323,7 +323,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pr" -#define AUTHORS "Pete TerMaat", "Roland Huebner" +#define AUTHORS N_ ("Pete TerMaat and Roland Huebner") #ifndef TRUE # define TRUE 1 diff --git a/src/printenv.c b/src/printenv.c index 033e98e1d..0ad821b08 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -40,7 +40,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "printenv" -#define AUTHORS "David MacKenzie", "Richard Mlynarik" +#define AUTHORS N_ ("David MacKenzie and Richard Mlynarik") /* The name this program was run with. */ char *program_name; @@ -94,7 +94,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { diff --git a/src/printf.c b/src/printf.c index b5d1cb511..97b7d9762 100644 --- a/src/printf.c +++ b/src/printf.c @@ -566,7 +566,7 @@ main (int argc, char **argv) posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL); if (!posixly_correct) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ @@ -68,7 +68,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); if (1 < argc) error (0, 0, _("ignoring non-option arguments")); @@ -58,7 +58,7 @@ #define PROGRAM_NAME "rm" #define AUTHORS \ - "Paul Rubin", "David MacKenzie", "Richard Stallman", "Jim Meyering" + N_ ("Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering") /* Name this program was run with. */ char *program_name; diff --git a/src/setuidgid.c b/src/setuidgid.c index e19acf3cf..9a4354153 100644 --- a/src/setuidgid.c +++ b/src/setuidgid.c @@ -83,7 +83,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ diff --git a/src/sleep.c b/src/sleep.c index 9e986930c..5a4bd3d57 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sleep" -#define AUTHORS "Jim Meyering", "Paul Eggert" +#define AUTHORS N_ ("Jim Meyering and Paul Eggert") /* The name by which this program was run. */ char *program_name; @@ -120,7 +120,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { diff --git a/src/sort.c b/src/sort.c index d7eaa1685..1b4e4a400 100644 --- a/src/sort.c +++ b/src/sort.c @@ -51,7 +51,7 @@ struct rlimit { size_t rlim_cur; }; /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sort" -#define AUTHORS "Mike Haertel", "Paul Eggert" +#define AUTHORS N_ ("Mike Haertel and Paul Eggert") #if HAVE_LANGINFO_CODESET # include <langinfo.h> diff --git a/src/split.c b/src/split.c index 311b08e5d..08617c3f8 100644 --- a/src/split.c +++ b/src/split.c @@ -40,7 +40,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "split" -#define AUTHORS "Torbjorn Granlund", "Richard M. Stallman" +#define AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman") #define DEFAULT_SUFFIX_LENGTH 2 diff --git a/src/stty.c b/src/stty.c index d47ab2f27..71e0eb3fa 100644 --- a/src/stty.c +++ b/src/stty.c @@ -750,7 +750,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); output_type = changed; verbose_output = 0; @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sum" -#define AUTHORS "Kayvan Aghaiepour", "David MacKenzie" +#define AUTHORS N_ ("Kayvan Aghaiepour and David MacKenzie") /* The name this program was run with. */ char *program_name; diff --git a/src/sync.c b/src/sync.c index 13e53f670..1481c4968 100644 --- a/src/sync.c +++ b/src/sync.c @@ -65,7 +65,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); if (1 < argc) error (0, 0, _("ignoring all arguments")); diff --git a/src/sys2.h b/src/sys2.h index bcbff0f15..79fff1476 100644 --- a/src/sys2.h +++ b/src/sys2.h @@ -476,7 +476,7 @@ enum #define case_GETOPT_VERSION_CHAR(Program_name, Authors) \ case GETOPT_VERSION_CHAR: \ - version_etc (stdout, Program_name, PACKAGE, VERSION, Authors, NULL); \ + version_etc (stdout, Program_name, PACKAGE, VERSION, Authors); \ exit (EXIT_SUCCESS); \ break; @@ -50,7 +50,7 @@ tac -r -s '.\| /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tac" -#define AUTHORS "Jay Lepreau", "David MacKenzie" +#define AUTHORS N_ ("Jay Lepreau and David MacKenzie") #if defined __MSDOS__ || defined _WIN32 /* Define this to non-zero on systems for which the regular mechanism diff --git a/src/tail.c b/src/tail.c index 67184a37c..66d848101 100644 --- a/src/tail.c +++ b/src/tail.c @@ -46,7 +46,7 @@ #define PROGRAM_NAME "tail" #define AUTHORS \ - "Paul Rubin", "David MacKenzie", "Ian Lance Taylor", "Jim Meyering" + N_ ("Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering") #ifndef ENOSYS /* Some systems don't have ENOSYS -- this should be a big enough @@ -29,7 +29,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tee" -#define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie" +#define AUTHORS N_ ("Mike Parker, Richard M. Stallman, and David MacKenzie") static int tee (int nfiles, const char **files); diff --git a/src/test.c b/src/test.c index 24d347e64..fa00a396b 100644 --- a/src/test.c +++ b/src/test.c @@ -1058,7 +1058,7 @@ INTEGER may also be -l STRING, which evaluates to the length of STRING.\n\ # define main test_command #endif -#define AUTHORS "Kevin Braunsdorf", "Matthew Bradburn" +#define AUTHORS N_ ("Kevin Braunsdorf and Matthew Bradburn") /* * [: @@ -1101,7 +1101,7 @@ main (int margc, char **margv) if (margc < 2 || strcmp (margv[margc - 1], "]") != 0) { parse_long_options (margc, margv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); test_syntax_error (_("missing `]'\n"), NULL); } diff --git a/src/touch.c b/src/touch.c index c6e8d2be6..288e6d161 100644 --- a/src/touch.c +++ b/src/touch.c @@ -37,7 +37,7 @@ #define PROGRAM_NAME "touch" #define AUTHORS \ -"Paul Rubin", "Arnold Robbins", "Jim Kingdon", "David MacKenzie", "Randy Smith" +N_ ("Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith") #ifndef STDC_HEADERS time_t time (); diff --git a/src/true.c b/src/true.c index c92700e03..65e7f524d 100644 --- a/src/true.c +++ b/src/true.c @@ -63,7 +63,7 @@ main (int argc, char **argv) usage (EXIT_SUCCESS); if (STREQ (argv[1], "--version")) - version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, AUTHORS, NULL); + version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, AUTHORS); } exit (EXIT_SUCCESS); diff --git a/src/tsort.c b/src/tsort.c index c6b7855a4..a66d37ba4 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -560,7 +560,7 @@ main (int argc, char **argv) exit_status = 0; parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1) switch (opt) diff --git a/src/uniq.c b/src/uniq.c index 199cc566f..9555d6c86 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "uniq" -#define AUTHORS "Richard Stallman", "David MacKenzie" +#define AUTHORS N_ ("Richard Stallman and David MacKenzie") #define SWAP_LINES(A, B) \ do \ diff --git a/src/unlink.c b/src/unlink.c index 6d3257e36..f5c3c24d1 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -74,7 +74,7 @@ main (int argc, char **argv) /* Don't recognize --help or --version if POSIXLY_CORRECT is set. */ if (getenv ("POSIXLY_CORRECT") == NULL) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ diff --git a/src/uptime.c b/src/uptime.c index 371e60b47..c987a2a32 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -35,7 +35,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "uptime" -#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi" +#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi") int getloadavg (); @@ -216,7 +216,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1) { diff --git a/src/users.c b/src/users.c index eb2bd56e1..6ef4396c0 100644 --- a/src/users.c +++ b/src/users.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "users" -#define AUTHORS "Joseph Arceneaux", "David MacKenzie" +#define AUTHORS N_ ("Joseph Arceneaux and David MacKenzie") /* The name this program was run with. */ char *program_name; @@ -141,7 +141,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1) { @@ -71,7 +71,7 @@ extern int wcwidth (); /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "wc" -#define AUTHORS "Paul Rubin", "David MacKenzie" +#define AUTHORS N_ ("Paul Rubin and David MacKenzie") /* Size of atomic reads. */ #define BUFFER_SIZE (16 * 1024) @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "who" -#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Michael Stone" +#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Michael Stone") #ifndef MAXHOSTNAMELEN # define MAXHOSTNAMELEN 64 diff --git a/src/whoami.c b/src/whoami.c index c113ba35d..019379e87 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -77,7 +77,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { @@ -77,7 +77,7 @@ main (int argc, char **argv) /* Don't recognize --help or --version if POSIXLY_CORRECT is set. */ if (getenv ("POSIXLY_CORRECT") == NULL) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - usage, AUTHORS, NULL); + AUTHORS, usage); if (argc == 1) { |