X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flong-options.c;h=d28d69fa6327f1d4786be007257912f4474e6653;hb=74a9f8aecf503bc6a6a1f955cc847a82b31ddbd4;hp=fdc9ec09502dc5cc2d95f056f5058dfa82e7809b;hpb=b18bd420fa0099ff6ef96277aeb002cca7d1b78f;p=gnulib.git
diff --git a/lib/long-options.c b/lib/long-options.c
index fdc9ec095..d28d69fa6 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,10 +1,12 @@
/* Utility to accept --help and --version options as unobtrusively as possible.
- Copyright (C) 1993, 1994, 1998, 1999 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2010 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,32 +14,27 @@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
+
+/* Specification. */
+#include "long-options.h"
+#include
#include
+#include
#include
-#include "closeout.h"
-#include "long-options.h"
-#if ENABLE_NLS
-# include
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
+#include "version-etc.h"
static struct option const long_options[] =
{
- {"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'v'},
- {0, 0, 0, 0}
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
+ {NULL, 0, NULL, 0}
};
/* Process long options --help and --version, but only if argc == 2.
@@ -45,12 +42,12 @@ static struct option const long_options[] =
void
parse_long_options (int argc,
- char **argv,
- const char *command_name,
- const char *package,
- const char *version,
- const char *authors,
- void (*usage_func)())
+ char **argv,
+ const char *command_name,
+ const char *package,
+ const char *version,
+ void (*usage_func) (int),
+ /* const char *author1, ...*/ ...)
{
int c;
int saved_opterr;
@@ -64,21 +61,22 @@ parse_long_options (int argc,
&& (c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
{
switch (c)
- {
- case 'h':
- (*usage_func) (0);
-
- case 'v':
- printf ("%s (%s) %s\n", command_name, package, version);
- printf (_("Written by %s.\n"), authors);
- close_stdout (); /* FIXME: output failure exit status
- should be settable via an arg. */
- exit (0);
-
- default:
- /* Don't process any other long-named options. */
- break;
- }
+ {
+ case 'h':
+ (*usage_func) (EXIT_SUCCESS);
+
+ case 'v':
+ {
+ va_list authors;
+ va_start (authors, usage_func);
+ version_etc_va (stdout, command_name, package, version, authors);
+ exit (0);
+ }
+
+ default:
+ /* Don't process any other long-named options. */
+ break;
+ }
}
/* Restore previous value. */