X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=6ec392a275d6cb2cec0b5534c46fbc167f93f671;hb=3e56dc3fc7ce31cb932fbd86e78eea02049d0b7e;hp=3999b77a9872ce961f511361a54ce2b551883cd9;hpb=b74a7373e768736dc12057e0ef9744dcc8a93443;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index 3999b77a..6ec392a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,7 +17,6 @@
  */
 
 #define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -54,6 +53,7 @@
 #include "afb-hook.h"
 #include "sd-fds.h"
 #include "afb-debug.h"
+#include "process-name.h"
 
 /*
    if SELF_PGROUP == 0 the launched command is the group leader
@@ -396,6 +396,7 @@ static int execute_command()
 {
 	struct sigaction siga;
 	char port[20];
+	const char *token;
 	int rc;
 
 	/* check whether a command is to execute or not */
@@ -426,8 +427,9 @@ static int execute_command()
 	}
 	else {
 		/* instanciate arguments and environment */
-		if (instanciate_command_args(port, config->token) >= 0
-		 && instanciate_environ(port, config->token) >= 0) {
+		token = afb_session_initial_token();
+		if (instanciate_command_args(port, token) >= 0
+		 && instanciate_environ(port, token) >= 0) {
 			/* run */
 			if (!SELF_PGROUP)
 				setpgid(0, 0);
@@ -590,11 +592,11 @@ static void start(int signum)
 
 	/* load bindings */
 	afb_debug("start-load");
+	apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
 	apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
 	apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
 	apiset_start_list(config->ldpaths, afb_api_so_add_pathset_fails, "the binding path set");
 	apiset_start_list(config->weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set");
-	apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
 
 	apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
 	apiset_start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
@@ -649,7 +651,11 @@ int main(int argc, char *argv[])
 
 	// ------------- Build session handler & init config -------
 	config = afb_config_parse_arguments(argc, argv);
-
+	if (config->name) {
+		verbose_set_name(config->name, 0);
+		process_name_set_name(config->name);
+		process_name_replace_cmdline(argv, config->name);
+	}
 	afb_debug("main-args");
 
 	// --------- run -----------