From: Jim Meyering Date: Mon, 19 May 2008 14:24:27 +0000 (+0200) Subject: convert single-author programs to use proper_name X-Git-Tag: v6.12~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b69b4cca953a9a0a13edf026ea104d13dc956bd3;p=thirdparty%2Fcoreutils.git convert single-author programs to use proper_name g grep -E -l 'define AUTHORS "[^,]+"$'|xargs perl -pi -e \ 's/(define AUTHORS) ("[^,]+")$/$1 proper_name ($2)/' --- diff --git a/src/basename.c b/src/basename.c index f26de8d10f..76163b164d 100644 --- a/src/basename.c +++ b/src/basename.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "basename" -#define AUTHORS "FIXME unknown" +#define AUTHORS proper_name ("FIXME unknown") /* The name this program was run with. */ char *program_name; diff --git a/src/chroot.c b/src/chroot.c index 90b0b967b0..e3621fd704 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -29,7 +29,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "chroot" -#define AUTHORS "Roland McGrath" +#define AUTHORS proper_name ("Roland McGrath") /* The name this program was run with, for error messages. */ char *program_name; diff --git a/src/cksum.c b/src/cksum.c index 9901f6ad12..5b594fd6b2 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cksum" -#define AUTHORS "Q. Frank Xia" +#define AUTHORS proper_name ("Q. Frank Xia") #include #include diff --git a/src/date.c b/src/date.c index ba88eb83be..282fa2ae81 100644 --- a/src/date.c +++ b/src/date.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "date" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") int putenv (); diff --git a/src/dircolors.c b/src/dircolors.c index 2a9007571a..d51d409dbb 100644 --- a/src/dircolors.c +++ b/src/dircolors.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "dircolors" -#define AUTHORS "H. Peter Anvin" +#define AUTHORS proper_name ("H. Peter Anvin") #define obstack_chunk_alloc malloc #define obstack_chunk_free free diff --git a/src/echo.c b/src/echo.c index f4e91f7dab..cd97cd0ad5 100644 --- a/src/echo.c +++ b/src/echo.c @@ -24,7 +24,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "echo" -#define AUTHORS "FIXME unknown" +#define AUTHORS proper_name ("FIXME unknown") /* echo [-neE] [arg ...] Output the ARGs. If -n is specified, the trailing newline is diff --git a/src/expand.c b/src/expand.c index fd4cab0d78..023d525f75 100644 --- a/src/expand.c +++ b/src/expand.c @@ -45,7 +45,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "expand" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") /* The number of bytes added at a time to the amount of memory allocated for the output line. */ diff --git a/src/expr.c b/src/expr.c index cd498f6451..1f740e2019 100644 --- a/src/expr.c +++ b/src/expr.c @@ -43,7 +43,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "expr" -#define AUTHORS "Mike Parker" +#define AUTHORS proper_name ("Mike Parker") /* Exit statuses. */ enum diff --git a/src/factor.c b/src/factor.c index b54a170954..5ee4a035a7 100644 --- a/src/factor.c +++ b/src/factor.c @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "factor" -#define AUTHORS "Paul Rubin" +#define AUTHORS proper_name ("Paul Rubin") /* Token delimiters when reading from a file. */ #define DELIM "\n\t " diff --git a/src/fmt.c b/src/fmt.c index a3e0014104..2a9e3c543e 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -33,7 +33,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "fmt" -#define AUTHORS "Ross Paterson" +#define AUTHORS proper_name ("Ross Paterson") /* The following parameters represent the program's idea of what is "best". Adjust to taste, subject to the caveats given. */ diff --git a/src/fold.c b/src/fold.c index d74167a893..948968069f 100644 --- a/src/fold.c +++ b/src/fold.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "fold" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") /* The name this program was run with. */ char *program_name; diff --git a/src/hostid.c b/src/hostid.c index ea50086eb0..95ee7c22b4 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "hostid" -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") /* The name this program was run with, for error messages. */ char *program_name; diff --git a/src/hostname.c b/src/hostname.c index 4be2185c17..5bd67b90f0 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "hostname" -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") #if HAVE_SETHOSTNAME && !defined sethostname int sethostname (); diff --git a/src/install.c b/src/install.c index 13feb850ec..308b022ac1 100644 --- a/src/install.c +++ b/src/install.c @@ -45,7 +45,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "install" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") #if HAVE_SYS_WAIT_H # include diff --git a/src/join.c b/src/join.c index b8a0011996..c14cc1e665 100644 --- a/src/join.c +++ b/src/join.c @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "join" -#define AUTHORS "Mike Haertel" +#define AUTHORS proper_name ("Mike Haertel") #define join system_join diff --git a/src/kill.c b/src/kill.c index 8d1a1c202f..95e769777e 100644 --- a/src/kill.c +++ b/src/kill.c @@ -39,7 +39,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "kill" -#define AUTHORS "Paul Eggert" +#define AUTHORS proper_name ("Paul Eggert") #if ! (HAVE_DECL_STRSIGNAL || defined strsignal) # if ! (HAVE_DECL_SYS_SIGLIST || defined sys_siglist) diff --git a/src/link.c b/src/link.c index 4c576e1cff..08e7b10741 100644 --- a/src/link.c +++ b/src/link.c @@ -33,7 +33,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "link" -#define AUTHORS "Michael Stone" +#define AUTHORS proper_name ("Michael Stone") /* Name this program was run with. */ char *program_name; diff --git a/src/logname.c b/src/logname.c index 7e85b5a669..290f6bb21e 100644 --- a/src/logname.c +++ b/src/logname.c @@ -27,7 +27,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "logname" -#define AUTHORS "FIXME: unknown" +#define AUTHORS proper_name ("FIXME: unknown") /* The name this program was run with. */ char *program_name; diff --git a/src/mkdir.c b/src/mkdir.c index d3d76ad489..d865407b2c 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "mkdir" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") /* The name this program was run with. */ char *program_name; diff --git a/src/mkfifo.c b/src/mkfifo.c index 6abd1bea9f..cfe9b51be8 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "mkfifo" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") /* The name this program was run with. */ char *program_name; diff --git a/src/mknod.c b/src/mknod.c index 445117c90c..b67d88cd2f 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "mknod" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") /* The name this program was run with. */ char *program_name; diff --git a/src/mktemp.c b/src/mktemp.c index 6f12d99478..c25f4b3d7b 100644 --- a/src/mktemp.c +++ b/src/mktemp.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "mktemp" -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") static const char *default_template = "tmp.XXXXXXXXXX"; diff --git a/src/nice.c b/src/nice.c index 79e7708504..b722d96408 100644 --- a/src/nice.c +++ b/src/nice.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "nice" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") #if HAVE_NICE # define GET_NICENESS() nice (0) diff --git a/src/nohup.c b/src/nohup.c index 275316485b..ea4befef89 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -34,7 +34,7 @@ #define PROGRAM_NAME "nohup" -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") /* Exit statuses. */ enum diff --git a/src/od.c b/src/od.c index 250a02d6aa..f6080d7f23 100644 --- a/src/od.c +++ b/src/od.c @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "od" -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") #include diff --git a/src/printf.c b/src/printf.c index e2536c797c..cd3e94a8ad 100644 --- a/src/printf.c +++ b/src/printf.c @@ -60,7 +60,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "printf" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") #define isodigit(c) ((c) >= '0' && (c) <= '7') #define hextobin(c) ((c) >= 'a' && (c) <= 'f' ? (c) - 'a' + 10 : \ diff --git a/src/pwd.c b/src/pwd.c index 28df3e6a7c..bfdec85ca1 100644 --- a/src/pwd.c +++ b/src/pwd.c @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pwd" -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") struct file_name { diff --git a/src/readlink.c b/src/readlink.c index 859e2a30ce..3121433a39 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "readlink" -#define AUTHORS "Dmitry V. Levin" +#define AUTHORS proper_name ("Dmitry V. Levin") /* Name this program was run with. */ char *program_name; diff --git a/src/rmdir.c b/src/rmdir.c index 5f7f54116d..b090d7a852 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "rmdir" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") /* The name this program was run with. */ char *program_name; diff --git a/src/runcon.c b/src/runcon.c index 418860146c..3c45c6fec8 100644 --- a/src/runcon.c +++ b/src/runcon.c @@ -43,7 +43,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "runcon" -#define AUTHORS "Russell Coker" +#define AUTHORS proper_name ("Russell Coker") static struct option long_options[] = { {"role", required_argument, NULL, 'r'}, diff --git a/src/seq.c b/src/seq.c index efc0c7243a..2277e7eae8 100644 --- a/src/seq.c +++ b/src/seq.c @@ -38,7 +38,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "seq" -#define AUTHORS "Ulrich Drepper" +#define AUTHORS proper_name ("Ulrich Drepper") /* If true print all number with equal width. */ static bool equal_width; diff --git a/src/setuidgid.c b/src/setuidgid.c index 83369fdef9..dde5e04fdf 100644 --- a/src/setuidgid.c +++ b/src/setuidgid.c @@ -35,7 +35,7 @@ /* I wrote this program from scratch, based on the description of D.J. Bernstein's program: http://cr.yp.to/daemontools/setuidgid.html. */ -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") #define SETUIDGID_FAILURE 111 diff --git a/src/shred.c b/src/shred.c index 7d794d6076..4a1313383b 100644 --- a/src/shred.c +++ b/src/shred.c @@ -82,7 +82,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "shred" -#define AUTHORS "Colin Plumb" +#define AUTHORS proper_name ("Colin Plumb") #include diff --git a/src/shuf.c b/src/shuf.c index b516ec33d8..1ab8795075 100644 --- a/src/shuf.c +++ b/src/shuf.c @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "shuf" -#define AUTHORS "Paul Eggert" +#define AUTHORS proper_name ("Paul Eggert") /* The name this program was run with. */ char *program_name; diff --git a/src/stat.c b/src/stat.c index 0f25df4e93..2129dce12a 100644 --- a/src/stat.c +++ b/src/stat.c @@ -150,7 +150,7 @@ statfs (char const *filename, struct fs_info *buf) #define PROGRAM_NAME "stat" -#define AUTHORS "Michael Meskes" +#define AUTHORS proper_name ("Michael Meskes") enum { diff --git a/src/stty.c b/src/stty.c index c7b8780d72..d27f1eff52 100644 --- a/src/stty.c +++ b/src/stty.c @@ -66,7 +66,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "stty" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") #ifndef _POSIX_VDISABLE # define _POSIX_VDISABLE 0 diff --git a/src/su.c b/src/su.c index 7778002f84..0cb415a3b8 100644 --- a/src/su.c +++ b/src/su.c @@ -92,7 +92,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "su" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") #if HAVE_PATHS_H # include diff --git a/src/sync.c b/src/sync.c index 4cc4812598..9534082bab 100644 --- a/src/sync.c +++ b/src/sync.c @@ -28,7 +28,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sync" -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") /* The name this program was run with. */ char *program_name; diff --git a/src/tr.c b/src/tr.c index a7565f8d43..d75dee352a 100644 --- a/src/tr.c +++ b/src/tr.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tr" -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") enum { N_CHARS = UCHAR_MAX + 1 }; diff --git a/src/true.c b/src/true.c index 4ce3fe6cb2..eebfaeeefe 100644 --- a/src/true.c +++ b/src/true.c @@ -30,7 +30,7 @@ # define PROGRAM_NAME "false" #endif -#define AUTHORS "Jim Meyering" +#define AUTHORS proper_name ("Jim Meyering") /* The name this program was run with. */ char *program_name; diff --git a/src/tsort.c b/src/tsort.c index 8ebacb4d8c..f6dde8ac14 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tsort" -#define AUTHORS "Mark Kettenis" +#define AUTHORS proper_name ("Mark Kettenis") /* Token delimiters when reading from a file. */ #define DELIM " \t\n" diff --git a/src/tty.c b/src/tty.c index 0a38093377..dd98c3fe06 100644 --- a/src/tty.c +++ b/src/tty.c @@ -40,7 +40,7 @@ enum /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tty" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") /* The name under which this program was run. */ char *program_name; diff --git a/src/uname.c b/src/uname.c index 5d04e6f882..a55f281df6 100644 --- a/src/uname.c +++ b/src/uname.c @@ -58,7 +58,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME (uname_mode == UNAME_UNAME ? "uname" : "arch") -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") #define ARCH_AUTHORS "David MacKenzie", "Karel Zak" /* Values that are bitwise or'd into `toprint'. */ diff --git a/src/unexpand.c b/src/unexpand.c index 488fc67a25..4f15a0fd81 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -46,7 +46,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "unexpand" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") /* The number of bytes added at a time to the amount of memory allocated for the output line. */ diff --git a/src/unlink.c b/src/unlink.c index 15a04a03a3..71379349ed 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -33,7 +33,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "unlink" -#define AUTHORS "Michael Stone" +#define AUTHORS proper_name ("Michael Stone") /* Name this program was run with. */ char *program_name; diff --git a/src/whoami.c b/src/whoami.c index 0e3a97d59d..93123572ff 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -33,7 +33,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "whoami" -#define AUTHORS "Richard Mlynarik" +#define AUTHORS proper_name ("Richard Mlynarik") /* The name this program was run with. */ char *program_name; diff --git a/src/yes.c b/src/yes.c index b789293508..377bd9dfbb 100644 --- a/src/yes.c +++ b/src/yes.c @@ -29,7 +29,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "yes" -#define AUTHORS "David MacKenzie" +#define AUTHORS proper_name ("David MacKenzie") /* The name this program was run with. */ char *program_name;