diff options
author | jbj <devnull@localhost> | 2001-12-08 17:21:36 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 2001-12-08 17:21:36 +0000 |
commit | 85f676ed6637f2ff677d6b32c0e1f547df7fe9ee (patch) | |
tree | 146c81d6f7596f445385fc9b4cfad8235a40a7af /lib/psm.c | |
parent | 58f451f3c3240f76874e27bff8325dea88134e7e (diff) | |
download | librpm-tizen-85f676ed6637f2ff677d6b32c0e1f547df7fe9ee.tar.gz librpm-tizen-85f676ed6637f2ff677d6b32c0e1f547df7fe9ee.tar.bz2 librpm-tizen-85f676ed6637f2ff677d6b32c0e1f547df7fe9ee.zip |
- lclint-3.0.0.19 fiddles.
CVS patchset: 5217
CVS date: 2001/12/08 17:21:36
Diffstat (limited to 'lib/psm.c')
-rw-r--r-- | lib/psm.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -801,6 +801,7 @@ static int runScript(PSM_t psm, Header h, } if (out == NULL) return 1; /* XXX can't happen */ + /*@-branchstate@*/ if (!(child = fork())) { const char * rootDir; int pipes[2]; @@ -812,7 +813,6 @@ static int runScript(PSM_t psm, Header h, xx = dup2(pipes[0], STDIN_FILENO); xx = close(pipes[0]); - /*@-branchstate@*/ if (ts->scriptFd != NULL) { int sfdno = Fileno(ts->scriptFd); int ofdno = Fileno(out); @@ -828,9 +828,7 @@ static int runScript(PSM_t psm, Header h, xx = Fclose (ts->scriptFd); } } - /*@=branchstate@*/ - /*@-branchstate@*/ { const char *ipath = rpmExpand("PATH=%{_install_script_path}", NULL); const char *path = SCRIPT_PATH; @@ -842,7 +840,6 @@ static int runScript(PSM_t psm, Header h, ipath = _free(ipath); /*@=modobserver@*/ } - /*@=branchstate@*/ for (i = 0; i < numPrefixes; i++) { sprintf(prefixBuf, "RPM_INSTALL_PREFIX%d=%s", i, prefixes[i]); @@ -877,6 +874,7 @@ static int runScript(PSM_t psm, Header h, _exit(-1); /*@notreached@*/ } + /*@=branchstate@*/ if (waitpid(child, &status, 0) < 0) { rpmError(RPMERR_SCRIPT, |