shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

fix optind after last change to it

Browse Source
This commit is contained in:
Alasdair Kergon 2003-04-24 21:59:42 +00:00
parent 9a079266dd
commit d9e14671aa
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/lvm.c
View File

@ -19,9 +19,14 @@
#ifdef HAVE_GETOPTLONG #ifdef HAVE_GETOPTLONG
# include <getopt.h> # include <getopt.h>
# define GETOPTLONG_FN(a, b, c, d, e) getopt_long((a), (b), (c), (d), (e)) # define GETOPTLONG_FN(a, b, c, d, e) getopt_long((a), (b), (c), (d), (e))
# define OPTIND_INIT 0
#else #else
struct option {}; struct option {
};
extern int optind;
extern char *optarg;
# define GETOPTLONG_FN(a, b, c, d, e) getopt((a), (b), (c)) # define GETOPTLONG_FN(a, b, c, d, e) getopt((a), (b), (c))
# define OPTIND_INIT 1
#endif #endif
#ifdef READLINE_SUPPORT #ifdef READLINE_SUPPORT
@ -402,7 +407,6 @@ static void _add_getopt_arg(int arg, char **ptr, struct option **o)
if (a->fn) if (a->fn)
*(*ptr)++ = ':'; *(*ptr)++ = ':';
} }
#ifdef HAVE_GETOPTLONG #ifdef HAVE_GETOPTLONG
if (*(a->long_arg + 2)) { if (*(a->long_arg + 2)) {
(*o)->name = a->long_arg + 2; (*o)->name = a->long_arg + 2;
@ -467,7 +471,7 @@ static int _process_command_line(struct cmd_context *cmd, int *argc,
/* initialise getopt_long & scan for command line switches */ /* initialise getopt_long & scan for command line switches */
optarg = 0; optarg = 0;
optind = 1; optind = OPTIND_INIT;
while ((opt = GETOPTLONG_FN(*argc, *argv, str, opts, NULL)) >= 0) { while ((opt = GETOPTLONG_FN(*argc, *argv, str, opts, NULL)) >= 0) {
if (opt == '?') if (opt == '?')