Merge branch 'master' into next

next
Michael Stapelberg 2012-09-05 17:09:43 +02:00
commit 8d2799c251
1 changed files with 2 additions and 2 deletions

View File

@ -93,7 +93,7 @@ void exec_i3_utility(char *name, char *argv[]) {
char buffer[BUFSIZ]; char buffer[BUFSIZ];
if (readlink("/proc/self/exe", buffer, BUFSIZ) == -1) { if (readlink("/proc/self/exe", buffer, BUFSIZ) == -1) {
warn("could not read /proc/self/exe"); warn("could not read /proc/self/exe");
exit(1); _exit(1);
} }
dir = dirname(buffer); dir = dirname(buffer);
sasprintf(&migratepath, "%s/%s", dir, name); sasprintf(&migratepath, "%s/%s", dir, name);
@ -102,7 +102,7 @@ void exec_i3_utility(char *name, char *argv[]) {
#endif #endif
warn("Could not start %s", name); warn("Could not start %s", name);
exit(2); _exit(2);
} }
/* /*