#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>
-static uns opt_default_value_flags[] = {
+static uint 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
};
static char *opt_name(struct opt_context *oc, struct opt_precomputed *opt)
{
- struct opt_item *item = opt->item;
+ const struct opt_item *item = opt->item;
char *res;
if (item->letter >= OPT_POSITIONAL_TAIL)
res = stk_printf("positional argument #%d", oc->positional_count);
#define THIS_OPT opt_name(oc, opt)
-void opt_precompute(struct opt_precomputed *opt, struct opt_item *item)
+void opt_precompute(struct opt_precomputed *opt, const struct opt_item *item)
{
opt->item = item;
opt->count = 0;
opt->name = item->name;
- uns flags = item->flags;
+ uint flags = item->flags;
if (item->letter >= OPT_POSITIONAL_TAIL) {
flags &= ~OPT_VALUE_FLAGS;
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];
}
opt->flags = flags;
}
-static void opt_invoke_hooks(struct opt_context *oc, uns event, struct opt_item *item, char *value)
+static void opt_invoke_hooks(struct opt_context *oc, uint event, const struct opt_item *item, char *value)
{
for (int i = 0; i < oc->hook_count; i++) {
- struct opt_item *hook = oc->hooks[i];
+ const struct opt_item *hook = oc->hooks[i];
if (hook->flags & event) {
void *data = (hook->flags & OPT_HOOK_INTERNAL) ? oc : hook->ptr;
hook->u.hook(item, event, value, data);
}
static struct opt_precomputed * opt_find_item_longopt(struct opt_context * oc, char * str) {
- uns len = strlen(str);
+ uint len = strlen(str);
struct opt_precomputed * candidate = NULL;
for (int i = 0; i < oc->opt_count; i++) {
if (!strncmp(opt->name, str, len)) {
if (strlen(opt->name) == len)
return opt;
- } else if (opt->item->cls == OPT_CL_BOOL && !strncmp("no-", str, 3) && !strncmp(opt->name, str+3, len-3)) {
- if (strlen(opt->name) == len-3)
- return opt;
+ } else if (opt->item->cls == OPT_CL_BOOL) {
+ if (opt->flags & OPT_NEGATIVE) {
+ // If the option is called no-X, match X as well
+ if (!strncmp("no-", opt->name, 3) && !strncmp(opt->name+3, str, len)) {
+ if (strlen(opt->name) == len+3)
+ return opt;
+ } else
+ continue;
+ } else {
+ // Match no-X as well
+ if (!strncmp("no-", str, 3) && !strncmp(opt->name, str+3, len-3)) {
+ if (strlen(opt->name) == len-3)
+ return opt;
+ } else
+ continue;
+ }
} else
continue;
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;
+ const struct opt_item * item = opt->item;
if (opt->count++ && (opt->flags & OPT_SINGLE))
opt_failure("Option %s must be specified at most once.", THIS_OPT);
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)
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:
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;
- }
+ case OPT_CL_BREAK:
+ oc->stop_parsing = 2;
+ break;
default:
ASSERT(0);
}
static int opt_longopt(struct opt_context * oc, char ** argv, int index) {
int eaten = 0;
char * name_in = argv[index] + 2; // skipping the -- on the beginning
- uns pos = strchrnul(name_in, '=') - name_in;
+ uint pos = strchrnul(name_in, '=') - name_in;
struct opt_precomputed * opt = opt_find_item_longopt(oc, strndupa(name_in, pos));
char * value = NULL;
opt->flags |= OPT_SEEN_AS_LONG;
- if (opt->item->cls == OPT_CL_BOOL && !strncmp(name_in, "no-", 3) && !strncmp(name_in+3, opt->item->name, pos-3)) {
+ if (opt->item->cls == OPT_CL_BOOL &&
+ ((opt->flags & OPT_NEGATIVE)
+ ? (!strncmp(opt->item->name, "no-", 3) && !strncmp(name_in, opt->item->name + 3, pos-3))
+ : (!strncmp(name_in, "no-", 3) && !strncmp(name_in+3, opt->item->name, pos-3)))) {
if (name_in[pos])
opt_failure("Option --%s must not have any value.", name_in);
value = "n";
static void opt_positional(struct opt_context * oc, char * value) {
oc->positional_count++;
- uns id = oc->positional_count > oc->positional_max ? OPT_POSITIONAL_TAIL : OPT_POSITIONAL(oc->positional_count);
+ uint id = oc->positional_count > oc->positional_max ? OPT_POSITIONAL_TAIL : OPT_POSITIONAL(oc->positional_count);
struct opt_precomputed * opt = oc->shortopt[id];
if (!opt)
opt_failure("Too many positional arguments.");
else {
- opt->flags &= OPT_SEEN_AS_LONG;
+ opt->flags &= ~OPT_SEEN_AS_LONG;
opt_parse_value(oc, opt, value);
}
}
static void opt_prepare_items(struct opt_context *oc, const struct opt_section *sec)
{
- for (struct opt_item *item = sec->opt; item->cls != OPT_CL_END; item++) {
+ for (const struct opt_item *item = sec->opt; item->cls != OPT_CL_END; item++) {
if (item->cls == OPT_CL_SECTION)
opt_prepare_items(oc, item->u.section);
else if (item->cls == OPT_CL_HOOK)
for (int i = 0; i < oc->opt_count; i++) {
struct opt_precomputed *opt = &oc->opts[i];
if (!opt->count && (opt->flags & OPT_REQUIRED)) {
- struct opt_item *item = opt->item;
+ const struct opt_item *item = opt->item;
if (item->letter > OPT_POSITIONAL_TAIL)
opt_failure("Required positional argument #%d not found.", item->letter - OPT_POSITIONAL_TAIL);
else if (item->letter == OPT_POSITIONAL_TAIL)
opt_count_items(oc, options);
oc->opts = alloca(sizeof(*oc->opts) * oc->opt_count);
- oc->shortopt = alloca(sizeof(*oc->shortopt) * (oc->positional_max + 257));
- memset(oc->shortopt, 0, sizeof(*oc->shortopt) * (oc->positional_max + 257));
+ oc->shortopt = alloca(sizeof(*oc->shortopt) * (oc->positional_max + OPT_POSITIONAL_TAIL + 1));
+ memset(oc->shortopt, 0, sizeof(*oc->shortopt) * (oc->positional_max + OPT_POSITIONAL_TAIL + 1));
oc->hooks = alloca(sizeof (*oc->hooks) * oc->hook_count);
oc->opt_count = 0;
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)
opt_check_required(oc);
opt_invoke_hooks(oc, OPT_HOOK_FINAL, NULL, NULL);
- return i;
+ return (oc->stop_parsing < 2 ? i : start_i);
}
projects / libucw.git / blobdiff