mirror of
https://github.com/python/cpython.git
synced 2024-12-01 05:45:40 +08:00
Patch #474169: Move fdopen calls out of critical section.
This commit is contained in:
parent
b7b3260128
commit
dedbe255d3
@ -2274,13 +2274,15 @@ popen(const char *command, const char *mode, int pipesize, int *err)
|
||||
if (dup2(whan, 1) == 0) { /* Connect STDOUT to Pipe Write Side */
|
||||
DosClose(whan); /* Close Now-Unused Pipe Write Handle */
|
||||
|
||||
if (async_system(command) == NO_ERROR)
|
||||
retfd = fdopen(rhan, mode); /* And Return Pipe Read Handle */
|
||||
rc = async_system(command);
|
||||
}
|
||||
|
||||
dup2(oldfd, 1); /* Reconnect STDOUT to Original Handle */
|
||||
DosExitCritSec(); /* Now Allow Other Threads to Run */
|
||||
|
||||
if (rc == NO_ERROR)
|
||||
retfd = fdopen(rhan, mode); /* And Return Pipe Read Handle */
|
||||
|
||||
close(oldfd); /* And Close Saved STDOUT Handle */
|
||||
return retfd; /* Return fd of Pipe or NULL if Error */
|
||||
|
||||
@ -2293,13 +2295,15 @@ popen(const char *command, const char *mode, int pipesize, int *err)
|
||||
if (dup2(rhan, 0) == 0) { /* Connect STDIN to Pipe Read Side */
|
||||
DosClose(rhan); /* Close Now-Unused Pipe Read Handle */
|
||||
|
||||
if (async_system(command) == NO_ERROR)
|
||||
retfd = fdopen(whan, mode); /* And Return Pipe Write Handle */
|
||||
rc = async_system(command);
|
||||
}
|
||||
|
||||
dup2(oldfd, 0); /* Reconnect STDIN to Original Handle */
|
||||
DosExitCritSec(); /* Now Allow Other Threads to Run */
|
||||
|
||||
if (rc == NO_ERROR)
|
||||
retfd = fdopen(whan, mode); /* And Return Pipe Write Handle */
|
||||
|
||||
close(oldfd); /* And Close Saved STDIN Handle */
|
||||
return retfd; /* Return fd of Pipe or NULL if Error */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user