Xtypes: Documentation

[libucw.git] / ucw / opt.c

diff --git a/ucw/opt.c b/ucw/opt.c
index e8d7cbeebe9308f7d7a39c1c39faf753b22b91a9..d082d03b9e4e11f3c1f0d0f2285ce49cace614de 100644 (file)
--- a/ucw/opt.c
+++ b/ucw/opt.c
@@ -3,6 +3,7 @@
  *
  *     (c) 2013 Jan Moskyto Matejka <mq@ucw.cz>
  *     (c) 2014 Martin Mares <mj@ucw.cz>
+ *     (c) 2014 Pavel Charvat <pchar@ucw.cz>
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
@@ -201,6 +202,13 @@ static void opt_parse_value(struct opt_context * oc, struct opt_precomputed * op
                  opt_failure("Cannot parse the value of %s: %s", THIS_OPT, e);
                break;
              }
+         case CT_XTYPE:
+             {
+               const char * e = item->u.xtype->parse(value, ptr, cf_get_pool());
+               if (e)
+                 opt_failure("Cannot parse the value of %s: %s", THIS_OPT, e);
+               break;
+             }
          default:
            ASSERT(0);
        }
@@ -225,6 +233,9 @@ static void opt_parse_value(struct opt_context * oc, struct opt_precomputed * op
        item->u.call(item, value, data);
        break;
       }
+    case OPT_CL_BREAK:
+      oc->stop_parsing = 2;
+      break;
     default:
       ASSERT(0);
   }
@@ -388,8 +399,9 @@ int opt_parse(const struct opt_section * options, char ** argv) {
   opt_prepare_items(oc, options);
 
   int force_positional = 0;
-  int i;
+  int i, start_i = 0;
   for (i=0; argv[i] && !oc->stop_parsing; i++) {
+    start_i = i;
     char *arg = argv[i];
     opt_invoke_hooks(oc, OPT_HOOK_BEFORE_ARG, NULL, NULL);
     if (arg[0] != '-' || force_positional)
@@ -409,5 +421,5 @@ int opt_parse(const struct opt_section * options, char ** argv) {
 
   opt_check_required(oc);
   opt_invoke_hooks(oc, OPT_HOOK_FINAL, NULL, NULL);
-  return i;
+  return (oc->stop_parsing < 2 ? i : start_i);
 }