* UCW Library -- Parsing of command line options
*
* (c) 2013 Jan Moskyto Matejka <mq@ucw.cz>
+ * (c) 2014 Martin Mares <mj@ucw.cz>
*
* This software may be freely distributed and used according to the terms
* of the GNU Lesser General Public License.
#include <ucw/lib.h>
#include <ucw/opt.h>
#include <ucw/conf.h>
+#include <ucw/conf-internal.h>
+#include <ucw/fastbuf.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_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
+};
+
+struct opt_precomputed {
+ struct opt_item * item;
+ const char * name;
+ short flags;
+ short count;
+};
+
+struct opt_context {
+ struct opt_precomputed * opts;
+ struct opt_precomputed ** shortopt;
+ struct opt_item ** hooks_before_arg;
+ struct opt_item ** hooks_before_value;
+ struct opt_item ** hooks_after_value;
+ short opt_count;
+ short hooks_before_arg_count;
+ short hooks_before_value_count;
+ short hooks_after_value_count;
+ int positional_max;
+ int positional_count;
+};
+
static void opt_failure(const char * mesg, ...) FORMAT_CHECK(printf,1,2) NONRET;
static void opt_failure(const char * mesg, ...) {
va_list args;
fprintf(stderr, "\n");
opt_usage();
exit(OPT_EXIT_BAD_ARGS);
- va_end(args);
+ va_end(args); // FIXME: Does this make a sense after exit()?
}
-#define OPT_ADD_DEFAULT_ITEM_FLAGS(item, flags) \
- do { \
- if (item->letter >= 256) { \
- if (flags & OPT_VALUE_FLAGS) \
- flags &= ~OPT_VALUE_FLAGS; \
- flags |= OPT_REQUIRED_VALUE; \
- } \
- if (!(flags & OPT_VALUE_FLAGS) && \
- (item->cls == OPT_CL_CALL || item->cls == OPT_CL_USER)) { \
- fprintf(stderr, "You MUST specify some of the value flags for the %c/%s item.\n", item->letter, item->name); \
- ASSERT(0); \
- } \
- else if (!(flags & OPT_VALUE_FLAGS)) \
- flags |= opt_default_value_flags[item->cls]; \
- } while (0)
-#define OPT_ITEM_FLAGS(item) ((item->flags & OPT_VALUE_FLAGS) ? item->flags : item->flags | opt_default_value_flags[item->cls])
-
-const struct opt_section * opt_section_root;
-
#define FOREACHLINE(text) for (const char * begin = (text), * end = (text); (*end) && (end = strchrnul(begin, '\n')); begin = end+1)
-void opt_help_internal(const struct opt_section * help) {
+static inline uns uns_min(uns x, uns y)
+{
+ return MIN(x, y);
+}
+
+void opt_help(const struct opt_section * help) {
int sections_cnt = 0;
int lines_cnt = 0;
uns eol = strchrnul(item->help, '\n') - item->help;
if (valoff > eol)
valoff = eol;
-#define VAL(it) ((OPT_ITEM_FLAGS(it) & OPT_REQUIRED_VALUE) ? stk_printf("=%.*s", valoff, item->help) : ((OPT_ITEM_FLAGS(it) & OPT_NO_VALUE) ? "" : stk_printf("(=%.*s)", valoff, item->help)))
+#define VAL(it) ((it->flags & OPT_REQUIRED_VALUE) ? stk_printf("=%.*s", valoff, item->help) : ((it->flags & OPT_NO_VALUE) ? "" : stk_printf("(=%.*s)", valoff, item->help)))
if (item->name) {
lines[line][1] = stk_printf("--%s%s", item->name, VAL(item));
if (linelengths[1] < (int) strlen(lines[line][1]))
#undef SPLITLINES
s = 0;
-#define FIELD(k) linelengths[k], MIN(strchrnul(lines[i][k], '\t')-lines[i][k],strchrnul(lines[i][k], '\n')-lines[i][k]), lines[i][k]
-#define LASTFIELD(k) MIN(strchrnul(lines[i][k], '\t')-lines[i][k],strchrnul(lines[i][k], '\n')-lines[i][k]), lines[i][k]
+#define FIELD(k) linelengths[k], uns_min(strchrnul(lines[i][k], '\t') - lines[i][k], strchrnul(lines[i][k], '\n') - lines[i][k]), lines[i][k]
+#define LASTFIELD(k) uns_min(strchrnul(lines[i][k], '\t') - lines[i][k], strchrnul(lines[i][k], '\n') - lines[i][k]), lines[i][k]
for (int i=0;i<line;i++) {
while (s < sections_cnt && sections[s].pos == i) {
- opt_help_internal(sections[s].sect);
+ opt_help(sections[s].sect);
s++;
}
if (lines[i][0] == NULL)
printf("%-*.*s %-*.*s %.*s\n", FIELD(0), FIELD(1), LASTFIELD(2));
}
while (s < sections_cnt && sections[s].pos == line) {
- opt_help_internal(sections[s].sect);
+ opt_help(sections[s].sect);
s++;
}
}
-static int opt_positional_max = 0;
-static int opt_positional_count = 0;
-
-struct opt_precomputed {
- struct opt_precomputed_option {
- struct opt_item * item;
- const char * name;
- short flags;
- short count;
- } ** opts;
- struct opt_precomputed_option ** shortopt;
- short opt_count;
-};
-
-static struct opt_precomputed_option * opt_find_item_shortopt(int chr, struct opt_precomputed * pre) {
- struct opt_precomputed_option * candidate = pre->shortopt[chr];
+static struct opt_precomputed * opt_find_item_shortopt(struct opt_context * oc, int chr) {
+ struct opt_precomputed * candidate = oc->shortopt[chr];
+ if (!candidate)
+ opt_failure("Invalid option -%c", chr);
if (candidate->count++ && (candidate->flags & OPT_SINGLE))
- opt_failure("Option %s appeared the second time.", candidate->name);
+ opt_failure("Option -%c appeared the second time.", candidate->item->letter);
return candidate;
}
-static struct opt_precomputed_option * opt_find_item_longopt(char * str, struct opt_precomputed * pre) {
+static struct opt_precomputed * opt_find_item_longopt(struct opt_context * oc, char * str) {
uns len = strlen(str);
- struct opt_precomputed_option * candidate = NULL;
+ struct opt_precomputed * candidate = NULL;
- for (int i=0; i<pre->opt_count; i++) {
- if (!strncmp(pre->opts[i]->name, str, len)) {
- if (strlen(pre->opts[i]->name) == len) {
- if (pre->opts[i]->count++ && (pre->opts[i]->flags & OPT_SINGLE))
- opt_failure("Option %s appeared the second time.", pre->opts[i]->name);
+ for (int i=0; i<oc->opt_count; i++) {
+ if (!oc->opts[i].name)
+ continue;
+ if (!strncmp(oc->opts[i].name, str, len)) {
+ if (strlen(oc->opts[i].name) == len) {
+ if (oc->opts[i].count++ && (oc->opts[i].flags & OPT_SINGLE))
+ opt_failure("Option %s appeared the second time.", oc->opts[i].name);
- return pre->opts[i];
+ return &oc->opts[i];
}
if (candidate)
- opt_failure("Ambiguous prefix %s: Found matching %s and %s.", str, candidate->name, pre->opts[i]->name);
+ opt_failure("Ambiguous prefix %s: Found matching %s and %s.", str, candidate->name, oc->opts[i].name);
else
- candidate = pre->opts[i];
+ candidate = &oc->opts[i];
}
- if (!strncmp("no-", str, 3) && !strncmp(pre->opts[i]->name, str+3, len-3)) {
- if (strlen(pre->opts[i]->name) == len-3) {
- if (pre->opts[i]->count++ && (pre->opts[i]->flags & OPT_SINGLE))
- opt_failure("Option %s appeared the second time.", pre->opts[i]->name);
+ if (!strncmp("no-", str, 3) && !strncmp(oc->opts[i].name, str+3, len-3)) {
+ if (strlen(oc->opts[i].name) == len-3) {
+ if (oc->opts[i].count++ && (oc->opts[i].flags & OPT_SINGLE))
+ opt_failure("Option %s appeared the second time.", oc->opts[i].name);
- return pre->opts[i];
+ return &oc->opts[i];
}
if (candidate)
- opt_failure("Ambiguous prefix %s: Found matching %s and %s.", str, candidate->name, pre->opts[i]->name);
+ opt_failure("Ambiguous prefix %s: Found matching %s and %s.", str, candidate->name, oc->opts[i].name);
else
- candidate = pre->opts[i];
+ candidate = &oc->opts[i];
}
}
opt_failure("Invalid option %s.", str);
}
-#define OPT_NAME (longopt == 2 ? stk_printf("positional arg #%d", opt_positional_count) : (longopt == 1 ? stk_printf("--%s", opt->name) : stk_printf("-%c", item->letter)))
-static void opt_parse_value(struct opt_precomputed_option * opt, char * value, int longopt) {
+#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; })
+
+#define OPT_NAME (longopt == 2 ? stk_printf("positional arg #%d", oc->positional_count) : (longopt == 1 ? stk_printf("--%s", opt->name) : stk_printf("-%c", item->letter)))
+static void opt_parse_value(struct opt_context * oc, struct opt_precomputed * opt, char * value, int longopt) {
struct opt_item * item = opt->item;
+ for (int i=0;i<oc->hooks_before_value_count;i++)
+ oc->hooks_before_value[i]->u.call(item, value, oc->hooks_before_value[i]->ptr);
+
switch (item->cls) {
case OPT_CL_BOOL:
if (!value || !strcasecmp(value, "y") || !strcasecmp(value, "yes") || !strcasecmp(value, "true") || !strcasecmp(value, "1"))
switch (item->type) {
case CT_INT:
if (!value)
- *((int*)item->ptr) = 0;
+ *OPT_PTR(int) = 0;
else
- e = cf_parse_int(value, item->ptr);
+ e = cf_parse_int(value, OPT_PTR(int));
if (e)
opt_failure("Integer value parsing failed for %s: %s", OPT_NAME, e);
break;
case CT_U64:
if (!value)
- *((u64*)item->ptr) = 0;
+ *OPT_PTR(u64) = 0;
else
- e = cf_parse_u64(value, item->ptr);
+ e = cf_parse_u64(value, OPT_PTR(u64));
if (e)
opt_failure("Unsigned 64-bit value parsing failed for %s: %s", OPT_NAME, e);
break;
case CT_DOUBLE:
if (!value)
- *((double*)item->ptr) = NAN;
+ *OPT_PTR(double) = NAN;
else
- e = cf_parse_double(value, item->ptr);
+ e = cf_parse_double(value, OPT_PTR(double));
if (e)
opt_failure("Double value parsing failed for %s: %s", OPT_NAME, e);
break;
case CT_IP:
if (!value)
- e = cf_parse_ip("0.0.0.0", item->ptr);
+ e = cf_parse_ip("0.0.0.0", OPT_PTR(u32));
else
- e = cf_parse_ip(value, item->ptr);
+ e = cf_parse_ip(value, OPT_PTR(u32));
if (e)
opt_failure("IP parsing failed for %s: %s", OPT_NAME, e);
break;
case CT_STRING:
if (!value)
- item->ptr = NULL;
+ *OPT_PTR(const char *) = NULL;
else
- *((const char **) (item->ptr)) = xstrdup(value);
+ *OPT_PTR(const char *) = xstrdup(value);
break;
default:
ASSERT(0);
(*((int *)item->ptr))--;
else
(*((int *)item->ptr))++;
+ break;
case OPT_CL_CALL:
item->u.call(item, value, item->ptr);
break;
case OPT_CL_USER:
{
char * e = NULL;
- e = item->u.utype->parser(value, item->ptr);
+ e = item->u.utype->parser(value, OPT_PTR(void*));
if (e)
opt_failure("User defined type value parsing failed for %s: %s", OPT_NAME, e);
break;
default:
ASSERT(0);
}
+
+ for (int i=0;i<oc->hooks_after_value_count;i++)
+ oc->hooks_after_value[i]->u.call(item, value, oc->hooks_after_value[i]->ptr);
}
#undef OPT_NAME
-static int opt_longopt(char ** argv, int index, struct opt_precomputed * pre) {
+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;
- struct opt_precomputed_option * opt = opt_find_item_longopt(strndupa(name_in, pos), pre);
+ struct opt_precomputed * opt = opt_find_item_longopt(oc, strndupa(name_in, pos));
char * value = NULL;
if (opt->item->cls == OPT_CL_BOOL && !strncmp(name_in, "no-", 3) && !strncmp(name_in+3, opt->item->name, pos-3))
if (pos < strlen(name_in))
opt_failure("Argument --%s must not have any value.", opt->name);
}
- opt_parse_value(opt, value, 1);
+ opt_parse_value(oc, opt, value, 1);
return eaten;
}
-static int opt_shortopt(char ** argv, int index, struct opt_precomputed * pre) {
+static int opt_shortopt(struct opt_context * oc, char ** argv, int index) {
int chr = 0;
- struct opt_precomputed_option * opt;
- while (argv[index][++chr] && (opt = opt_find_item_shortopt(argv[index][chr], pre))) {
+ struct opt_precomputed * opt;
+ while (argv[index][++chr] && (opt = opt_find_item_shortopt(oc, argv[index][chr]))) {
if (opt->flags & OPT_NO_VALUE) {
- opt_parse_value(opt, NULL, 0);
- continue;
+ opt_parse_value(oc, opt, NULL, 0);
}
else if (opt->flags & OPT_REQUIRED_VALUE) {
- if (chr == 1 && argv[index][2])
- opt_parse_value(opt, argv[index] + 2, 0);
+ if (chr == 1 && argv[index][2]) {
+ opt_parse_value(oc, opt, argv[index] + 2, 0);
+ return 0;
+ }
else if (argv[index][chr+1])
opt_failure("Option -%c must have a value but found inside a bunch of short opts.", opt->item->letter);
else if (!argv[index+1])
opt_failure("Option -%c must have a value but nothing supplied.", opt->item->letter);
else {
- opt_parse_value(opt, argv[index+1], 0);
+ opt_parse_value(oc, opt, argv[index+1], 0);
return 1;
}
}
else if (opt->flags & OPT_MAYBE_VALUE) {
- if (chr == 1 && argv[index][2])
- opt_parse_value(opt, argv[index] + 2, 0);
+ if (chr == 1 && argv[index][2]) {
+ opt_parse_value(oc, opt, argv[index] + 2, 0);
+ return 0;
+ }
else
- opt_parse_value(opt, NULL, 0);
+ opt_parse_value(oc, opt, NULL, 0);
}
else {
ASSERT(0);
if (argv[index][chr])
opt_failure("Unknown option -%c.", argv[index][chr]);
-
+
return 0;
}
-static void opt_positional(char * value, struct opt_precomputed * pre) {
- opt_positional_count++;
- struct opt_precomputed_option * opt = opt_find_item_shortopt((opt_positional_count > opt_positional_max ? 256 : opt_positional_count + 256), pre);
+static void opt_positional(struct opt_context * oc, char * value) {
+ oc->positional_count++;
+ struct opt_precomputed * opt = opt_find_item_shortopt(oc, (oc->positional_count > oc->positional_max ? 256 : oc->positional_count + 256));
if (!opt) {
- ASSERT(opt_positional_count > opt_positional_max);
+ ASSERT(oc->positional_count > oc->positional_max);
opt_failure("Too many positional args.");
}
- opt_parse_value(opt, value, 2);
+ opt_parse_value(oc, opt, value, 2);
}
-#define OPT_TRAVERSE_SECTIONS \
- while (item->cls == OPT_CL_SECTION) { \
- if (stk->next) \
- stk = stk->next; \
- else { \
- struct opt_stack * new_stk = alloca(sizeof(*new_stk)); \
- new_stk->prev = stk; \
- stk->next = new_stk; \
- stk = new_stk; \
- } \
- stk->this = item; \
- item = item->u.section->opt; \
- } \
- if (item->cls == OPT_CL_END) { \
- if (!stk->prev) break; \
- item = stk->this; \
- stk = stk->prev; \
- continue; \
+static void opt_count_items(struct opt_context *oc, const struct opt_section *sec)
+{
+ for (const struct opt_item *item = sec->opt; item->cls != OPT_CL_END; item++) {
+ if (item->cls == OPT_CL_SECTION)
+ opt_count_items(oc, item->u.section);
+ else if (item->cls == OPT_CL_HOOK) {
+ if (item->flags & OPT_HOOK_BEFORE_ARG)
+ oc->hooks_before_arg_count++;
+ else if (item->flags & OPT_HOOK_BEFORE_VALUE)
+ oc->hooks_before_value_count++;
+ else if (item->flags & OPT_HOOK_AFTER_VALUE)
+ oc->hooks_after_value_count++;
+ else
+ ASSERT(0);
+ } else if (item->letter || item->name) {
+ oc->opt_count++;
+ if (item->letter > OPT_POSITIONAL_TAIL)
+ oc->positional_max++;
}
+ }
+}
-void opt_parse(const struct opt_section * options, char ** argv) {
- opt_section_root = options;
-
- struct opt_stack {
- struct opt_item * this;
- struct opt_stack * prev;
- struct opt_stack * next;
- } * stk = alloca(sizeof(*stk));
- stk->this = NULL;
- stk->prev = NULL;
- stk->next = NULL;
-
- struct opt_precomputed * pre = alloca(sizeof(*pre));
- memset(pre, 0, sizeof (*pre));
-
- int count = 0;
-
- for (struct opt_item * item = options->opt; ; item++) {
- OPT_TRAVERSE_SECTIONS;
- if (item->letter || item->name)
- count++;
- if (item->cls == OPT_CL_BOOL)
- count++;
- if (item->letter > 256)
- opt_positional_max++;
+static void opt_add_default_flags(struct opt_precomputed *opt)
+{
+ struct opt_item *item = opt->item;
+ uns flags = opt->flags;
+
+ if (item->letter >= 256) {
+ flags &= ~OPT_VALUE_FLAGS;
+ flags |= OPT_REQUIRED_VALUE;
+ }
+ if (!(flags & OPT_VALUE_FLAGS)) {
+ ASSERT(item->cls != OPT_CL_CALL && item->cls != OPT_CL_USER);
+ flags |= opt_default_value_flags[item->cls];
}
-
- pre->opts = alloca(sizeof(*pre->opts) * count);
- pre->shortopt = alloca(sizeof(*pre->shortopt) * (opt_positional_max + 257));
- memset(pre->shortopt, 0, sizeof(*pre->shortopt) * (opt_positional_max + 257));
-
- pre->opt_count = 0;
-
- for (struct opt_item * item = options->opt; ; item++) {
- OPT_TRAVERSE_SECTIONS;
- if (item->letter || item->name) {
- struct opt_precomputed_option * opt = xmalloc(sizeof(*opt));
+
+ opt->flags = flags;
+}
+
+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++) {
+ if (item->cls == OPT_CL_SECTION)
+ opt_prepare_items(oc, item->u.section);
+ else if (item->cls == OPT_CL_HOOK) {
+ if (item->flags & OPT_HOOK_BEFORE_ARG)
+ oc->hooks_before_arg[oc->hooks_before_arg_count++] = item;
+ else if (item->flags & OPT_HOOK_BEFORE_VALUE)
+ oc->hooks_before_value[oc->hooks_before_value_count++] = item;
+ else if (item->flags & OPT_HOOK_AFTER_VALUE)
+ oc->hooks_after_value[oc->hooks_after_value_count++] = item;
+ else
+ ASSERT(0);
+ } else if (item->letter || item->name) {
+ struct opt_precomputed * opt = &oc->opts[oc->opt_count++];
opt->item = item;
opt->flags = item->flags;
opt->count = 0;
opt->name = item->name;
- pre->opts[pre->opt_count++] = opt;
if (item->letter)
- pre->shortopt[(int) item->letter] = opt;
- OPT_ADD_DEFAULT_ITEM_FLAGS(item, opt->flags);
+ oc->shortopt[(int) item->letter] = opt;
+ opt_add_default_flags(opt);
}
}
+}
+
+void opt_parse(const struct opt_section * options, char ** argv) {
+ struct opt_context * oc = alloca(sizeof(*oc));
+ memset(oc, 0, sizeof (*oc));
+
+ 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->hooks_before_arg = alloca(sizeof (*oc->hooks_before_arg) * oc->hooks_before_arg_count);
+ oc->hooks_before_value = alloca(sizeof (*oc->hooks_before_value) * oc->hooks_before_value_count);
+ oc->hooks_after_value = alloca(sizeof (*oc->hooks_after_value) * oc->hooks_after_value_count);
+
+ oc->opt_count = 0;
+ oc->hooks_before_arg_count = 0;
+ oc->hooks_before_value_count = 0;
+ oc->hooks_after_value_count = 0;
+ opt_prepare_items(oc, options);
int force_positional = 0;
for (int i=0;argv[i];i++) {
+ for (int j=0;j<oc->hooks_before_arg_count;j++)
+ oc->hooks_before_arg[j]->u.call(NULL, NULL, oc->hooks_before_arg[j]->ptr);
if (argv[i][0] != '-' || force_positional) {
- opt_positional(argv[i], pre);
+ opt_positional(oc, argv[i]);
}
else {
if (argv[i][1] == '-') {
if (argv[i][2] == '\0')
force_positional++;
else
- i += opt_longopt(argv, i, pre);
+ i += opt_longopt(oc, argv, i);
}
else if (argv[i][1])
- i += opt_shortopt(argv, i, pre);
+ i += opt_shortopt(oc, argv, i);
else
- opt_positional(argv[i], pre);
+ opt_positional(oc, argv[i]);
}
}
- for (int i=0;i<opt_positional_max+257;i++) {
- if (!pre->shortopt[i])
+ for (int i=0;i<oc->positional_max+257;i++) {
+ if (!oc->shortopt[i])
continue;
- if (!pre->shortopt[i]->count && (pre->shortopt[i]->flags | OPT_REQUIRED))
+ if (!oc->shortopt[i]->count && (oc->shortopt[i]->flags & OPT_REQUIRED))
if (i < 256)
- opt_failure("Required option -%c not found.\n", pre->shortopt[i]->item->letter);
+ if (oc->shortopt[i]->item->name)
+ opt_failure("Required option -%c/--%s not found.", oc->shortopt[i]->item->letter, oc->shortopt[i]->item->name);
+ else
+ opt_failure("Required option -%c not found.", oc->shortopt[i]->item->letter);
else
- opt_failure("Required positional argument #%d not found.\n", (i > 256) ? pre->shortopt[i]->item->letter-256 : opt_positional_max+1);
+ opt_failure("Required positional argument #%d not found.", (i > 256) ? oc->shortopt[i]->item->letter-256 : oc->positional_max+1);
}
- for (int i=0;i<pre->opt_count;i++) {
- if (!pre->opts[i])
- continue;
- if (!pre->opts[i]->count && (pre->opts[i]->flags | OPT_REQUIRED))
- opt_failure("Required option --%s not found.\n", pre->opts[i]->item->name);
+ for (int i=0;i<oc->opt_count;i++) {
+ if (!oc->opts[i].count && (oc->opts[i].flags & OPT_REQUIRED))
+ opt_failure("Required option --%s not found.", oc->opts[i].item->name);
}
}
-#ifdef TEST
-#include <ucw/fastbuf.h>
-
-static void show_version(struct opt_item * opt UNUSED, const char * value UNUSED, void * data UNUSED) {
- printf("This is a simple tea boiling console v0.1.\n");
- exit(EXIT_SUCCESS);
+static void opt_conf_end_of_options(struct cf_context *cc) {
+ cf_load_default(cc);
+ if (cc->postpone_commit && cf_close_group())
+ opt_failure("Loading of configuration failed");
}
-struct teapot_temperature {
- enum {
- TEMP_CELSIUS = 0,
- TEMP_FAHRENHEIT,
- TEMP_KELVIN,
- TEMP_REAUMUR,
- TEMP_RANKINE
- } scale;
- int value;
-} temperature;
-
-static char * temp_scale_str[] = { "C", "F", "K", "Re", "R" };
-
-static enum TEAPOT_TYPE {
- TEAPOT_STANDARD = 0,
- TEAPOT_EXCLUSIVE,
- TEAPOT_GLASS,
- TEAPOT_HANDS,
- TEAPOT_UNDEFINED = -1
-} set = TEAPOT_UNDEFINED;
-
-static char * teapot_type_str[] = { "standard", "exclusive", "glass", "hands" };
-
-static int english = 0;
-static int sugar = 0;
-static int verbose = 1;
-static int with_gas = 0;
-static int black_magic = 0;
-static int pray = 0;
-static int water_amount = 0;
-static char * first_tea = NULL;
-
-#define MAX_TEA_COUNT 30
-static char * tea_list[MAX_TEA_COUNT];
-static int tea_num = 0;
-static void add_tea(struct opt_item * opt UNUSED, const char * name, void * data) {
- char ** tea_list = data;
- if (tea_num >= MAX_TEA_COUNT) {
- fprintf(stderr, "Cannot boil more than %d teas.\n", MAX_TEA_COUNT);
- exit(OPT_EXIT_BAD_ARGS);
+void opt_conf_internal(struct opt_item * opt, const char * value, void * data UNUSED) {
+ struct cf_context *cc = cf_get_context();
+ switch (opt->letter) {
+ case 'S':
+ cf_load_default(cc);
+ if (cf_set(value))
+ opt_failure("Cannot set %s", value);
+ break;
+ case 'C':
+ if (cf_load(value))
+ opt_failure("Cannot load config file %s", value);
+ break;
+#ifdef CONFIG_UCW_DEBUG
+ case '0':
+ opt_conf_end_of_options(cc);
+ struct fastbuf *b = bfdopen(1, 4096);
+ cf_dump_sections(b);
+ bclose(b);
+ exit(0);
+ break;
+#endif
}
- tea_list[tea_num++] = xstrdup(name);
}
-static const char * teapot_temperature_parser(char * in, void * ptr) {
- struct teapot_temperature * temp = ptr;
- const char * next;
- const char * err = str_to_int(&temp->value, in, &next, 10);
- if (err)
- return err;
- if (!strcmp("C", next))
- temp->scale = TEMP_CELSIUS;
- else if (!strcmp("F", next))
- temp->scale = TEMP_FAHRENHEIT;
- else if (!strcmp("K", next))
- temp->scale = TEMP_KELVIN;
- else if (!strcmp("R", next))
- temp->scale = TEMP_RANKINE;
- else if (!strcmp("Re", next))
- temp->scale = TEMP_REAUMUR;
- else {
- fprintf(stderr, "Unknown scale: %s\n", next);
- exit(OPT_EXIT_BAD_ARGS);
- }
- return NULL;
-}
+void opt_conf_hook_internal(struct opt_item * opt, const char * value UNUSED, void * data UNUSED) {
+ static enum {
+ OPT_CONF_HOOK_BEGIN,
+ OPT_CONF_HOOK_CONFIG,
+ OPT_CONF_HOOK_OTHERS
+ } state = OPT_CONF_HOOK_BEGIN;
-static void teapot_temperature_dumper(struct fastbuf * fb, void * ptr) {
- struct teapot_temperature * temp = ptr;
- bprintf(fb, "%d%s", temp->value, temp_scale_str[temp->scale]);
-}
+ int confopt = 0;
-static struct cf_user_type teapot_temperature_t = {
- .size = sizeof(struct teapot_temperature),
- .name = "teapot_temperature_t",
- .parser = (cf_parser1*) teapot_temperature_parser,
- .dumper = (cf_dumper1*) teapot_temperature_dumper
-};
+ if (opt->letter == 'S' || opt->letter == 'C' || (opt->name && !strcmp(opt->name, "dumpconfig")))
+ confopt = 1;
-static struct opt_section water_options = {
- OPT_ITEMS {
- OPT_INT('w', "water", water_amount, OPT_REQUIRED | OPT_REQUIRED_VALUE, "<volume>\tAmount of water (in mls)"),
- OPT_BOOL('G', "with-gas", with_gas, OPT_NO_VALUE, "\tUse water with gas"),
- OPT_END
- }
-};
-
-static struct opt_section help = {
- OPT_ITEMS {
- OPT_HELP("A simple tea boiling console."),
- OPT_HELP("Usage: teapot [options] name-of-the-tea"),
- OPT_HELP("Black, green or white tea supported as well as fruit or herbal tea."),
- OPT_HELP("You may specify more kinds of tea, all of them will be boiled for you, in the given order."),
- OPT_HELP(""),
- OPT_HELP("Options:"),
- OPT_HELP_OPTION,
- OPT_CALL('V', "version", show_version, NULL, OPT_NO_VALUE, "\tShow the version"),
- OPT_HELP(""),
- OPT_BOOL('e', "english-style", english, 0, "\tEnglish style (with milk)"),
- OPT_INT('s', "sugar", sugar, OPT_REQUIRED_VALUE, "<spoons>\tAmount of sugar (in teaspoons)"),
- OPT_SWITCH(0, "standard-set", set, TEAPOT_STANDARD, 0, "\tStandard teapot"),
- OPT_SWITCH('x', "exclusive-set", set, TEAPOT_EXCLUSIVE, 0, "\tExclusive teapot"),
- OPT_SWITCH('g', "glass-set", set, TEAPOT_GLASS, 0, "\tTransparent glass teapot"),
- OPT_SWITCH('h', "hands", set, TEAPOT_HANDS, 0, "\tUse user's hands as a teapot (a bit dangerous)"),
- OPT_USER('t', "temperature", temperature, teapot_temperature_t, OPT_REQUIRED_VALUE | OPT_REQUIRED,
- "<value>\tWanted final temperature of the tea to be served\n"
- "\t\tSupported scales: Celsius [60C], Fahrenheit [140F],\n"
- "\t\t Kelvin [350K], Rankine [600R] and Reaumur [50Re]\n"
- "\t\tOnly integer values allowed."),
- OPT_INC('v', "verbose", verbose, 0, "\tVerbose (the more -v, the more verbose)"),
- OPT_INC('q', "quiet", verbose, OPT_NEGATIVE, "\tQuiet (the more -q, the more quiet)"),
- OPT_INT('b', "black-magic", black_magic, 0, "<strength>\tUse black magic to make the tea extraordinary delicious"),
- OPT_BOOL('p', "pray", pray, OPT_SINGLE, "\tPray before boiling"),
- OPT_STRING(OPT_POSITIONAL(1), NULL, first_tea, OPT_REQUIRED | OPT_NO_HELP, ""),
- OPT_CALL(OPT_POSITIONAL_TAIL, NULL, add_tea, &tea_list, OPT_NO_HELP, ""),
- OPT_HELP(""),
- OPT_HELP("Water options:"),
- OPT_SECTION(water_options),
- OPT_END
+ switch (state) {
+ case OPT_CONF_HOOK_BEGIN:
+ if (confopt)
+ state = OPT_CONF_HOOK_CONFIG;
+ else {
+ opt_conf_end_of_options(cf_get_context());
+ state = OPT_CONF_HOOK_OTHERS;
+ }
+ break;
+ case OPT_CONF_HOOK_CONFIG:
+ if (!confopt) {
+ opt_conf_end_of_options(cf_get_context());
+ state = OPT_CONF_HOOK_OTHERS;
+ }
+ break;
+ case OPT_CONF_HOOK_OTHERS:
+ if (confopt)
+ opt_failure("Config options (-C, -S) must stand before other options.");
+ break;
+ default:
+ ASSERT(0);
}
-};
-
-static void boil_tea(const char * name) {
- printf("Boiling a tea: %s\n", name);
}
-
-int main(int argc UNUSED, char ** argv)
-{
- opt_parse(&help, argv+1);
-
- printf("Parsed values:\n");
- printf("English style: %s\n", english ? "yes" : "no");
- if (sugar)
- printf("Sugar: %d teaspoons\n", sugar);
- if (set != -1)
- printf("Chosen teapot: %s\n", teapot_type_str[set]);
- printf("Temperature: %d%s\n", temperature.value, temp_scale_str[temperature.scale]);
- printf("Verbosity: %d\n", verbose);
- if (black_magic)
- printf("Black magic: %d\n", black_magic);
- printf("Prayer: %s\n", pray ? "yes" : "no");
- printf("Water amount: %d\n", water_amount);
- printf("Gas: %s\n", with_gas ? "yes" : "no");
- printf("First tea: %s\n", first_tea);
- for (int i=0; i<tea_num; i++)
- boil_tea(tea_list[i]);
-
- printf("Everything OK. Bye.\n");
-}
-
-#endif