convert 3-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), \\\n  proper_name ($4)/'

diff --git a/src/cut.c b/src/cut.c
index f6254e45b3b4b49bfc86b5cb62a36a8b445f83d6..a48be00f761ea4dd3801438ade5593d972f45b2f 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -39,7 +39,10 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "cut"
 
-#define AUTHORS "David Ihnat", "David MacKenzie", "Jim Meyering"
+#define AUTHORS \
+  proper_name ("David Ihnat"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Jim Meyering")
 
 #define FATAL_ERROR(Message)                                           \
   do                                                                   \

diff --git a/src/dd.c b/src/dd.c
index 0a7b154213f255733d6f74538a5a62a26ec344ac..b1635b8753cfccbda0a6ee6543a129f98021ba09 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -40,7 +40,10 @@ static void process_signals (void);
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dd"
 
-#define AUTHORS "Paul Rubin", "David MacKenzie", "Stuart Kemp"
+#define AUTHORS \
+  proper_name ("Paul Rubin"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Stuart Kemp")
 
 /* Use SA_NOCLDSTOP as a proxy for whether the sigaction machinery is
    present.  SA_NODEFER and SA_RESETHAND are XSI extensions.  */

diff --git a/src/md5sum.c b/src/md5sum.c
index f83a7b1152604cf512e5a31a8dbabdfcd3f7756a..df812b91b67691fd8231f1f6ae108c72cfa9d985 100644 (file)
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -88,7 +88,10 @@
 #define DIGEST_HEX_BYTES (DIGEST_BITS / 4)
 #define DIGEST_BIN_BYTES (DIGEST_BITS / 8)
 
-#define AUTHORS "Ulrich Drepper", "Scott Miller", "David Madore"
+#define AUTHORS \
+  proper_name ("Ulrich Drepper"), \
+  proper_name ("Scott Miller"), \
+  proper_name ("David Madore")
 
 /* The minimum length of a valid digest line.  This length does
    not include any newline character at the end of a line.  */

diff --git a/src/mv.c b/src/mv.c
index 44f5bfc51807194836798b9467c77d8bf1766787..3902c13b0b0bd10d8305295ded73c76cce5a6c66 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -37,7 +37,10 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mv"
 
-#define AUTHORS "Mike Parker", "David MacKenzie", "Jim Meyering"
+#define AUTHORS \
+  proper_name ("Mike Parker"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Jim Meyering")
 
 /* Initial number of entries in each hash table entry's table of inodes.  */
 #define INITIAL_HASH_MODULE 100

diff --git a/src/pathchk.c b/src/pathchk.c
index a711a091c2a2322b1ac1ad977b576310fbbcb72e..5bf297952f83618f345532719d335acbe47e7ee7 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -35,7 +35,10 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pathchk"
 
-#define AUTHORS "Paul Eggert", "David MacKenzie", "Jim Meyering"
+#define AUTHORS \
+  proper_name ("Paul Eggert"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Jim Meyering")
 
 #ifndef _POSIX_PATH_MAX
 # define _POSIX_PATH_MAX 256

diff --git a/src/pinky.c b/src/pinky.c
index 760ae52c541a33004702da8b927980e284b13361..fd2bdb69c9bd5da978900183e3e1e6fe0e11984e 100644 (file)
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -33,7 +33,10 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pinky"
 
-#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi"
+#define AUTHORS \
+  proper_name ("Joseph Arceneaux"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Kaveh Ghazi")
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN 64

diff --git a/src/tee.c b/src/tee.c
index 4a9f37bbac896f8dff88f53f526ecf453604ebfc..987ffbdaa0b6a7f17b186f862b4ed8836a68b935 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -28,7 +28,10 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tee"
 
-#define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie"
+#define AUTHORS \
+  proper_name ("Mike Parker"), \
+  proper_name ("Richard M. Stallman"), \
+  proper_name ("David MacKenzie")
 
 static bool tee_files (int nfiles, const char **files);
 

diff --git a/src/uptime.c b/src/uptime.c
index aff1e3dfa5479e137609da799b28c23b80fc977a..f6925e31e9ce5b325fa0b7c02496485c4e9a75fa 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -40,7 +40,10 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uptime"
 
-#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi"
+#define AUTHORS \
+  proper_name ("Joseph Arceneaux"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Kaveh Ghazi")
 
 int getloadavg ();
 

diff --git a/src/who.c b/src/who.c
index 4d024cea45c0f42910e64d3ab6b478b0db41cd21..6a39331cfb87154def75d01c10c4f29f5453e2f1 100644 (file)
--- a/src/who.c
+++ b/src/who.c
@@ -40,7 +40,10 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "who"
 
-#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Michael Stone"
+#define AUTHORS \
+  proper_name ("Joseph Arceneaux"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Michael Stone")
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN 64