convert the rest to use proper_name -- manually

* src/base64.c (AUTHORS): Rename from AUTHOR, for consistency.

diff --git a/src/base64.c b/src/base64.c
index 4a7e51fc66960ea52b737e45201c562020341f80..c9e50cf5c17f3610dad5e5bf7e851ffa1d51ac3e 100644 (file)
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,5 +1,5 @@
 /* Base64 encode/decode strings or files.
-   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004-2008 Free Software Foundation, Inc.
 
    This file is part of Base64.
 
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "base64"
 
-#define AUTHOR "Simon Josefsson"
+#define AUTHORS proper_name ("Simon Josefsson")
 
 /* The invocation name of this program.  */
 char *program_name;
@@ -274,7 +274,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHOR);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
 
       default:
        usage (EXIT_FAILURE);

diff --git a/src/cat.c b/src/cat.c
index b0bed28688934a6e027bb711e4b070f8b2ecd734..87bcc368bd421ce0c50ed06cf8a64aab2a2b91ec 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -45,7 +45,7 @@
 
 #define AUTHORS \
   proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
-    "Richard M. Stallman"
+  proper_name ("Richard M. Stallman")
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
 #undef max

diff --git a/src/cp.c b/src/cp.c
index ee5379a0ec38b99c6af6e2cbc923d4628f0fdc59..0a33ec31e0903ec5a1c8ae7b6a13e4e45f52e20f 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -54,7 +54,8 @@
 
 #define AUTHORS \
   proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
-    "David MacKenzie", "Jim Meyering"
+  proper_name ("David MacKenzie"), \
+  proper_name ("Jim Meyering")
 
 /* Used by do_copy, make_dir_parents_private, and re_protect
    to keep a list of leading directories whose protections

diff --git a/src/df.c b/src/df.c
index e8162f658829d6c6eed70a491504da7dbc14e491..20b8f2158f6cd8961b303940d6d7d8a2abb56fd4 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -39,7 +39,8 @@
 
 #define AUTHORS \
   proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
-    "David MacKenzie", "Paul Eggert"
+  proper_name ("David MacKenzie"), \
+  proper_name ("Paul Eggert")
 
 /* Name this program was run with. */
 char *program_name;

diff --git a/src/du.c b/src/du.c
index 1c4a7361c6deb2803e4eacc5e3d2a80a80ecc8f6..4d5062289df10f6f5630b4021129e0ec8bee8942 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -51,7 +51,9 @@ extern bool fts_debug;
 
 #define AUTHORS \
   proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
-  "David MacKenzie, Paul Eggert", "Jim Meyering"
+  proper_name ("David MacKenzie"), \
+  proper_name ("Paul Eggert"), \
+  proper_name ("Jim Meyering")
 
 #if DU_DEBUG
 # define FTS_CROSS_CHECK(Fts) fts_cross_check (Fts)

diff --git a/src/rm.c b/src/rm.c
index 820646f36ab899dfb0d896c8c80bb446c48c1522..c3d6e05b236af21f426288cbb65d2699290dc18b 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -1,5 +1,5 @@
 /* `rm' file deletion utility for GNU.
-   Copyright (C) 88, 90, 91, 1994-2007 Free Software Foundation, Inc.
+   Copyright (C) 88, 90, 91, 1994-2008 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
@@ -61,7 +61,10 @@
 #define PROGRAM_NAME "rm"
 
 #define AUTHORS \
-  "Paul Rubin", "David MacKenzie, Richard Stallman", "Jim Meyering"
+  proper_name ("Paul Rubin"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Richard Stallman"), \
+  proper_name ("Jim Meyering")
 
 /* Name this program was run with.  */
 char *program_name;

diff --git a/src/split.c b/src/split.c
index d78b506e41e234da3a999d9a2ee45ed0d15677ad..a490c87bc2aa73c94690293c5194066ca1873827 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -42,7 +42,7 @@
 
 #define AUTHORS \
   proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
-    "Richard M. Stallman"
+  proper_name ("Richard M. Stallman")
 
 #define DEFAULT_SUFFIX_LENGTH 2
 

diff --git a/src/tail.c b/src/tail.c
index 0a63969b8818aa6224da44f516e0005088fde111..a2ea79aea08690082df51a77131264811fb38e68 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -1,5 +1,5 @@
 /* tail -- output the last part of file(s)
-   Copyright (C) 1989, 90, 91, 1995-2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 90, 91, 1995-2006, 2008 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
@@ -49,7 +49,10 @@
 #define PROGRAM_NAME "tail"
 
 #define AUTHORS \
-  "Paul Rubin", "David MacKenzie, Ian Lance Taylor", "Jim Meyering"
+  proper_name ("Paul Rubin"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Ian Lance Taylor"), \
+  proper_name ("Jim Meyering")
 
 /* Number of items to tail.  */
 #define DEFAULT_N_LINES 10

diff --git a/src/touch.c b/src/touch.c
index 76c811fd36888db89366175eb1e8da8d4126543c..37b598717f9481573ded7868639a6b1344d4493f 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -38,7 +38,11 @@
 #define PROGRAM_NAME "touch"
 
 #define AUTHORS \
-"Paul Rubin", "Arnold Robbins, Jim Kingdon, David MacKenzie", "Randy Smith"
+  proper_name ("Paul Rubin"), \
+  proper_name ("Arnold Robbins"), \
+  proper_name ("Jim Kingdon"), \
+  proper_name ("David MacKenzie"), \
+  proper_name ("Randy Smith")
 
 /* Bitmasks for `change_times'. */
 #define CH_ATIME 1