projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify last commit.
[gnulib.git]
/
lib
/
long-options.c
diff --git
a/lib/long-options.c
b/lib/long-options.c
index
fb61661
..
450947d
100644
(file)
--- a/
lib/long-options.c
+++ b/
lib/long-options.c
@@
-1,12
+1,12
@@
/* 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, 1999, 2000, 2002, 2003, 2004, 2005,
-
2006 Free Software
Foundation, Inc.
+ Copyright (C) 1993
-1994, 1998-2000, 2002-2006, 2009-2012 Free Software
+ Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,8
+14,7
@@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Jim Meyering. */
/* Written by Jim Meyering. */
@@
-39,16
+38,16
@@
static struct option const long_options[] =
};
/* Process long options --help and --version, but only if argc == 2.
};
/* Process long options --help and --version, but only if argc == 2.
- Be careful not to gobble up
`--'
. */
+ Be careful not to gobble up
"--"
. */
void
parse_long_options (int argc,
void
parse_long_options (int argc,
- char **argv,
- const char *command_name,
- const char *package,
- const char *version,
- void (*usage_func) (int),
- /* const char *author1, ...*/ ...)
+
char **argv,
+
const char *command_name,
+
const char *package,
+
const char *version,
+
void (*usage_func) (int),
+
/* const char *author1, ...*/ ...)
{
int c;
int saved_opterr;
{
int c;
int saved_opterr;
@@
-62,22
+61,22
@@
parse_long_options (int argc,
&& (c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
{
switch (c)
&& (c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
{
switch (c)
- {
- 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;
- }
+
{
+
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. */
}
/* Restore previous value. */