Merge branch 'master' into next

diff --git a/src/util.c b/src/util.c
index db2f0204d24a0ddb83a166c28fae1737ed0589bf..e623ce81b822e0121d2641665145b2da2402f05d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -93,7 +93,7 @@ void exec_i3_utility(char *name, char *argv[]) {
     char buffer[BUFSIZ];
     if (readlink("/proc/self/exe", buffer, BUFSIZ) == -1) {
         warn("could not read /proc/self/exe");
-        exit(1);
+        _exit(1);
     }
     dir = dirname(buffer);
     sasprintf(&migratepath, "%s/%s", dir, name);
@@ -102,7 +102,7 @@ void exec_i3_utility(char *name, char *argv[]) {
 #endif
 
     warn("Could not start %s", name);
-    exit(2);
+    _exit(2);
 }
 
 /*