diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/basename.c | 4 | ||||
-rw-r--r-- | src/cat.c | 4 | ||||
-rw-r--r-- | src/chgrp.c | 4 | ||||
-rw-r--r-- | src/chmod.c | 4 | ||||
-rw-r--r-- | src/chown.c | 4 | ||||
-rw-r--r-- | src/chroot.c | 4 | ||||
-rw-r--r-- | src/cksum.c | 4 | ||||
-rw-r--r-- | src/comm.c | 4 | ||||
-rw-r--r-- | src/cp.c | 4 | ||||
-rw-r--r-- | src/csplit.c | 4 | ||||
-rw-r--r-- | src/cut.c | 4 | ||||
-rw-r--r-- | src/date.c | 4 | ||||
-rw-r--r-- | src/dd.c | 4 | ||||
-rw-r--r-- | src/df.c | 6 | ||||
-rw-r--r-- | src/dircolors.c | 4 | ||||
-rw-r--r-- | src/dirname.c | 4 | ||||
-rw-r--r-- | src/du.c | 6 | ||||
-rw-r--r-- | src/echo.c | 6 | ||||
-rw-r--r-- | src/env.c | 4 | ||||
-rw-r--r-- | src/expand.c | 4 | ||||
-rw-r--r-- | src/expr.c | 4 | ||||
-rw-r--r-- | src/factor.c | 4 | ||||
-rw-r--r-- | src/fmt.c | 4 | ||||
-rw-r--r-- | src/fold.c | 4 | ||||
-rw-r--r-- | src/head.c | 4 | ||||
-rw-r--r-- | src/hostid.c | 4 | ||||
-rw-r--r-- | src/hostname.c | 4 | ||||
-rw-r--r-- | src/id.c | 4 | ||||
-rw-r--r-- | src/install.c | 4 | ||||
-rw-r--r-- | src/join.c | 4 | ||||
-rw-r--r-- | src/kill.c | 4 | ||||
-rw-r--r-- | src/link.c | 4 | ||||
-rw-r--r-- | src/ln.c | 4 | ||||
-rw-r--r-- | src/logname.c | 4 | ||||
-rw-r--r-- | src/ls.c | 4 | ||||
-rw-r--r-- | src/md5sum.c | 4 | ||||
-rw-r--r-- | src/mkdir.c | 4 | ||||
-rw-r--r-- | src/mkfifo.c | 4 | ||||
-rw-r--r-- | src/mknod.c | 4 | ||||
-rw-r--r-- | src/mv.c | 4 | ||||
-rw-r--r-- | src/nice.c | 4 | ||||
-rw-r--r-- | src/nl.c | 4 | ||||
-rw-r--r-- | src/nohup.c | 4 | ||||
-rw-r--r-- | src/od.c | 4 | ||||
-rw-r--r-- | src/paste.c | 4 | ||||
-rw-r--r-- | src/pathchk.c | 4 | ||||
-rw-r--r-- | src/pinky.c | 4 | ||||
-rw-r--r-- | src/pr.c | 4 | ||||
-rw-r--r-- | src/printenv.c | 4 | ||||
-rw-r--r-- | src/printf.c | 4 | ||||
-rw-r--r-- | src/ptx.c | 4 | ||||
-rw-r--r-- | src/pwd.c | 4 | ||||
-rw-r--r-- | src/readlink.c | 4 | ||||
-rw-r--r-- | src/rm.c | 6 | ||||
-rw-r--r-- | src/rmdir.c | 4 | ||||
-rw-r--r-- | src/seq.c | 4 | ||||
-rw-r--r-- | src/setuidgid.c | 4 | ||||
-rw-r--r-- | src/shred.c | 4 | ||||
-rw-r--r-- | src/sleep.c | 4 | ||||
-rw-r--r-- | src/sort.c | 4 | ||||
-rw-r--r-- | src/split.c | 4 | ||||
-rw-r--r-- | src/stat.c | 4 | ||||
-rw-r--r-- | src/stty.c | 4 | ||||
-rw-r--r-- | src/su.c | 4 | ||||
-rw-r--r-- | src/sum.c | 4 | ||||
-rw-r--r-- | src/sync.c | 4 | ||||
-rw-r--r-- | src/sys2.h | 4 | ||||
-rw-r--r-- | src/tac.c | 4 | ||||
-rw-r--r-- | src/tail.c | 6 | ||||
-rw-r--r-- | src/tee.c | 4 | ||||
-rw-r--r-- | src/test.c | 4 | ||||
-rw-r--r-- | src/touch.c | 6 | ||||
-rw-r--r-- | src/tr.c | 4 | ||||
-rw-r--r-- | src/true.c | 4 | ||||
-rw-r--r-- | src/tsort.c | 4 | ||||
-rw-r--r-- | src/tty.c | 4 | ||||
-rw-r--r-- | src/uname.c | 4 | ||||
-rw-r--r-- | src/unexpand.c | 4 | ||||
-rw-r--r-- | src/uniq.c | 4 | ||||
-rw-r--r-- | src/unlink.c | 4 | ||||
-rw-r--r-- | src/uptime.c | 4 | ||||
-rw-r--r-- | src/users.c | 4 | ||||
-rw-r--r-- | src/wc.c | 4 | ||||
-rw-r--r-- | src/who.c | 4 | ||||
-rw-r--r-- | src/whoami.c | 4 | ||||
-rw-r--r-- | src/yes.c | 4 |
86 files changed, 178 insertions, 178 deletions
diff --git a/src/basename.c b/src/basename.c index 84c52a5a8..9ba33c357 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 WRITTEN_BY _("Written by FIXME unknown.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) @@ -38,7 +38,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cat" -#define WRITTEN_BY _("Written by Torbjorn Granlund and Richard M. Stallman.") +#define AUTHORS "Torbjorn Granlund", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/chgrp.c b/src/chgrp.c index dc731a26f..6f221358c 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -35,7 +35,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "chgrp" -#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.") +#define AUTHORS "David MacKenzie", "Jim Meyering" #ifndef _POSIX_VERSION struct group *getgrnam (); @@ -231,7 +231,7 @@ main (int argc, char **argv) break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/chmod.c b/src/chmod.c index 132d1ccd8..aae2172d8 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "chmod" -#define WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "David MacKenzie" enum Change_status { @@ -389,7 +389,7 @@ main (int argc, char **argv) verbosity = V_high; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/chown.c b/src/chown.c index 3ebff168b..fae399db0 100644 --- a/src/chown.c +++ b/src/chown.c @@ -44,7 +44,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "chown" -#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.") +#define AUTHORS "David MacKenzie", "Jim Meyering" /* The name the program was run with. */ char *program_name; @@ -234,7 +234,7 @@ main (int argc, char **argv) break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/chroot.c b/src/chroot.c index 30e070f36..d808908b4 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 WRITTEN_BY _("Written by Roland McGrath.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); if (argc <= 1) { error (0, 0, _("too few arguments")); diff --git a/src/cksum.c b/src/cksum.c index 5d56ba228..c991181d5 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 WRITTEN_BY _("Written by Q. Frank Xia.") +#define AUTHORS "Q. Frank Xia" #include <stdio.h> #include <sys/types.h> @@ -309,7 +309,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); have_read_stdin = 0; diff --git a/src/comm.c b/src/comm.c index 736a60d82..12c872867 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 WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.") +#define AUTHORS "Richard Stallman", "David MacKenzie" /* Undefine, to avoid warning about redefinition on some systems. */ #undef min @@ -269,7 +269,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); @@ -47,7 +47,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cp" -#define WRITTEN_BY _("Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering.") +#define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering" #ifndef _POSIX_VERSION uid_t geteuid (); @@ -991,7 +991,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/csplit.c b/src/csplit.c index 7a931ad50..d2294b90e 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 WRITTEN_BY _("Written by Stuart Kemp and David MacKenzie.") +#define AUTHORS "Stuart Kemp", "David MacKenzie" /* Increment size of area for control records. */ #define ALLOC_SIZE 20 @@ -1353,7 +1353,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); @@ -39,7 +39,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "cut" -#define WRITTEN_BY _("Written by David Ihnat, David MacKenzie, and Jim Meyering.") +#define AUTHORS "David Ihnat", "David MacKenzie", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (2); diff --git a/src/date.c b/src/date.c index 4948d7d50..6d9333833 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } @@ -39,7 +39,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "dd" -#define WRITTEN_BY _("Written by Paul Rubin, David MacKenzie, and Stuart Kemp.") +#define AUTHORS "Paul Rubin", "David MacKenzie", "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* Don't close stdout on exit from here on. */ closeout_func = NULL; @@ -41,8 +41,8 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "df" -#define WRITTEN_BY \ - _("Written by Torbjorn Granlund, David MacKenzie, and Paul Eggert.") +#define AUTHORS \ + "Torbjorn Granlund", "David MacKenzie", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/dircolors.c b/src/dircolors.c index 64d17f3b9..5d18f098c 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 WRITTEN_BY _("Written by H. Peter Anvin.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/dirname.c b/src/dirname.c index 922573d5b..9eee8221b 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 WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.") +#define AUTHORS "David MacKenzie", "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) @@ -45,8 +45,8 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "du" -#define WRITTEN_BY \ - _("Written by Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering.") +#define AUTHORS \ + "Torbjorn Granlund", "David MacKenzie, Paul Eggert", "Jim Meyering" /* Initial size of the hash table. */ #define INITIAL_TABLE_SIZE 103 @@ -655,7 +655,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: fail = 1; diff --git a/src/echo.c b/src/echo.c index dfaf0aa31..658ceea20 100644 --- a/src/echo.c +++ b/src/echo.c @@ -1,5 +1,5 @@ /* echo.c, derived from code echo.c in Bash. - Copyright (C) 87,89, 1991-1997, 1999-2002 Free Software Foundation, Inc. + Copyright (C) 87,89, 1991-1997, 1999-2003 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 @@ -24,7 +24,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "echo" -#define WRITTEN_BY _("Written by FIXME unknown.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL, NULL); else allow_options = 0; @@ -89,7 +89,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "env" -#define WRITTEN_BY _("Written by Richard Mlynarik and David MacKenzie.") +#define AUTHORS "Richard Mlynarik", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (2); } diff --git a/src/expand.c b/src/expand.c index eaddff27f..8be52b563 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: if (tabval == -1) tabval = 0; diff --git a/src/expr.c b/src/expr.c index 607abbbd6..8b7562162 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 WRITTEN_BY _("Written by Mike Parker.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* 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 88b64cc6b..03be10609 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 WRITTEN_BY _("Written by Paul Rubin.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ if (argc > 1 && STREQ (argv[1], "--")) @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "fmt" -#define WRITTEN_BY _("Written by Ross Paterson.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); } diff --git a/src/fold.c b/src/fold.c index 517be282a..5be82db2c 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "David MacKenzie" /* The name this program was run with. */ char *program_name; @@ -301,7 +301,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/head.c b/src/head.c index 8646f4877..ead59aec4 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 WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.") +#define AUTHORS "David MacKenzie", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/hostid.c b/src/hostid.c index 3fc6b055f..1f89fda70 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 WRITTEN_BY _("Written by Jim Meyering.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); if (argc > 1) { diff --git a/src/hostname.c b/src/hostname.c index e6250a10d..5aedf29e7 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 WRITTEN_BY _("Written by Jim Meyering.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); #ifdef HAVE_SETHOSTNAME if (argc == 2) @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "id" -#define WRITTEN_BY _("Written by Arnold Robbins and David MacKenzie.") +#define AUTHORS "Arnold Robbins", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/install.c b/src/install.c index 3cd72c337..5b32eea78 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "David MacKenzie" #if HAVE_SYS_WAIT_H # include <sys/wait.h> @@ -255,7 +255,7 @@ main (int argc, char **argv) backup_suffix_string = optarg; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/join.c b/src/join.c index 694a18e5a..16097837e 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 WRITTEN_BY _("Written by Mike Haertel.") +#define AUTHORS "Mike Haertel" #define join system_join @@ -840,7 +840,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/kill.c b/src/kill.c index 39dde86c0..7f3ecb14b 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 WRITTEN_BY _("Written by Paul Eggert.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/link.c b/src/link.c index 4f9b99ac2..d0ae1ed4d 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 WRITTEN_BY _("Written by Michael Stone.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "ln" -#define WRITTEN_BY _("Written by Mike Parker and David MacKenzie.") +#define AUTHORS "Mike Parker", "David MacKenzie" #ifndef ENABLE_HARD_LINK_TO_SYMLINK_WARNING # define ENABLE_HARD_LINK_TO_SYMLINK_WARNING 0 @@ -484,7 +484,7 @@ main (int argc, char **argv) backup_suffix_string = optarg; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); break; diff --git a/src/logname.c b/src/logname.c index ecddb7fee..a10de9f7a 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 WRITTEN_BY _("Written by FIXME: unknown.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { @@ -119,7 +119,7 @@ int wcwidth (); : (ls_mode == LS_MULTI_COL \ ? "dir" : "vdir")) -#define WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.") +#define AUTHORS "Richard Stallman", "David MacKenzie" #define obstack_chunk_alloc malloc #define obstack_chunk_free free @@ -1647,7 +1647,7 @@ decode_switches (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/md5sum.c b/src/md5sum.c index 62d52ef44..570dde9f1 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 WRITTEN_BY _("Written by Ulrich Drepper and Scott Miller.") +#define AUTHORS "Ulrich Drepper", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/mkdir.c b/src/mkdir.c index b2f0c3e70..3527e1073 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/mkfifo.c b/src/mkfifo.c index 7aa4e62ac..0739c3619 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/mknod.c b/src/mknod.c index d3af094af..1d8278a57 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "mv" -#define WRITTEN_BY _("Written by Mike Parker, David MacKenzie, and Jim Meyering.") +#define AUTHORS "Mike Parker", "David MacKenzie", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/nice.c b/src/nice.c index b55c0a738..003fa1f8e 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); for (i = 1; i < argc; /* empty */) { @@ -36,7 +36,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "nl" -#define WRITTEN_BY _("Written by Scott Bartram and David MacKenzie.") +#define AUTHORS "Scott Bartram", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: fail = 1; break; diff --git a/src/nohup.c b/src/nohup.c index f55c510c5..a8772f84d 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -31,7 +31,7 @@ #define PROGRAM_NAME "nohup" -#define WRITTEN_BY _("Written by Jim Meyering.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* The above handles --help and --version. Now, handle `--'. */ @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "od" -#define WRITTEN_BY _("Written by Jim Meyering.") +#define AUTHORS "Jim Meyering" #if defined(__GNUC__) || defined(STDC_HEADERS) # include <float.h> @@ -1815,7 +1815,7 @@ it must be one character from [doxn]"), case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/paste.c b/src/paste.c index 1f6a98101..9753d83f5 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 WRITTEN_BY _("Written by David M. Ihnat and David MacKenzie.") +#define AUTHORS "David M. Ihnat", "David MacKenzie" /* Indicates that no delimiter should be added in the current position. */ #define EMPTY_DELIM '\0' @@ -471,7 +471,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/pathchk.c b/src/pathchk.c index 1b79dc1a9..17638de66 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 WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.") +#define AUTHORS "David MacKenzie", "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); while ((optc = getopt_long (argc, argv, "p", longopts, NULL)) != -1) { diff --git a/src/pinky.c b/src/pinky.c index 901c8cb25..37ad56dfc 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 WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi.") +#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); @@ -323,7 +323,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pr" -#define WRITTEN_BY _("Written by Pete TerMaat and Roland Huebner.") +#define AUTHORS "Pete TerMaat", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (2); break; diff --git a/src/printenv.c b/src/printenv.c index faf202e1b..033e98e1d 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 WRITTEN_BY _("Written by David MacKenzie and Richard Mlynarik.") +#define AUTHORS "David MacKenzie", "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { diff --git a/src/printf.c b/src/printf.c index bf269f6c9..b5d1cb511 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ @@ -35,7 +35,7 @@ /* Note to translator: Please translate "F. Pinard" to "François Pinard" if "ç" (c-with-cedilla) is available in the translation's character set and encoding. */ -#define WRITTEN_BY _("Written by F. Pinard.") +#define AUTHORS _("F. Pinard") /* Number of possible characters in a byte. */ #define CHAR_SET_SIZE 256 @@ -2087,7 +2087,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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); } } @@ -29,7 +29,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "pwd" -#define WRITTEN_BY _("Written by Jim Meyering.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); if (1 < argc) error (0, 0, _("ignoring non-option arguments")); diff --git a/src/readlink.c b/src/readlink.c index 90bd33d8d..9af6ae731 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 WRITTEN_BY _("Written by Dmitry V. Levin.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } @@ -57,8 +57,8 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "rm" -#define WRITTEN_BY \ - _("Written by Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering.") +#define AUTHORS \ + "Paul Rubin", "David MacKenzie, Richard Stallman", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/rmdir.c b/src/rmdir.c index 5d4f6815e..f21092ddf 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } @@ -31,7 +31,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "seq" -#define WRITTEN_BY _("Written by Ulrich Drepper.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/setuidgid.c b/src/setuidgid.c index 864946af2..e19acf3cf 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 WRITTEN_BY _("Written by Jim Meyering.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* 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 4c9345b3b..9453cb30c 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 WRITTEN_BY _("Written by Colin Plumb.") +#define AUTHORS "Colin Plumb" #if HAVE_CONFIG_H # include <config.h> @@ -1586,7 +1586,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/sleep.c b/src/sleep.c index 2013573ff..9e986930c 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 WRITTEN_BY _("Written by Jim Meyering and Paul Eggert.") +#define AUTHORS "Jim Meyering", "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { diff --git a/src/sort.c b/src/sort.c index 5945c867a..f2268f1df 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 WRITTEN_BY _("Written by Mike Haertel and Paul Eggert.") +#define AUTHORS "Mike Haertel", "Paul Eggert" #if HAVE_LANGINFO_CODESET # include <langinfo.h> @@ -2514,7 +2514,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (SORT_FAILURE); diff --git a/src/split.c b/src/split.c index 919c299a5..311b08e5d 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 WRITTEN_BY _("Written by Torbjorn Granlund and Richard M. Stallman.") +#define AUTHORS "Torbjorn Granlund", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/stat.c b/src/stat.c index aa75e17d7..8b9881653 100644 --- a/src/stat.c +++ b/src/stat.c @@ -87,7 +87,7 @@ #define PROGRAM_NAME "stat" -#define WRITTEN_BY _("Written by Michael Meskes.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/stty.c b/src/stty.c index a01cc2b6b..d47ab2f27 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); output_type = changed; verbose_output = 0; @@ -115,7 +115,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "su" -#define WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "David MacKenzie" #if HAVE_PATHS_H # include <paths.h> @@ -508,7 +508,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sum" -#define WRITTEN_BY _("Written by Kayvan Aghaiepour and David MacKenzie.") +#define AUTHORS "Kayvan Aghaiepour", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/sync.c b/src/sync.c index 643800b15..13e53f670 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 WRITTEN_BY _("Written by Jim Meyering.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); if (1 < argc) error (0, 0, _("ignoring all arguments")); diff --git a/src/sys2.h b/src/sys2.h index 602b91278..683ddb410 100644 --- a/src/sys2.h +++ b/src/sys2.h @@ -474,9 +474,9 @@ enum #include "closeout.h" #include "version-etc.h" -#define case_GETOPT_VERSION_CHAR(Program_name, Written_by) \ +#define case_GETOPT_VERSION_CHAR(Program_name, Authors) \ case GETOPT_VERSION_CHAR: \ - version_etc (stdout, Program_name, PACKAGE, VERSION, Written_by); \ + version_etc (stdout, Program_name, PACKAGE, VERSION, Authors, NULL);\ exit (EXIT_SUCCESS); \ break; @@ -50,7 +50,7 @@ tac -r -s '.\| /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tac" -#define WRITTEN_BY _("Written by Jay Lepreau and David MacKenzie.") +#define AUTHORS "Jay Lepreau", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); } diff --git a/src/tail.c b/src/tail.c index 8575c18ce..4b14225e8 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 WRITTEN_BY \ - _("Written by Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering.") +#define AUTHORS \ + "Paul Rubin", "David MacKenzie, Ian Lance Taylor", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); @@ -29,7 +29,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tee" -#define WRITTEN_BY _("Written by Mike Parker, Richard M. Stallman, and David MacKenzie.") +#define AUTHORS "Mike Parker", "Richard M. Stallman", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/test.c b/src/test.c index 78666f081..24d347e64 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 WRITTEN_BY _("Written by Kevin Braunsdorf and Matthew Bradburn.") +#define AUTHORS "Kevin Braunsdorf", "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); test_syntax_error (_("missing `]'\n"), NULL); } diff --git a/src/touch.c b/src/touch.c index 1cccc84ca..f8be9e33c 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 WRITTEN_BY \ -_("Written by Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith.") +#define AUTHORS \ +"Paul Rubin", "Arnold Robbins, Jim Kingdon, David MacKenzie", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); @@ -32,7 +32,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tr" -#define WRITTEN_BY _("Written by Jim Meyering.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (2); diff --git a/src/true.c b/src/true.c index e5b1fc03e..c92700e03 100644 --- a/src/true.c +++ b/src/true.c @@ -21,7 +21,7 @@ #include "system.h" #define PROGRAM_NAME "true" -#define WRITTEN_BY _("Written by Jim Meyering.") +#define AUTHORS "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, WRITTEN_BY); + version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, AUTHORS, NULL); } exit (EXIT_SUCCESS); diff --git a/src/tsort.c b/src/tsort.c index 560f63eb6..c6b7855a4 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 WRITTEN_BY _("Written by Mark Kettenis.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1) switch (opt) @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "tty" -#define WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (2); diff --git a/src/uname.c b/src/uname.c index 87af1a216..47f9ff45c 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/unexpand.c b/src/unexpand.c index ab0b8fb15..ac50629e6 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 WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "David MacKenzie" /* The number of bytes added at a time to the amount of memory allocated for the output line. */ @@ -450,7 +450,7 @@ main (int argc, char **argv) obsolete_tablist = true; break; case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: if (tabval == -1) tabval = 0; diff --git a/src/uniq.c b/src/uniq.c index 85c45e200..bafd42349 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 WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.") +#define AUTHORS "Richard Stallman", "David MacKenzie" #define SWAP_LINES(A, B) \ do \ @@ -524,7 +524,7 @@ main (int argc, char **argv) case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/unlink.c b/src/unlink.c index ad73e12d1..6d3257e36 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 WRITTEN_BY _("Written by Michael Stone.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); /* 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 f68726e15..371e60b47 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 WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi.") +#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1) { diff --git a/src/users.c b/src/users.c index 12bad08bf..eb2bd56e1 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 WRITTEN_BY _("Written by Joseph Arceneaux and David MacKenzie.") +#define AUTHORS "Joseph Arceneaux", "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1) { @@ -71,7 +71,7 @@ extern int wcwidth (); /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "wc" -#define WRITTEN_BY _("Written by Paul Rubin and David MacKenzie.") +#define AUTHORS "Paul Rubin", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); @@ -37,7 +37,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "who" -#define WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Michael Stone.") +#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "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, WRITTEN_BY); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (EXIT_FAILURE); diff --git a/src/whoami.c b/src/whoami.c index be7bc04a6..c113ba35d 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 WRITTEN_BY _("Written by Richard Mlynarik.") +#define AUTHORS "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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { @@ -30,7 +30,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "yes" -#define WRITTEN_BY _("Written by David MacKenzie.") +#define AUTHORS "David MacKenzie" /* The 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, - WRITTEN_BY, usage); + usage, AUTHORS, NULL); if (argc == 1) { |