| 10 |
|
|
| 11 |
|
#include "copyright.h" |
| 12 |
|
|
| 13 |
+ |
#include <sys/types.h> |
| 14 |
+ |
#include <sys/wait.h> |
| 15 |
+ |
#include <fcntl.h> |
| 16 |
+ |
#include <stdlib.h> |
| 17 |
+ |
|
| 18 |
|
#include "rtprocess.h" |
| 19 |
< |
#include "vfork.h" |
| 19 |
> |
#include "rtio.h" |
| 20 |
|
|
| 21 |
|
|
| 22 |
|
int |
| 25 |
|
char *av[] |
| 26 |
|
) |
| 27 |
|
{ |
| 23 |
– |
extern char *getpath(), *getenv(); |
| 28 |
|
char *compath; |
| 29 |
|
int p0[2], p1[2]; |
| 30 |
|
|
| 35 |
|
return(0); |
| 36 |
|
if (pipe(p0) < 0 || pipe(p1) < 0) |
| 37 |
|
return(-1); |
| 38 |
< |
if ((pd->pid = vfork()) == 0) { /* if child */ |
| 38 |
> |
if ((pd->pid = fork()) == 0) { /* if child */ |
| 39 |
|
close(p0[1]); |
| 40 |
|
close(p1[0]); |
| 41 |
|
if (p0[0] != 0) { /* connect p0 to stdin */ |
| 56 |
|
close(p1[1]); |
| 57 |
|
pd->r = p1[0]; |
| 58 |
|
pd->w = p0[1]; |
| 59 |
+ |
/* |
| 60 |
+ |
* Close write stream on exec to avoid multiprocessing deadlock. |
| 61 |
+ |
* No use in read stream without it, so set flag there as well. |
| 62 |
+ |
* GW: This bug took me two days to figure out!! |
| 63 |
+ |
*/ |
| 64 |
+ |
fcntl(pd->r, F_SETFD, FD_CLOEXEC); |
| 65 |
+ |
fcntl(pd->w, F_SETFD, FD_CLOEXEC); |
| 66 |
|
pd->running = 1; |
| 67 |
|
return(PIPE_BUF); |
| 68 |
|
} |
| 74 |
|
SUBPROC *pd |
| 75 |
|
) |
| 76 |
|
{ |
| 77 |
< |
int pid, status; |
| 77 |
> |
int status; |
| 78 |
|
|
| 79 |
+ |
if (!pd->running) |
| 80 |
+ |
return(0); |
| 81 |
|
close(pd->r); |
| 82 |
|
close(pd->w); |
| 83 |
|
pd->running = 0; |
| 84 |
< |
while ((pid = wait(&status)) != -1) |
| 85 |
< |
if (pid == pd->pid) |
| 73 |
< |
return(status>>8 & 0xff); |
| 84 |
> |
if (waitpid(pd->pid, &status, 0) == pd->pid) |
| 85 |
> |
return(status>>8 & 0xff); |
| 86 |
|
return(-1); /* ? unknown status */ |
| 87 |
|
} |
| 88 |
|
|
