projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
lib
/
long-options.c
diff --git
a/lib/long-options.c
b/lib/long-options.c
index
dd7a8ca
..
82372d6
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 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994
, 1998, 1999
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
@@
-12,18
+12,27
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
-
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139
, USA. */
+ along with this program; if not, write to the Free Software
Foundation,
+
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
-/*
Jim Meyering (meyering@comco.com)
*/
+/*
Written by Jim Meyering.
*/
-#if
def
HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+#
include <config.h>
#endif
#include <stdio.h>
#include <getopt.h>
#endif
#include <stdio.h>
#include <getopt.h>
+#include "closeout.h"
#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[] =
{
@@
-36,33
+45,34
@@
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, version_string, usage)
- int argc;
- char **argv;
- const char *command_name;
- const char *version_string;
- 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;
- int saved_optind;
saved_opterr = opterr;
saved_opterr = opterr;
- saved_optind = optind;
/* Don't print an error message for unrecognized options. */
opterr = 0;
if (argc == 2
/* Don't print an error message for unrecognized options. */
opterr = 0;
if (argc == 2
- && (c = getopt_long (argc, argv, "+", long_options,
(int *) 0)) != EOF
)
+ && (c = getopt_long (argc, argv, "+", long_options,
NULL)) != -1
)
{
switch (c)
{
case 'h':
{
switch (c)
{
case 'h':
- (*usage) (0);
+ (*usage
_func
) (0);
case 'v':
case 'v':
- printf ("%s - %s\n", command_name, version_string);
+ version_etc (stdout, command_name, package, version, authors);
+ close_stdout (); /* FIXME: output failure exit status
+ should be settable via an arg. */
exit (0);
default:
exit (0);
default:
@@
-74,6
+84,7
@@
parse_long_options (argc, argv, command_name, version_string, usage)
/* Restore previous value. */
opterr = saved_opterr;
/* Restore previous value. */
opterr = saved_opterr;
- /* Restore optind in case it has advanced past a leading `--'. */
- optind = saved_optind;
+ /* Reset this to zero so that getopt internals get initialized from
+ the probably-new parameters when/if getopt is called later. */
+ optind = 0;
}
}