diff options
| -rw-r--r-- | src/basename.c | 2 | ||||
| -rw-r--r-- | src/cat.c | 2 | ||||
| -rw-r--r-- | src/chroot.c | 2 | ||||
| -rw-r--r-- | src/cksum.c | 2 | ||||
| -rw-r--r-- | src/comm.c | 2 | ||||
| -rw-r--r-- | src/cp.c | 2 | ||||
| -rw-r--r-- | src/csplit.c | 2 | ||||
| -rw-r--r-- | src/cut.c | 2 | ||||
| -rw-r--r-- | src/dd.c | 4 | ||||
| -rw-r--r-- | src/df.c | 2 | ||||
| -rw-r--r-- | src/dirname.c | 4 | ||||
| -rw-r--r-- | src/du.c | 2 | ||||
| -rw-r--r-- | src/echo.c | 2 | ||||
| -rw-r--r-- | src/env.c | 2 | ||||
| -rw-r--r-- | src/expr.c | 2 | ||||
| -rw-r--r-- | src/factor.c | 2 | ||||
| -rw-r--r-- | src/head.c | 2 | ||||
| -rw-r--r-- | src/hostid.c | 2 | ||||
| -rw-r--r-- | src/hostname.c | 2 | ||||
| -rw-r--r-- | src/id.c | 2 | ||||
| -rw-r--r-- | src/link.c | 2 | ||||
| -rw-r--r-- | src/ln.c | 2 | ||||
| -rw-r--r-- | src/logname.c | 2 | ||||
| -rw-r--r-- | src/ls.c | 2 | ||||
| -rw-r--r-- | src/md5sum.c | 2 | ||||
| -rw-r--r-- | src/mv.c | 2 | ||||
| -rw-r--r-- | src/nice.c | 2 | ||||
| -rw-r--r-- | src/nl.c | 2 | ||||
| -rw-r--r-- | src/nohup.c | 2 | ||||
| -rw-r--r-- | src/paste.c | 2 | ||||
| -rw-r--r-- | src/pathchk.c | 4 | ||||
| -rw-r--r-- | src/pinky.c | 2 | ||||
| -rw-r--r-- | src/pr.c | 2 | ||||
| -rw-r--r-- | src/printenv.c | 4 | ||||
| -rw-r--r-- | src/printf.c | 2 | ||||
| -rw-r--r-- | src/pwd.c | 2 | ||||
| -rw-r--r-- | src/rm.c | 2 | ||||
| -rw-r--r-- | src/setuidgid.c | 2 | ||||
| -rw-r--r-- | src/sleep.c | 4 | ||||
| -rw-r--r-- | src/sort.c | 2 | ||||
| -rw-r--r-- | src/split.c | 2 | ||||
| -rw-r--r-- | src/stty.c | 2 | ||||
| -rw-r--r-- | src/sum.c | 2 | ||||
| -rw-r--r-- | src/sync.c | 2 | ||||
| -rw-r--r-- | src/tac.c | 2 | ||||
| -rw-r--r-- | src/tail.c | 2 | ||||
| -rw-r--r-- | src/tee.c | 2 | ||||
| -rw-r--r-- | src/test.c | 4 | ||||
| -rw-r--r-- | src/touch.c | 2 | ||||
| -rw-r--r-- | src/tsort.c | 2 | ||||
| -rw-r--r-- | src/uniq.c | 2 | ||||
| -rw-r--r-- | src/unlink.c | 2 | ||||
| -rw-r--r-- | src/uptime.c | 4 | ||||
| -rw-r--r-- | src/users.c | 4 | ||||
| -rw-r--r-- | src/wc.c | 2 | ||||
| -rw-r--r-- | src/who.c | 2 | ||||
| -rw-r--r-- | src/whoami.c | 2 | ||||
| -rw-r--r-- | src/yes.c | 2 |
58 files changed, 66 insertions, 66 deletions
diff --git a/src/basename.c b/src/basename.c index 805ee25ca..9ba33c357 100644 --- a/src/basename.c +++ b/src/basename.c @@ -100,7 +100,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, 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 AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman") +#define AUTHORS "Torbjorn Granlund", "Richard M. Stallman" /* Undefine, to avoid warning about redefinition on some systems. */ #undef max diff --git a/src/chroot.c b/src/chroot.c index 78836c8a5..d808908b4 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -72,7 +72,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); if (argc <= 1) { error (0, 0, _("too few arguments")); diff --git a/src/cksum.c b/src/cksum.c index 4d0fec187..c991181d5 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -309,7 +309,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); have_read_stdin = 0; diff --git a/src/comm.c b/src/comm.c index efa5ee431..0541d9710 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 AUTHORS "Richard Stallman", "David MacKenzie" /* Undefine, to avoid warning about redefinition on some systems. */ #undef min @@ -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 AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering" #ifndef _POSIX_VERSION uid_t geteuid (); diff --git a/src/csplit.c b/src/csplit.c index e6bdb558c..7ea8fc4fd 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 AUTHORS "Stuart Kemp", "David MacKenzie" #ifndef TRUE # define FALSE 0 @@ -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 AUTHORS "David Ihnat", "David MacKenzie", "Jim Meyering" #define FATAL_ERROR(Message) \ do \ @@ -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 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, - AUTHORS, usage); + usage, AUTHORS, NULL); /* Don't close stdout on exit from here on. */ closeout_func = NULL; @@ -42,7 +42,7 @@ #define PROGRAM_NAME "df" #define AUTHORS \ - N_ ("Torbjorn Granlund, David MacKenzie, and Paul Eggert") + "Torbjorn Granlund", "David MacKenzie", "Paul Eggert" /* Name this program was run with. */ char *program_name; diff --git a/src/dirname.c b/src/dirname.c index ec4e353f7..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 AUTHORS N_ ("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, - AUTHORS, 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], "--")) @@ -46,7 +46,7 @@ #define PROGRAM_NAME "du" #define AUTHORS \ - N_ ("Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering") + "Torbjorn Granlund", "David MacKenzie", "Paul Eggert", "Jim Meyering" /* Initial size of the hash table. */ #define INITIAL_TABLE_SIZE 103 diff --git a/src/echo.c b/src/echo.c index e1629a638..aaeb0eee8 100644 --- a/src/echo.c +++ b/src/echo.c @@ -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); + usage, AUTHORS, 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 AUTHORS N_ ("Richard Mlynarik and David MacKenzie") +#define AUTHORS "Richard Mlynarik", "David MacKenzie" int putenv (); diff --git a/src/expr.c b/src/expr.c index b6132755a..8b7562162 100644 --- a/src/expr.c +++ b/src/expr.c @@ -188,7 +188,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, 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 f27c1c08d..03be10609 100644 --- a/src/factor.c +++ b/src/factor.c @@ -202,7 +202,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, 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/head.c b/src/head.c index cf28bbe94..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 AUTHORS N_("David MacKenzie and Jim Meyering") +#define AUTHORS "David MacKenzie", "Jim Meyering" /* Number of lines/chars/blocks to head. */ #define DEFAULT_NUMBER 10 diff --git a/src/hostid.c b/src/hostid.c index 3119aadff..1f89fda70 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -69,7 +69,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); if (argc > 1) { diff --git a/src/hostname.c b/src/hostname.c index 8f97a7aff..5aedf29e7 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -91,7 +91,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, 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 AUTHORS N_ ("Arnold Robbins and David MacKenzie") +#define AUTHORS "Arnold Robbins", "David MacKenzie" #ifndef _POSIX_VERSION struct passwd *getpwuid (); diff --git a/src/link.c b/src/link.c index 20cf42b53..d0ae1ed4d 100644 --- a/src/link.c +++ b/src/link.c @@ -73,7 +73,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, 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 AUTHORS N_ ("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 diff --git a/src/logname.c b/src/logname.c index 4ff863924..a10de9f7a 100644 --- a/src/logname.c +++ b/src/logname.c @@ -72,7 +72,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, 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 AUTHORS N_ ("Richard Stallman and David MacKenzie") +#define AUTHORS "Richard Stallman", "David MacKenzie" #define obstack_chunk_alloc malloc #define obstack_chunk_free free diff --git a/src/md5sum.c b/src/md5sum.c index c1685a509..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 AUTHORS N_ ("Ulrich Drepper and Scott Miller") +#define AUTHORS "Ulrich Drepper", "Scott Miller" /* Most systems do not distinguish between external and internal text representations. */ @@ -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 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 diff --git a/src/nice.c b/src/nice.c index 487fb5510..003fa1f8e 100644 --- a/src/nice.c +++ b/src/nice.c @@ -99,7 +99,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, 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 AUTHORS N_ ("Scott Bartram and David MacKenzie") +#define AUTHORS "Scott Bartram", "David MacKenzie" #ifndef TRUE # define TRUE 1 diff --git a/src/nohup.c b/src/nohup.c index 9a7221f8c..a8772f84d 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -86,7 +86,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); /* The above handles --help and --version. Now, handle `--'. */ diff --git a/src/paste.c b/src/paste.c index a41709381..451c2b069 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 AUTHORS "David M. Ihnat", "David MacKenzie" /* Indicates that no delimiter should be added in the current position. */ #define EMPTY_DELIM '\0' diff --git a/src/pathchk.c b/src/pathchk.c index f29627224..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 AUTHORS N_ ("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, - AUTHORS, 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 77aad7e5f..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 AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi") +#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi" #ifndef MAXHOSTNAMELEN # define MAXHOSTNAMELEN 64 @@ -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 AUTHORS "Pete TerMaat", "Roland Huebner" #ifndef TRUE # define TRUE 1 diff --git a/src/printenv.c b/src/printenv.c index 0ad821b08..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 AUTHORS N_ ("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, - AUTHORS, 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 97b7d9762..b5d1cb511 100644 --- a/src/printf.c +++ b/src/printf.c @@ -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); + usage, AUTHORS, NULL); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ @@ -68,7 +68,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); if (1 < argc) error (0, 0, _("ignoring non-option arguments")); @@ -58,7 +58,7 @@ #define PROGRAM_NAME "rm" #define AUTHORS \ - N_ ("Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering") + "Paul Rubin", "David MacKenzie", "Richard Stallman", "Jim Meyering" /* Name this program was run with. */ char *program_name; diff --git a/src/setuidgid.c b/src/setuidgid.c index 9a4354153..e19acf3cf 100644 --- a/src/setuidgid.c +++ b/src/setuidgid.c @@ -83,7 +83,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ diff --git a/src/sleep.c b/src/sleep.c index 5a4bd3d57..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 AUTHORS N_ ("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, - AUTHORS, 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 1b4e4a400..d7eaa1685 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 AUTHORS "Mike Haertel", "Paul Eggert" #if HAVE_LANGINFO_CODESET # include <langinfo.h> diff --git a/src/split.c b/src/split.c index 08617c3f8..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 AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman") +#define AUTHORS "Torbjorn Granlund", "Richard M. Stallman" #define DEFAULT_SUFFIX_LENGTH 2 diff --git a/src/stty.c b/src/stty.c index 71e0eb3fa..d47ab2f27 100644 --- a/src/stty.c +++ b/src/stty.c @@ -750,7 +750,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); output_type = changed; verbose_output = 0; @@ -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 AUTHORS "Kayvan Aghaiepour", "David MacKenzie" /* The name this program was run with. */ char *program_name; diff --git a/src/sync.c b/src/sync.c index 1481c4968..13e53f670 100644 --- a/src/sync.c +++ b/src/sync.c @@ -65,7 +65,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); if (1 < argc) error (0, 0, _("ignoring all arguments")); @@ -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 AUTHORS "Jay Lepreau", "David MacKenzie" #if defined __MSDOS__ || defined _WIN32 /* Define this to non-zero on systems for which the regular mechanism diff --git a/src/tail.c b/src/tail.c index 66d848101..67184a37c 100644 --- a/src/tail.c +++ b/src/tail.c @@ -46,7 +46,7 @@ #define PROGRAM_NAME "tail" #define AUTHORS \ - N_ ("Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering") + "Paul Rubin", "David MacKenzie", "Ian Lance Taylor", "Jim Meyering" #ifndef ENOSYS /* Some systems don't have ENOSYS -- this should be a big enough @@ -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 AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie" static int tee (int nfiles, const char **files); diff --git a/src/test.c b/src/test.c index fa00a396b..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 AUTHORS N_ ("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, - AUTHORS, usage); + usage, AUTHORS, NULL); test_syntax_error (_("missing `]'\n"), NULL); } diff --git a/src/touch.c b/src/touch.c index 288e6d161..c6e8d2be6 100644 --- a/src/touch.c +++ b/src/touch.c @@ -37,7 +37,7 @@ #define PROGRAM_NAME "touch" #define AUTHORS \ -N_ ("Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith") +"Paul Rubin", "Arnold Robbins", "Jim Kingdon", "David MacKenzie", "Randy Smith" #ifndef STDC_HEADERS time_t time (); diff --git a/src/tsort.c b/src/tsort.c index a66d37ba4..c6b7855a4 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -560,7 +560,7 @@ main (int argc, char **argv) exit_status = 0; parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1) switch (opt) diff --git a/src/uniq.c b/src/uniq.c index 9555d6c86..199cc566f 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 AUTHORS "Richard Stallman", "David MacKenzie" #define SWAP_LINES(A, B) \ do \ diff --git a/src/unlink.c b/src/unlink.c index f5c3c24d1..6d3257e36 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -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); + 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 c987a2a32..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 AUTHORS N_ ("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, - AUTHORS, usage); + usage, AUTHORS, NULL); while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1) { diff --git a/src/users.c b/src/users.c index 6ef4396c0..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 AUTHORS N_ ("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, - AUTHORS, 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 AUTHORS N_ ("Paul Rubin and David MacKenzie") +#define AUTHORS "Paul Rubin", "David MacKenzie" /* Size of atomic reads. */ #define BUFFER_SIZE (16 * 1024) @@ -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 AUTHORS "Joseph Arceneaux", "David MacKenzie", "Michael Stone" #ifndef MAXHOSTNAMELEN # define MAXHOSTNAMELEN 64 diff --git a/src/whoami.c b/src/whoami.c index 019379e87..c113ba35d 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -77,7 +77,7 @@ main (int argc, char **argv) atexit (close_stdout); parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); + usage, AUTHORS, NULL); while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1) { @@ -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); + usage, AUTHORS, NULL); if (argc == 1) { |