Doc: Updated the list of contributors

[libucw.git] / ucw / opt.c

diff --git a/ucw/opt.c b/ucw/opt.c
index c0986aa736075a4ceb8837d09581df2a828c6ac7..5598a13b340bdbff9402495d8c38781feebfefa6 100644 (file)
--- a/ucw/opt.c
+++ b/ucw/opt.c
@@ -11,28 +11,20 @@
 #include <ucw/lib.h>
 #include <ucw/opt.h>
 #include <ucw/opt-internal.h>
+#include <ucw/gary.h>
 #include <ucw/stkstring.h>
 #include <ucw/strtonum.h>
 
 #include <alloca.h>
 #include <math.h>
 
-/***
- * Value flags defaults
- * ~~~~~~~~~~~~~~~~~~~~
- *
- * OPT_NO_VALUE for OPT_BOOL, OPT_SWITCH and OPT_INC
- * OPT_MAYBE_VALUE for OPT_STRING, OPT_UNS, OPT_INT
- * Some of the value flags (OPT_NO_VALUE, OPT_MAYBE_VALUE, OPT_REQUIRED_VALUE)
- * must be specified for OPT_CALL and OPT_USER.
- ***/
 static uns opt_default_value_flags[] = {
     [OPT_CL_BOOL] = OPT_NO_VALUE,
     [OPT_CL_STATIC] = OPT_MAYBE_VALUE,
+    [OPT_CL_MULTIPLE] = OPT_REQUIRED_VALUE,
     [OPT_CL_SWITCH] = OPT_NO_VALUE,
     [OPT_CL_INC] = OPT_NO_VALUE,
     [OPT_CL_CALL] = 0,
-    [OPT_CL_USER] = 0,
     [OPT_CL_SECTION] = 0,
     [OPT_CL_HELP] = 0
 };
@@ -72,7 +64,7 @@ void opt_precompute(struct opt_precomputed *opt, struct opt_item *item)
     flags |= OPT_REQUIRED_VALUE;
   }
   if (!(flags & OPT_VALUE_FLAGS)) {
-    ASSERT(item->cls != OPT_CL_CALL && item->cls != OPT_CL_USER);
+    ASSERT(item->cls != OPT_CL_CALL);
     flags |= opt_default_value_flags[item->cls];
   }
 
@@ -120,20 +112,6 @@ static struct opt_precomputed * opt_find_item_longopt(struct opt_context * oc, c
   opt_failure("Invalid option --%s.", str);
 }
 
-// FIXME: Use simple-lists?
-#define OPT_PTR(type) ({                       \
-  type * ptr;                                  \
-  if (item->flags & OPT_MULTIPLE) {            \
-    struct {                                   \
-      cnode n;                                         \
-      type v;                                  \
-    } * n = xmalloc(sizeof(*n));               \
-    clist_add_tail(item->ptr, &(n->n));        \
-    ptr = &(n->v);                             \
-  } else                                       \
-    ptr = item->ptr;                           \
-  ptr; })
-
 static void opt_parse_value(struct opt_context * oc, struct opt_precomputed * opt, char * value) {
   struct opt_item * item = opt->item;
 
@@ -155,8 +133,15 @@ static void opt_parse_value(struct opt_context * oc, struct opt_precomputed * op
        opt_failure("Boolean argument for %s has a strange value. Supported (case insensitive): 1/0, y/n, yes/no, true/false.", THIS_OPT);
       break;
     case OPT_CL_STATIC:
+    case OPT_CL_MULTIPLE:
       {
        char * e = NULL;
+       void * ptr;
+       if (item->cls == OPT_CL_STATIC)
+         ptr = item->ptr;
+       else
+         ptr = GARY_PUSH_GENERIC(*(void **)item->ptr);
+#define OPT_PTR(type) ((type *) ptr)
        switch (item->type) {
          case CT_INT:
            if (!value)
@@ -196,9 +181,17 @@ static void opt_parse_value(struct opt_context * oc, struct opt_precomputed * op
            else
              *OPT_PTR(const char *) = xstrdup(value);
            break;
+         case CT_USER:
+             {
+               char * e = item->u.utype->parser(value, ptr);
+               if (e)
+                 opt_failure("Cannot parse the value of %s: %s", THIS_OPT, e);
+               break;
+             }
          default:
            ASSERT(0);
        }
+#undef OPT_PTR
        break;
       }
     case OPT_CL_SWITCH:
@@ -219,14 +212,6 @@ static void opt_parse_value(struct opt_context * oc, struct opt_precomputed * op
        item->u.call(item, value, data);
        break;
       }
-    case OPT_CL_USER:
-      {
-       char * e = NULL;
-       e = item->u.utype->parser(value, OPT_PTR(void*));
-       if (e)
-         opt_failure("Cannot parse the value of %s: %s", THIS_OPT, e);
-       break;
-      }
     default:
       ASSERT(0);
   }