summaryrefslogtreecommitdiffstats
path: root/jnlib/argparse.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2008-11-20 14:08:26 +0100
committerWerner Koch <wk@gnupg.org>2008-11-20 14:08:26 +0100
commit31af1b3f036c8e42eae578ac512a78088a7e7fa0 (patch)
tree58d99b05af2173557f74708c4b39b7aafd52f040 /jnlib/argparse.c
parentPrint library versions according to GNU standards. (diff)
downloadgnupg2-31af1b3f036c8e42eae578ac512a78088a7e7fa0.tar.xz
gnupg2-31af1b3f036c8e42eae578ac512a78088a7e7fa0.zip
Fix last change.
Diffstat (limited to '')
-rw-r--r--jnlib/argparse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index e9905e385..22133f410 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -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;