POTD skeleton #86.

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

3 files changed, 25 insertions, 11 deletions

diff --git a/README b/README
index bb73f43..0875999 100644
--- a/README
+++ b/README
@@ -9,6 +9,9 @@ Suits perfect for your favoured Desktop/Server/OpenWrt Linux system.
 TODOs
 =====
 
-1. implement more protocols such as SCADA/MySQL/telnet
-2. improved event handling (maybe libevent?)
-3. more/other jail options (e.g. per jail filesystem w/ image managment)
+Priority == Item order!
+1. more/other jail options (e.g. per jail filesystem w/ image managment)
+2. RESTful listener for output sampled data from different processes
+    (send (real-time)statistics about protocols/jails/etc to highler level apps)
+3. implement more protocols such as SCADA/MySQL/telnet/Jabber/IRC/IMAP/POP
+4. improved event handling (maybe libevent?)
diff --git a/configure.ac b/configure.ac
index 76a3a4e..50b7751 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
         SPECTRE_MIT="-mindirect-branch=thunk" ],
         AC_MSG_RESULT([no]))
 CFLAGS="$saved_CFLAGS"
-AC_SUBST(SPECTRE_MIT)
+AC_SUBST([SPECTRE_MIT])
 
 # check for -fvisibility=hidden compiler support (GCC >= 4)
 saved_CFLAGS="$CFLAGS"
@@ -36,7 +36,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
         SYMBOL_VISIBILITY="-fvisibility=hidden" ],
         AC_MSG_RESULT([no]))
 CFLAGS="$saved_CFLAGS"
-AC_SUBST(SYMBOL_VISIBILITY)
+AC_SUBST([SYMBOL_VISIBILITY])
 
 AC_CHECK_LIB([socket], [connect])
 AC_CHECK_LIB([pthread], [pthread_create])
@@ -181,4 +181,8 @@ AC_CHECK_FUNCS([epoll_create1 epoll_ctl epoll_pwait], [],
       [ AC_MSG_ERROR([required epoll function not available]) ])
 
 
+potd_logfile="/var/log/potd.log"
+AC_DEFINE_UNQUOTED([POTD_LOGFILE], ["$potd_logfile"],
+      [default path to the log file])
+
 AC_OUTPUT(Makefile src/Makefile)
diff --git a/src/options.c b/src/options.c
index b9cd4f1..be30e7c 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -8,7 +12,8 @@
 #include "options.h"
 
 typedef enum opt_type {
-    OT_INVALID = 0, OT_NOARG, OT_L, OT_LL, OT_STR
+    OT_INVALID = 0, OT_NOARG, OT_L, OT_LL, OT_STR,
+    OT_PATH
 } opt_type;
 
 typedef union opt_ptr {
@@ -32,13 +37,11 @@ struct opt {
 
 #define OPT(type, def_value, is_list, arg, short_help, help) \
     { type, {0}, {def_value}, 0, is_list, arg, short_help, help }
-#define OPT_STR(def_value, is_list, arg, short_help, help) \
-    OPT(OT_STR, .str = def_value, is_list, arg, short_help, help)
 #define OPT_NOARG(arg, short_help, help) \
     OPT(OT_NOARG, .ll = 0, 0, arg, short_help, help)
 static struct opt options[OPT_MAX+1] = {
-    OPT_STR("./potd.log", 0, "log", "short help", "help"),
-    OPT_STR(NULL, 0, "log-level", "short help", "help"),
+    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("daemon", "short help", "help"),
 
     OPT(OT_INVALID, .ll = 0, 0, NULL, NULL, NULL)
@@ -67,6 +70,9 @@ static int setopt(struct opt *o, const char *optarg)
         case OT_STR:
             o->value.str_dup = strdup(optarg);
             break;
+        case OT_PATH:
+            o->value.str_dup = realpath(optarg, NULL);
+            break;
         case OT_NOARG:
         case OT_INVALID:
             return 1;
@@ -135,7 +141,8 @@ getopt_str(opt_name on)
 {
     char *str;
 
-    assert(options[on].type == OT_STR);
+    assert(options[on].type == OT_STR ||
+        options[on].type == OT_PATH);
     assert(getopt_used(on) || options[on].def_value.str);
     str = options[on].value.str_dup;
     if (!str)