mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-11 23:59:50 +02:00
Fix last change.
This commit is contained in:
parent
5dc1c18c3a
commit
31af1b3f03
|
@ -1,3 +1,7 @@
|
||||||
|
2008-11-20 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
|
* argparse.c (arg_parse): Fix last change.
|
||||||
|
|
||||||
2008-11-11 Werner Koch <wk@g10code.com>
|
2008-11-11 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* argparse.h: Add a bunch of macros and constants.
|
* argparse.h: Add a bunch of macros and constants.
|
||||||
|
|
|
@ -585,7 +585,7 @@ arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
|
||||||
s = *argv;
|
s = *argv;
|
||||||
arg->internal.last = s;
|
arg->internal.last = s;
|
||||||
|
|
||||||
if (arg->internal.stopped && (arg->flags & ARGPARSE_FLAG_KEEP))
|
if (arg->internal.stopped && (arg->flags & ARGPARSE_FLAG_ALL))
|
||||||
{
|
{
|
||||||
arg->r_opt = ARGPARSE_IS_ARG; /* Not an option but an argument. */
|
arg->r_opt = ARGPARSE_IS_ARG; /* Not an option but an argument. */
|
||||||
arg->r_type = 2;
|
arg->r_type = 2;
|
||||||
|
@ -603,7 +603,7 @@ arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
|
||||||
char *argpos;
|
char *argpos;
|
||||||
|
|
||||||
arg->internal.inarg = 0;
|
arg->internal.inarg = 0;
|
||||||
if (!s[2] && !(arg->flags & ARGPARSE_FLAG_MIXED))
|
if (!s[2] && !(arg->flags & ARGPARSE_FLAG_NOSTOP))
|
||||||
{
|
{
|
||||||
/* Stop option processing. */
|
/* Stop option processing. */
|
||||||
arg->internal.stopped = 1;
|
arg->internal.stopped = 1;
|
||||||
|
@ -786,7 +786,7 @@ arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
|
||||||
argc--; argv++; idx++;
|
argc--; argv++; idx++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( arg->flags & ARGPARSE_FLAG_ALL )
|
else if ( arg->flags & ARGPARSE_FLAG_MIXED )
|
||||||
{
|
{
|
||||||
arg->r_opt = ARGPARSE_IS_ARG;
|
arg->r_opt = ARGPARSE_IS_ARG;
|
||||||
arg->r_type = 2;
|
arg->r_type = 2;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user