diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2013-10-09 03:45:09 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2013-10-09 03:45:09 -0400 |
| commit | 4b364457ca7ffaf96bfec8e60660ef939bc6e0a7 (patch) | |
| tree | 8c0aa44a15c668da1c8ef39ea14b36f512bbce6b /gpsd.c | |
| parent | 78c9e3e428776464ec71e66ccb40c40f2f220a2f (diff) | |
| download | gpsd-4b364457ca7ffaf96bfec8e60660ef939bc6e0a7.tar.gz | |
Simplify signal handling.
Diffstat (limited to 'gpsd.c')
| -rw-r--r-- | gpsd.c | 15 |
1 files changed, 1 insertions, 14 deletions
@@ -1757,9 +1757,6 @@ int main(int argc, char *argv[]) int i, option, dfd; int msocks[2] = {-1, -1}; bool go_background = true; -#ifdef COMPAT_SELECT - sigset_t oldset, blockset; -#endif /* COMPAT_SELECT */ bool in_restart; context.debug = 0; @@ -2052,16 +2049,6 @@ int main(int argc, char *argv[]) subscribers[i].fd = UNALLOCATED_FD; #endif /* SOCKET_EXPORT_ENABLE*/ - /* Handle some signals */ -#ifndef COMPAT_SELECT - (void)sigemptyset(&blockset); - (void)sigaddset(&blockset, SIGHUP); - (void)sigaddset(&blockset, SIGINT); - (void)sigaddset(&blockset, SIGTERM); - (void)sigaddset(&blockset, SIGQUIT); - (void)sigprocmask(SIG_BLOCK, &blockset, &oldset); -#endif /* COMPAT_SELECT */ - /*@-compdef -compdestroy@*/ { struct sigaction sa; @@ -2125,7 +2112,7 @@ int main(int argc, char *argv[]) } while (0 == signalled) { - if (!gpsd_await_data(&rfds, maxfd, &all_fds, &oldset, context.debug)) + if (!gpsd_await_data(&rfds, maxfd, &all_fds, context.debug)) continue; #ifdef SOCKET_EXPORT_ENABLE |