X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-config.c;h=016da835c1835f7219bd8980a98d43cbbf230447;hb=c70645be828bc0ee182a4fc97db0e4471501d2a4;hp=d906bcb719c30ef6b68a6a7bf10f5dd3bfc3f38e;hpb=9bc48026a93e8330a2bd2795e78d5951c16b7d33;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-config.c b/src/afb-config.c
index d906bcb7..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
@@ -230,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);
 }
 
 /*----------------------------------------------------------
@@ -393,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
  +--------------------------------------------------------- */
@@ -565,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: