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

diff --git a/src/afb-config.c b/src/afb-config.c
index d906bcb7..0bfd9d4c 100644
--- a/src/afb-config.c
+++ b/src/afb-config.c
@@ -393,6 +393,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 +590,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: