X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-daemon.c;h=0db84bc1378f86f98a20cafdad004a85e24a3a54;hb=5dd7df31306b95a3fafe6d3238d4553107a6c70f;hp=df0efbcc77f919c50c46d65c05f1e34ec2b9f883;hpb=e39610f8c9b2e6bbb8a460f7d7ccccbc5161b4ed;p=src%2Fapp-framework-binder.git

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index df0efbcc..0db84bc1 100644
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -24,6 +24,8 @@
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
+#include <limits.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -52,6 +54,7 @@
 #include "afb-session.h"
 #include "verbose.h"
 #include "afb-common.h"
+#include "afb-export.h"
 #include "afb-monitor.h"
 #include "afb-hook.h"
 #include "afb-hook-flags.h"
@@ -73,6 +76,44 @@ struct json_object *main_config;
 
 static pid_t childpid;
 
+/**
+ * Tiny helper around putenv: add the variable name=value
+ *
+ * @param name name of the variable to set
+ * @param value value to set to the variable
+ *
+ * @return 0 in case of success or -1 in case of error (with errno set to ENOMEM)
+ */
+static int addenv(const char *name, const char *value)
+{
+	char *head, *middle;
+
+	head = malloc(2 + strlen(name) + strlen(value));
+	if (head == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
+	middle = stpcpy(head, name);
+	middle[0] = '=';
+	strcpy(&middle[1], value);
+	return putenv(head);
+}
+
+/**
+ * Tiny helper around addenv that export the real path
+ *
+ * @param name name of the variable to set
+ * @param path the path value to export to the variable
+ *
+ * @return 0 in case of success or -1 in case of error (with errno set to ENOMEM)
+ */
+static int addenv_realpath(const char *name, const char *path)
+{
+	char buffer[PATH_MAX];
+	char *p = realpath(path, buffer);
+	return p ? addenv(name, p) : -1;
+}
+
 /*----------------------------------------------------------
  |   helpers for handling list of arguments
  +--------------------------------------------------------- */
@@ -172,7 +213,7 @@ static void setup_daemon()
  +--------------------------------------------------------- */
 static void daemonize()
 {
-	int fd, daemon;
+	int fd = 0, daemon;
 	const char *output;
 	pid_t pid;
 
@@ -604,6 +645,7 @@ static void start(int signum, void *arg)
 {
 	const char *tracereq, *traceapi, *traceevt, *traceses, *tracesvc, *traceditf, *traceglob;
 	const char *workdir, *rootdir, *token, *rootapi;
+	struct json_object *settings;
 	struct afb_hsrv *hsrv;
 	int max_session_count, session_timeout, api_timeout;
 	int no_httpd, http_port;
@@ -617,6 +659,7 @@ static void start(int signum, void *arg)
 		exit(1);
 	}
 
+	settings = NULL;
 	token = rootapi = tracesvc = traceditf = tracereq =
 		traceapi = traceevt = traceses = traceglob = NULL;
 	no_httpd = http_port = 0;
@@ -624,6 +667,7 @@ static void start(int signum, void *arg)
 			"ss ss s?s"
 			"si si si"
 			"s?b s?i s?s"
+			"s?o"
 #if !defined(REMOVE_LEGACY_TRACE)
 			"s?s s?s"
 #endif
@@ -642,6 +686,7 @@ static void start(int signum, void *arg)
 			"port", &http_port,
 			"rootapi", &rootapi,
 
+			"set", &settings,
 #if !defined(REMOVE_LEGACY_TRACE)
 			"tracesvc", &tracesvc,
 			"traceditf", &traceditf,
@@ -664,11 +709,17 @@ static void start(int signum, void *arg)
 		goto error;
 	}
 	if (afb_common_rootdir_set(rootdir) < 0) {
-		ERROR("failed to set common root directory");
+		ERROR("failed to set common root directory %s", rootdir);
+		goto error;
+	}
+	if (addenv_realpath("AFB_WORKDIR", "."     /* resolved by realpath */)
+	 || addenv_realpath("AFB_ROOTDIR", rootdir /* relative to current directory */)) {
+		ERROR("can't set environment");
 		goto error;
 	}
 
 	/* configure the daemon */
+	afb_export_set_config(settings);
 	if (afb_session_init(max_session_count, session_timeout, token)) {
 		ERROR("initialisation of session manager failed");
 		goto error;