diff options
| -rw-r--r-- | src/base64.c | 6 | ||||
| -rw-r--r-- | src/cat.c | 2 | ||||
| -rw-r--r-- | src/cp.c | 3 | ||||
| -rw-r--r-- | src/df.c | 3 | ||||
| -rw-r--r-- | src/du.c | 4 | ||||
| -rw-r--r-- | src/rm.c | 7 | ||||
| -rw-r--r-- | src/split.c | 2 | ||||
| -rw-r--r-- | src/tail.c | 7 | ||||
| -rw-r--r-- | src/touch.c | 6 |
9 files changed, 27 insertions, 13 deletions
diff --git a/src/base64.c b/src/base64.c index 4a7e51fc6..c9e50cf5c 100644 --- 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); @@ -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 @@ -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 @@ -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; @@ -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) @@ -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 d78b506e4..a490c87bc 100644 --- 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 0a63969b8..a2ea79aea 100644 --- 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 76c811fd3..37b598717 100644 --- 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 |