mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
revert previous change
This commit is contained in:
1 parent
2c5fbb29a6
commit
c6ec144494
64 files changed
+91
-180
No files matched your search
+5
-10
@@ -25,10 +25,9 @@
|
||||
|
||||
#include "long-options.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <getopt.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "version-etc.h"
|
||||
|
||||
@@ -48,8 +47,8 @@ parse_long_options (int argc,
|
||||
const char *command_name,
|
||||
const char *package,
|
||||
const char *version,
|
||||
void (*usage_func)(),
|
||||
...)
|
||||
const char *authors,
|
||||
void (*usage_func)())
|
||||
{
|
||||
int c;
|
||||
int saved_opterr;
|
||||
@@ -68,12 +67,8 @@ parse_long_options (int argc,
|
||||
(*usage_func) (0);
|
||||
|
||||
case 'v':
|
||||
{
|
||||
va_list args;
|
||||
va_start (args, usage_func);
|
||||
version_etc_va (stdout, command_name, package, version, args);
|
||||
exit (0);
|
||||
}
|
||||
version_etc (stdout, command_name, package, version, authors);
|
||||
exit (0);
|
||||
|
||||
default:
|
||||
/* Don't process any other long-named options. */
|
||||
|
||||
+2
-2
@@ -22,5 +22,5 @@ void parse_long_options (int _argc,
|
||||
const char *_command_name,
|
||||
const char *_package,
|
||||
const char *_version,
|
||||
void (*_usage) (int),
|
||||
...);
|
||||
const char *_authors,
|
||||
void (*_usage) (int));
|
||||
+14
-94
@@ -21,13 +21,9 @@
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "unlocked-io.h"
|
||||
#include "version-etc.h"
|
||||
#include "xalloc.h"
|
||||
|
||||
#include "gettext.h"
|
||||
#define _(msgid) gettext (msgid)
|
||||
@@ -39,77 +35,26 @@ char* version_etc_copyright =
|
||||
"Copyright (C) 2003 Free Software Foundation, Inc.";
|
||||
|
||||
|
||||
/* Like version_etc, below, but with the NULL-terminated author list
|
||||
provided via a variable of type va_list. */
|
||||
/* Display the --version information the standard way.
|
||||
|
||||
If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of
|
||||
the program. The formats are therefore:
|
||||
|
||||
PACKAGE VERSION
|
||||
|
||||
or
|
||||
|
||||
COMMAND_NAME (PACKAGE) VERSION. */
|
||||
void
|
||||
version_etc_va (FILE *stream,
|
||||
char const *command_name, char const *package,
|
||||
char const *version, va_list authors)
|
||||
version_etc (FILE *stream,
|
||||
const char *command_name, const char *package,
|
||||
const char *version, const char *authors)
|
||||
{
|
||||
unsigned int n_authors;
|
||||
va_list saved_authors;
|
||||
|
||||
#ifdef __va_copy
|
||||
__va_copy (saved_authors, authors);
|
||||
#else
|
||||
saved_authors = authors;
|
||||
#endif
|
||||
|
||||
for (n_authors = 0; va_arg (authors, char const *); ++n_authors)
|
||||
{
|
||||
/* empty */
|
||||
}
|
||||
va_end (authors);
|
||||
|
||||
if (n_authors == 0)
|
||||
abort ();
|
||||
|
||||
if (command_name)
|
||||
fprintf (stream, "%s (%s) %s\n", command_name, package, version);
|
||||
else
|
||||
fprintf (stream, "%s %s\n", package, version);
|
||||
|
||||
switch (n_authors)
|
||||
{
|
||||
case 1:
|
||||
vfprintf (stream, _("Written by %s.\n"), saved_authors);
|
||||
break;
|
||||
case 2:
|
||||
vfprintf (stream, _("Written by %s and %s.\n"), saved_authors);
|
||||
break;
|
||||
case 3:
|
||||
vfprintf (stream, _("Written by %s, %s, and %s.\n"), saved_authors);
|
||||
break;
|
||||
case 4:
|
||||
vfprintf (stream, _("Written by %s, %s, %s, and %s.\n"), saved_authors);
|
||||
break;
|
||||
default:
|
||||
{
|
||||
|
||||
/* Note that the following must have one `%s' and one `%%s'. */
|
||||
#define FMT_TEMPLATE _("Written by %sand %%s.\n")
|
||||
|
||||
/* for the string "%s, %s, ..., %s, " */
|
||||
size_t s_len = (n_authors - 1) * strlen ("%s, ");
|
||||
char *s_fmt = xmalloc (s_len + 1);
|
||||
|
||||
/* This could be a few bytes tighter, but don't bother because
|
||||
that'd just make it a little more fragile. */
|
||||
char *full_fmt = xmalloc (strlen (FMT_TEMPLATE) + s_len + 1);
|
||||
|
||||
unsigned int i;
|
||||
char *s = s_fmt;
|
||||
for (i = 0; i < n_authors - 1; i++)
|
||||
s = stpcpy (s, "%s, ");
|
||||
sprintf (full_fmt, FMT_TEMPLATE, s_fmt);
|
||||
free (s_fmt);
|
||||
|
||||
vfprintf (stream, full_fmt, saved_authors);
|
||||
free (full_fmt);
|
||||
}
|
||||
break;
|
||||
}
|
||||
va_end (saved_authors);
|
||||
fprintf (stream, _("Written by %s.\n"), authors);
|
||||
putc ('\n', stream);
|
||||
|
||||
fputs (version_etc_copyright, stream);
|
||||
@@ -120,28 +65,3 @@ This is free software; see the source for copying conditions. There is NO\n\
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),
|
||||
stream);
|
||||
}
|
||||
|
||||
|
||||
/* Display the --version information the standard way.
|
||||
|
||||
If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of
|
||||
the program. The formats are therefore:
|
||||
|
||||
PACKAGE VERSION
|
||||
|
||||
or
|
||||
|
||||
COMMAND_NAME (PACKAGE) VERSION.
|
||||
|
||||
There must be one or more author names (each as a separate string)
|
||||
after the VERSION argument, and the final argument must be `NULL'. */
|
||||
void
|
||||
version_etc (FILE *stream,
|
||||
char const *command_name, char const *package,
|
||||
char const *version, ...)
|
||||
{
|
||||
va_list authors;
|
||||
|
||||
va_start (authors, version);
|
||||
version_etc_va (stream, command_name, package, version, authors);
|
||||
}
|
||||
+2
-6
@@ -24,12 +24,8 @@
|
||||
|
||||
extern char *version_etc_copyright;
|
||||
|
||||
void version_etc_va (FILE *stream,
|
||||
char const *command_name, char const *package,
|
||||
char const *version, va_list authors);
|
||||
|
||||
void version_etc (FILE *stream,
|
||||
char const *command_name, char const *package,
|
||||
char const *version, ...);
|
||||
const char *command_name, const char *package,
|
||||
const char *version, const char *authors);
|
||||
|
||||
#endif /* VERSION_ETC_H */
|
||||
+1
-1
@@ -100,7 +100,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
/* 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 "Torbjorn Granlund", "Richard M. Stallman"
|
||||
#define AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman")
|
||||
|
||||
/* Undefine, to avoid warning about redefinition on some systems. */
|
||||
#undef max
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
if (argc <= 1)
|
||||
{
|
||||
error (0, 0, _("too few arguments"));
|
||||
|
||||
+1
-1
@@ -309,7 +309,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
have_read_stdin = 0;
|
||||
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "comm"
|
||||
|
||||
#define AUTHORS "Richard Stallman", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Richard Stallman and 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 "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
|
||||
#define AUTHORS N_ ("Torbjorn Granlund, David MacKenzie, and Jim Meyering")
|
||||
|
||||
#ifndef _POSIX_VERSION
|
||||
uid_t geteuid ();
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "csplit"
|
||||
|
||||
#define AUTHORS "Stuart Kemp", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Stuart Kemp and 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 "David Ihnat", "David MacKenzie", "Jim Meyering"
|
||||
#define AUTHORS N_ ("David Ihnat, David MacKenzie, and 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 "Paul Rubin", "David MacKenzie", "Stuart Kemp"
|
||||
#define AUTHORS N_ ("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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
/* Don't close stdout on exit from here on. */
|
||||
closeout_func = NULL;
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#define PROGRAM_NAME "df"
|
||||
|
||||
#define AUTHORS \
|
||||
"Torbjorn Granlund", "David MacKenzie", "Paul Eggert"
|
||||
N_ ("Torbjorn Granlund, David MacKenzie, and Paul Eggert")
|
||||
|
||||
/* Name this program was run with. */
|
||||
char *program_name;
|
||||
|
||||
+2
-2
@@ -29,7 +29,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "dirname"
|
||||
|
||||
#define AUTHORS "David MacKenzie", "Jim Meyering"
|
||||
#define AUTHORS N_ ("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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
/* 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 \
|
||||
"Torbjorn Granlund", "David MacKenzie", "Paul Eggert", "Jim Meyering"
|
||||
N_ ("Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering")
|
||||
|
||||
/* Initial size of the hash table. */
|
||||
#define INITIAL_TABLE_SIZE 103
|
||||
|
||||
+1
-1
@@ -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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
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 "Richard Mlynarik", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Richard Mlynarik and David MacKenzie")
|
||||
|
||||
int putenv ();
|
||||
|
||||
|
||||
+1
-1
@@ -188,7 +188,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
/* The above handles --help and --version.
|
||||
Since there is no other invocation of getopt, handle `--' here. */
|
||||
if (argc > 1 && STREQ (argv[1], "--"))
|
||||
|
||||
+1
-1
@@ -202,7 +202,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
/* The above handles --help and --version.
|
||||
Since there is no other invocation of getopt, handle `--' here. */
|
||||
if (argc > 1 && STREQ (argv[1], "--"))
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "head"
|
||||
|
||||
#define AUTHORS "David MacKenzie", "Jim Meyering"
|
||||
#define AUTHORS N_("David MacKenzie and Jim Meyering")
|
||||
|
||||
/* Number of lines/chars/blocks to head. */
|
||||
#define DEFAULT_NUMBER 10
|
||||
|
||||
+1
-1
@@ -69,7 +69,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
if (argc > 1)
|
||||
{
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
#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 "Arnold Robbins", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Arnold Robbins and David MacKenzie")
|
||||
|
||||
#ifndef _POSIX_VERSION
|
||||
struct passwd *getpwuid ();
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
/* 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 "Mike Parker", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Mike Parker and David MacKenzie")
|
||||
|
||||
#ifndef ENABLE_HARD_LINK_TO_SYMLINK_WARNING
|
||||
# define ENABLE_HARD_LINK_TO_SYMLINK_WARNING 0
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
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 "Richard Stallman", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Richard Stallman and David MacKenzie")
|
||||
|
||||
#define obstack_chunk_alloc malloc
|
||||
#define obstack_chunk_free free
|
||||
|
||||
+1
-1
@@ -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 "Ulrich Drepper", "Scott Miller"
|
||||
#define AUTHORS N_ ("Ulrich Drepper and 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 "Mike Parker", "David MacKenzie", "Jim Meyering"
|
||||
#define AUTHORS N_ ("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
|
||||
|
||||
+1
-1
@@ -99,7 +99,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
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 "Scott Bartram", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Scott Bartram and David MacKenzie")
|
||||
|
||||
#ifndef TRUE
|
||||
# define TRUE 1
|
||||
|
||||
+1
-1
@@ -86,7 +86,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
/* The above handles --help and --version.
|
||||
Now, handle `--'. */
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "paste"
|
||||
|
||||
#define AUTHORS "David M. Ihnat", "David MacKenzie"
|
||||
#define AUTHORS N_ ("David M. Ihnat and David MacKenzie")
|
||||
|
||||
/* Indicates that no delimiter should be added in the current position. */
|
||||
#define EMPTY_DELIM '\0'
|
||||
|
||||
+2
-2
@@ -50,7 +50,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "pathchk"
|
||||
|
||||
#define AUTHORS "David MacKenzie", "Jim Meyering"
|
||||
#define AUTHORS N_ ("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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
while ((optc = getopt_long (argc, argv, "p", longopts, NULL)) != -1)
|
||||
{
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "pinky"
|
||||
|
||||
#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi"
|
||||
#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and 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 "Pete TerMaat", "Roland Huebner"
|
||||
#define AUTHORS N_ ("Pete TerMaat and Roland Huebner")
|
||||
|
||||
#ifndef TRUE
|
||||
# define TRUE 1
|
||||
|
||||
+2
-2
@@ -40,7 +40,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "printenv"
|
||||
|
||||
#define AUTHORS "David MacKenzie", "Richard Mlynarik"
|
||||
#define AUTHORS N_ ("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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
|
||||
{
|
||||
|
||||
+1
-1
@@ -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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
/* 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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
if (1 < argc)
|
||||
error (0, 0, _("ignoring non-option arguments"));
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
#define PROGRAM_NAME "rm"
|
||||
|
||||
#define AUTHORS \
|
||||
"Paul Rubin", "David MacKenzie", "Richard Stallman", "Jim Meyering"
|
||||
N_ ("Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering")
|
||||
|
||||
/* Name this program was run with. */
|
||||
char *program_name;
|
||||
|
||||
+1
-1
@@ -83,7 +83,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
/* The above handles --help and --version.
|
||||
Since there is no other invocation of getopt, handle `--' here. */
|
||||
|
||||
+2
-2
@@ -30,7 +30,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "sleep"
|
||||
|
||||
#define AUTHORS "Jim Meyering", "Paul Eggert"
|
||||
#define AUTHORS N_ ("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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
|
||||
{
|
||||
|
||||
+1
-1
@@ -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 "Mike Haertel", "Paul Eggert"
|
||||
#define AUTHORS N_ ("Mike Haertel and Paul Eggert")
|
||||
|
||||
#if HAVE_LANGINFO_CODESET
|
||||
# include <langinfo.h>
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "split"
|
||||
|
||||
#define AUTHORS "Torbjorn Granlund", "Richard M. Stallman"
|
||||
#define AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman")
|
||||
|
||||
#define DEFAULT_SUFFIX_LENGTH 2
|
||||
|
||||
|
||||
+1
-1
@@ -750,7 +750,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
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 "Kayvan Aghaiepour", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Kayvan Aghaiepour and David MacKenzie")
|
||||
|
||||
/* The name this program was run with. */
|
||||
char *program_name;
|
||||
|
||||
+1
-1
@@ -65,7 +65,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
if (1 < argc)
|
||||
error (0, 0, _("ignoring all arguments"));
|
||||
|
||||
+1
-1
@@ -476,7 +476,7 @@ enum
|
||||
|
||||
#define case_GETOPT_VERSION_CHAR(Program_name, Authors) \
|
||||
case GETOPT_VERSION_CHAR: \
|
||||
version_etc (stdout, Program_name, PACKAGE, VERSION, Authors, NULL); \
|
||||
version_etc (stdout, Program_name, PACKAGE, VERSION, Authors); \
|
||||
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 AUTHORS "Jay Lepreau", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Jay Lepreau and David MacKenzie")
|
||||
|
||||
#if defined __MSDOS__ || defined _WIN32
|
||||
/* Define this to non-zero on systems for which the regular mechanism
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@
|
||||
#define PROGRAM_NAME "tail"
|
||||
|
||||
#define AUTHORS \
|
||||
"Paul Rubin", "David MacKenzie", "Ian Lance Taylor", "Jim Meyering"
|
||||
N_ ("Paul Rubin, David MacKenzie, Ian Lance Taylor, and 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 "Mike Parker", "Richard M. Stallman", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Mike Parker, Richard M. Stallman, and David MacKenzie")
|
||||
|
||||
static int tee (int nfiles, const char **files);
|
||||
|
||||
|
||||
+2
-2
@@ -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 "Kevin Braunsdorf", "Matthew Bradburn"
|
||||
#define AUTHORS N_ ("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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
test_syntax_error (_("missing `]'\n"), NULL);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@
|
||||
#define PROGRAM_NAME "touch"
|
||||
|
||||
#define AUTHORS \
|
||||
"Paul Rubin", "Arnold Robbins", "Jim Kingdon", "David MacKenzie", "Randy Smith"
|
||||
N_ ("Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith")
|
||||
|
||||
#ifndef STDC_HEADERS
|
||||
time_t time ();
|
||||
|
||||
+1
-1
@@ -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, NULL);
|
||||
version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, AUTHORS);
|
||||
}
|
||||
|
||||
exit (EXIT_SUCCESS);
|
||||
|
||||
+1
-1
@@ -560,7 +560,7 @@ main (int argc, char **argv)
|
||||
exit_status = 0;
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1)
|
||||
switch (opt)
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "uniq"
|
||||
|
||||
#define AUTHORS "Richard Stallman", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Richard Stallman and David MacKenzie")
|
||||
|
||||
#define SWAP_LINES(A, B) \
|
||||
do \
|
||||
|
||||
+1
-1
@@ -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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
/* The above handles --help and --version.
|
||||
Since there is no other invocation of getopt, handle `--' here. */
|
||||
|
||||
+2
-2
@@ -35,7 +35,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "uptime"
|
||||
|
||||
#define AUTHORS "Joseph Arceneaux", "David MacKenzie", "Kaveh Ghazi"
|
||||
#define AUTHORS N_ ("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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1)
|
||||
{
|
||||
|
||||
+2
-2
@@ -31,7 +31,7 @@
|
||||
/* The official name of this program (e.g., no `g' prefix). */
|
||||
#define PROGRAM_NAME "users"
|
||||
|
||||
#define AUTHORS "Joseph Arceneaux", "David MacKenzie"
|
||||
#define AUTHORS N_ ("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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
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 "Paul Rubin", "David MacKenzie"
|
||||
#define AUTHORS N_ ("Paul Rubin and 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 "Joseph Arceneaux", "David MacKenzie", "Michael Stone"
|
||||
#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Michael Stone")
|
||||
|
||||
#ifndef MAXHOSTNAMELEN
|
||||
# define MAXHOSTNAMELEN 64
|
||||
|
||||
+1
-1
@@ -77,7 +77,7 @@ main (int argc, char **argv)
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
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,
|
||||
usage, AUTHORS, NULL);
|
||||
AUTHORS, usage);
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user