From: José Bollo <jose.bollo@iot.bzh>
Date: Fri, 2 Jun 2017 12:37:35 +0000 (+0200)
Subject: Fix error on initialisation
X-Git-Tag: dab_3.99.2~25
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=8ed4166fe1e1d24c174ae53101159853709b1346;p=src%2Fapp-framework-binder.git

Fix error on initialisation

Change-Id: If6a988359b4d2747cefdd683b6328f5b36e37548
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

diff --git a/src/jobs.c b/src/jobs.c
index 8725d00e..1e84c824 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -689,7 +689,7 @@ struct sd_event *jobs_get_sd_event()
  * @param start         The start routine to activate (can't be NULL)
  * @return 0 in case of success or -1 in case of error.
  */
-int jobs_start(int allowed_count, int start_count, int waiter_count, void (*start)())
+int jobs_start(int allowed_count, int start_count, int waiter_count, void (*start)(int signum))
 {
 	int rc, launched;
 	struct thread me;
diff --git a/src/jobs.h b/src/jobs.h
index 49f45dd5..f461342c 100644
--- a/src/jobs.h
+++ b/src/jobs.h
@@ -44,5 +44,5 @@ extern struct sd_event *jobs_get_sd_event();
 
 extern void jobs_terminate();
 
-extern int jobs_start(int allowed_count, int start_count, int waiter_count, void (*start)());
+extern int jobs_start(int allowed_count, int start_count, int waiter_count, void (*start)(int signum));
 
diff --git a/src/main.c b/src/main.c
index fc1ec13e..6b89aef1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -529,10 +529,15 @@ static void run_startup_calls()
  | job for starting the daemon
  +--------------------------------------------------------- */
 
-static void start()
+static void start(int signum)
 {
 	struct afb_hsrv *hsrv;
 
+	if (signum) {
+		ERROR("start aborted: received signal %s", strsignal(signum));
+		exit(1);
+	}
+
 	// ------------------ sanity check ----------------------------------------
 	if (config->httpdPort <= 0) {
 		ERROR("no port is defined");
diff --git a/src/sig-monitor.c b/src/sig-monitor.c
index ce0a4cd0..aaffaed0 100644
--- a/src/sig-monitor.c
+++ b/src/sig-monitor.c
@@ -187,6 +187,3 @@ void sig_monitor(int timeout, void (*function)(int sig, void*), void *arg)
 }
 
 
-
-
-