From 31af1b3f036c8e42eae578ac512a78088a7e7fa0 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 20 Nov 2008 13:08:26 +0000
Subject: Fix last change.

---
 jnlib/argparse.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'jnlib/argparse.c')

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;
-- 
cgit v1.2.3