summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>1998-05-15 22:21:41 +0000
committerGurusamy Sarathy <gsar@cpan.org>1998-05-15 22:21:41 +0000
commit1d3434b8c1ecb43ba830424cfca969ab84444ed7 (patch)
treef1b72339d10b3ba328781e90cf5ea9cfa0830cf0 /util.c
parent067391eacdcfc760b09b573f48f90fa54dd5e5b4 (diff)
downloadperl-1d3434b8c1ecb43ba830424cfca969ab84444ed7.tar.gz
[win32] merge changes#982,984 from maintbranch
p4raw-link: @984 on //depot/maint-5.004/perl: aaffd3c27a04135bbc287616252cc5830b7c5543 p4raw-link: @982 on //depot/maint-5.004/perl: c5ed518aab0e5c6006080a87273e79a1b8e0d48b p4raw-id: //depot/win32/perl@997
Diffstat (limited to 'util.c')
-rw-r--r--util.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/util.c b/util.c
index 22af92170b..2db504a10d 100644
--- a/util.c
+++ b/util.c
@@ -2086,6 +2086,7 @@ my_pclose(PerlIO *ptr)
int status;
SV **svp;
int pid;
+ int pid2;
bool close_failed;
int saved_errno;
#ifdef VMS
@@ -2120,8 +2121,8 @@ my_pclose(PerlIO *ptr)
rsignal_save(SIGINT, SIG_IGN, &istat);
rsignal_save(SIGQUIT, SIG_IGN, &qstat);
do {
- pid = wait4pid(pid, &status, 0);
- } while (pid == -1 && errno == EINTR);
+ pid2 = wait4pid(pid, &status, 0);
+ } while (pid2 == -1 && errno == EINTR);
rsignal_restore(SIGHUP, &hstat);
rsignal_restore(SIGINT, &istat);
rsignal_restore(SIGQUIT, &qstat);
@@ -2129,7 +2130,7 @@ my_pclose(PerlIO *ptr)
SETERRNO(saved_errno, saved_vaxc_errno);
return -1;
}
- return(pid < 0 ? pid : status == 0 ? 0 : (errno = 0, status));
+ return(pid2 < 0 ? pid2 : status == 0 ? 0 : (errno = 0, status));
}
#endif /* !DOSISH */