diff options
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/devfsd.c | 4 | ||||
-rw-r--r-- | miscutils/rx.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 50c8203cb..1b88f050e 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -390,8 +390,8 @@ int devfsd_main(int argc, char **argv) | |||
390 | sigemptyset(&new_action.sa_mask); | 390 | sigemptyset(&new_action.sa_mask); |
391 | new_action.sa_flags = 0; | 391 | new_action.sa_flags = 0; |
392 | new_action.sa_handler = signal_handler; | 392 | new_action.sa_handler = signal_handler; |
393 | sigaction(SIGHUP, &new_action, NULL); | 393 | sigaction_set(SIGHUP, &new_action); |
394 | sigaction(SIGUSR1, &new_action, NULL); | 394 | sigaction_set(SIGUSR1, &new_action); |
395 | 395 | ||
396 | printf("%s v%s started for %s\n", applet_name, DEVFSD_VERSION, mount_point); | 396 | printf("%s v%s started for %s\n", applet_name, DEVFSD_VERSION, mount_point); |
397 | 397 | ||
diff --git a/miscutils/rx.c b/miscutils/rx.c index 9a8fcaa20..48867b83c 100644 --- a/miscutils/rx.c +++ b/miscutils/rx.c | |||
@@ -220,7 +220,6 @@ static void sigalrm_handler(int ATTRIBUTE_UNUSED signum) | |||
220 | int rx_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 220 | int rx_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
221 | int rx_main(int argc, char **argv) | 221 | int rx_main(int argc, char **argv) |
222 | { | 222 | { |
223 | struct sigaction act; | ||
224 | struct termios tty, orig_tty; | 223 | struct termios tty, orig_tty; |
225 | int termios_err; | 224 | int termios_err; |
226 | int file_fd; | 225 | int file_fd; |
@@ -243,9 +242,7 @@ int rx_main(int argc, char **argv) | |||
243 | } | 242 | } |
244 | 243 | ||
245 | /* No SA_RESTART: we want ALRM to interrupt read() */ | 244 | /* No SA_RESTART: we want ALRM to interrupt read() */ |
246 | memset(&act, 0, sizeof(act)); | 245 | signal_no_SA_RESTART_empty_mask(SIGALRM, sigalrm_handler); |
247 | act.sa_handler = sigalrm_handler; | ||
248 | sigaction(SIGALRM, &act, NULL); | ||
249 | 246 | ||
250 | n = receive(file_fd); | 247 | n = receive(file_fd); |
251 | 248 | ||