core: Fix the "ignore" meta command of the argparser.

* src/argparse.c (_gpgrt_argparse): Factor some code out to ...
(prepare_arg_return): new.
(_gpgrt_argparse): No missing arg error in ignore sections.
--

Options in an [ignore] section do not anymore lead to an error if an
argument is missing.  However, if the option is also in a force
section the error is thrown.

Signed-off-by: Werner Koch <[email protected]>

3 files changed, 60 insertions, 37 deletions

diff --git a/src/argparse.c b/src/argparse.c
index 0415909..e4a1436 100644
--- a/src/argparse.c
+++ b/src/argparse.c
@@ -911,6 +911,34 @@ handle_metacmd (gpgrt_argparse_t *arg, char *keyword)
 }
 
 
+/* Helper for _gpgrt_argparse.  */
+static void
+prepare_arg_return (gpgrt_argparse_t *arg, opttable_t *opts,
+                    int idx, int in_alias, int set_ignore)
+{
+  /* No argument found at the end of the line.  */
+  if (in_alias)
+    arg->r_opt = ARGPARSE_MISSING_ARG;
+  else if (!(opts[idx].flags & ARGPARSE_TYPE_MASK))
+    arg->r_type = ARGPARSE_TYPE_NONE; /* Does not take an arg. */
+  else if ((opts[idx].flags & ARGPARSE_OPT_OPTIONAL))
+    arg->r_type = ARGPARSE_TYPE_NONE; /* No optional argument. */
+  else if (!(opts[idx].ignore && !opts[idx].forced) && !set_ignore)
+    arg->r_opt = ARGPARSE_MISSING_ARG;
+
+  /* If the caller wants us to return the attributes or
+   * ignored options, or these flags in.  */
+  if ((arg->flags & ARGPARSE_FLAG_WITHATTR))
+    {
+      if (opts[idx].ignore)
+        arg->r_type |= ARGPARSE_ATTR_IGNORE;
+      if (opts[idx].forced)
+        arg->r_type |= ARGPARSE_ATTR_FORCE;
+      if (set_ignore)
+        arg->r_type |= ARGPARSE_OPT_IGNORE;
+    }
+}
+
 /****************
  * Get options from a file.
  * Lines starting with '#' are comment lines.
@@ -956,6 +984,7 @@ _gpgrt_argparse (estream_t fp, gpgrt_argparse_t *arg, gpgrt_opt_t *opts_orig)
   char *buffer = NULL;
   size_t buflen = 0;
   int in_alias=0;
+  int set_ignore = 0;
   int unread_buf[3];  /* We use an int so that we can store EOF.  */
   int unread_buf_count = 0;
 
@@ -1053,12 +1082,8 @@ _gpgrt_argparse (estream_t fp, gpgrt_argparse_t *arg, gpgrt_opt_t *opts_orig)
                     goto leave;
                 }
             }
-          else if (state == Akeyword_spc)
-            {
-              /* Known option but need to scan for args.  */
-              state = Awaitarg;
-            }
-          else if (arg->internal->in_sysconf
+          else if (state != Akeyword_spc
+                   && arg->internal->in_sysconf
                    && arg->internal->user_seen
                    && !arg->internal->user_active)
             {
@@ -1067,7 +1092,8 @@ _gpgrt_argparse (estream_t fp, gpgrt_argparse_t *arg, gpgrt_opt_t *opts_orig)
               state = state == Akeyword_eol? Ainit : Acomment;
               i = 0;
             }
-          else if ((opts[idx].flags & ARGPARSE_OPT_IGNORE))
+          else if (state != Akeyword_spc
+                   && (opts[idx].flags & ARGPARSE_OPT_IGNORE))
             {
               /* Known option is configured to be ignored.  Start from
                * scratch (new line) or process like a comment.  */
@@ -1076,7 +1102,7 @@ _gpgrt_argparse (estream_t fp, gpgrt_argparse_t *arg, gpgrt_opt_t *opts_orig)
             }
           else /* Known option */
             {
-              int set_ignore = 0;
+              set_ignore = 0;
 
               if (arg->internal->in_sysconf)
                 {
@@ -1111,27 +1137,27 @@ _gpgrt_argparse (estream_t fp, gpgrt_argparse_t *arg, gpgrt_opt_t *opts_orig)
                     }
                 }
 
-              arg->r_opt = opts[idx].short_opt;
-              if (!(opts[idx].flags & ARGPARSE_TYPE_MASK))
-                arg->r_type = ARGPARSE_TYPE_NONE; /* Does not take an arg. */
-              else if ((opts[idx].flags & ARGPARSE_OPT_OPTIONAL) )
-                arg->r_type = ARGPARSE_TYPE_NONE; /* Arg is optional.  */
+              if (state == Akeyword_spc)
+                {
+                  /* If we shall ignore but not set the option we skip
+                   * the argument.  Otherwise we would need to use a
+                   * made-up but not used args in the conf file. */
+                  if (set_ignore || (opts[idx].ignore && !opts[idx].forced))
+                    {
+                      prepare_arg_return (arg, opts, idx, 0, set_ignore);
+                      set_ignore = 0;
+                      state = Askipandleave;
+                    }
+                  else
+                    state = Awaitarg;
+                }
               else
-                arg->r_opt = ARGPARSE_MISSING_ARG;
-
-              /* If the caller wants us to return the attributes or
-               * ignored options, or the flags in.  */
-              if ((arg->flags & ARGPARSE_FLAG_WITHATTR))
                 {
-                  if (opts[idx].ignore)
-                    arg->r_type |= ARGPARSE_ATTR_IGNORE;
-                  if (opts[idx].forced)
-                    arg->r_type |= ARGPARSE_ATTR_FORCE;
-                  if (set_ignore)
-                    arg->r_type |= ARGPARSE_OPT_IGNORE;
+                  prepare_arg_return (arg, opts, idx, 0, set_ignore);
+                  set_ignore = 0;
+                  goto leave;
                 }
 
-              goto leave;
             }
         } /* (end state Akeyword_eol/Akeyword_spc) */
       else if (state == Ametacmd)
@@ -1185,15 +1211,8 @@ _gpgrt_argparse (estream_t fp, gpgrt_argparse_t *arg, gpgrt_opt_t *opts_orig)
           else if (state == Awaitarg)
             {
               /* No argument found at the end of the line.  */
-              if (in_alias)
-                arg->r_opt = ARGPARSE_MISSING_ARG;
-              else if (!(opts[idx].flags & ARGPARSE_TYPE_MASK))
-                arg->r_type = ARGPARSE_TYPE_NONE; /* Does not take an arg. */
-              else if ((opts[idx].flags & ARGPARSE_OPT_OPTIONAL))
-                arg->r_type = ARGPARSE_TYPE_NONE; /* No optional argument. */
-              else
-                arg->r_opt = ARGPARSE_MISSING_ARG;
-
+              prepare_arg_return (arg, opts, idx, in_alias, set_ignore);
+              set_ignore = 0;
               goto leave;
 	    }
           else if (state == Acopyarg)
@@ -2707,7 +2726,7 @@ _gpgrt_strusage (int level)
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 "GNU Lesser General Public License for more details.\n\n"
-"You should have received a copy of the GNU General Public License\n"
+"You should have received a copy of the GNU Lesser General Public License\n"
 "along with this software.  If not, see <https://gnu.org/licenses/>.\n";
       else /* Default */
         p =
diff --git a/tests/etc/t-argparse.conf b/tests/etc/t-argparse.conf
index f2db907..6559266 100644
--- a/tests/etc/t-argparse.conf
+++ b/tests/etc/t-argparse.conf
@@ -57,6 +57,11 @@ not-my-option
 [user wk ]
 [-info Options applied only for user wk follow]
 
+[ignore]
+output
+[-ignore]
+
+
 # Change the immutable attribute back to mutable.
 [-force]
 #compliance gnupg
@@ -72,5 +77,4 @@ my-option 42
 # The default algorithm for new keys is set to this.
 a-long-option
 
-
 [-echo End global config]
diff --git a/tests/t-argparse.conf b/tests/t-argparse.conf
index f50712e..431ee7d 100644
--- a/tests/t-argparse.conf
+++ b/tests/t-argparse.conf
@@ -13,4 +13,4 @@ my-option 4711
 not-my-option
 
 verbose
-[-echo end of user config]
\ No newline at end of file
+[-echo end of user config]