convert 2-author programs to use proper_name

g grep -E -l 'define AUTHORS "[^,]+", "[^,]+"$'|xargs perl -pi -e \
  's/(define AUTHORS) ("[^,]+"), ("[^,]+")$/$1 \\\n  proper_name ($2), \\\n  proper_name ($3)/'

25 files changed, 75 insertions, 25 deletions

diff --git a/src/chcon.c b/src/chcon.c
index 01bb4ad69..2642bf4a9 100644
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -31,7 +31,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chcon"
 
-#define AUTHORS "Russell Coker", "Jim Meyering"
+#define AUTHORS \
+  proper_name ("Russell Coker"), \
+  proper_name ("Jim Meyering")
 
 enum Change_status
 {
diff --git a/src/chgrp.c b/src/chgrp.c
index b15c385aa..725ea7232 100644
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -34,7 +34,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chgrp"
 
-#define AUTHORS "David MacKenzie", "Jim Meyering"
+#define AUTHORS \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Jim Meyering")
 
 #if ! HAVE_ENDGRENT
 # define endgrent() ((void) 0)
diff --git a/src/chmod.c b/src/chmod.c
index 9f307e508..e8a795f24 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -34,7 +34,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chmod"
 
-#define AUTHORS "David MacKenzie", "Jim Meyering"
+#define AUTHORS \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Jim Meyering")
 
 enum Change_status
 {
diff --git a/src/chown.c b/src/chown.c
index f39e611b5..fd9428cb8 100644
--- a/src/chown.c
+++ b/src/chown.c
@@ -43,7 +43,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chown"
 
-#define AUTHORS "David MacKenzie", "Jim Meyering"
+#define AUTHORS \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Jim Meyering")
 
 /* The name the program was run with. */
 char *program_name;
diff --git a/src/comm.c b/src/comm.c
index cbda362df..ff33b71ce 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -31,7 +31,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "comm"
 
-#define AUTHORS "Richard Stallman", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Richard Stallman"), \
+  proper_name ("David MacKenzie")
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
 #undef min
diff --git a/src/csplit.c b/src/csplit.c
index 790b601e9..ef29ab8d4 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -49,7 +49,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "csplit"
 
-#define AUTHORS "Stuart Kemp", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Stuart Kemp"), \
+  proper_name ("David MacKenzie")
 
 /* Increment size of area for control records. */
 #define ALLOC_SIZE 20
diff --git a/src/dirname.c b/src/dirname.c
index acd00033c..93b33d2ba 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -31,7 +31,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dirname"
 
-#define AUTHORS "David MacKenzie", "Jim Meyering"
+#define AUTHORS \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Jim Meyering")
 
 /* The name this program was run with. */
 char *program_name;
diff --git a/src/env.c b/src/env.c
index 14a62d093..e8b4ac356 100644
--- a/src/env.c
+++ b/src/env.c
@@ -88,7 +88,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "env"
 
-#define AUTHORS "Richard Mlynarik", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Richard Mlynarik"), \
+  proper_name ("David MacKenzie")
 
 int putenv ();
 
diff --git a/src/groups.c b/src/groups.c
index baac7b931..f61e07ab0 100644
--- a/src/groups.c
+++ b/src/groups.c
@@ -35,7 +35,9 @@ char *program_name;
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "groups"
 
-#define AUTHORS "David MacKenzie", "James Youngman"
+#define AUTHORS \
+  proper_name ("David MacKenzie"), \
+  proper_name ("James Youngman")
 
 
 static struct option const longopts[] =
diff --git a/src/head.c b/src/head.c
index e862c975f..7851eb910 100644
--- a/src/head.c
+++ b/src/head.c
@@ -42,7 +42,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "head"
 
-#define AUTHORS "David MacKenzie", "Jim Meyering"
+#define AUTHORS \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Jim Meyering")
 
 /* Number of lines/chars/blocks to head. */
 #define DEFAULT_NUMBER 10
diff --git a/src/id.c b/src/id.c
index 92c39fe36..533f42868 100644
--- a/src/id.c
+++ b/src/id.c
@@ -34,7 +34,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "id"
 
-#define AUTHORS "Arnold Robbins", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Arnold Robbins"), \
+  proper_name ("David MacKenzie")
 
 /* If nonzero, output only the SELinux context. -Z */
 static int just_context = 0;
diff --git a/src/ln.c b/src/ln.c
index aa0e47382..33be275ef 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -35,7 +35,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "ln"
 
-#define AUTHORS "Mike Parker", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Mike Parker"), \
+  proper_name ("David MacKenzie")
 
 #ifndef ENABLE_HARD_LINK_TO_SYMLINK_WARNING
 # define ENABLE_HARD_LINK_TO_SYMLINK_WARNING 0
diff --git a/src/ls.c b/src/ls.c
index e029fe065..8528e4cff 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -110,7 +110,9 @@
 		      : (ls_mode == LS_MULTI_COL \
 			 ? "dir" : "vdir"))
 
-#define AUTHORS "Richard Stallman", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Richard Stallman"), \
+  proper_name ("David MacKenzie")
 
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
diff --git a/src/nl.c b/src/nl.c
index 455c11839..99ba1ef08 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -35,7 +35,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "nl"
 
-#define AUTHORS "Scott Bartram", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Scott Bartram"), \
+  proper_name ("David MacKenzie")
 
 /* Line-number formats.  They are given an int width, an intmax_t
    value, and a string separator.  */
diff --git a/src/paste.c b/src/paste.c
index 20d695333..cdecd557e 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -47,7 +47,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "paste"
 
-#define AUTHORS "David M. Ihnat", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("David M. Ihnat"), \
+  proper_name ("David MacKenzie")
 
 /* Indicates that no delimiter should be added in the current position. */
 #define EMPTY_DELIM '\0'
diff --git a/src/pr.c b/src/pr.c
index 14c9d22a1..ed2876a76 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -325,7 +325,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pr"
 
-#define AUTHORS "Pete TerMaat", "Roland Huebner"
+#define AUTHORS \
+  proper_name ("Pete TerMaat"), \
+  proper_name ("Roland Huebner")
 
 /* Used with start_position in the struct COLUMN described below.
    If start_position == ANYWHERE, we aren't truncating columns and
diff --git a/src/printenv.c b/src/printenv.c
index fff1644ae..24b4d979b 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -41,7 +41,9 @@ enum { PRINTENV_FAILURE = 2 };
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "printenv"
 
-#define AUTHORS "David MacKenzie", "Richard Mlynarik"
+#define AUTHORS \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Richard Mlynarik")
 
 /* The name this program was run with. */
 char *program_name;
diff --git a/src/sleep.c b/src/sleep.c
index a5ba3bc8f..39bb0c91c 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -30,7 +30,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sleep"
 
-#define AUTHORS "Jim Meyering", "Paul Eggert"
+#define AUTHORS \
+  proper_name ("Jim Meyering"), \
+  proper_name ("Paul Eggert")
 
 /* The name by which this program was run. */
 char *program_name;
diff --git a/src/sort.c b/src/sort.c
index 8b2eec542..e0480eeb9 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -55,7 +55,9 @@ struct rlimit { size_t rlim_cur; };
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sort"
 
-#define AUTHORS "Mike Haertel", "Paul Eggert"
+#define AUTHORS \
+  proper_name ("Mike Haertel"), \
+  proper_name ("Paul Eggert")
 
 #if HAVE_LANGINFO_CODESET
 # include <langinfo.h>
diff --git a/src/sum.c b/src/sum.c
index b58336d10..468ebbe68 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -31,7 +31,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sum"
 
-#define AUTHORS "Kayvan Aghaiepour", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Kayvan Aghaiepour"), \
+  proper_name ("David MacKenzie")
 
 /* The name this program was run with. */
 char *program_name;
diff --git a/src/tac.c b/src/tac.c
index e9ba10d73..39a5ce0ff 100644
--- a/src/tac.c
+++ b/src/tac.c
@@ -52,7 +52,9 @@ tac -r -s '.\|
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tac"
 
-#define AUTHORS "Jay Lepreau", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Jay Lepreau"), \
+  proper_name ("David MacKenzie")
 
 #if defined __MSDOS__ || defined _WIN32
 /* Define this to non-zero on systems for which the regular mechanism
diff --git a/src/test.c b/src/test.c
index c6502f948..b546efdb8 100644
--- a/src/test.c
+++ b/src/test.c
@@ -785,7 +785,9 @@ test treats each of those as it treats any other nonempty STRING.\n\
 # define main test_command
 #endif
 
-#define AUTHORS "Kevin Braunsdorf", "Matthew Bradburn"
+#define AUTHORS \
+  proper_name ("Kevin Braunsdorf"), \
+  proper_name ("Matthew Bradburn")
 
 /*
  * [:
diff --git a/src/uniq.c b/src/uniq.c
index ce883d791..e044b8918 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -36,7 +36,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uniq"
 
-#define AUTHORS "Richard Stallman", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Richard Stallman"), \
+  proper_name ("David MacKenzie")
 
 #define SWAP_LINES(A, B)			\
   do						\
diff --git a/src/users.c b/src/users.c
index 75298863d..0548fb99e 100644
--- a/src/users.c
+++ b/src/users.c
@@ -31,7 +31,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "users"
 
-#define AUTHORS "Joseph Arceneaux", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Joseph Arceneaux"), \
+  proper_name ("David MacKenzie")
 
 /* The name this program was run with. */
 char *program_name;
diff --git a/src/wc.c b/src/wc.c
index ebbb5b337..0fd138d07 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -42,7 +42,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "wc"
 
-#define AUTHORS "Paul Rubin", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Paul Rubin"), \
+  proper_name ("David MacKenzie")
 
 /* Size of atomic reads. */
 #define BUFFER_SIZE (16 * 1024)