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

Use rpmsqFork() return code instead of semi-private struct member for pid 

- rpmsqFork() behaves like regular fork() in this regard so this
  just makes the code more obvious and eliminates an set-but-unused
  warning while at it.
This commit is contained in:
Panu Matilainen 2011-04-19 13:08:28 +03:00
parent 6e731e2832
commit b2abe49578
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/rpmscript.c
View File

@ -199,7 +199,7 @@ static rpmRC runExtScript(int selinux, ARGV_const_t prefixes,
{
FD_t out = NULL;
char * fn = NULL;
int xx;
pid_t pid;
rpmRC rc = RPMRC_FAIL;
struct rpmsqElem sq;
@ -244,26 +244,25 @@ static rpmRC runExtScript(int selinux, ARGV_const_t prefixes,
goto exit;
}
xx = rpmsqFork(&sq);
if (sq.child == 0) {
pid = rpmsqFork(&sq);
if (pid == (pid_t) -1) {
rpmlog(RPMLOG_ERR, _("Couldn't fork %s: %s\n"),
sname, strerror(errno));
goto exit;
} else if (pid == 0) {/* Child */
rpmlog(RPMLOG_DEBUG, "%s: execv(%s) pid %d\n",
sname, *argvp[0], (unsigned)getpid());
doScriptExec(selinux, *argvp, prefixes, scriptFd, out);
}
if (sq.child == (pid_t)-1) {
rpmlog(RPMLOG_ERR, _("Couldn't fork %s: %s\n"), sname, strerror(errno));
goto exit;
}
rpmsqWait(&sq);
rpmlog(RPMLOG_DEBUG, "%s: waitpid(%d) rc %d status %x\n",
sname, (unsigned)sq.child, (unsigned)sq.reaped, sq.status);
sname, (unsigned)pid, (unsigned)sq.reaped, sq.status);
if (sq.reaped < 0) {
rpmlog(lvl, _("%s scriptlet failed, waitpid(%d) rc %d: %s\n"),
sname, sq.child, sq.reaped, strerror(errno));
sname, pid, sq.reaped, strerror(errno));
} else if (!WIFEXITED(sq.status) || WEXITSTATUS(sq.status)) {
if (WIFSIGNALED(sq.status)) {
rpmlog(lvl, _("%s scriptlet failed, signal %d\n"),