revert previous change

diff --git a/lib/long-options.c b/lib/long-options.c
index 94fea1587a32355904d958bd12bef963650df90f..58bc93c1d18a992d5f0c3044b7178ffc303aec2a 100644 (file)
--- 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 78a33a389023edea05620310382bd096c5f5b4a7..e89b3512de75ed447dd4bfa716cd7cc6a1214c30 100644 (file)
--- 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 031c2e92138c9ca798786f4893725773156d22ef..663aa8dcf003fe60c7b780db592fb8b3388317d3 100644 (file)
--- 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 7056aaaeb8ba9b0dcddaf622e0513133e7a34b45..e2ef98185d528d309cd9b7dd7d3fd6d924eb6556 100644 (file)
--- 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 9ba33c35703a2f457265e83b089f4adbe8f1cf37..805ee25caa24f0aea6d5deeb74ed0c2d9d7782e1 100644 (file)
--- 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], "--"))

diff --git a/src/cat.c b/src/cat.c
index 116ad5404fb39feb9e75e7b428dde48eac6526fa..cf0a90016a4e3dc8f393b35785edbd21c97c10d0 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -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 d808908b4e761333e1e9aa6ae55e1675f6b8baed..78836c8a5a6ff145324014920d7722ff759ac56e 100644 (file)
--- 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 c991181d5a660b3c50bb17a21810c38fd448f431..4d0fec187d8b984c5a1048d167d1ed2285894262 100644 (file)
--- 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 0541d9710a7d929855b36a3f6d07bbc226b67b7d..efa5ee4313dbc1e86d2519a87e9b34d0830e704a 100644 (file)
--- 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

diff --git a/src/cp.c b/src/cp.c
index db234049d509a011746c325aea685ac182a5d9c9..a0e59110c9cf514620d80709e4ff7a8120377975 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -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 7ea8fc4fd5c9143198ad1b83e5d275f65ba890e1..e6bdb558c5a37be2a5aac21e47caa1d17cdb0a14 100644 (file)
--- 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

diff --git a/src/cut.c b/src/cut.c
index f24160928fcc5f36b661acf9b70c0060100062d0..d1af11285303b3a049d04a3df24d702fb0a467b4 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -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                                                                   \

diff --git a/src/dd.c b/src/dd.c
index 5300d3b4a899c905a86f2b444649d6d9218aa633..187764ca9e65a2a73076845e80309509e5aff929 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -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;

diff --git a/src/df.c b/src/df.c
index 85097a25eb4db9221b6546053fabe4b03699e44e..af8c2bf1d6a6164a79c773e5d521d841e7d5bcf0 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -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 9eee8221bed9c1ba7c8aef9998003963c142d9c6..ec4e353f791e0d725441d0e82a879dc839b7b5ca 100644 (file)
--- 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], "--"))

diff --git a/src/du.c b/src/du.c
index 5d039adb7490ce48ae9769afc8cf711c0c0f7854..890abeda0475b968486646ba8ca707756c7abd72 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -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 aaeb0eee89dfcd7d8bcbffcd14542051151b9a4a..e1629a638c98c8815fcffe935d68df46e649f609 100644 (file)
--- 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;
 

diff --git a/src/env.c b/src/env.c
index 0502220ef10a7f3c6d1a3bbc7fb2521c26c0117a..440ec8fb3d235dfd30819a605bc3b7bb212642c4 100644 (file)
--- a/src/env.c
+++ b/src/env.c
@@ -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 8b75621625e5994c5918eacd0b8d366720b66c87..b6132755a3075c4388f67c4c13795a8b4bb60ab8 100644 (file)
--- 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 03be106090c9a0d55e90e6d8bf9237098c463215..f27c1c08db3681b33790d8c75b87165a151ecbed 100644 (file)
--- 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 ead59aec4879fe62ac891ac4133d2f8019b36cb4..cf28bbe940160869d754b443f756b330fde7912f 100644 (file)
--- 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 1f89fda708f66c5683bb5be7ae5dc3b89d3c485c..3119aadff8023dc5602353b57c93ab8fe39f4689 100644 (file)
--- 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 5aedf29e7be22d7f2321a35e373f17e7ee55c742..8f97a7affaad59ff9b4fe696ceb55e6a06fc9a48 100644 (file)
--- 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)

diff --git a/src/id.c b/src/id.c
index 9cd426a2ecceccb032532777b3dba62ef828d907..2880928d6f946344bbfc057c3a76acf896e0e6e0 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -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 d0ae1ed4d9c280ab0922db85e8e52f6e990e7528..20cf42b5322606b78eccdba4c7d6bc0703100265 100644 (file)
--- 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.  */

diff --git a/src/ln.c b/src/ln.c
index 9334e49d42860988a022b3780b3d30a37c77fe85..35a879033ac70f95a22125d70b88d8308abfa138 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -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 a10de9f7a43d462ad457d2f2a39dbcf6ca4e68fc..4ff86392422cefdc194c30d8016ed1f15376962c 100644 (file)
--- 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)
     {

diff --git a/src/ls.c b/src/ls.c
index b3c1c564b511e9471346c8a6bd778eb57f95de34..1570ad0941474a94a264070d898245bb833247ae 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -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 570dde9f1c44cd4290ca30957a3b4abc348c7684..c1685a509b3e1cafb5ec9a0a9cee94387e67cb9e 100644 (file)
--- 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.  */

diff --git a/src/mv.c b/src/mv.c
index e48161c843e1f0b67299c49afe442cf18ba8519e..9052a12e45b3d7b233c433e9438200ffac05b78d 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -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 003fa1f8eb74efec81cfee998922c5313563268f..487fb5510d0fa059aa5b0df04101e0663b47f5b2 100644 (file)
--- 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 */)
     {

diff --git a/src/nl.c b/src/nl.c
index 7fa88120c13faa845c268c11932fe78ece879e1d..befbc0e4d1dbab0011222f893ed3d56b3ad7190b 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -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 a8772f84d9a4d9d08ac684ccf3627192f4294de3..9a7221f8c07a22a4c6a4d12718b51cc1755a5230 100644 (file)
--- 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 451c2b0690c8c2868f446986b6f3af88e01c7a0a..a417093811546d006f95533513cfcb8120d69528 100644 (file)
--- 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 17638de66cca11fa7e4b87d1537535a5d1dcb83a..f296272247a6b7212a737a2d3a5c9ee953b92305 100644 (file)
--- 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 37ad56dfc5b0c8d114ca4b50b3355272563b2c6f..77aad7e5faafd6a228156500df2950eb6d1656ec 100644 (file)
--- 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

diff --git a/src/pr.c b/src/pr.c
index f8184883b6be7e88e43da0b83a18dd523aacd198..e6883bbbe85b5916e3c5f69895a3ea77c64d5991 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -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 033e98e1dcace813ec5c3bdb61b5d2cce80efa81..0ad821b08df24024f154e62d2c4e10a2c6f64e41 100644 (file)
--- 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 b5d1cb511b3bf346be4791b14e8a746f1ec919f7..97b7d97621343f976fb54f0402b0481e7d976d39 100644 (file)
--- 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.  */

diff --git a/src/pwd.c b/src/pwd.c
index 17a80a69e6a8f259785524c74bcf12c6a0486d63..c4be503d886cf0fde3e411d9fe82bd8cba801422 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -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"));

diff --git a/src/rm.c b/src/rm.c
index 27b0cb82fda56004f9d834227279f0ad16f90ce7..a2be56d451ba0b31e873438ac4042d9d865a7519 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -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 e19acf3cf25e333fffdaf24fd837c4e02659fdae..9a4354153cc6ce5a724cbc0d214064f2dfbc67da 100644 (file)
--- 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 9e986930cfe4ff0417840419f1e165912a7919cf..5a4bd3d57319c596ac32f9e0195467be10b28469 100644 (file)
--- 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 d7eaa1685c67e9b567d77f7a7c41e5000d9b8237..1b4e4a4008ae8ba42b2558c660e88efccc1005ba 100644 (file)
--- 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 311b08e5db13db082dfb726257b8213ba88e54ca..08617c3f8f16efba2ebeac28ed2e961e35bf1ad0 100644 (file)
--- 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 d47ab2f27884dc1a240f82e1380e8d76dd58a489..71e0eb3fa22e8a323370108df5b4ba467a4c7f61 100644 (file)
--- 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;

diff --git a/src/sum.c b/src/sum.c
index 20a496905fdbe46be43be9b5a7af4550006244fc..9abd4f3f0ba75d9348c39ff170b718445ea9e60c 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -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 13e53f670ef18eba7bfbc7e96041c08bc013ab70..1481c4968f8f358b53686f6143bbdf08e2e14ec5 100644 (file)
--- 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 bcbff0f15517374d2861870d73cbafdd86b929a7..79fff1476993dae8507aaec6a7f5c7f55ca2a394 100644 (file)
--- 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;
 

diff --git a/src/tac.c b/src/tac.c
index 77611d3f9c4765fc19fc3a22212ec4de117110f2..4567e8705d3abd6649ff5de86e16a2be99770d5c 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -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 67184a37cf7abadf75aa24cd3bb2e85b9104b930..66d848101f006a7e93fafd08330a5fc2fb10ad8c 100644 (file)
--- 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

diff --git a/src/tee.c b/src/tee.c
index ccd7873f2d22819f5ac8c9c8be5b35672f57202c..4ec399b8522cf84c7cf8b15f846c59c576f15669 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -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 24d347e641c8a982603220578f40ed16e7625960..fa00a396b4fdb86623cd022602bcc3efbc95e3e9 100644 (file)
--- 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 c6e8d2be610364497edf5d30cdb438bfa862f966..288e6d1615b7f011182cd224f731d583bc287445 100644 (file)
--- 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 c92700e03adbd7d5fdbe6d4c303baa8c7a617286..65e7f524dcf47f6bd2bd352c7e54e7b018bc3343 100644 (file)
--- 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 c6b7855a45b66d9abd712ded26a7f916271fb69d..a66d37ba42b7d421fc996fd9181eed961342b018 100644 (file)
--- 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 199cc566f0e2df9145382298188f2323cacb8aec..9555d6c86daf5731def28907a81692f01586edf9 100644 (file)
--- 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 6d3257e366425bcad8bf43868cd0d4a828c116bd..f5c3c24d1c9f91b4883ae26ec0073c9eba493f58 100644 (file)
--- 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 371e60b47de5ccbf926258214c191d0476858344..c987a2a32cea96f5d03aab3f08a98bf0e9fabf77 100644 (file)
--- 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 eb2bd56e15dce84517b3de4273f42f581df196c8..6ef4396c0176f2d7d543da798df7f50666450e91 100644 (file)
--- 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)
     {

diff --git a/src/wc.c b/src/wc.c
index 061b4650044657f59d5e71a1af67bb5d4628c24a..e7a693594029e67a74be8ed631f32191f9dd0186 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -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)

diff --git a/src/who.c b/src/who.c
index fc46b6fe764784ad839569dfeb4c7f3e914e86c6..9c6e71435de66eadd5c0e47789577772011506cf 100644 (file)
--- a/src/who.c
+++ b/src/who.c
@@ -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 c113ba35dda69d1432c5f7f14757bb1494e39529..019379e87aac83de5e0ae8b8337f8682ed320452 100644 (file)
--- 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)
     {

diff --git a/src/yes.c b/src/yes.c
index 332c3e29fa868b7274d83648f99f03d35fc81ce3..f2e37ce8e9f0d3d75b14f028149ce43db7662fe6 100644 (file)
--- a/src/yes.c
+++ b/src/yes.c
@@ -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)
     {