Improve handling of verbosity in bindings

[src/app-framework-binder.git] / src / afb-config.c

diff --git a/src/afb-config.c b/src/afb-config.c
index 3a50e41..7635575 100644 (file)
--- a/src/afb-config.c
+++ b/src/afb-config.c
@@ -16,7 +16,6 @@
  */
 
 #define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -90,6 +89,7 @@
 #if defined(WITH_MONITORING_OPTION)
 #define SET_MONITORING     'M'
 #endif
+#define SET_NAME           'n'
 #define SET_TCP_PORT       'p'
 #define SET_QUIET          'q'
 #define SET_RNDTOKEN       'r'
@@ -102,7 +102,7 @@
 #define SET_WORK_DIR       'w'
 
 const char shortopts[] =
-       "c:D:E:ehp:qrT:t:u:Vvw:"
+       "c:D:E:ehn:p:qrT:t:u:Vvw:"
 #if defined(WITH_MONITORING_OPTION)
        "M"
 #endif
@@ -125,6 +125,8 @@ static AFB_options cliOptions[] = {
        {SET_FORGROUND,     0, "foreground",  "Get all in foreground mode"},
        {SET_BACKGROUND,    0, "daemon",      "Get all in background mode"},
 
+       {SET_NAME,          1, "name",        "Set the visible name"},
+
        {SET_TCP_PORT,      1, "port",        "HTTP listening TCP port  [default 1234]"},
        {SET_ROOT_HTTP,     1, "roothttp",    "HTTP Root Directory [default no root http (files not served but apis still available)]"},
        {SET_ROOT_BASE,     1, "rootbase",    "Angular Base Root URL [default /opa]"},
@@ -390,6 +392,31 @@ static void noarg(int optc)
        }
 }
 
+static char **make_exec(char **argv)
+{
+       char **result, *iter;
+       size_t length;
+       int i;
+
+       length = 0;
+       for (i = 0 ; argv[i] ; i++)
+               length += strlen(argv[i]) + 1;
+
+       result = malloc(length + ((unsigned)(i + 1)) * sizeof *result);
+       if (result == NULL) {
+               ERROR("can't alloc memory");
+               exit(1);
+       }
+
+       iter = (char*)&result[i+1];
+       for (i = 0 ; argv[i] ; i++) {
+               result[i] = iter;
+               iter = stpcpy(iter, argv[i]) + 1;
+       }
+       result[i] = NULL;
+       return result;
+}
+
 /*---------------------------------------------------------
  |   Parse option and launch action
  +--------------------------------------------------------- */
@@ -512,6 +539,10 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config)
                        config->background = 1;
                        break;
 
+               case SET_NAME:
+                       config->name = argvalstr(optc);
+                       break;
+
                case SET_MODE:
                        config->mode = argvalenum(optc, mode_desc);
                        break;
@@ -558,8 +589,8 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config)
                        break;
 
                case SET_EXEC:
-                       config->exec = &argv[optind];
-                       optind = argc;
+                       config->exec = make_exec(&argv[optind]);
+                       optind = argc; /* stop option scanning */
                        break;
 
                case SET_RNDTOKEN:
@@ -674,6 +705,7 @@ void afb_config_dump(struct afb_config *config)
        S(workdir)
        S(uploaddir)
        S(token)
+       S(name)
 
        L(aliases)
        L(dbus_clients)
@@ -682,20 +714,28 @@ void afb_config_dump(struct afb_config *config)
        L(ws_servers)
        L(so_bindings)
        L(ldpaths)
+       L(weak_ldpaths)
        L(calls)
 
        V(exec)
 
        D(httpdPort)
-       B(background)
        D(cacheTimeout)
        D(apiTimeout)
        D(cntxTimeout)
        D(nbSessionMax)
+
        E(mode,mode_desc)
        E(tracereq,tracereq_desc)
        E(traceditf,traceditf_desc)
+       E(tracesvc,tracesvc_desc)
+       E(traceevt,traceevt_desc)
+
+       B(no_ldpaths)
        B(noHttpd)
+       B(background)
+       B(monitoring)
+       B(random_token)
        P("---END-OF-CONFIG---\n");
 
 #undef V