X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=229ec5c6fcbdfcc6c015ef41e082db2ff3a90f23;hp=ca08ed729a9f6d65ae34ccacfc931e5bdea6dec8;hb=3781a3df94ce9bb28c98369df7a140fb4c086c23;hpb=f88a3b9d8ab2f05c4548504dca5a87f1ec170e25 diff --git a/command.c b/command.c index ca08ed72..229ec5c6 100644 --- a/command.c +++ b/command.c @@ -313,9 +313,7 @@ int com_stat(int fd, int argc, char * const * argv) struct misc_meta_data tmp, *nmmd = &tmp; char *s; - ret = para_sigaction(SIGUSR1, dummy); - if (ret < 0) - return ret; + para_sigaction(SIGUSR1, dummy); if (argc > 1) num = atoi(argv[1]); @@ -652,22 +650,12 @@ out: } -static int reset_signals(void) +static void reset_signals(void) { - int ret = para_sigaction(SIGCHLD, SIG_IGN); - - if (ret < 0) - return ret; - ret = para_sigaction(SIGINT, SIG_DFL); - if (ret < 0) - return ret; - ret = para_sigaction(SIGTERM, SIG_DFL); - if (ret < 0) - return ret; - ret = para_sigaction(SIGHUP, SIG_DFL); - if (ret < 0) - return ret; - return 1; + para_sigaction(SIGCHLD, SIG_IGN); + para_sigaction(SIGINT, SIG_DFL); + para_sigaction(SIGTERM, SIG_DFL); + para_sigaction(SIGHUP, SIG_DFL); } /** @@ -709,9 +697,7 @@ __noreturn void handle_connect(int fd, const char *peername) char *p, *command = NULL; size_t numbytes; - ret = reset_signals(); - if (ret < 0) - goto err_out; + reset_signals(); /* we need a blocking fd here as recv() might return EAGAIN otherwise. */ ret = mark_fd_blocking(fd); if (ret < 0)