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->flags = flags;
}
-static void opt_invoke_hooks(struct opt_context *oc, uint 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 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);
item->u.call(item, value, data);
break;
}
+ case OPT_CL_BREAK:
+ oc->stop_parsing = 2;
+ break;
default:
ASSERT(0);
}
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_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);
}