folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use rpmsqIsCaught() instead of directly accessing rpmsqCaught sigset

This commit is contained in:
Panu Matilainen 2008-06-03 12:10:02 +03:00
parent cd040ba59b
commit 0863a4420b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rpmdb.c
View File

@ -610,11 +610,11 @@ int rpmdbCheckTerminate(int terminate)
(void) sigfillset(&newMask); /* block all signals */
(void) sigprocmask(SIG_BLOCK, &newMask, &oldMask);
if (sigismember(&rpmsqCaught, SIGINT)
|| sigismember(&rpmsqCaught, SIGQUIT)
|| sigismember(&rpmsqCaught, SIGHUP)
|| sigismember(&rpmsqCaught, SIGTERM)
|| sigismember(&rpmsqCaught, SIGPIPE)
if (rpmsqIsCaught(SIGINT) > 0
|| rpmsqIsCaught(SIGQUIT) > 0
|| rpmsqIsCaught(SIGHUP) > 0
|| rpmsqIsCaught(SIGTERM) > 0
|| rpmsqIsCaught(SIGPIPE) > 0
|| terminate)
terminating = 1;
@ -641,9 +641,7 @@ int rpmdbCheckTerminate(int terminate)
int rpmdbCheckSignals(void)
{
if (rpmdbCheckTerminate(0)) {
/* sigset_t is abstract type */
rpmlog(RPMLOG_DEBUG, "Exiting on signal(0x%lx) ...\n",
*((unsigned long *)&rpmsqCaught));
rpmlog(RPMLOG_DEBUG, "Exiting on signal...\n");
exit(EXIT_FAILURE);
}
return 0;

2
python/rpmmodule.c
View File

@ -72,7 +72,7 @@ static PyObject * signalsCaught(PyObject * self, PyObject * check)
for (i = 0; i < llen; i++) {
o = PyList_GetItem(check, i);
signum = PyInt_AsLong(o);
if (sigismember(&rpmsqCaught, signum)) {
if (rpmsqIsCaught(signum) > 0) {
PyList_Append(caught, o);
}
}