From bafd927f03084ba6b12f7ff1b95352eb0e3a0a84 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 18 Sep 2003 22:19:03 +0000 Subject: [PATCH] (WRITTEN_BY): Rename from AUTHORS. Begin each WRITTEN_BY string with `Written by ' and end it with `.'. Mark each WRITTEN_BY string as translatable. --- src/basename.c | 4 ++-- src/cat.c | 4 ++-- src/chgrp.c | 4 ++-- src/chmod.c | 4 ++-- src/chown.c | 4 ++-- src/chroot.c | 4 ++-- src/cksum.c | 4 ++-- src/comm.c | 4 ++-- src/cp.c | 4 ++-- src/csplit.c | 4 ++-- src/cut.c | 4 ++-- src/date.c | 4 ++-- src/dd.c | 4 ++-- src/df.c | 6 +++--- src/dircolors.c | 4 ++-- src/dirname.c | 4 ++-- src/du.c | 6 +++--- src/echo.c | 4 ++-- src/env.c | 4 ++-- src/expand.c | 4 ++-- src/expr.c | 4 ++-- src/factor.c | 4 ++-- src/fmt.c | 4 ++-- src/fold.c | 4 ++-- src/head.c | 4 ++-- src/hostid.c | 4 ++-- src/hostname.c | 4 ++-- src/id.c | 4 ++-- src/install.c | 4 ++-- src/join.c | 4 ++-- src/kill.c | 4 ++-- src/link.c | 4 ++-- src/ln.c | 4 ++-- src/logname.c | 4 ++-- src/ls.c | 4 ++-- src/md5sum.c | 4 ++-- src/mkdir.c | 4 ++-- src/mkfifo.c | 4 ++-- src/mknod.c | 4 ++-- src/mv.c | 4 ++-- src/nice.c | 4 ++-- src/nl.c | 4 ++-- src/nohup.c | 4 ++-- src/od.c | 4 ++-- src/paste.c | 4 ++-- src/pathchk.c | 4 ++-- src/pinky.c | 4 ++-- src/pr.c | 4 ++-- src/printenv.c | 4 ++-- src/printf.c | 4 ++-- src/ptx.c | 4 ++-- src/pwd.c | 4 ++-- src/readlink.c | 4 ++-- src/rm.c | 6 +++--- src/rmdir.c | 4 ++-- src/seq.c | 4 ++-- src/setuidgid.c | 4 ++-- src/shred.c | 4 ++-- src/sleep.c | 4 ++-- src/sort.c | 4 ++-- src/split.c | 4 ++-- src/stat.c | 4 ++-- src/stty.c | 4 ++-- src/su.c | 4 ++-- src/sum.c | 4 ++-- src/sync.c | 4 ++-- src/tac.c | 4 ++-- src/tail.c | 6 +++--- src/tee.c | 4 ++-- src/test.c | 4 ++-- src/touch.c | 6 +++--- src/tr.c | 4 ++-- src/true.c | 4 ++-- src/tsort.c | 4 ++-- src/tty.c | 4 ++-- src/uname.c | 4 ++-- src/unexpand.c | 4 ++-- src/uniq.c | 4 ++-- src/unlink.c | 4 ++-- src/uptime.c | 4 ++-- src/users.c | 4 ++-- src/wc.c | 4 ++-- src/who.c | 4 ++-- src/whoami.c | 4 ++-- src/yes.c | 4 ++-- 85 files changed, 175 insertions(+), 175 deletions(-) diff --git a/src/basename.c b/src/basename.c index 805ee25..84c52a5 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 WRITTEN_BY _("Written by FIXME unknown.") /* The name this program was run with. */ char *program_name; @@ -100,7 +100,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) diff --git a/src/cat.c b/src/cat.c index cf0a900..e8ca98c 100644 --- a/src/cat.c +++ b/src/cat.c @@ -38,7 +38,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cat" -#define AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman") +#define WRITTEN_BY _("Written by Torbjorn Granlund and Richard M. Stallman.") /* Undefine, to avoid warning about redefinition on some systems. */ #undef max @@ -650,7 +650,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/chgrp.c b/src/chgrp.c index 1bcc85e..e5a1cdd 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "chgrp" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") /* MAXUID may come from limits.h *or* sys/params.h (via system.h) above. */ #ifndef MAXUID @@ -200,7 +200,7 @@ main (int argc, char **argv) chopt.verbosity = V_high; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/chmod.c b/src/chmod.c index 7059b86..5f78835 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "chmod" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") enum Change_status { @@ -339,7 +339,7 @@ main (int argc, char **argv) verbosity = V_high; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/chown.c b/src/chown.c index 10273bd..5d22de8 100644 --- a/src/chown.c +++ b/src/chown.c @@ -42,7 +42,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "chown" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") #ifndef _POSIX_VERSION struct passwd *getpwnam (); @@ -201,7 +201,7 @@ main (int argc, char **argv) chopt.verbosity = V_high; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/chroot.c b/src/chroot.c index 78836c8..30e070f 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -28,7 +28,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "chroot" -#define AUTHORS "Roland McGrath" +#define WRITTEN_BY _("Written by Roland McGrath.") /* The name this program was run with, for error messages. */ char *program_name; @@ -72,7 +72,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); if (argc <= 1) { error (0, 0, _("too few arguments")); diff --git a/src/cksum.c b/src/cksum.c index 4d0fec1..5d56ba2 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -45,7 +45,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cksum" -#define AUTHORS "Q. Frank Xia" +#define WRITTEN_BY _("Written by Q. Frank Xia.") #include #include @@ -309,7 +309,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); have_read_stdin = 0; diff --git a/src/comm.c b/src/comm.c index efa5ee4..0b69e5c 100644 --- a/src/comm.c +++ b/src/comm.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "comm" -#define AUTHORS N_ ("Richard Stallman and David MacKenzie") +#define WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.") /* Undefine, to avoid warning about redefinition on some systems. */ #undef min @@ -254,7 +254,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/cp.c b/src/cp.c index a0e5911..9e5e3d7 100644 --- a/src/cp.c +++ b/src/cp.c @@ -47,7 +47,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cp" -#define AUTHORS N_ ("Torbjorn Granlund, David MacKenzie, and Jim Meyering") +#define WRITTEN_BY _("Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering.") #ifndef _POSIX_VERSION uid_t geteuid (); @@ -992,7 +992,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/csplit.c b/src/csplit.c index e6bdb55..07fd2d3 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "csplit" -#define AUTHORS N_ ("Stuart Kemp and David MacKenzie") +#define WRITTEN_BY _("Written by Stuart Kemp and David MacKenzie.") #ifndef TRUE # define FALSE 0 @@ -1453,7 +1453,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/cut.c b/src/cut.c index d1af112..d97183e 100644 --- a/src/cut.c +++ b/src/cut.c @@ -39,7 +39,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cut" -#define AUTHORS N_ ("David Ihnat, David MacKenzie, and Jim Meyering") +#define WRITTEN_BY _("Written by David Ihnat, David MacKenzie, and Jim Meyering.") #define FATAL_ERROR(Message) \ do \ @@ -800,7 +800,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (2); diff --git a/src/date.c b/src/date.c index 6d93338..4948d7d 100644 --- a/src/date.c +++ b/src/date.c @@ -40,7 +40,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "date" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") int putenv (); @@ -350,7 +350,7 @@ main (int argc, char **argv) TZSET; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/dd.c b/src/dd.c index 187764c..9df0542 100644 --- a/src/dd.c +++ b/src/dd.c @@ -39,7 +39,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "dd" -#define AUTHORS N_ ("Paul Rubin, David MacKenzie, and Stuart Kemp") +#define WRITTEN_BY _("Written by Paul Rubin, David MacKenzie, and Stuart Kemp.") #ifndef SIGINFO # define SIGINFO SIGUSR1 @@ -1161,7 +1161,7 @@ main (int argc, char **argv) atexit (close_stdout_wrapper); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* Don't close stdout on exit from here on. */ closeout_func = NULL; diff --git a/src/df.c b/src/df.c index af8c2bf..d1ae89c 100644 --- a/src/df.c +++ b/src/df.c @@ -41,8 +41,8 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "df" -#define AUTHORS \ - N_ ("Torbjorn Granlund, David MacKenzie, and Paul Eggert") +#define WRITTEN_BY \ + _("Written by Torbjorn Granlund, David MacKenzie, and Paul Eggert.") /* Name this program was run with. */ char *program_name; @@ -854,7 +854,7 @@ main (int argc, char **argv) break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/dircolors.c b/src/dircolors.c index 5d18f09..64d17f3 100644 --- a/src/dircolors.c +++ b/src/dircolors.c @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "dircolors" -#define AUTHORS "H. Peter Anvin" +#define WRITTEN_BY _("Written by H. Peter Anvin.") #define obstack_chunk_alloc malloc #define obstack_chunk_free free @@ -443,7 +443,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/dirname.c b/src/dirname.c index ec4e353..922573d 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -29,7 +29,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "dirname" -#define AUTHORS N_ ("David MacKenzie and Jim Meyering") +#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.") /* The name this program was run with. */ char *program_name; @@ -75,7 +75,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) diff --git a/src/du.c b/src/du.c index 890abed..ddcb13c 100644 --- a/src/du.c +++ b/src/du.c @@ -45,8 +45,8 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "du" -#define AUTHORS \ - N_ ("Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering") +#define WRITTEN_BY \ + _("Written by Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering.") /* Initial size of the hash table. */ #define INITIAL_TABLE_SIZE 103 @@ -693,7 +693,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: fail = 1; diff --git a/src/echo.c b/src/echo.c index e1629a6..dfaf0aa 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 WRITTEN_BY _("Written by FIXME unknown.") /* echo [-neE] [arg ...] Output the ARGs. If -n is specified, the trailing newline is @@ -127,7 +127,7 @@ main (int argc, char **argv) /* Don't recognize --help or --version if POSIXLY_CORRECT is set. */ if (getenv ("POSIXLY_CORRECT") == NULL) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); else allow_options = 0; diff --git a/src/env.c b/src/env.c index 440ec8f..1f39ff4 100644 --- a/src/env.c +++ b/src/env.c @@ -89,7 +89,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "env" -#define AUTHORS N_ ("Richard Mlynarik and David MacKenzie") +#define WRITTEN_BY _("Written by Richard Mlynarik and David MacKenzie.") int putenv (); @@ -161,7 +161,7 @@ main (register int argc, register char **argv, char **envp) case 'u': break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (2); } diff --git a/src/expand.c b/src/expand.c index 8be52b5..eaddff2 100644 --- a/src/expand.c +++ b/src/expand.c @@ -47,7 +47,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "expand" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") /* The number of bytes added at a time to the amount of memory allocated for the output line. */ @@ -399,7 +399,7 @@ main (int argc, char **argv) obsolete_tablist = true; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: if (tabval == -1) tabval = 0; diff --git a/src/expr.c b/src/expr.c index b613275..607abbb 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 WRITTEN_BY _("Written by Mike Parker.") #undef NEW #define NEW(Type) XMALLOC (Type, 1) @@ -188,7 +188,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) diff --git a/src/factor.c b/src/factor.c index f27c1c0..88b64cc 100644 --- a/src/factor.c +++ b/src/factor.c @@ -35,7 +35,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "factor" -#define AUTHORS "Paul Rubin" +#define WRITTEN_BY _("Written by Paul Rubin.") /* Token delimiters when reading from a file. */ #define DELIM "\n\t " @@ -202,7 +202,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) diff --git a/src/fmt.c b/src/fmt.c index a931593..d243c46 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "fmt" -#define AUTHORS "Ross Paterson" +#define WRITTEN_BY _("Written by Ross Paterson.") /* The following parameters represent the program's idea of what is "best". Adjust to taste, subject to the caveats given. */ @@ -401,7 +401,7 @@ main (register int argc, register char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); } diff --git a/src/fold.c b/src/fold.c index 538dcfd..2937660 100644 --- a/src/fold.c +++ b/src/fold.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "fold" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") /* The name this program was run with. */ char *program_name; @@ -298,7 +298,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/head.c b/src/head.c index cf28bbe..8646f48 100644 --- a/src/head.c +++ b/src/head.c @@ -44,7 +44,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "head" -#define AUTHORS N_("David MacKenzie and Jim Meyering") +#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.") /* Number of lines/chars/blocks to head. */ #define DEFAULT_NUMBER 10 @@ -1059,7 +1059,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/hostid.c b/src/hostid.c index 3119aad..3fc6b05 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -28,7 +28,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "hostid" -#define AUTHORS "Jim Meyering" +#define WRITTEN_BY _("Written by Jim Meyering.") /* The name this program was run with, for error messages. */ char *program_name; @@ -69,7 +69,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); if (argc > 1) { diff --git a/src/hostname.c b/src/hostname.c index 8f97a7a..e6250a1 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -28,7 +28,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "hostname" -#define AUTHORS "Jim Meyering" +#define WRITTEN_BY _("Written by Jim Meyering.") #if !defined(HAVE_SETHOSTNAME) && defined(HAVE_SYSINFO) && \ defined (HAVE_SYS_SYSTEMINFO_H) && defined(HAVE_LIMITS_H) @@ -91,7 +91,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); #ifdef HAVE_SETHOSTNAME if (argc == 2) diff --git a/src/id.c b/src/id.c index 2880928..ac348b3 100644 --- a/src/id.c +++ b/src/id.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "id" -#define AUTHORS N_ ("Arnold Robbins and David MacKenzie") +#define WRITTEN_BY _("Written by Arnold Robbins and David MacKenzie.") #ifndef _POSIX_VERSION struct passwd *getpwuid (); @@ -152,7 +152,7 @@ main (int argc, char **argv) just_group_list = 1; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/install.c b/src/install.c index 5b32eea..3cd72c3 100644 --- a/src/install.c +++ b/src/install.c @@ -40,7 +40,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "install" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") #if HAVE_SYS_WAIT_H # include @@ -255,7 +255,7 @@ main (int argc, char **argv) backup_suffix_string = optarg; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/join.c b/src/join.c index 554df88..e82b66f 100644 --- a/src/join.c +++ b/src/join.c @@ -35,7 +35,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "join" -#define AUTHORS "Mike Haertel" +#define WRITTEN_BY _("Written by Mike Haertel.") #define join system_join @@ -838,7 +838,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/kill.c b/src/kill.c index 7f3ecb1..39dde86 100644 --- a/src/kill.c +++ b/src/kill.c @@ -40,7 +40,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "kill" -#define AUTHORS "Paul Eggert" +#define WRITTEN_BY _("Written by Paul Eggert.") #if ! (HAVE_DECL_STRTOIMAX || defined strtoimax) intmax_t strtoimax (); @@ -350,7 +350,7 @@ main (int argc, char **argv) break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/link.c b/src/link.c index 20cf42b..4f9b99a 100644 --- a/src/link.c +++ b/src/link.c @@ -35,7 +35,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "link" -#define AUTHORS "Michael Stone" +#define WRITTEN_BY _("Written by Michael Stone.") /* Name this program was run with. */ char *program_name; @@ -73,7 +73,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ diff --git a/src/ln.c b/src/ln.c index 35a8790..77055c7 100644 --- a/src/ln.c +++ b/src/ln.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "ln" -#define AUTHORS N_ ("Mike Parker and David MacKenzie") +#define WRITTEN_BY _("Written by Mike Parker and David MacKenzie.") #ifndef ENABLE_HARD_LINK_TO_SYMLINK_WARNING # define ENABLE_HARD_LINK_TO_SYMLINK_WARNING 0 @@ -476,7 +476,7 @@ main (int argc, char **argv) backup_suffix_string = optarg; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); break; diff --git a/src/logname.c b/src/logname.c index 4ff8639..ecddb7f 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 WRITTEN_BY _("Written by FIXME: unknown.") /* The name this program was run with. */ char *program_name; @@ -72,7 +72,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { diff --git a/src/ls.c b/src/ls.c index 1570ad0..fd2e366 100644 --- a/src/ls.c +++ b/src/ls.c @@ -119,7 +119,7 @@ int wcwidth (); : (ls_mode == LS_MULTI_COL \ ? "dir" : "vdir")) -#define AUTHORS N_ ("Richard Stallman and David MacKenzie") +#define WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.") #define obstack_chunk_alloc malloc #define obstack_chunk_free free @@ -1646,7 +1646,7 @@ decode_switches (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/md5sum.c b/src/md5sum.c index c1685a5..62d52ef 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME (algorithm == ALG_MD5 ? "md5sum" : "shasum") -#define AUTHORS N_ ("Ulrich Drepper and Scott Miller") +#define WRITTEN_BY _("Written by Ulrich Drepper and Scott Miller.") /* Most systems do not distinguish between external and internal text representations. */ @@ -602,7 +602,7 @@ main (int argc, char **argv) warn = 1; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/mkdir.c b/src/mkdir.c index 3527e10..b2f0c3e 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "mkdir" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") /* The name this program was run with. */ char *program_name; @@ -114,7 +114,7 @@ main (int argc, char **argv) verbose_fmt_string = _("created directory %s"); break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/mkfifo.c b/src/mkfifo.c index 0739c36..7aa4e62 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 WRITTEN_BY _("Written by David MacKenzie.") /* The name this program was run with. */ char *program_name; @@ -103,7 +103,7 @@ main (int argc, char **argv) specified_mode = optarg; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/mknod.c b/src/mknod.c index 1d8278a..d3af094 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 WRITTEN_BY _("Written by David MacKenzie.") /* The name this program was run with. */ char *program_name; @@ -113,7 +113,7 @@ main (int argc, char **argv) specified_mode = optarg; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/mv.c b/src/mv.c index 9052a12..edc4ad8 100644 --- a/src/mv.c +++ b/src/mv.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "mv" -#define AUTHORS N_ ("Mike Parker, David MacKenzie, and Jim Meyering") +#define WRITTEN_BY _("Written by Mike Parker, David MacKenzie, and Jim Meyering.") /* Initial number of entries in each hash table entry's table of inodes. */ #define INITIAL_HASH_MODULE 100 @@ -436,7 +436,7 @@ main (int argc, char **argv) backup_suffix_string = optarg; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/nice.c b/src/nice.c index 487fb55..b55c0a7 100644 --- a/src/nice.c +++ b/src/nice.c @@ -41,7 +41,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "nice" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") #ifdef NICE_PRIORITY # define GET_PRIORITY() nice (0) @@ -99,7 +99,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); for (i = 1; i < argc; /* empty */) { diff --git a/src/nl.c b/src/nl.c index befbc0e..63beb57 100644 --- a/src/nl.c +++ b/src/nl.c @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "nl" -#define AUTHORS N_ ("Scott Bartram and David MacKenzie") +#define WRITTEN_BY _("Written by Scott Bartram and David MacKenzie.") #ifndef TRUE # define TRUE 1 @@ -598,7 +598,7 @@ main (int argc, char **argv) section_del = optarg; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: fail = 1; break; diff --git a/src/nohup.c b/src/nohup.c index 9a7221f..f55c510 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -31,7 +31,7 @@ #define PROGRAM_NAME "nohup" -#define AUTHORS "Jim Meyering" +#define WRITTEN_BY _("Written by Jim Meyering.") /* Exit statuses. */ enum @@ -86,7 +86,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* The above handles --help and --version. Now, handle `--'. */ diff --git a/src/od.c b/src/od.c index 710786e..7bb1052 100644 --- a/src/od.c +++ b/src/od.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "od" -#define AUTHORS "Jim Meyering" +#define WRITTEN_BY _("Written by Jim Meyering.") #if defined(__GNUC__) || defined(STDC_HEADERS) # include @@ -1808,7 +1808,7 @@ it must be one character from [doxn]"), case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/paste.c b/src/paste.c index a417093..5ddb16f 100644 --- a/src/paste.c +++ b/src/paste.c @@ -46,7 +46,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "paste" -#define AUTHORS N_ ("David M. Ihnat and David MacKenzie") +#define WRITTEN_BY _("Written by David M. Ihnat and David MacKenzie.") /* Indicates that no delimiter should be added in the current position. */ #define EMPTY_DELIM '\0' @@ -468,7 +468,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/pathchk.c b/src/pathchk.c index f296272..1b79dc1 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -50,7 +50,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pathchk" -#define AUTHORS N_ ("David MacKenzie and Jim Meyering") +#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.") #define NEED_PATHCONF_WRAPPER 0 #if HAVE_PATHCONF @@ -166,7 +166,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); while ((optc = getopt_long (argc, argv, "p", longopts, NULL)) != -1) { diff --git a/src/pinky.c b/src/pinky.c index 77aad7e..901c8cb 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pinky" -#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi") +#define WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi.") #ifndef MAXHOSTNAMELEN # define MAXHOSTNAMELEN 64 @@ -560,7 +560,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/pr.c b/src/pr.c index e6883bb..4b0e0a6 100644 --- a/src/pr.c +++ b/src/pr.c @@ -323,7 +323,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pr" -#define AUTHORS N_ ("Pete TerMaat and Roland Huebner") +#define WRITTEN_BY _("Written by Pete TerMaat and Roland Huebner.") #ifndef TRUE # define TRUE 1 @@ -1066,7 +1066,7 @@ main (int argc, char **argv) break; } case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (2); break; diff --git a/src/printenv.c b/src/printenv.c index 0ad821b..faf202e 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -40,7 +40,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "printenv" -#define AUTHORS N_ ("David MacKenzie and Richard Mlynarik") +#define WRITTEN_BY _("Written by David MacKenzie and Richard Mlynarik.") /* The name this program was run with. */ char *program_name; @@ -94,7 +94,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { diff --git a/src/printf.c b/src/printf.c index 97b7d97..bf269f6 100644 --- a/src/printf.c +++ b/src/printf.c @@ -59,7 +59,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "printf" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") #ifndef STDC_HEADERS double strtod (); @@ -566,7 +566,7 @@ main (int argc, char **argv) posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL); if (!posixly_correct) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ diff --git a/src/ptx.c b/src/ptx.c index 9b677e8..f55dd3e 100644 --- a/src/ptx.c +++ b/src/ptx.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "ptx" -#define AUTHORS "François Pinard" +#define WRITTEN_BY _("Written by François Pinard.") /* Number of possible characters in a byte. */ #define CHAR_SET_SIZE 256 @@ -2084,7 +2084,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"), format_args, format_vals); case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); } } diff --git a/src/pwd.c b/src/pwd.c index c4be503..1c0a037 100644 --- a/src/pwd.c +++ b/src/pwd.c @@ -29,7 +29,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pwd" -#define AUTHORS "Jim Meyering" +#define WRITTEN_BY _("Written by Jim Meyering.") /* The name this program was run with. */ char *program_name; @@ -68,7 +68,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); if (1 < argc) error (0, 0, _("ignoring non-option arguments")); diff --git a/src/readlink.c b/src/readlink.c index 9af6ae7..90bd33d 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "readlink" -#define AUTHORS "Dmitry V. Levin" +#define WRITTEN_BY _("Written by Dmitry V. Levin.") /* Name this program was run with. */ char *program_name; @@ -117,7 +117,7 @@ main (int argc, char *const argv[]) verbose = 1; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/rm.c b/src/rm.c index a2be56d..dcb3a19 100644 --- a/src/rm.c +++ b/src/rm.c @@ -57,8 +57,8 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "rm" -#define AUTHORS \ - N_ ("Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering") +#define WRITTEN_BY \ + _("Written by Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering.") /* Name this program was run with. */ char *program_name; @@ -188,7 +188,7 @@ main (int argc, char **argv) x.verbose = 1; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/rmdir.c b/src/rmdir.c index f21092d..5d4f681 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -35,7 +35,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "rmdir" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") #ifndef EEXIST # define EEXIST 0 @@ -196,7 +196,7 @@ main (int argc, char **argv) verbose = 1; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/seq.c b/src/seq.c index d7a3068..6f1cbc7 100644 --- a/src/seq.c +++ b/src/seq.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "seq" -#define AUTHORS "Ulrich Drepper" +#define WRITTEN_BY _("Written by Ulrich Drepper.") /* If nonzero print all number with equal width. */ static int equal_width; @@ -362,7 +362,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/setuidgid.c b/src/setuidgid.c index 9a43541..864946a 100644 --- a/src/setuidgid.c +++ b/src/setuidgid.c @@ -33,7 +33,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 WRITTEN_BY _("Written by Jim Meyering.") #define FAIL_STATUS 111 @@ -83,7 +83,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ diff --git a/src/shred.c b/src/shred.c index 9453cb3..4c9345b 100644 --- a/src/shred.c +++ b/src/shred.c @@ -89,7 +89,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "shred" -#define AUTHORS "Colin Plumb" +#define WRITTEN_BY _("Written by Colin Plumb.") #if HAVE_CONFIG_H # include @@ -1586,7 +1586,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/sleep.c b/src/sleep.c index 5a4bd3d..2013573 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sleep" -#define AUTHORS N_ ("Jim Meyering and Paul Eggert") +#define WRITTEN_BY _("Written by Jim Meyering and Paul Eggert.") /* The name by which this program was run. */ char *program_name; @@ -120,7 +120,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { diff --git a/src/sort.c b/src/sort.c index 1b4e4a4..00a8247 100644 --- a/src/sort.c +++ b/src/sort.c @@ -51,7 +51,7 @@ struct rlimit { size_t rlim_cur; }; /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sort" -#define AUTHORS N_ ("Mike Haertel and Paul Eggert") +#define WRITTEN_BY _("Written by Mike Haertel and Paul Eggert.") #if HAVE_LANGINFO_CODESET # include @@ -2513,7 +2513,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (SORT_FAILURE); diff --git a/src/split.c b/src/split.c index 08617c3..919c299a 100644 --- a/src/split.c +++ b/src/split.c @@ -40,7 +40,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "split" -#define AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman") +#define WRITTEN_BY _("Written by Torbjorn Granlund and Richard M. Stallman.") #define DEFAULT_SUFFIX_LENGTH 2 @@ -490,7 +490,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/stat.c b/src/stat.c index 8b98816..aa75e17 100644 --- a/src/stat.c +++ b/src/stat.c @@ -87,7 +87,7 @@ #define PROGRAM_NAME "stat" -#define AUTHORS "Michael Meskes" +#define WRITTEN_BY _("Written by Michael Meskes.") static struct option const long_options[] = { {"link", no_argument, 0, 'l'}, /* deprecated. FIXME: remove in 2003 */ @@ -807,7 +807,7 @@ main (int argc, char *argv[]) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/stty.c b/src/stty.c index 71e0eb3..a01cc2b 100644 --- a/src/stty.c +++ b/src/stty.c @@ -63,7 +63,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "stty" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") #ifndef _POSIX_VDISABLE # define _POSIX_VDISABLE ((unsigned char) 0) @@ -750,7 +750,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); output_type = changed; verbose_output = 0; diff --git a/src/su.c b/src/su.c index 3bcc87a..94594b2 100644 --- a/src/su.c +++ b/src/su.c @@ -115,7 +115,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "su" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") #if HAVE_PATHS_H # include @@ -508,7 +508,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/sum.c b/src/sum.c index 9abd4f3..ca3dbbb 100644 --- a/src/sum.c +++ b/src/sum.c @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sum" -#define AUTHORS N_ ("Kayvan Aghaiepour and David MacKenzie") +#define WRITTEN_BY _("Written by Kayvan Aghaiepour and David MacKenzie.") /* The name this program was run with. */ char *program_name; @@ -249,7 +249,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/sync.c b/src/sync.c index 1481c49..643800b 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 WRITTEN_BY _("Written by Jim Meyering.") /* The name this program was run with. */ char *program_name; @@ -65,7 +65,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); if (1 < argc) error (0, 0, _("ignoring all arguments")); diff --git a/src/tac.c b/src/tac.c index 4567e87..17a9dac 100644 --- a/src/tac.c +++ b/src/tac.c @@ -50,7 +50,7 @@ tac -r -s '.\| /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tac" -#define AUTHORS N_ ("Jay Lepreau and David MacKenzie") +#define WRITTEN_BY _("Written by Jay Lepreau and David MacKenzie.") #if defined __MSDOS__ || defined _WIN32 /* Define this to non-zero on systems for which the regular mechanism @@ -638,7 +638,7 @@ main (int argc, char **argv) error (EXIT_FAILURE, 0, _("separator cannot be empty")); break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); } diff --git a/src/tail.c b/src/tail.c index 66d8481..a9d89fc 100644 --- a/src/tail.c +++ b/src/tail.c @@ -45,8 +45,8 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tail" -#define AUTHORS \ - N_ ("Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering") +#define WRITTEN_BY \ + _("Written by Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering.") #ifndef ENOSYS /* Some systems don't have ENOSYS -- this should be a big enough @@ -1623,7 +1623,7 @@ parse_options (int argc, char **argv, case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/tee.c b/src/tee.c index 4ec399b..a1eb475 100644 --- a/src/tee.c +++ b/src/tee.c @@ -29,7 +29,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tee" -#define AUTHORS N_ ("Mike Parker, Richard M. Stallman, and David MacKenzie") +#define WRITTEN_BY _("Written by Mike Parker, Richard M. Stallman, and David MacKenzie.") static int tee (int nfiles, const char **files); @@ -107,7 +107,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/test.c b/src/test.c index fa00a39..78666f0 100644 --- a/src/test.c +++ b/src/test.c @@ -1058,7 +1058,7 @@ INTEGER may also be -l STRING, which evaluates to the length of STRING.\n\ # define main test_command #endif -#define AUTHORS N_ ("Kevin Braunsdorf and Matthew Bradburn") +#define WRITTEN_BY _("Written by Kevin Braunsdorf and Matthew Bradburn.") /* * [: @@ -1101,7 +1101,7 @@ main (int margc, char **margv) if (margc < 2 || strcmp (margv[margc - 1], "]") != 0) { parse_long_options (margc, margv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); test_syntax_error (_("missing `]'\n"), NULL); } diff --git a/src/touch.c b/src/touch.c index 288e6d1..1cccc84 100644 --- a/src/touch.c +++ b/src/touch.c @@ -36,8 +36,8 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "touch" -#define AUTHORS \ -N_ ("Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith") +#define WRITTEN_BY \ +_("Written by Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith.") #ifndef STDC_HEADERS time_t time (); @@ -336,7 +336,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/tr.c b/src/tr.c index 5a0a612..417726d 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 WRITTEN_BY _("Written by Jim Meyering.") #define N_CHARS (UCHAR_MAX + 1) @@ -1819,7 +1819,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (2); diff --git a/src/true.c b/src/true.c index 65e7f52..e5b1fc0 100644 --- a/src/true.c +++ b/src/true.c @@ -21,7 +21,7 @@ #include "system.h" #define PROGRAM_NAME "true" -#define AUTHORS "Jim Meyering" +#define WRITTEN_BY _("Written by Jim Meyering.") /* The name this program was run with. */ char *program_name; @@ -63,7 +63,7 @@ main (int argc, char **argv) usage (EXIT_SUCCESS); if (STREQ (argv[1], "--version")) - version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, AUTHORS); + version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, WRITTEN_BY); } exit (EXIT_SUCCESS); diff --git a/src/tsort.c b/src/tsort.c index a66d37b..560f63e 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 WRITTEN_BY _("Written by Mark Kettenis.") /* Token delimiters when reading from a file. */ #define DELIM " \t\n" @@ -560,7 +560,7 @@ main (int argc, char **argv) exit_status = 0; parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1) switch (opt) diff --git a/src/tty.c b/src/tty.c index 076ac15..8d1cc42 100644 --- a/src/tty.c +++ b/src/tty.c @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tty" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") /* The name under which this program was run. */ char *program_name; @@ -102,7 +102,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (2); diff --git a/src/uname.c b/src/uname.c index 47f9ff4..87af1a2 100644 --- a/src/uname.c +++ b/src/uname.c @@ -50,7 +50,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "uname" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") /* Values that are bitwise or'd into `toprint'. */ /* Kernel name. */ @@ -203,7 +203,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/unexpand.c b/src/unexpand.c index 89cac64..8ba563a 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -47,7 +47,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "unexpand" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") /* The number of bytes added at a time to the amount of memory allocated for the output line. */ @@ -447,7 +447,7 @@ main (int argc, char **argv) obsolete_tablist = true; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: if (tabval == -1) tabval = 0; diff --git a/src/uniq.c b/src/uniq.c index 9555d6c..8a5e5c9 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "uniq" -#define AUTHORS N_ ("Richard Stallman and David MacKenzie") +#define WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.") #define SWAP_LINES(A, B) \ do \ @@ -518,7 +518,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/unlink.c b/src/unlink.c index f5c3c24..ad73e12 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -35,7 +35,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "unlink" -#define AUTHORS "Michael Stone" +#define WRITTEN_BY _("Written by Michael Stone.") /* Name this program was run with. */ char *program_name; @@ -74,7 +74,7 @@ main (int argc, char **argv) /* Don't recognize --help or --version if POSIXLY_CORRECT is set. */ if (getenv ("POSIXLY_CORRECT") == NULL) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ diff --git a/src/uptime.c b/src/uptime.c index c987a2a..f68726e 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -35,7 +35,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "uptime" -#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi") +#define WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi.") int getloadavg (); @@ -216,7 +216,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1) { diff --git a/src/users.c b/src/users.c index 6ef4396..12bad08 100644 --- a/src/users.c +++ b/src/users.c @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "users" -#define AUTHORS N_ ("Joseph Arceneaux and David MacKenzie") +#define WRITTEN_BY _("Written by Joseph Arceneaux and David MacKenzie.") /* The name this program was run with. */ char *program_name; @@ -141,7 +141,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1) { diff --git a/src/wc.c b/src/wc.c index e7a6935..4bdffc4 100644 --- a/src/wc.c +++ b/src/wc.c @@ -71,7 +71,7 @@ extern int wcwidth (); /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "wc" -#define AUTHORS N_ ("Paul Rubin and David MacKenzie") +#define WRITTEN_BY _("Written by Paul Rubin and David MacKenzie.") /* Size of atomic reads. */ #define BUFFER_SIZE (16 * 1024) @@ -642,7 +642,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/who.c b/src/who.c index 9c6e714..3cf9793 100644 --- a/src/who.c +++ b/src/who.c @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "who" -#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Michael Stone") +#define WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Michael Stone.") #ifndef MAXHOSTNAMELEN # define MAXHOSTNAMELEN 64 @@ -765,7 +765,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); default: usage (EXIT_FAILURE); diff --git a/src/whoami.c b/src/whoami.c index 019379e..be7bc04 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "whoami" -#define AUTHORS "Richard Mlynarik" +#define WRITTEN_BY _("Written by Richard Mlynarik.") /* The name this program was run with. */ char *program_name; @@ -77,7 +77,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { diff --git a/src/yes.c b/src/yes.c index f2e37ce..6f62cb7 100644 --- a/src/yes.c +++ b/src/yes.c @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "yes" -#define AUTHORS "David MacKenzie" +#define WRITTEN_BY _("Written by David MacKenzie.") /* How many iterations between ferror checks. */ #define UNROLL 10000 @@ -77,7 +77,7 @@ main (int argc, char **argv) /* Don't recognize --help or --version if POSIXLY_CORRECT is set. */ if (getenv ("POSIXLY_CORRECT") == NULL) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + WRITTEN_BY, usage); if (argc == 1) { -- 2.7.4