diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-08-11 05:47:10 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-08-11 05:47:10 +0200 |
| commit | 4f8ac368dbead32aaa30684c29df3afa0a8ba17f (patch) | |
| tree | 60a1007dba7a0f2456c44f7152e68b274f4bb3f2 /src/mds-respawn.c | |
| parent | m (diff) | |
| download | mds-4f8ac368dbead32aaa30684c29df3afa0a8ba17f.tar.gz mds-4f8ac368dbead32aaa30684c29df3afa0a8ba17f.tar.bz2 mds-4f8ac368dbead32aaa30684c29df3afa0a8ba17f.tar.xz | |
add fork_for_safety option + beginning of kernel-based keyboard
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
| -rw-r--r-- | src/mds-respawn.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mds-respawn.c b/src/mds-respawn.c index 24084f0..ebe8411 100644 --- a/src/mds-respawn.c +++ b/src/mds-respawn.c @@ -46,7 +46,8 @@ server_characteristics_t server_characteristics = .require_privileges = 0, .require_display = 0, .require_respawn_info = 1, - .sanity_check_argc = 0 + .sanity_check_argc = 0, + .fork_for_safety = 0 }; @@ -508,7 +509,7 @@ int master_loop(void) while (!reexecing && !terminating && live_count) { - pid_t pid = waitpid(-1, &status, 0); + pid_t pid = uninterruptable_waitpid(-1, &status, 0); if (reviving) for (reviving = 0, i = 0; i < servers; i++) @@ -517,8 +518,6 @@ int master_loop(void) if (pid == (pid_t)-1) { - if (errno == EINTR) - continue; xperror(*argv); rc = 1; break; |