POTD skeleton #87.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

3 files changed, 65 insertions, 22 deletions

diff --git a/src/main.c b/src/main.c
index 5d18d4a..88deb7f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,9 +136,10 @@ int main(int argc, char *argv[])
         exit(EXIT_FAILURE);
     }
 
-    if (getopt_used(OPT_LOGFILE)) {
+    if (getopt_used(OPT_LOGTOFILE) || getopt_used(OPT_LOGFILE)) {
         log_file = getopt_str(OPT_LOGFILE);
         LOG_SET_FUNCS_VA(LOG_FILE_FUNCS);
+        fprintf(stderr, "Logfile: '%s'\n", log_file);
     } else {
         LOG_SET_FUNCS_VA(LOG_COLORED_FUNCS);
     }
diff --git a/src/options.c b/src/options.c
index be30e7c..6a122b5 100644
--- a/src/options.c
+++ b/src/options.c
@@ -16,13 +16,21 @@ typedef enum opt_type {
     OT_PATH
 } opt_type;
 
+struct opt_list;
+
 typedef union opt_ptr {
     long int l;
     long long int ll;
     const char *str;
     char *str_dup;
+    struct opt_list *list;
 } opt_ptr;
 
+typedef struct opt_list {
+    opt_ptr value;
+    struct opt_list *next;
+} opt_list;
+
 struct opt {
     opt_type type;
     opt_ptr value;
@@ -35,43 +43,43 @@ struct opt {
     const char *help;
 };
 
-#define OPT(type, def_value, is_list, arg, short_help, help) \
-    { type, {0}, {def_value}, 0, is_list, arg, short_help, help }
+#define OPT(type, def_value, arg, short_help, help) \
+    { type, {0}, {def_value}, 0, 0, arg, short_help, help }
+#define OPT_LIST(type, def_values, arg, short_help, help) \
+    { type, {0}, {def_values}, 0, 1, arg, short_help, help }
 #define OPT_NOARG(arg, short_help, help) \
-    OPT(OT_NOARG, .ll = 0, 0, arg, short_help, help)
+    OPT(OT_NOARG, .ll = 0, arg, short_help, help)
 static struct opt options[OPT_MAX+1] = {
-    OPT(OT_PATH, .str = POTD_LOGFILE, 0, "log-file", "short help", "help"),
-    OPT(OT_STR, .ll = 0, 0, "log-level", "short help", "help"),
+    OPT_NOARG("log-to-file", "short_help", "help"),
+    OPT(OT_PATH, .str = POTD_LOGFILE, "log-file", "short help", "help"),
+    OPT(OT_STR, .ll = 0, "log-level", "short help", "help"),
     OPT_NOARG("daemon", "short help", "help"),
+    OPT_LIST(OT_STR, .ll = 0, "test", "short_help", "help"),
 
-    OPT(OT_INVALID, .ll = 0, 0, NULL, NULL, NULL)
+    OPT(OT_INVALID, .ll = 0, NULL, NULL, NULL)
 };
 
+static int opt_convert(opt_type t, opt_ptr *d);
+static int setopt_list(struct opt *o, const char *optarg);
 static int setopt(struct opt *o, const char *optarg);
 
 
-static int setopt(struct opt *o, const char *optarg)
+static int opt_convert(opt_type t, opt_ptr *d)
 {
     char *endptr = NULL;
 
-    assert(o && o->type != OT_INVALID);
-    if (o->used && !o->is_list)
-        return 1;
-    if (!optarg || o->type == OT_NOARG)
-        goto noarg;
-
-    switch (o->type) {
+    switch (t) {
         case OT_L:
-            o->value.l = strtol(optarg, &endptr, 10);
+            d->l = strtol(optarg, &endptr, 10);
             break;
         case OT_LL:
-            o->value.ll = strtoll(optarg, &endptr, 10);
+            d->ll = strtoll(optarg, &endptr, 10);
             break;
         case OT_STR:
-            o->value.str_dup = strdup(optarg);
+            d->str_dup = strdup(optarg);
             break;
         case OT_PATH:
-            o->value.str_dup = realpath(optarg, NULL);
+            d->str_dup = realpath(optarg, NULL);
             break;
         case OT_NOARG:
         case OT_INVALID:
@@ -81,6 +89,37 @@ static int setopt(struct opt *o, const char *optarg)
     if (endptr && *endptr != 0)
         return 1;
 
+    return 0;
+}
+
+static int setopt_list(struct opt *o, const char *optarg)
+{
+    opt_list **l;
+
+    assert(o && o->type != OT_INVALID);
+
+    if (o->type == OT_NOARG || !o->is_list)
+        return 1;
+
+    l = &o->value.list;
+    while (*l) l = &(*l)->next;
+
+    o->used = 1;
+
+    return 0;
+}
+
+static int setopt(struct opt *o, const char *optarg)
+{
+    assert(o && o->type != OT_INVALID);
+    if (o->used && !o->is_list)
+        return 1;
+    if (!optarg || o->type == OT_NOARG)
+        goto noarg;
+
+    if (opt_convert(o->type, &o->value))
+        return 1;
+
 noarg:
     o->used = 1;
 
@@ -96,7 +135,7 @@ int options_cmdline(int argc, char **argv)
     for (i = 0; i < OPT_MAX; ++i) {
         o[i].name = options[i].arg_name;
         if (options[i].def_value.ll)
-            o[i].has_arg = optional_argument;
+            o[i].has_arg = required_argument;
         else
             o[i].has_arg =
                 (options[i].type == OT_NOARG ? no_argument : required_argument);
@@ -115,7 +154,8 @@ int options_cmdline(int argc, char **argv)
             break;
 
         if (!option) {
-            if (setopt(&options[option_index], optarg)) {
+            if (!setopt_list(&options[option_index], optarg)) {
+            } else if (setopt(&options[option_index], optarg)) {
                 rc = 1;
                 goto error;
             }
diff --git a/src/options.h b/src/options.h
index f36e393..8ba6016 100644
--- a/src/options.h
+++ b/src/options.h
@@ -2,7 +2,9 @@
 #define POTD_OPTIONS_H 1
 
 typedef enum opt_name {
-    OPT_LOGFILE = 0, OPT_LOGLEVEL, OPT_DAEMON,
+    OPT_LOGTOFILE = 0, OPT_LOGFILE, OPT_LOGLEVEL,
+    OPT_DAEMON,
+    OPT_TEST,
 
     OPT_MAX
 } opt_name;