From: Jim Meyering <jim@meyering.net>
Date: Thu, 18 Sep 2003 18:22:23 +0000 (+0000)
Subject: Update AUTHORS definition to be a comma-separated list of strings and/or update
X-Git-Tag: v5.1.0~585
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3280bf4b5571fd4425c7e6f7d765d08b77ce8d8a;p=thirdparty%2Fcoreutils.git

Update AUTHORS definition to be a comma-separated list of strings and/or update
the call to parse_long_options so that `AUTHORS, NULL' are the last parameters.
---

diff --git a/src/basename.c b/src/basename.c
index 805ee25caa..9ba33c3570 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -100,7 +100,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, 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 cf0a90016a..116ad5404f 100644
--- 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 N_ ("Torbjorn Granlund and Richard M. Stallman")
+#define AUTHORS "Torbjorn Granlund", "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 78836c8a5a..d808908b4e 100644
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -72,7 +72,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
   if (argc <= 1)
     {
       error (0, 0, _("too few arguments"));
diff --git a/src/cksum.c b/src/cksum.c
index 4d0fec187d..c991181d5a 100644
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -309,7 +309,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   have_read_stdin = 0;
 
diff --git a/src/comm.c b/src/comm.c
index efa5ee4313..0541d9710a 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "comm"
 
-#define AUTHORS N_ ("Richard Stallman and David MacKenzie")
+#define AUTHORS "Richard Stallman", "David MacKenzie"
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
 #undef min
diff --git a/src/cp.c b/src/cp.c
index a0e59110c9..db234049d5 100644
--- 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 N_ ("Torbjorn Granlund, David MacKenzie, and Jim Meyering")
+#define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
 
 #ifndef _POSIX_VERSION
 uid_t geteuid ();
diff --git a/src/csplit.c b/src/csplit.c
index e6bdb558c5..7ea8fc4fd5 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -37,7 +37,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "csplit"
 
-#define AUTHORS N_ ("Stuart Kemp and David MacKenzie")
+#define AUTHORS "Stuart Kemp", "David MacKenzie"
 
 #ifndef TRUE
 # define FALSE 0
diff --git a/src/cut.c b/src/cut.c
index d1af112853..f24160928f 100644
--- 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 N_ ("David Ihnat, David MacKenzie, and Jim Meyering")
+#define AUTHORS "David Ihnat", "David MacKenzie", "Jim Meyering"
 
 #define FATAL_ERROR(Message)						\
   do									\
diff --git a/src/dd.c b/src/dd.c
index 187764ca9e..5300d3b4a8 100644
--- 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 N_ ("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,
-		      AUTHORS, 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 af8c2bf1d6..85097a25eb 100644
--- a/src/df.c
+++ b/src/df.c
@@ -42,7 +42,7 @@
 #define PROGRAM_NAME "df"
 
 #define AUTHORS \
-  N_ ("Torbjorn Granlund, David MacKenzie, and Paul Eggert")
+  "Torbjorn Granlund", "David MacKenzie", "Paul Eggert"
 
 /* Name this program was run with. */
 char *program_name;
diff --git a/src/dirname.c b/src/dirname.c
index ec4e353f79..9eee8221be 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -29,7 +29,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dirname"
 
-#define AUTHORS N_ ("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,
-		      AUTHORS, 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 890abeda04..5d039adb74 100644
--- a/src/du.c
+++ b/src/du.c
@@ -46,7 +46,7 @@
 #define PROGRAM_NAME "du"
 
 #define AUTHORS \
-  N_ ("Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering")
+  "Torbjorn Granlund", "David MacKenzie", "Paul Eggert", "Jim Meyering"
 
 /* Initial size of the hash table.  */
 #define INITIAL_TABLE_SIZE 103
diff --git a/src/echo.c b/src/echo.c
index e1629a638c..aaeb0eee89 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -127,7 +127,7 @@ main (int argc, char **argv)
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
   else
     allow_options = 0;
 
diff --git a/src/env.c b/src/env.c
index 440ec8fb3d..0502220ef1 100644
--- 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 N_ ("Richard Mlynarik and David MacKenzie")
+#define AUTHORS "Richard Mlynarik", "David MacKenzie"
 
 int putenv ();
 
diff --git a/src/expr.c b/src/expr.c
index b6132755a3..8b75621625 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -188,7 +188,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, 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 f27c1c08db..03be106090 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -202,7 +202,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, 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/head.c b/src/head.c
index cf28bbe940..ead59aec48 100644
--- a/src/head.c
+++ b/src/head.c
@@ -44,7 +44,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "head"
 
-#define AUTHORS N_("David MacKenzie and Jim Meyering")
+#define AUTHORS "David MacKenzie", "Jim Meyering"
 
 /* Number of lines/chars/blocks to head. */
 #define DEFAULT_NUMBER 10
diff --git a/src/hostid.c b/src/hostid.c
index 3119aadff8..1f89fda708 100644
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -69,7 +69,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   if (argc > 1)
     {
diff --git a/src/hostname.c b/src/hostname.c
index 8f97a7affa..5aedf29e7b 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -91,7 +91,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
 #ifdef HAVE_SETHOSTNAME
   if (argc == 2)
diff --git a/src/id.c b/src/id.c
index 2880928d6f..9cd426a2ec 100644
--- 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 N_ ("Arnold Robbins and David MacKenzie")
+#define AUTHORS "Arnold Robbins", "David MacKenzie"
 
 #ifndef _POSIX_VERSION
 struct passwd *getpwuid ();
diff --git a/src/link.c b/src/link.c
index 20cf42b532..d0ae1ed4d9 100644
--- a/src/link.c
+++ b/src/link.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, 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 35a879033a..9334e49d42 100644
--- 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 N_ ("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
diff --git a/src/logname.c b/src/logname.c
index 4ff8639242..a10de9f7a4 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -72,7 +72,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, 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 1570ad0941..b3c1c564b5 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -119,7 +119,7 @@ int wcwidth ();
 		      : (ls_mode == LS_MULTI_COL \
 			 ? "dir" : "vdir"))
 
-#define AUTHORS N_ ("Richard Stallman and David MacKenzie")
+#define AUTHORS "Richard Stallman", "David MacKenzie"
 
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
diff --git a/src/md5sum.c b/src/md5sum.c
index c1685a509b..570dde9f1c 100644
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -34,7 +34,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME (algorithm == ALG_MD5 ? "md5sum" : "shasum")
 
-#define AUTHORS N_ ("Ulrich Drepper and Scott Miller")
+#define AUTHORS "Ulrich Drepper", "Scott Miller"
 
 /* Most systems do not distinguish between external and internal
    text representations.  */
diff --git a/src/mv.c b/src/mv.c
index 9052a12e45..e48161c843 100644
--- 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 N_ ("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
diff --git a/src/nice.c b/src/nice.c
index 487fb5510d..003fa1f8eb 100644
--- a/src/nice.c
+++ b/src/nice.c
@@ -99,7 +99,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   for (i = 1; i < argc; /* empty */)
     {
diff --git a/src/nl.c b/src/nl.c
index befbc0e4d1..7fa88120c1 100644
--- 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 N_ ("Scott Bartram and David MacKenzie")
+#define AUTHORS "Scott Bartram", "David MacKenzie"
 
 #ifndef TRUE
 # define TRUE   1
diff --git a/src/nohup.c b/src/nohup.c
index 9a7221f8c0..a8772f84d9 100644
--- a/src/nohup.c
+++ b/src/nohup.c
@@ -86,7 +86,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   /* The above handles --help and --version.
      Now, handle `--'.  */
diff --git a/src/paste.c b/src/paste.c
index a417093811..451c2b0690 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -46,7 +46,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "paste"
 
-#define AUTHORS N_ ("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'
diff --git a/src/pathchk.c b/src/pathchk.c
index f296272247..17638de66c 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -50,7 +50,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pathchk"
 
-#define AUTHORS N_ ("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,
-		      AUTHORS, 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 77aad7e5fa..37ad56dfc5 100644
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pinky"
 
-#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi")
+#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi"
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN 64
diff --git a/src/pr.c b/src/pr.c
index e6883bbbe8..f8184883b6 100644
--- 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 N_ ("Pete TerMaat and Roland Huebner")
+#define AUTHORS "Pete TerMaat", "Roland Huebner"
 
 #ifndef TRUE
 # define TRUE	1
diff --git a/src/printenv.c b/src/printenv.c
index 0ad821b08d..033e98e1dc 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "printenv"
 
-#define AUTHORS N_ ("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,
-		      AUTHORS, 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 97b7d97621..b5d1cb511b 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -566,7 +566,7 @@ main (int argc, char **argv)
   posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL);
   if (!posixly_correct)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-			AUTHORS, usage);
+			usage, AUTHORS, NULL);
 
   /* 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 c4be503d88..17a80a69e6 100644
--- 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,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   if (1 < argc)
     error (0, 0, _("ignoring non-option arguments"));
diff --git a/src/rm.c b/src/rm.c
index a2be56d451..27b0cb82fd 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -58,7 +58,7 @@
 #define PROGRAM_NAME "rm"
 
 #define AUTHORS \
-  N_ ("Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering")
+  "Paul Rubin", "David MacKenzie", "Richard Stallman", "Jim Meyering"
 
 /* Name this program was run with.  */
 char *program_name;
diff --git a/src/setuidgid.c b/src/setuidgid.c
index 9a4354153c..e19acf3cf2 100644
--- a/src/setuidgid.c
+++ b/src/setuidgid.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   /* 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 5a4bd3d573..9e986930cf 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -30,7 +30,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sleep"
 
-#define AUTHORS N_ ("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,
-		      AUTHORS, 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 1b4e4a4008..d7eaa1685c 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -51,7 +51,7 @@ struct rlimit { size_t rlim_cur; };
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sort"
 
-#define AUTHORS N_ ("Mike Haertel and Paul Eggert")
+#define AUTHORS "Mike Haertel", "Paul Eggert"
 
 #if HAVE_LANGINFO_CODESET
 # include <langinfo.h>
diff --git a/src/split.c b/src/split.c
index 08617c3f8f..311b08e5db 100644
--- a/src/split.c
+++ b/src/split.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "split"
 
-#define AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman")
+#define AUTHORS "Torbjorn Granlund", "Richard M. Stallman"
 
 #define DEFAULT_SUFFIX_LENGTH 2
 
diff --git a/src/stty.c b/src/stty.c
index 71e0eb3fa2..d47ab2f278 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -750,7 +750,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   output_type = changed;
   verbose_output = 0;
diff --git a/src/sum.c b/src/sum.c
index 9abd4f3f0b..20a496905f 100644
--- 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 N_ ("Kayvan Aghaiepour and David MacKenzie")
+#define AUTHORS "Kayvan Aghaiepour", "David MacKenzie"
 
 /* The name this program was run with. */
 char *program_name;
diff --git a/src/sync.c b/src/sync.c
index 1481c4968f..13e53f670e 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -65,7 +65,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   if (1 < argc)
     error (0, 0, _("ignoring all arguments"));
diff --git a/src/tac.c b/src/tac.c
index 4567e8705d..77611d3f9c 100644
--- 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 N_ ("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
diff --git a/src/tail.c b/src/tail.c
index 66d848101f..67184a37cf 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -46,7 +46,7 @@
 #define PROGRAM_NAME "tail"
 
 #define AUTHORS \
-  N_ ("Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering")
+  "Paul Rubin", "David MacKenzie", "Ian Lance Taylor", "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 4ec399b852..ccd7873f2d 100644
--- 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 N_ ("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);
 
diff --git a/src/test.c b/src/test.c
index fa00a396b4..24d347e641 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1058,7 +1058,7 @@ INTEGER may also be -l STRING, which evaluates to the length of STRING.\n\
 # define main test_command
 #endif
 
-#define AUTHORS N_ ("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,
-			      AUTHORS, usage);
+			      usage, AUTHORS, NULL);
 	  test_syntax_error (_("missing `]'\n"), NULL);
 	}
 
diff --git a/src/touch.c b/src/touch.c
index 288e6d1615..c6e8d2be61 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -37,7 +37,7 @@
 #define PROGRAM_NAME "touch"
 
 #define AUTHORS \
-N_ ("Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith")
+"Paul Rubin", "Arnold Robbins", "Jim Kingdon", "David MacKenzie", "Randy Smith"
 
 #ifndef STDC_HEADERS
 time_t time ();
diff --git a/src/tsort.c b/src/tsort.c
index a66d37ba42..c6b7855a45 100644
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -560,7 +560,7 @@ main (int argc, char **argv)
   exit_status = 0;
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     switch (opt)
diff --git a/src/uniq.c b/src/uniq.c
index 9555d6c86d..199cc566f0 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -36,7 +36,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uniq"
 
-#define AUTHORS N_ ("Richard Stallman and David MacKenzie")
+#define AUTHORS "Richard Stallman", "David MacKenzie"
 
 #define SWAP_LINES(A, B)			\
   do						\
diff --git a/src/unlink.c b/src/unlink.c
index f5c3c24d1c..6d3257e366 100644
--- a/src/unlink.c
+++ b/src/unlink.c
@@ -74,7 +74,7 @@ main (int argc, char **argv)
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-			AUTHORS, 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 c987a2a32c..371e60b47d 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uptime"
 
-#define AUTHORS N_ ("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,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1)
     {
diff --git a/src/users.c b/src/users.c
index 6ef4396c01..eb2bd56e15 100644
--- a/src/users.c
+++ b/src/users.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "users"
 
-#define AUTHORS N_ ("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,
-		      AUTHORS, usage);
+		      usage, AUTHORS, NULL);
 
   while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1)
     {
diff --git a/src/wc.c b/src/wc.c
index e7a6935940..061b465004 100644
--- 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 N_ ("Paul Rubin and David MacKenzie")
+#define AUTHORS "Paul Rubin", "David MacKenzie"
 
 /* Size of atomic reads. */
 #define BUFFER_SIZE (16 * 1024)
diff --git a/src/who.c b/src/who.c
index 9c6e71435d..fc46b6fe76 100644
--- 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 N_ ("Joseph Arceneaux, David MacKenzie, and Michael Stone")
+#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Michael Stone"
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN 64
diff --git a/src/whoami.c b/src/whoami.c
index 019379e87a..c113ba35dd 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -77,7 +77,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      AUTHORS, 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 f2e37ce8e9..332c3e29fa 100644
--- 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,
-			AUTHORS, usage);
+			usage, AUTHORS, NULL);
 
   if (argc == 1)
     {