security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

Fix last change.

This commit is contained in:
Werner Koch 2008-11-20 13:08:26 +00:00
parent 5dc1c18c3a
commit 31af1b3f03
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jnlib/ChangeLog
View File

@ -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>
* argparse.h: Add a bunch of macros and constants.

6
jnlib/argparse.c
View File

@ -585,7 +585,7 @@ arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
s = *argv;
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_type = 2;
@ -603,7 +603,7 @@ arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
char *argpos;
arg->internal.inarg = 0;
if (!s[2] && !(arg->flags & ARGPARSE_FLAG_MIXED))
if (!s[2] && !(arg->flags & ARGPARSE_FLAG_NOSTOP))
{
/* Stop option processing. */
arg->internal.stopped = 1;
@ -786,7 +786,7 @@ arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
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_type = 2;