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)/'

diff --git a/src/chcon.c b/src/chcon.c
index 01bb4ad69321febc765b39045a9270e510327d08..2642bf4a97b31c5f9569f3a900478ca8e12cf45f 100644 (file)
--- 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 b15c385aaa7d5227ae1ee624785a50a663276c75..725ea72329a8741fc81f692bd30d2ce52e7fd0d8 100644 (file)
--- 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 9f307e508c6b57ccc3c102153e7052a24d75a188..e8a795f2441df23fee473392d834796f5baf04d4 100644 (file)
--- 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 f39e611b5352d015ba04df0a339cba36790aaf1b..fd9428cb8ccbfdb9aa0dd27b9c7d1dc8bd24e4d8 100644 (file)
--- 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 cbda362df3d8a77feb6785ed96db1912313d144a..ff33b71ce6f6e34d678d2ad47162d8236d3aad1a 100644 (file)
--- 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 790b601e982657a55c85b1d005b32234a3c5a1cb..ef29ab8d40a5808a88ff7ca104e86a5b2ddcd2ad 100644 (file)
--- 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 acd00033cde2d93335d895edad289c0350d23de4..93b33d2baced5365561a9eaa1e6607f4aba09ca5 100644 (file)
--- 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 14a62d09342e105cae216e972bf93d6b6b24f0c9..e8b4ac35645fd1cc96edae664856c78807858023 100644 (file)
--- 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 baac7b931294779c5b830041d0d6f1c2ee5aa9f9..f61e07ab0245fb2f4a49d438227a3b3201724bc9 100644 (file)
--- 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 e862c975f3cf12bd4e7d404d6e20f3177824ce72..7851eb9108e37287c30f4e5211b146e5690acde5 100644 (file)
--- 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 92c39fe365b1d5b4421db0d17c16393024319ac0..533f42868a1df8a2cd67ad04e20dcc0700ad224b 100644 (file)
--- 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 aa0e473821ba96ae3e9eb212699f22a5ffa53988..33be275ef47f70622eec9219915b0d8e307ce9b8 100644 (file)
--- 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 e029fe06583181ead505cadc1ae7f054740894fd..8528e4cffaa867c73d0c6c953ffa3bff186c4bed 100644 (file)
--- 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 455c1183956ee96640ba7c724546cf862183f6fe..99ba1ef08f4e5f0eca7819600f9dda0fd6f5d1f0 100644 (file)
--- 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 20d6953334937b71dd2f8785f4116ae5826524d9..cdecd557eae6d658c86803dfc6a1a6f0c4d32b8a 100644 (file)
--- 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 14c9d22a1729c4f8d2e11dff28931b2755e03640..ed2876a7603d2769443f8f8848298f5b91de3c95 100644 (file)
--- 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 fff1644ae354543acc26581b8347f775d6d29f94..24b4d979b9cffc4162ba1fddab17b060c88884f3 100644 (file)
--- 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 a5ba3bc8f3b2a8c8ccb8975cdc30712e1db96695..39bb0c91c80ccaae25f8c15e6c29d680eaf26540 100644 (file)
--- 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 8b2eec542a451296ffaff2020b40cbd652529dd6..e0480eeb9e08b518e498733a9322f2b0a712122e 100644 (file)
--- 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 b58336d1057a547550e4d2f4b853030ded8e6d9a..468ebbe68b6a9667d4bfa73cbdf55e3853df7a7d 100644 (file)
--- 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 e9ba10d73673664af0c4fcf8e8e8f2dcc337d523..39a5ce0ffef8baee157c10b2d295bbfe2673d0e3 100644 (file)
--- 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 c6502f9485be491ea6916b27f10aaf16c75cac80..b546efdb895edd78169cde67630cdbeec4f52225 100644 (file)
--- 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 ce883d791b631fb3173dded1fc2b89ec7735b52e..e044b8918ef3b67d0ab0ef7f93e1570c1539f953 100644 (file)
--- 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 75298863d3af92cdcb851251b22ab420c606b2fc..0548fb99e71b5f159b9840cf0c162987fb7aa2f9 100644 (file)
--- 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 ebbb5b337c4f0a7b3739849d556c7e4fb3526ad3..0fd138d070fa527058ea11b3a72a4a3905b6fbde 100644 (file)
--- 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)