mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-03-19 05:33:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve child spawning

Browse source
This commit is contained in:
Jente Hidskes 2018-12-16 21:51:48 +01:00
parent 96fd0e13bb
commit b22f4b465c
No known key found for this signature in database
GPG key ID: 04BE5A29F32D91EA
1 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cage.c
View file

@ -10,6 +10,7 @@
#include <signal.h> #include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/backend.h> #include <wlr/backend.h>
@ -642,6 +643,23 @@ server_new_xdg_surface(struct wl_listener *listener, void *data)
wl_list_insert(&server->views, &view->link); wl_list_insert(&server->views, &view->link);
} }
static bool
spawn_primary_client(char *argv[], pid_t *pid_out)
{
pid_t pid = fork();
if (pid == 0) {
execvp(argv[0], argv);
_exit(1);
} else if (pid == -1) {
wlr_log_errno(WLR_ERROR, "Unable to fork");
return false;
}
*pid_out = pid;
wlr_log(WLR_DEBUG, "Child process created with pid %d", pid);
return true;
}
static void static void
sig_handler(int signal) sig_handler(int signal)
{ {
@ -773,13 +791,17 @@ main(int argc, char *argv[])
"Clients may not be able to connect"); "Clients may not be able to connect");
} }
if (fork() == 0) { pid_t pid;
execvp(argv[1], (char * const *) argv + 1); if (!spawn_primary_client(argv + 1, &pid)) {
ret = 1;
goto end;
} }
wl_display_run(server.wl_display); wl_display_run(server.wl_display);
wl_display_destroy_clients(server.wl_display); wl_display_destroy_clients(server.wl_display);
waitpid(pid, NULL, 0);
end: end:
wlr_xcursor_manager_destroy(server.cursor_mgr); wlr_xcursor_manager_destroy(server.cursor_mgr);
if (server.cursor) { if (server.cursor) {