| 20 |
|
#else |
| 21 |
|
|
| 22 |
|
#include <signal.h> |
| 23 |
+ |
|
| 24 |
|
#include "color.h" |
| 25 |
|
#include "view.h" |
| 26 |
+ |
#include "rtprocess.h" |
| 27 |
|
|
| 28 |
|
#ifndef NFS |
| 29 |
|
#define NFS 1 |
| 51 |
|
/* rpict command */ |
| 52 |
|
char *rpargv[128] = {"rpict", "-S", "1"}; |
| 53 |
|
int rpargc = 3; |
| 52 |
– |
int rpd[3]; |
| 54 |
|
FILE *torp, *fromrp; |
| 55 |
|
COLR *pbuf; |
| 56 |
|
/* our view parameters */ |
| 211 |
|
char *err; |
| 212 |
|
FILE *fp; |
| 213 |
|
int hr, vr; |
| 214 |
+ |
SUBPROC rpd; /* since we don't close_process(), this can be local */ |
| 215 |
|
/* set up view */ |
| 216 |
|
if ((err = setview(&ourview)) != NULL) { |
| 217 |
|
fprintf(stderr, "%s: %s\n", progname, err); |
| 270 |
|
goto filerr; |
| 271 |
|
dolock(outfd, F_UNLCK); |
| 272 |
|
/* start rpict process */ |
| 273 |
< |
if (open_process(rpd, rpargv) <= 0) { |
| 273 |
> |
if (open_process(&rpd, rpargv) <= 0) { |
| 274 |
|
fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]); |
| 275 |
|
exit(1); |
| 276 |
|
} |
| 277 |
< |
if ((fromrp = fdopen(rpd[0], "r")) == NULL || |
| 278 |
< |
(torp = fdopen(rpd[1], "w")) == NULL) { |
| 277 |
> |
if ((fromrp = fdopen(rpd.r, "r")) == NULL || |
| 278 |
> |
(torp = fdopen(rpd.w, "w")) == NULL) { |
| 279 |
|
fprintf(stderr, "%s: cannot open stream to %s\n", |
| 280 |
|
progname, rpargv[0]); |
| 281 |
|
exit(1); |
