X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-daemon.c;h=cc07e86f7669ecded996736555fe3761ab3d4793;hb=d6f6df814d87b5d5f77570196576637c8deb9afe;hp=75706b7a66628ceb4c2b7f4d97abd448d94c2c4f;hpb=a2cf84ecde926adeebf09bc2c284401513d3fab3;p=src%2Fapp-framework-binder.git

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 75706b7a..cc07e86f 100644
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -38,12 +38,12 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "afb-config.h"
+#include "afb-args.h"
 #include "afb-hswitch.h"
 #include "afb-apiset.h"
 #include "afb-autoset.h"
 #include "afb-api-so.h"
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 #   include "afb-api-dbus.h"
 #endif
 #include "afb-api-ws.h"
@@ -60,7 +60,7 @@
 #include "afb-hook-flags.h"
 #endif
 #include "afb-debug.h"
-#if defined(WITH_SUPERVISION)
+#if WITH_SUPERVISION
 #   include "afb-supervision.h"
 #endif
 
@@ -358,8 +358,12 @@ static struct afb_hsrv *start_http_server()
 	}
 
 	if (afb_hreq_init_download_path(uploaddir)) {
-		ERROR("unable to set the upload directory %s", uploaddir);
-		return NULL;
+		static const char fallback_uploaddir[] = "/tmp";
+		WARNING("unable to set the upload directory %s", uploaddir);
+		if (afb_hreq_init_download_path(fallback_uploaddir)) {
+			ERROR("unable to fallback to upload directory %s", fallback_uploaddir);
+			return NULL;
+		}
 	}
 
 	hsrv = afb_hsrv_create();
@@ -399,6 +403,17 @@ static struct afb_hsrv *start_http_server()
  | execute_command
  +--------------------------------------------------------- */
 
+static void wait_child_and_exit()
+{
+	pid_t pidchld = childpid;
+
+	childpid = 0;
+	if (!SELF_PGROUP)
+		killpg(pidchld, SIGKILL);
+	waitpid(pidchld, NULL, 0);
+	exit(0);
+}
+
 static void on_sigchld(int signum, siginfo_t *info, void *uctx)
 {
 	if (info->si_pid == childpid) {
@@ -406,11 +421,9 @@ static void on_sigchld(int signum, siginfo_t *info, void *uctx)
 		case CLD_EXITED:
 		case CLD_KILLED:
 		case CLD_DUMPED:
-			childpid = 0;
-			if (!SELF_PGROUP)
-				killpg(info->si_pid, SIGKILL);
-			waitpid(info->si_pid, NULL, 0);
-			exit(0);
+			jobs_exit(wait_child_and_exit);
+		default:
+			break;
 		}
 	}
 }
@@ -796,7 +809,7 @@ static void start(int signum, void *arg)
 		ERROR("failed to setup monitor");
 		goto error;
 	}
-#if defined(WITH_SUPERVISION)
+#if WITH_SUPERVISION
 	if (afb_supervision_init(main_apiset, main_config) < 0) {
 		ERROR("failed to setup supervision");
 		goto error;
@@ -826,11 +839,13 @@ static void start(int signum, void *arg)
 
 	/* load bindings and apis */
 	afb_debug("start-load");
+#if WITH_DYNAMIC_BINDING
 	apiset_start_list("binding", afb_api_so_add_binding, "the binding");
 	apiset_start_list("ldpaths", afb_api_so_add_pathset_fails, "the binding path set");
 	apiset_start_list("weak-ldpaths", afb_api_so_add_pathset_nofails, "the weak binding path set");
+#endif
 	apiset_start_list("auto-api", afb_autoset_add_any, "the automatic api path set");
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 	apiset_start_list("dbus-client", afb_api_dbus_add_client, "the afb-dbus client");
 #endif
 	apiset_start_list("ws-client", afb_api_ws_add_client_weak, "the afb-websocket client");
@@ -847,7 +862,7 @@ static void start(int signum, void *arg)
 
 	/* export started apis */
 	apiset_start_list("ws-server", afb_api_ws_add_server, "the afb-websocket service");
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 	apiset_start_list("dbus-server", afb_api_dbus_add_server, "the afb-dbus service");
 #endif
 
@@ -898,7 +913,7 @@ int main(int argc, char *argv[])
 	afb_debug("main-entry");
 
 	// ------------- Build session handler & init config -------
-	main_config = afb_config_parse_arguments(argc, argv);
+	main_config = afb_args_parse(argc, argv);
 	if (sig_monitor_init(
 		!json_object_object_get_ex(main_config, "trap-faults", &obj)
 			|| json_object_get_boolean(obj)) < 0) {