X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=1ca54da90191fd270c98b3001d16a4b5f5c04c53;hp=ca08ed729a9f6d65ae34ccacfc931e5bdea6dec8;hb=1583369f6defebc7f44249b9ce4cc01f717db3b9;hpb=f88a3b9d8ab2f05c4548504dca5a87f1ec170e25 diff --git a/command.c b/command.c index ca08ed72..1ca54da9 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) @@ -805,8 +791,6 @@ __noreturn void handle_connect(int fd, const char *peername) ret = cmd->handler(fd, argc, argv); mutex_lock(mmd_mutex); mmd->num_commands++; - free(mmd->afd.afhi.info_string); - free(mmd->afd.afhi.chunk_table); mutex_unlock(mmd_mutex); if (ret >= 0) goto out;