Most .c files (AUTHORS): Revert the WRITTEN_BY/AUTHORS change

of 2003-09-19.  Now, AUTHORS is a comma-separated list of strings.
Update the call to parse_long_options so that `AUTHORS, NULL' are the
last parameters.

* src/true.c (main): Append NULL to version_etc argument list.
* src/sys2.h (case_GETOPT_VERSION_CHAR): Likewise.

diff --git a/src/basename.c b/src/basename.c
index 84c52a5a8b87328becd4bceb98dfa3320f4fb178..9ba33c35703a2f457265e83b089f4adbe8f1cf37 100644 (file)
--- a/src/basename.c
+++ b/src/basename.c
@@ -37,7 +37,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "basename"
 
-#define WRITTEN_BY _("Written by FIXME unknown.")
+#define AUTHORS "FIXME unknown"
 
 /* The name this program was run with. */
 char *program_name;
@@ -100,7 +100,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
   /* 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 e8ca98cc63b173264b75b4fbcced5353585402bc..116ad5404fb39feb9e75e7b428dde48eac6526fa 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 WRITTEN_BY _("Written by Torbjorn Granlund and Richard M. Stallman.")
+#define AUTHORS "Torbjorn Granlund", "Richard M. Stallman"
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
 #undef max
@@ -650,7 +650,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/chgrp.c b/src/chgrp.c
index dc731a26f6bc4a791044e5eaa3e745821d349b0c..6f221358c76d3160bd91002d8b7812dffedd4ae9 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chgrp"
 
-#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.")
+#define AUTHORS "David MacKenzie", "Jim Meyering"
 
 #ifndef _POSIX_VERSION
 struct group *getgrnam ();
@@ -231,7 +231,7 @@ main (int argc, char **argv)
          break;
 
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/chmod.c b/src/chmod.c
index 132d1ccd852b2aca46d717b8a88f87dab5f99fd4..aae2172d8d05645ea2ed5eeeb2d3103615718f34 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -34,7 +34,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chmod"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 enum Change_status
 {
@@ -389,7 +389,7 @@ main (int argc, char **argv)
          verbosity = V_high;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/chown.c b/src/chown.c
index 3ebff168b9852fc649afcfb1b7713b2e9eff7966..fae399db04e7f4c2124808da7790c5154105df6d 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -44,7 +44,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chown"
 
-#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.")
+#define AUTHORS "David MacKenzie", "Jim Meyering"
 
 /* The name the program was run with. */
 char *program_name;
@@ -234,7 +234,7 @@ main (int argc, char **argv)
          break;
 
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/chroot.c b/src/chroot.c
index 30e070f36c48721416435d0698307f308d55d22a..d808908b4e761333e1e9aa6ae55e1675f6b8baed 100644 (file)
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -28,7 +28,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chroot"
 
-#define WRITTEN_BY _("Written by Roland McGrath.")
+#define AUTHORS "Roland McGrath"
 
 /* The name this program was run with, for error messages. */
 char *program_name;
@@ -72,7 +72,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
   if (argc <= 1)
     {
       error (0, 0, _("too few arguments"));

diff --git a/src/cksum.c b/src/cksum.c
index 5d56ba228e3e361af82d25d43a3ffb3ffa493509..c991181d5a660b3c50bb17a21810c38fd448f431 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -45,7 +45,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "cksum"
 
-#define WRITTEN_BY _("Written by Q. Frank Xia.")
+#define AUTHORS "Q. Frank Xia"
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -309,7 +309,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   have_read_stdin = 0;
 

diff --git a/src/comm.c b/src/comm.c
index 736a60d82b551ef81b2228e91b226e2a31e07483..12c872867e0759fc62c2dc382e766f178b6d872e 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 WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.")
+#define AUTHORS "Richard Stallman", "David MacKenzie"
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
 #undef min
@@ -269,7 +269,7 @@ main (int argc, char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
       default:
        usage (EXIT_FAILURE);

diff --git a/src/cp.c b/src/cp.c
index a3f89e309b679c6016a36c5cf6f0fb29a4875c24..05c4bc22782e3b8772ad5ae4831fdf7365553379 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 WRITTEN_BY _("Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering.")
+#define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
 
 #ifndef _POSIX_VERSION
 uid_t geteuid ();
@@ -991,7 +991,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/csplit.c b/src/csplit.c
index 7a931ad50f7a1540fee51e557c69aca14f92058c..d2294b90e43e50da0526f263d15c73bb4fe9cf4f 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 WRITTEN_BY _("Written by Stuart Kemp and David MacKenzie.")
+#define AUTHORS "Stuart Kemp", "David MacKenzie"
 
 /* Increment size of area for control records. */
 #define ALLOC_SIZE 20
@@ -1353,7 +1353,7 @@ main (int argc, char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
       default:
        usage (EXIT_FAILURE);

diff --git a/src/cut.c b/src/cut.c
index d97183e2bf3d20afe6f3a5131f9fc4a4482ffb00..f24160928fcc5f36b661acf9b70c0060100062d0 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 WRITTEN_BY _("Written by David Ihnat, David MacKenzie, and Jim Meyering.")
+#define AUTHORS "David Ihnat", "David MacKenzie", "Jim Meyering"
 
 #define FATAL_ERROR(Message)                                           \
   do                                                                   \
@@ -800,7 +800,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (2);

diff --git a/src/date.c b/src/date.c
index 4948d7d502ce1043050b8397ab10587fa0c082b8..6d93338330cdac72f56caaa248e380540d90ae72 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "date"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 int putenv ();
 
@@ -350,7 +350,7 @@ main (int argc, char **argv)
        TZSET;
        break;
       case_GETOPT_HELP_CHAR;
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
       default:
        usage (EXIT_FAILURE);
       }

diff --git a/src/dd.c b/src/dd.c
index 9df05420afbffdb7b1ef7890f7ae495c98caa28e..5300d3b4a899c905a86f2b444649d6d9218aa633 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 WRITTEN_BY _("Written by Paul Rubin, David MacKenzie, and Stuart Kemp.")
+#define AUTHORS "Paul Rubin", "David MacKenzie", "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,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   /* Don't close stdout on exit from here on.  */
   closeout_func = NULL;

diff --git a/src/df.c b/src/df.c
index d1ae89c639b91f7cbea418418402ddf3ce4bd534..85097a25eb4db9221b6546053fabe4b03699e44e 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -41,8 +41,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "df"
 
-#define WRITTEN_BY \
-  _("Written by Torbjorn Granlund, David MacKenzie, and Paul Eggert.")
+#define AUTHORS \
+  "Torbjorn Granlund", "David MacKenzie", "Paul Eggert"
 
 /* Name this program was run with. */
 char *program_name;
@@ -854,7 +854,7 @@ main (int argc, char **argv)
          break;
 
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/dircolors.c b/src/dircolors.c
index 64d17f3b9d5791a71a74c41ad0ef890c1da8ae8c..5d18f098cd402193bf9b39348f7c3aeb3def1cbd 100644 (file)
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -36,7 +36,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dircolors"
 
-#define WRITTEN_BY _("Written by H. Peter Anvin.")
+#define AUTHORS "H. Peter Anvin"
 
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
@@ -443,7 +443,7 @@ main (int argc, char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
       default:
        usage (EXIT_FAILURE);

diff --git a/src/dirname.c b/src/dirname.c
index 922573d5b3146ac73ee846fe38e5f4bc128b6546..9eee8221bed9c1ba7c8aef9998003963c142d9c6 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 WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.")
+#define AUTHORS "David MacKenzie", "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,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
   /* 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 58c799ab3e06308fb2403f2a79016ee879ad3eba..584d39ba10321f9c60899d43de319d7f8a2cc9f7 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -45,8 +45,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "du"
 
-#define WRITTEN_BY \
-  _("Written by Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering.")
+#define AUTHORS \
+  "Torbjorn Granlund", "David MacKenzie, Paul Eggert", "Jim Meyering"
 
 /* Initial size of the hash table.  */
 #define INITIAL_TABLE_SIZE 103
@@ -655,7 +655,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          fail = 1;

diff --git a/src/echo.c b/src/echo.c
index dfaf0aa31896eeb653c998c51099e114eac6cfd9..658ceea209798d075d8d34e79d4208a925bdfe22 100644 (file)
--- a/src/echo.c
+++ b/src/echo.c
@@ -1,5 +1,5 @@
 /* echo.c, derived from code echo.c in Bash.
-   Copyright (C) 87,89, 1991-1997, 1999-2002 Free Software Foundation, Inc.
+   Copyright (C) 87,89, 1991-1997, 1999-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "echo"
 
-#define WRITTEN_BY _("Written by FIXME unknown.")
+#define AUTHORS "FIXME unknown"
 
 /* echo [-neE] [arg ...]
 Output the ARGs.  If -n is specified, the trailing newline is
@@ -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,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL, NULL);
   else
     allow_options = 0;
 

diff --git a/src/env.c b/src/env.c
index 1f39ff4c96a161c660d7b7562e80ca7775b6df23..0502220ef10a7f3c6d1a3bbc7fb2521c26c0117a 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 WRITTEN_BY _("Written by Richard Mlynarik and David MacKenzie.")
+#define AUTHORS "Richard Mlynarik", "David MacKenzie"
 
 int putenv ();
 
@@ -161,7 +161,7 @@ main (register int argc, register char **argv, char **envp)
        case 'u':
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (2);
        }

diff --git a/src/expand.c b/src/expand.c
index eaddff27f6410e4d56353060dbcddc951287adf4..8be52b5631dd0ddf8d0cf52dd1294ace45585116 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -47,7 +47,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "expand"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 /* The number of bytes added at a time to the amount of memory
    allocated for the output line. */
@@ -399,7 +399,7 @@ main (int argc, char **argv)
          obsolete_tablist = true;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          if (tabval == -1)
            tabval = 0;

diff --git a/src/expr.c b/src/expr.c
index 607abbbd6d61c9b5cc5ede0042f6ac37225a813c..8b75621625e5994c5918eacd0b8d366720b66c87 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -43,7 +43,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "expr"
 
-#define WRITTEN_BY _("Written by Mike Parker.")
+#define AUTHORS "Mike Parker"
 
 #undef NEW
 #define NEW(Type) XMALLOC (Type, 1)
@@ -188,7 +188,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
   /* 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 88b64cc6b21c50104689328a6feb781d60e33885..03be106090c9a0d55e90e6d8bf9237098c463215 100644 (file)
--- a/src/factor.c
+++ b/src/factor.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "factor"
 
-#define WRITTEN_BY _("Written by Paul Rubin.")
+#define AUTHORS "Paul Rubin"
 
 /* Token delimiters when reading from a file.  */
 #define DELIM "\n\t "
@@ -202,7 +202,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
   /* 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/fmt.c b/src/fmt.c
index d243c4629f3c47aa9dd5050d797ea7388cf344db..a931593dcff9117a4559ba364893ade2cf97f73e 100644 (file)
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -34,7 +34,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "fmt"
 
-#define WRITTEN_BY _("Written by Ross Paterson.")
+#define AUTHORS "Ross Paterson"
 
 /* The following parameters represent the program's idea of what is
    "best".  Adjust to taste, subject to the caveats given.  */
@@ -401,7 +401,7 @@ main (register int argc, register char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
       }
 

diff --git a/src/fold.c b/src/fold.c
index 517be282a2e5974bb12ff3276e7d3a85d393cf90..5be82db2c4a3efead0c80db9feb30447f1cbc948 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "fold"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 /* The name this program was run with. */
 char *program_name;
@@ -301,7 +301,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/head.c b/src/head.c
index 8646f4877e5cd08d79b35d93f8569831681c463a..ead59aec4879fe62ac891ac4133d2f8019b36cb4 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 WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.")
+#define AUTHORS "David MacKenzie", "Jim Meyering"
 
 /* Number of lines/chars/blocks to head. */
 #define DEFAULT_NUMBER 10
@@ -1059,7 +1059,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/hostid.c b/src/hostid.c
index 3fc6b055f5c0f4b74a82b970f2dccf86db728afa..1f89fda708f66c5683bb5be7ae5dc3b89d3c485c 100644 (file)
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -28,7 +28,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "hostid"
 
-#define WRITTEN_BY _("Written by Jim Meyering.")
+#define AUTHORS "Jim Meyering"
 
 /* The name this program was run with, for error messages. */
 char *program_name;
@@ -69,7 +69,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   if (argc > 1)
     {

diff --git a/src/hostname.c b/src/hostname.c
index e6250a10d1f8632b7f38fc79f59e99cb09d05779..5aedf29e7be22d7f2321a35e373f17e7ee55c742 100644 (file)
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -28,7 +28,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "hostname"
 
-#define WRITTEN_BY _("Written by Jim Meyering.")
+#define AUTHORS "Jim Meyering"
 
 #if !defined(HAVE_SETHOSTNAME) && defined(HAVE_SYSINFO) && \
      defined (HAVE_SYS_SYSTEMINFO_H) && defined(HAVE_LIMITS_H)
@@ -91,7 +91,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
 #ifdef HAVE_SETHOSTNAME
   if (argc == 2)

diff --git a/src/id.c b/src/id.c
index ac348b3464a7b0c4612f803e34bfb77b231df793..9cd426a2ecceccb032532777b3dba62ef828d907 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 WRITTEN_BY _("Written by Arnold Robbins and David MacKenzie.")
+#define AUTHORS "Arnold Robbins", "David MacKenzie"
 
 #ifndef _POSIX_VERSION
 struct passwd *getpwuid ();
@@ -152,7 +152,7 @@ main (int argc, char **argv)
          just_group_list = 1;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/install.c b/src/install.c
index 3cd72c3379de4855209832da0bc588baaf242dac..5b32eea78cdd472becc0808e5edf6e9c0f73a153 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "install"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 #if HAVE_SYS_WAIT_H
 # include <sys/wait.h>
@@ -255,7 +255,7 @@ main (int argc, char **argv)
          backup_suffix_string = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/join.c b/src/join.c
index 694a18e5a4076cf3d36434d35bed9a4766d08918..16097837e0cba285978d2a3283f3c3e7fb509020 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "join"
 
-#define WRITTEN_BY _("Written by Mike Haertel.")
+#define AUTHORS "Mike Haertel"
 
 #define join system_join
 
@@ -840,7 +840,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/kill.c b/src/kill.c
index 39dde86c0258f091ec2cfd858075222ff5bde81b..7f3ecb14b6826f9010ccf274def063997c7ae1b3 100644 (file)
--- a/src/kill.c
+++ b/src/kill.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "kill"
 
-#define WRITTEN_BY _("Written by Paul Eggert.")
+#define AUTHORS "Paul Eggert"
 \f
 #if ! (HAVE_DECL_STRTOIMAX || defined strtoimax)
 intmax_t strtoimax ();
@@ -350,7 +350,7 @@ main (int argc, char **argv)
        break;
 
       case_GETOPT_HELP_CHAR;
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
       default:
        usage (EXIT_FAILURE);
       }

diff --git a/src/link.c b/src/link.c
index 4f9b99ac2b13a4eb00add1b0292e63eca82546da..d0ae1ed4d9c280ab0922db85e8e52f6e990e7528 100644 (file)
--- a/src/link.c
+++ b/src/link.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "link"
 
-#define WRITTEN_BY _("Written by Michael Stone.")
+#define AUTHORS "Michael Stone"
 
 /* Name this program was run with.  */
 char *program_name;
@@ -73,7 +73,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   /* 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 4bb75d7617d5a8c0c6e4d97f6aca1d58a5a08121..e9708b96b74dce69b64af3ad229dd420eba5ee9c 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 WRITTEN_BY _("Written by Mike Parker and David MacKenzie.")
+#define AUTHORS "Mike Parker", "David MacKenzie"
 
 #ifndef ENABLE_HARD_LINK_TO_SYMLINK_WARNING
 # define ENABLE_HARD_LINK_TO_SYMLINK_WARNING 0
@@ -484,7 +484,7 @@ main (int argc, char **argv)
          backup_suffix_string = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
          break;

diff --git a/src/logname.c b/src/logname.c
index ecddb7fee62d5aa53b3d3c5d0a168e585150caae..a10de9f7a43d462ad457d2f2a39dbcf6ca4e68fc 100644 (file)
--- a/src/logname.c
+++ b/src/logname.c
@@ -27,7 +27,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "logname"
 
-#define WRITTEN_BY _("Written by FIXME: unknown.")
+#define AUTHORS "FIXME: unknown"
 
 /* The name this program was run with. */
 char *program_name;
@@ -72,7 +72,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {

diff --git a/src/ls.c b/src/ls.c
index 3680020246807234082a8990ee1dbfaa2e74663b..7f42953bd815628ea52f6c65983836ee6576083e 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -119,7 +119,7 @@ int wcwidth ();
                      : (ls_mode == LS_MULTI_COL \
                         ? "dir" : "vdir"))
 
-#define WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.")
+#define AUTHORS "Richard Stallman", "David MacKenzie"
 
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
@@ -1647,7 +1647,7 @@ decode_switches (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/md5sum.c b/src/md5sum.c
index 62d52ef443bb39475ec1b473c2c9a688baea5982..570dde9f1c44cd4290ca30957a3b4abc348c7684 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 WRITTEN_BY _("Written by Ulrich Drepper and Scott Miller.")
+#define AUTHORS "Ulrich Drepper", "Scott Miller"
 
 /* Most systems do not distinguish between external and internal
    text representations.  */
@@ -602,7 +602,7 @@ main (int argc, char **argv)
        warn = 1;
        break;
       case_GETOPT_HELP_CHAR;
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
       default:
        usage (EXIT_FAILURE);
       }

diff --git a/src/mkdir.c b/src/mkdir.c
index b2f0c3e7069be8f05daee294f08790c915ea36cf..3527e107315be0f61d9a5a2a442750b481002b50 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mkdir"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 /* The name this program was run with. */
 char *program_name;
@@ -114,7 +114,7 @@ main (int argc, char **argv)
          verbose_fmt_string = _("created directory %s");
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/mkfifo.c b/src/mkfifo.c
index 7aa4e62ac5d8287294b56d00bf13c531c1eaa714..0739c36199a216d5aa0f8bdbe34db278f1ba8150 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -30,7 +30,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mkfifo"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 /* The name this program was run with. */
 char *program_name;
@@ -103,7 +103,7 @@ main (int argc, char **argv)
          specified_mode = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/mknod.c b/src/mknod.c
index d3af094af9919139350193717b3f2974b9b81e03..1d8278a57f20bc0b2482888794c8a0e122f48bd8 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mknod"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 /* The name this program was run with. */
 char *program_name;
@@ -113,7 +113,7 @@ main (int argc, char **argv)
          specified_mode = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/mv.c b/src/mv.c
index a1b6719cc8ed58229b1f574ad2733698e45ecc4e..4beb83638b825930af142a2cebb6fbd4f36a270d 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 WRITTEN_BY _("Written by Mike Parker, David MacKenzie, and Jim Meyering.")
+#define AUTHORS "Mike Parker", "David MacKenzie", "Jim Meyering"
 
 /* Initial number of entries in each hash table entry's table of inodes.  */
 #define INITIAL_HASH_MODULE 100
@@ -436,7 +436,7 @@ main (int argc, char **argv)
          backup_suffix_string = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/nice.c b/src/nice.c
index b55c0a738ab0802d353d8a4120faaa1cdf84f709..003fa1f8eb74efec81cfee998922c5313563268f 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -41,7 +41,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "nice"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 #ifdef NICE_PRIORITY
 # define GET_PRIORITY() nice (0)
@@ -99,7 +99,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   for (i = 1; i < argc; /* empty */)
     {

diff --git a/src/nl.c b/src/nl.c
index 63beb57ead1eae0d30daf7929251c73399b8f769..7fa88120c13faa845c268c11932fe78ece879e1d 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 WRITTEN_BY _("Written by Scott Bartram and David MacKenzie.")
+#define AUTHORS "Scott Bartram", "David MacKenzie"
 
 #ifndef TRUE
 # define TRUE   1
@@ -598,7 +598,7 @@ main (int argc, char **argv)
          section_del = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          fail = 1;
          break;

diff --git a/src/nohup.c b/src/nohup.c
index f55c510c566026ce2e97da5a93714547d7022352..a8772f84d9a4d9d08ac684ccf3627192f4294de3 100644 (file)
--- a/src/nohup.c
+++ b/src/nohup.c
@@ -31,7 +31,7 @@
 
 #define PROGRAM_NAME "nohup"
 
-#define WRITTEN_BY _("Written by Jim Meyering.")
+#define AUTHORS "Jim Meyering"
 
 /* Exit statuses.  */
 enum
@@ -86,7 +86,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   /* The above handles --help and --version.
      Now, handle `--'.  */

diff --git a/src/od.c b/src/od.c
index d362e66ad80085717465dd850e49e6a2b62cdd57..257ea43b38c0092f7b366b5e8578b933120ed815 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "od"
 
-#define WRITTEN_BY _("Written by Jim Meyering.")
+#define AUTHORS "Jim Meyering"
 
 #if defined(__GNUC__) || defined(STDC_HEADERS)
 # include <float.h>
@@ -1815,7 +1815,7 @@ it must be one character from [doxn]"),
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/paste.c b/src/paste.c
index 1f6a98101d1a803ec5c33af3ee4a69fac98a12e0..9753d83f52aaffd9ff2c27466785156151457caf 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 WRITTEN_BY _("Written by David M. Ihnat and David MacKenzie.")
+#define AUTHORS "David M. Ihnat", "David MacKenzie"
 
 /* Indicates that no delimiter should be added in the current position. */
 #define EMPTY_DELIM '\0'
@@ -471,7 +471,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/pathchk.c b/src/pathchk.c
index 1b79dc1a9deaa4f71d2079e9a3a5b88734c94a0c..17638de66cca11fa7e4b87d1537535a5d1dcb83a 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 WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.")
+#define AUTHORS "David MacKenzie", "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,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   while ((optc = getopt_long (argc, argv, "p", longopts, NULL)) != -1)
     {

diff --git a/src/pinky.c b/src/pinky.c
index 901c8cb25e9347a96e77de6334cfc2bc318059c8..37ad56dfc5b0c8d114ca4b50b3355272563b2c6f 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 WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi.")
+#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi"
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN 64
@@ -560,7 +560,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/pr.c b/src/pr.c
index 4b0e0a6b28fc9297068577aebb1c69b0d8ab4bbc..f8184883b6be7e88e43da0b83a18dd523aacd198 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 WRITTEN_BY _("Written by Pete TerMaat and Roland Huebner.")
+#define AUTHORS "Pete TerMaat", "Roland Huebner"
 
 #ifndef TRUE
 # define TRUE  1
@@ -1066,7 +1066,7 @@ main (int argc, char **argv)
            break;
          }
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (2);
          break;

diff --git a/src/printenv.c b/src/printenv.c
index faf202e1bd8a9d2b34d6ac2a65bb575d5de640ce..033e98e1dcace813ec5c3bdb61b5d2cce80efa81 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 WRITTEN_BY _("Written by David MacKenzie and Richard Mlynarik.")
+#define AUTHORS "David MacKenzie", "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,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {

diff --git a/src/printf.c b/src/printf.c
index bf269f6c90087a44723a2a30f4619e5e2883e295..b5d1cb511b3bf346be4791b14e8a746f1ec919f7 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -59,7 +59,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "printf"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 #ifndef STDC_HEADERS
 double strtod ();
@@ -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,
-                       WRITTEN_BY, usage);
+                       usage, AUTHORS, NULL);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */

diff --git a/src/ptx.c b/src/ptx.c
index eb7e481d741484f120ea9e40de94ce72ca9fcba0..f34db72e51bb927cdf627bbfaff3dcd4c5b7ab85 100644 (file)
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -35,7 +35,7 @@
 /* Note to translator: Please translate "F. Pinard" to "François
    Pinard" if "ç" (c-with-cedilla) is available in the
    translation's character set and encoding.  */
-#define WRITTEN_BY _("Written by F. Pinard.")
+#define AUTHORS _("F. Pinard")
 
 /* Number of possible characters in a byte.  */
 #define CHAR_SET_SIZE 256
@@ -2087,7 +2087,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"),
                                     format_args, format_vals);
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        }
     }
 

diff --git a/src/pwd.c b/src/pwd.c
index 1c0a0376d0719cd20c220bf87e251e3c78ff5fec..17a80a69e6a8f259785524c74bcf12c6a0486d63 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -29,7 +29,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pwd"
 
-#define WRITTEN_BY _("Written by Jim Meyering.")
+#define AUTHORS "Jim Meyering"
 
 /* The name this program was run with. */
 char *program_name;
@@ -68,7 +68,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   if (1 < argc)
     error (0, 0, _("ignoring non-option arguments"));

diff --git a/src/readlink.c b/src/readlink.c
index 90bd33d8defe993b93488c42cce225efdd9e541b..9af6ae731f937f300fc09a5077a16adddda18890 100644 (file)
--- a/src/readlink.c
+++ b/src/readlink.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "readlink"
 
-#define WRITTEN_BY _("Written by Dmitry V. Levin.")
+#define AUTHORS "Dmitry V. Levin"
 
 /* Name this program was run with.  */
 char *program_name;
@@ -117,7 +117,7 @@ main (int argc, char *const argv[])
          verbose = 1;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/rm.c b/src/rm.c
index dcb3a19fefdfc890ef50279f9e708a6fef1280a4..e1fa2ff026edf8347887783167cbe539366962ac 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -57,8 +57,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "rm"
 
-#define WRITTEN_BY \
-  _("Written by Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering.")
+#define AUTHORS \
+  "Paul Rubin", "David MacKenzie, Richard Stallman", "Jim Meyering"
 
 /* Name this program was run with.  */
 char *program_name;
@@ -188,7 +188,7 @@ main (int argc, char **argv)
          x.verbose = 1;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/rmdir.c b/src/rmdir.c
index 5d4f6815e9a6b5d0c1f8b2911b8e2a7978066bec..f21092ddff6bbeb579b42b534a7ade9e45cffb8c 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "rmdir"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 #ifndef EEXIST
 # define EEXIST 0
@@ -196,7 +196,7 @@ main (int argc, char **argv)
          verbose = 1;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/seq.c b/src/seq.c
index 6f1cbc77afa3d555fa4ccc41258ed4278c2a4622..d7a306887abd8cfe6afb5a26e61e71da89076ac6 100644 (file)
--- a/src/seq.c
+++ b/src/seq.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "seq"
 
-#define WRITTEN_BY _("Written by Ulrich Drepper.")
+#define AUTHORS "Ulrich Drepper"
 
 /* If nonzero print all number with equal width.  */
 static int equal_width;
@@ -362,7 +362,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/setuidgid.c b/src/setuidgid.c
index 864946af24fe0945aec66349b6620613c45ba82f..e19acf3cf25e333fffdaf24fd837c4e02659fdae 100644 (file)
--- a/src/setuidgid.c
+++ b/src/setuidgid.c
@@ -33,7 +33,7 @@
 
 /* I wrote this program from scratch, based on the description of
    D.J. Bernstein's program: http://cr.yp.to/daemontools/setuidgid.html.  */
-#define WRITTEN_BY _("Written by Jim Meyering.")
+#define AUTHORS "Jim Meyering"
 
 #define FAIL_STATUS 111
 
@@ -83,7 +83,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */

diff --git a/src/shred.c b/src/shred.c
index 4c9345b3b69067ea9dc4eb950e401d82b9687343..9453cb30cf157040021b18b0cb2ed5cc620ea4de 100644 (file)
--- a/src/shred.c
+++ b/src/shred.c
@@ -89,7 +89,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "shred"
 
-#define WRITTEN_BY _("Written by Colin Plumb.")
+#define AUTHORS "Colin Plumb"
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -1586,7 +1586,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/sleep.c b/src/sleep.c
index 2013573ffc2018329c55c63b51022f44470a2e1c..9e986930cfe4ff0417840419f1e165912a7919cf 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 WRITTEN_BY _("Written by Jim Meyering and Paul Eggert.")
+#define AUTHORS "Jim Meyering", "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,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {

diff --git a/src/sort.c b/src/sort.c
index 5945c867ab62a1e7c86df50c49dda6bc430e0bdc..f2268f1dffe0b106fd44f127a06e3b15c622634c 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 WRITTEN_BY _("Written by Mike Haertel and Paul Eggert.")
+#define AUTHORS "Mike Haertel", "Paul Eggert"
 
 #if HAVE_LANGINFO_CODESET
 # include <langinfo.h>
@@ -2514,7 +2514,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (SORT_FAILURE);

diff --git a/src/split.c b/src/split.c
index 919c299a5642d3e31ca7c951a71d5d43f5c3253e..311b08e5db13db082dfb726257b8213ba88e54ca 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 WRITTEN_BY _("Written by Torbjorn Granlund and Richard M. Stallman.")
+#define AUTHORS "Torbjorn Granlund", "Richard M. Stallman"
 
 #define DEFAULT_SUFFIX_LENGTH 2
 
@@ -490,7 +490,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/stat.c b/src/stat.c
index aa75e17d7fbc6e6eb441c6a9f1a33dca888053cb..8b988165393d4046d4147caa3c95229f117f6490 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -87,7 +87,7 @@
 
 #define PROGRAM_NAME "stat"
 
-#define WRITTEN_BY _("Written by Michael Meskes.")
+#define AUTHORS "Michael Meskes"
 
 static struct option const long_options[] = {
   {"link", no_argument, 0, 'l'}, /* deprecated.  FIXME: remove in 2003 */
@@ -807,7 +807,7 @@ main (int argc, char *argv[])
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/stty.c b/src/stty.c
index a01cc2b6baeef30b2476524f7da0e46c5381e6b2..d47ab2f27884dc1a240f82e1380e8d76dd58a489 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -63,7 +63,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "stty"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 #ifndef _POSIX_VDISABLE
 # define _POSIX_VDISABLE ((unsigned char) 0)
@@ -750,7 +750,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   output_type = changed;
   verbose_output = 0;

diff --git a/src/su.c b/src/su.c
index 94594b237d350ce867e75e336cab5194a2474d36..3bcc87abde26a0ee51fc2e4db57da6a98f2500c2 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -115,7 +115,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "su"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 #if HAVE_PATHS_H
 # include <paths.h>
@@ -508,7 +508,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/sum.c b/src/sum.c
index ca3dbbb44dbb808538f3635b660f67d0e2737447..20a496905fdbe46be43be9b5a7af4550006244fc 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 WRITTEN_BY _("Written by Kayvan Aghaiepour and David MacKenzie.")
+#define AUTHORS "Kayvan Aghaiepour", "David MacKenzie"
 
 /* The name this program was run with. */
 char *program_name;
@@ -249,7 +249,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/sync.c b/src/sync.c
index 643800b153033eb4623711e6cde8e68115acdc2f..13e53f670ef18eba7bfbc7e96041c08bc013ab70 100644 (file)
--- a/src/sync.c
+++ b/src/sync.c
@@ -28,7 +28,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sync"
 
-#define WRITTEN_BY _("Written by Jim Meyering.")
+#define AUTHORS "Jim Meyering"
 
 /* The name this program was run with. */
 char *program_name;
@@ -65,7 +65,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   if (1 < argc)
     error (0, 0, _("ignoring all arguments"));

diff --git a/src/sys2.h b/src/sys2.h
index 602b9127853693bbad3f776385ccd301f4b78271..683ddb41008eb92ee4aac4ef0b9c15b9176d74de 100644 (file)
--- a/src/sys2.h
+++ b/src/sys2.h
@@ -474,9 +474,9 @@ enum
 #include "closeout.h"
 #include "version-etc.h"
 
-#define case_GETOPT_VERSION_CHAR(Program_name, Written_by)             \
+#define case_GETOPT_VERSION_CHAR(Program_name, Authors)                        \
   case GETOPT_VERSION_CHAR:                                            \
-    version_etc (stdout, Program_name, PACKAGE, VERSION, Written_by);  \
+    version_etc (stdout, Program_name, PACKAGE, VERSION, Authors, NULL);\
     exit (EXIT_SUCCESS);                                               \
     break;
 

diff --git a/src/tac.c b/src/tac.c
index 7471a060d19361ad293fbea1e046c192ffe9096a..e0bc93b53076b4445e88195ababf04692a07371c 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 WRITTEN_BY _("Written by Jay Lepreau and David MacKenzie.")
+#define AUTHORS "Jay Lepreau", "David MacKenzie"
 
 #if defined __MSDOS__ || defined _WIN32
 /* Define this to non-zero on systems for which the regular mechanism
@@ -638,7 +638,7 @@ main (int argc, char **argv)
            error (EXIT_FAILURE, 0, _("separator cannot be empty"));
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/tail.c b/src/tail.c
index 8575c18ce5b9ad7c723fa6c0ded5b6473bd9e6a0..4b14225e88f70549e4522193ec39a31f1b431982 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -45,8 +45,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tail"
 
-#define WRITTEN_BY \
-  _("Written by Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering.")
+#define AUTHORS \
+  "Paul Rubin", "David MacKenzie, Ian Lance Taylor", "Jim Meyering"
 
 #ifndef ENOSYS
   /* Some systems don't have ENOSYS -- this should be a big enough
@@ -1623,7 +1623,7 @@ parse_options (int argc, char **argv,
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/tee.c b/src/tee.c
index b8df35edbf8142a11eb8d6e13b841b4d7019abf4..37cd3e727de626db94829badc08d6afabfeedab1 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 WRITTEN_BY _("Written by Mike Parker, Richard M. Stallman, and David MacKenzie.")
+#define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie"
 
 static int tee (int nfiles, const char **files);
 
@@ -107,7 +107,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/test.c b/src/test.c
index 78666f0813e8cb3f9a285ea4b0ee4c8e1e966087..24d347e641c8a982603220578f40ed16e7625960 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 WRITTEN_BY _("Written by Kevin Braunsdorf and Matthew Bradburn.")
+#define AUTHORS "Kevin Braunsdorf", "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,
-                             WRITTEN_BY, usage);
+                             usage, AUTHORS, NULL);
          test_syntax_error (_("missing `]'\n"), NULL);
        }
 

diff --git a/src/touch.c b/src/touch.c
index 1cccc84ca563cc0d0b5a041affdfa70eace1444e..f8be9e33cebdc77e23291825beb50010a9eb19d5 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -36,8 +36,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "touch"
 
-#define WRITTEN_BY \
-_("Written by Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith.")
+#define AUTHORS \
+"Paul Rubin", "Arnold Robbins, Jim Kingdon, David MacKenzie", "Randy Smith"
 
 #ifndef STDC_HEADERS
 time_t time ();
@@ -336,7 +336,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/tr.c b/src/tr.c
index 417726d68bf4e78e6471db17edd9c745669f6e21..5a0a6126a5a60f6680ae9b1c3712db7d08b431b0 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tr"
 
-#define WRITTEN_BY _("Written by Jim Meyering.")
+#define AUTHORS "Jim Meyering"
 
 #define N_CHARS (UCHAR_MAX + 1)
 
@@ -1819,7 +1819,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (2);

diff --git a/src/true.c b/src/true.c
index e5b1fc03e16fe13c9130a48d0613c3eadeac1f37..c92700e03adbd7d5fdbe6d4c303baa8c7a617286 100644 (file)
--- a/src/true.c
+++ b/src/true.c
@@ -21,7 +21,7 @@
 #include "system.h"
 
 #define PROGRAM_NAME "true"
-#define WRITTEN_BY _("Written by Jim Meyering.")
+#define AUTHORS "Jim Meyering"
 
 /* The name this program was run with. */
 char *program_name;
@@ -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, WRITTEN_BY);
+       version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, AUTHORS, NULL);
     }
 
   exit (EXIT_SUCCESS);

diff --git a/src/tsort.c b/src/tsort.c
index 560f63eb6f3f210ebf8cd2c8784d6904caf55375..c6b7855a45b66d9abd712ded26a7f916271fb69d 100644 (file)
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -36,7 +36,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tsort"
 
-#define WRITTEN_BY _("Written by Mark Kettenis.")
+#define AUTHORS "Mark Kettenis"
 
 /* Token delimiters when reading from a file.  */
 #define DELIM " \t\n"
@@ -560,7 +560,7 @@ main (int argc, char **argv)
   exit_status = 0;
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     switch (opt)

diff --git a/src/tty.c b/src/tty.c
index 8d1cc42d6e507354cf905aaffd2d073e1126fcc2..076ac15d78f005a6cd4f7453ef653d2fbb30aa50 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -34,7 +34,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tty"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 /* The name under which this program was run. */
 char *program_name;
@@ -102,7 +102,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (2);

diff --git a/src/uname.c b/src/uname.c
index 87af1a216e0eb227f1a228dad90c9eddb9c7ecca..47f9ff45ca5baf49769e436a87d8de5663e1f2ae 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -50,7 +50,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uname"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 /* Values that are bitwise or'd into `toprint'. */
 /* Kernel name. */
@@ -203,7 +203,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/unexpand.c b/src/unexpand.c
index ab0b8fb1565527e884a315057e342f58d76cc5bc..ac50629e6dfd1fab193d6b0c4442a9f72eec163a 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -47,7 +47,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "unexpand"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 /* The number of bytes added at a time to the amount of memory
    allocated for the output line. */
@@ -450,7 +450,7 @@ main (int argc, char **argv)
          obsolete_tablist = true;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
        default:
          if (tabval == -1)
            tabval = 0;

diff --git a/src/uniq.c b/src/uniq.c
index 85c45e2008e58bb6092e24a79a80e4602a817914..bafd4234950475f990b6331805454d0398721899 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 WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.")
+#define AUTHORS "Richard Stallman", "David MacKenzie"
 
 #define SWAP_LINES(A, B)                       \
   do                                           \
@@ -524,7 +524,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/unlink.c b/src/unlink.c
index ad73e12d12bee9068b9b6c40d7e47124546e7598..6d3257e366425bcad8bf43868cd0d4a828c116bd 100644 (file)
--- a/src/unlink.c
+++ b/src/unlink.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "unlink"
 
-#define WRITTEN_BY _("Written by Michael Stone.")
+#define AUTHORS "Michael Stone"
 
 /* Name this program was run with.  */
 char *program_name;
@@ -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,
-                       WRITTEN_BY, usage);
+                       usage, AUTHORS, NULL);
 
   /* 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 f68726e15b08a7cf2c1d595556f18ed648da7b3e..371e60b47de5ccbf926258214c191d0476858344 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 WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi.")
+#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "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,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1)
     {

diff --git a/src/users.c b/src/users.c
index 12bad08bf9d09c245b9bae9f4a86a29dd0cdf3cb..eb2bd56e15dce84517b3de4273f42f581df196c8 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 WRITTEN_BY _("Written by Joseph Arceneaux and David MacKenzie.")
+#define AUTHORS "Joseph Arceneaux", "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,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1)
     {

diff --git a/src/wc.c b/src/wc.c
index 4bdffc4d813868a18545ba4447d27235987904cc..061b4650044657f59d5e71a1af67bb5d4628c24a 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 WRITTEN_BY _("Written by Paul Rubin and David MacKenzie.")
+#define AUTHORS "Paul Rubin", "David MacKenzie"
 
 /* Size of atomic reads. */
 #define BUFFER_SIZE (16 * 1024)
@@ -642,7 +642,7 @@ main (int argc, char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
       default:
        usage (EXIT_FAILURE);

diff --git a/src/who.c b/src/who.c
index 3cf979343665f933b253a427ff43bc1f92018353..fc46b6fe764784ad839569dfeb4c7f3e914e86c6 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 WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Michael Stone.")
+#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Michael Stone"
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN 64
@@ -765,7 +765,7 @@ main (int argc, char **argv)
 
          case_GETOPT_HELP_CHAR;
 
-         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
+         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/whoami.c b/src/whoami.c
index be7bc04a651538caa223d170d75cb46d65eb0d3f..c113ba35dda69d1432c5f7f14757bb1494e39529 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -30,7 +30,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "whoami"
 
-#define WRITTEN_BY _("Written by Richard Mlynarik.")
+#define AUTHORS "Richard Mlynarik"
 
 /* The name this program was run with. */
 char *program_name;
@@ -77,7 +77,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     WRITTEN_BY, usage);
+                     usage, AUTHORS, NULL);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {

diff --git a/src/yes.c b/src/yes.c
index f77ec5630db1348f429f49165c242a2dd3fb721f..65e5342e02bccd78132c4c5200f10758e39a214d 100644 (file)
--- a/src/yes.c
+++ b/src/yes.c
@@ -30,7 +30,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "yes"
 
-#define WRITTEN_BY _("Written by David MacKenzie.")
+#define AUTHORS "David MacKenzie"
 
 /* The name this program was run with. */
 char *program_name;
@@ -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,
-                       WRITTEN_BY, usage);
+                       usage, AUTHORS, NULL);
 
   if (argc == 1)
     {