projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(jm_ICONV): Recommend GNU libiconv.
[gnulib.git]
/
lib
/
long-options.c
diff --git
a/lib/long-options.c
b/lib/long-options.c
index
40c1a0d
..
e36685f
100644
(file)
--- a/
lib/long-options.c
+++ b/
lib/long-options.c
@@
-1,5
+1,5
@@
/* Utility to accept --help and --version options as unobtrusively as possible.
/* Utility to accept --help and --version options as unobtrusively as possible.
- Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1998
, 1999, 2000
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
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
@@
-17,14
+17,25
@@
/* Written by Jim Meyering. */
/* Written by Jim Meyering. */
-#if
def
HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
#include <getopt.h>
# include <config.h>
#endif
#include <stdio.h>
#include <getopt.h>
-#include "closeout.h"
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
#include "long-options.h"
#include "long-options.h"
+#include "version-etc.h"
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
static struct option const long_options[] =
{
static struct option const long_options[] =
{
@@
-37,13
+48,13
@@
static struct option const long_options[] =
Be careful not to gobble up `--'. */
void
Be careful not to gobble up `--'. */
void
-parse_long_options (
argc, argv, command_name, package, version, usage)
- int argc;
- char **argv;
- const char *command_name;
- const char *package;
- const char *version;
- void (*usage)();
+parse_long_options (
int argc,
+ char **argv,
+ const char *command_name,
+ const char *package,
+ const char *version,
+ const char *authors,
+ void (*usage_func)())
{
int c;
int saved_opterr;
{
int c;
int saved_opterr;
@@
-59,12
+70,10
@@
parse_long_options (argc, argv, command_name, package, version, usage)
switch (c)
{
case 'h':
switch (c)
{
case 'h':
- (*usage) (0);
+ (*usage
_func
) (0);
case 'v':
case 'v':
- printf ("%s (%s) %s\n", command_name, package, version);
- close_stdout (); /* FIXME: output failure exit status
- should be settable via an arg. */
+ version_etc (stdout, command_name, package, version, authors);
exit (0);
default:
exit (0);
default: