moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <s.jegen@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Silvan Jegen 2014-06-23 17:51:05 +02:00 committed by Allan McRae
parent 8dbb80cfe9
commit fa0c1e1419
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pacman/pacman.c
View File

@ -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);