diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-05-09 16:40:39 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-05-09 16:40:39 +0000 |
| commit | b5ac89c3e91fc5e73ab09acd099240e5aaa213a5 (patch) | |
| tree | 8a6af29c877dca43df7acdd44a951e56df047d31 /util.c | |
| parent | 2c646907d8be3abcfdbcb890fa5c8ca825c7ce91 (diff) | |
| download | perl-b5ac89c3e91fc5e73ab09acd099240e5aaa213a5.tar.gz | |
Integrate maint branch io (pipe) fixes. (changes#16329,16330,16331)
p4raw-link: @16331 on //depot/maint-5.6/perl: 821302ef08e28e13ed846e63b71b1a8e0bd6e09a
p4raw-link: @16330 on //depot/maint-5.6/perl: 32b5515015764ee3e189442094a83142675fbf9b
p4raw-link: @16329 on //depot/maint-5.6/perl: 5676c1b12073c1e0625a9800fba3bbcb4a2e99c8
p4raw-id: //depot/perl@16528
p4raw-integrated: from //depot/maint-5.6/perl@16527 'merge in' pp_sys.c
(@12026..)
p4raw-integrated: from //depot/maint-5.6/perl@16331 'merge in' util.c
(@16329..)
p4raw-integrated: from //depot/maint-5.6/perl@16330 'merge in' doio.c
(@14704..)
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -2096,6 +2096,7 @@ Perl_my_popen(pTHX_ char *cmd, char *mode) while ((pid = PerlProc_fork()) < 0) { if (errno != EAGAIN) { PerlLIO_close(p[This]); + PerlLIO_close(p[that]); if (did_pipes) { PerlLIO_close(pp[0]); PerlLIO_close(pp[1]); @@ -2113,7 +2114,6 @@ Perl_my_popen(pTHX_ char *cmd, char *mode) #undef THAT #define THIS that #define THAT This - PerlLIO_close(p[THAT]); if (did_pipes) { PerlLIO_close(pp[0]); #if defined(HAS_FCNTL) && defined(F_SETFD) @@ -2123,7 +2123,11 @@ Perl_my_popen(pTHX_ char *cmd, char *mode) if (p[THIS] != (*mode == 'r')) { PerlLIO_dup2(p[THIS], *mode == 'r'); PerlLIO_close(p[THIS]); + if (p[THAT] != (*mode == 'r')) /* if dup2() didn't close it */ + PerlLIO_close(p[THAT]); } + else + PerlLIO_close(p[THAT]); #ifndef OS2 if (doexec) { #if !defined(HAS_FCNTL) || !defined(F_SETFD) @@ -2157,8 +2161,7 @@ Perl_my_popen(pTHX_ char *cmd, char *mode) #undef THIS #undef THAT } - do_execfree(); /* free any memory malloced by child on fork */ - PerlLIO_close(p[that]); + do_execfree(); /* free any memory malloced by child on vfork */ if (did_pipes) PerlLIO_close(pp[1]); if (p[that] < p[This]) { @@ -2166,6 +2169,9 @@ Perl_my_popen(pTHX_ char *cmd, char *mode) PerlLIO_close(p[This]); p[This] = p[that]; } + else + PerlLIO_close(p[that]); + LOCK_FDPID_MUTEX; sv = *av_fetch(PL_fdpid,p[This],TRUE); UNLOCK_FDPID_MUTEX; @@ -4216,7 +4222,7 @@ S_socketpair_udp (int fd[2]) { } #endif /* EMULATE_SOCKETPAIR_UDP */ -#if !defined(HAS_SOCKETPAIR) && defined(HAS_SOCKET) && defined(AF_INET) && defined(PF_INET) +#if !defined(HAS_SOCKETPAIR) && defined(HAS_SOCKET) && defined(AF_INET) && defined(PF_INET) int Perl_my_socketpair (int family, int type, int protocol, int fd[2]) { /* Stevens says that family must be AF_LOCAL, protocol 0. |