aboutsummaryrefslogtreecommitdiffstats
path: root/src/firejail/x11.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/firejail/x11.c')
-rw-r--r--src/firejail/x11.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index d40d349e1..c79f1a74e 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -314,7 +314,7 @@ void x11_start_xephyr(int argc, char **argv) {
314 314
315 execvp(server_argv[0], server_argv); 315 execvp(server_argv[0], server_argv);
316 perror("execvp"); 316 perror("execvp");
317 exit(1); 317 _exit(1);
318 } 318 }
319 319
320 if (arg_debug) 320 if (arg_debug)
@@ -355,7 +355,7 @@ void x11_start_xephyr(int argc, char **argv) {
355 355
356 execvp(jail_argv[0], jail_argv); 356 execvp(jail_argv[0], jail_argv);
357 perror("execvp"); 357 perror("execvp");
358 exit(1); 358 _exit(1);
359 } 359 }
360 360
361 // cleanup 361 // cleanup
@@ -434,7 +434,7 @@ void x11_start_xpra(int argc, char **argv) {
434 434
435 execvp(server_argv[0], server_argv); 435 execvp(server_argv[0], server_argv);
436 perror("execvp"); 436 perror("execvp");
437 exit(1); 437 _exit(1);
438 } 438 }
439 439
440 // check X11 socket 440 // check X11 socket
@@ -480,7 +480,7 @@ void x11_start_xpra(int argc, char **argv) {
480 480
481 execvp(attach_argv[0], attach_argv); 481 execvp(attach_argv[0], attach_argv);
482 perror("execvp"); 482 perror("execvp");
483 exit(1); 483 _exit(1);
484 } 484 }
485 485
486 setenv("DISPLAY", display_str, 1); 486 setenv("DISPLAY", display_str, 1);
@@ -536,7 +536,7 @@ void x11_start_xpra(int argc, char **argv) {
536 } 536 }
537 execvp(stop_argv[0], stop_argv); 537 execvp(stop_argv[0], stop_argv);
538 perror("execvp"); 538 perror("execvp");
539 exit(1); 539 _exit(1);
540 } 540 }
541 541
542 // wait for xpra server to stop, 10 seconds limit 542 // wait for xpra server to stop, 10 seconds limit
@@ -672,7 +672,7 @@ void x11_xorg(void) {
672 execlp("/usr/bin/xauth", "/usr/bin/xauth", "-f", RUN_XAUTHORITY_SEC_FILE, 672 execlp("/usr/bin/xauth", "/usr/bin/xauth", "-f", RUN_XAUTHORITY_SEC_FILE,
673 "generate", display, "MIT-MAGIC-COOKIE-1", "untrusted", NULL); 673 "generate", display, "MIT-MAGIC-COOKIE-1", "untrusted", NULL);
674 674
675 exit(0); 675 _exit(0);
676 } 676 }
677 // wait for the child to finish 677 // wait for the child to finish
678 waitpid(child, NULL, 0); 678 waitpid(child, NULL, 0);