Allow choice to trap or not program faults

[src/app-framework-binder.git] / src / main-afb-daemon.c

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index cb362a8..06aeb58 100644 (file)
--- 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>
@@ -48,7 +50,6 @@
 #include "afb-hsrv.h"
 #include "afb-hreq.h"
 #include "afb-xreq.h"
-#include "jobs.h"
 #include "afb-session.h"
 #include "verbose.h"
 #include "afb-common.h"
@@ -57,12 +58,15 @@
 #include "afb-hook.h"
 #include "afb-hook-flags.h"
 #include "afb-debug.h"
-#include "process-name.h"
-#include "wrap-json.h"
 #if defined(WITH_SUPERVISION)
 #   include "afb-supervision.h"
 #endif
 
+#include "process-name.h"
+#include "wrap-json.h"
+#include "jobs.h"
+#include "sig-monitor.h"
+
 /*
    if SELF_PGROUP == 0 the launched command is the group leader
    if SELF_PGROUP != 0 afb-daemon is the group leader
@@ -74,6 +78,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
  +--------------------------------------------------------- */
@@ -669,7 +711,12 @@ 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;
        }
 
@@ -778,15 +825,23 @@ error:
 
 int main(int argc, char *argv[])
 {
-       struct json_object *name;
+       struct json_object *obj;
        afb_debug("main-entry");
 
        // ------------- Build session handler & init config -------
        main_config = afb_config_parse_arguments(argc, argv);
-       if (json_object_object_get_ex(main_config, "name", &name)) {
-               verbose_set_name(json_object_get_string(name), 0);
-               process_name_set_name(json_object_get_string(name));
-               process_name_replace_cmdline(argv, json_object_get_string(name));
+       if (sig_monitor_init(
+               !json_object_object_get_ex(main_config, "trap-faults", &obj)
+                       || json_object_get_boolean(obj)) < 0) {
+               ERROR("failed to initialise signal handlers");
+               return 1;
+       }
+
+
+       if (json_object_object_get_ex(main_config, "name", &obj)) {
+               verbose_set_name(json_object_get_string(obj), 0);
+               process_name_set_name(json_object_get_string(obj));
+               process_name_replace_cmdline(argv, json_object_get_string(obj));
        }
        afb_debug("main-args");