From fa0c1e1419b4a73b4a522bc6f4117b8bf337eabe Mon Sep 17 00:00:00 2001 From: Silvan Jegen Date: Mon, 23 Jun 2014 17:51:05 +0200 Subject: pacman: Correct signal handler comment and refactor One of the comments for this function is out of sync with the code. Since the code exhibits the more sane behavior of treating SIGINT and SIGHUB the same way (by not exiting pacman when there is a commit in flight) we adjust the comment. Given this code flow, the if/else statements can be simplified somewhat as well. Signed-off-by: Silvan Jegen Signed-off-by: Allan McRae --- src/pacman/pacman.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 783c30bf..e8c5f9e3 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -301,7 +301,7 @@ static void handler(int signum) "Please submit a full bug report with --debug if appropriate.\n"; xwrite(err, msg, strlen(msg)); exit(signum); - } else if(signum == SIGINT || signum == SIGHUP) { + } else if(signum != SIGTERM) { if(signum == SIGINT) { msg = "\nInterrupt signal received\n"; } else { @@ -313,8 +313,8 @@ static void handler(int signum) return; } } - /* SIGINT: no committing transaction, release it now and then exit pacman - * SIGHUP, SIGTERM: release no matter what */ + /* SIGINT/SIGHUP: no committing transaction, release it now and then exit pacman + * SIGTERM: release no matter what */ alpm_trans_release(config->handle); /* output a newline to be sure we clear any line we may be on */ xwrite(out, "\n", 1); -- cgit v1.2.3-70-g09d2