[svn] GnuPG - r4879 - trunk/jnlib

[svn author wk]

Author: wk
Date: 2008-11-20 14:08:26 +0100 (Thu, 20 Nov 2008)
New Revision: 4879

Modified:
   trunk/jnlib/ChangeLog
   trunk/jnlib/argparse.c
Log:
Fix last change.


Modified: trunk/jnlib/ChangeLog
===================================================================
--- trunk/jnlib/ChangeLog	2008-11-18 18:43:13 UTC (rev 4878)
+++ trunk/jnlib/ChangeLog	2008-11-20 13:08:26 UTC (rev 4879)
@@ -1,3 +1,7 @@
+2008-11-20  Werner Koch  <wk at g10code.com>
+
+	* argparse.c (arg_parse): Fix last change.
+
 2008-11-11  Werner Koch  <wk at g10code.com>
 
 	* argparse.h: Add a bunch of macros and constants.

Modified: trunk/jnlib/argparse.c
===================================================================
--- trunk/jnlib/argparse.c	2008-11-18 18:43:13 UTC (rev 4878)
+++ trunk/jnlib/argparse.c	2008-11-20 13:08:26 UTC (rev 4879)
@@ -585,7 +585,7 @@
   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 @@
       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 @@
 	    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;