X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-config.c;h=016da835c1835f7219bd8980a98d43cbbf230447;hb=0891ef4826e347d5554c630b5c0ce73c68f76c9c;hp=3a50e417ffbdbf23a5f7f9361ab35f1caea6c1a6;hpb=56c39b8f71d3c098873c4165af1c58d8c1ec999f;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-config.c b/src/afb-config.c
index 3a50e417..016da835 100644
--- 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>
@@ -34,8 +33,9 @@
 #if !defined(BINDING_INSTALL_DIR)
 #error "you should define BINDING_INSTALL_DIR"
 #endif
-
-#define AFB_VERSION    "0.6"
+#if !defined(AFB_VERSION)
+#error "you should define AFB_VERSION"
+#endif
 
 // default
 #define DEFLT_CNTX_TIMEOUT  3600	// default Client Connection
@@ -90,6 +90,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 +103,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 +126,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]"},
@@ -227,14 +230,16 @@ static struct enumdesc mode_desc[] = {
  +--------------------------------------------------------- */
 static void printVersion(FILE * file)
 {
-	fprintf(file, "\n----------------------------------------- \n");
-	fprintf(file, "  AFB [Application Framework Binder] version=%s |\n",
-		AFB_VERSION);
-	fprintf(file, " \n");
-	fprintf(file,
-		"  Copyright (C) 2015, 2016, 2017 \"IoT.bzh\" [fulup -at- iot.bzh]\n");
-	fprintf(file, "  AFB comes with ABSOLUTELY NO WARRANTY.\n");
-	fprintf(file, "  Licence Apache 2\n\n");
+	static const char version[] =
+		"\n"
+		"  AFB [Application Framework Binder] version="AFB_VERSION"\n"
+		"\n"
+		"  Copyright (C) 2015, 2016, 2017 \"IoT.bzh\"\n"
+		"  AFB comes with ABSOLUTELY NO WARRANTY.\n"
+		"  Licence Apache 2\n"
+		"\n";
+
+	fprintf(file, "%s", version);
 }
 
 /*----------------------------------------------------------
@@ -390,6 +395,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 +542,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 +592,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 +708,7 @@ void afb_config_dump(struct afb_config *config)
 	S(workdir)
 	S(uploaddir)
 	S(token)
+	S(name)
 
 	L(aliases)
 	L(dbus_clients)
@@ -682,20 +717,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