7 |
|
|
8 |
|
#include "standard.h" |
9 |
|
#include <ctype.h> |
10 |
+ |
#include <signal.h> |
11 |
|
#include "platform.h" |
12 |
|
#include "rtprocess.h" |
13 |
|
#include "selcall.h" |
68 |
|
|
69 |
|
/* rtrace command and defaults */ |
70 |
|
char *rtargv[256] = { "rtrace", "-dj", ".5", "-dr", "3", |
71 |
< |
"-ab", "1", "-ad", "128", }; |
72 |
< |
int rtargc = 9; |
71 |
> |
"-ab", "1", "-ad", "128", "-lr", "-10", }; |
72 |
> |
int rtargc = 11; |
73 |
|
/* overriding rtrace options */ |
74 |
|
char *myrtopts[] = { "-o~~TmWdp", "-h-", "-x", "1", "-y", "0", |
75 |
|
"-dt", "0", "-as", "0", "-aa", "0", NULL }; |
123 |
|
setformat(const char *fmt) |
124 |
|
{ |
125 |
|
switch (fmt[0]) { |
125 |
– |
case 'a': |
126 |
|
case 'f': |
127 |
|
case 'd': |
128 |
+ |
SET_FILE_BINARY(stdin); |
129 |
+ |
/* fall through */ |
130 |
+ |
case 'a': |
131 |
|
inpfmt = fmt[0]; |
132 |
|
break; |
133 |
|
default: |
164 |
|
int i, j; |
165 |
|
/* global program name */ |
166 |
|
gargv = argv; |
167 |
< |
/* set up calcomp mode */ |
167 |
> |
/* initialize calcomp routines */ |
168 |
|
esupport |= E_VARIABLE|E_FUNCTION|E_INCHAN|E_RCONST|E_REDEFW; |
169 |
|
esupport &= ~(E_OUTCHAN); |
170 |
+ |
varset("PI", ':', PI); |
171 |
|
/* get our options */ |
172 |
|
for (i = 1; i < argc-1; i++) { |
173 |
|
/* expand arguments */ |
205 |
|
break; |
206 |
|
case 'f': /* file or i/o format */ |
207 |
|
if (!argv[i][2]) { |
208 |
+ |
char *fpath; |
209 |
|
if (i >= argc-1) break; |
210 |
< |
fcompile(argv[++i]); |
210 |
> |
fpath = getpath(argv[++i], |
211 |
> |
getrlibpath(), R_OK); |
212 |
> |
if (fpath == NULL) { |
213 |
> |
sprintf(errmsg, |
214 |
> |
"cannot find file '%s'", |
215 |
> |
argv[i]); |
216 |
> |
error(USER, errmsg); |
217 |
> |
} |
218 |
> |
fcompile(fpath); |
219 |
|
continue; |
220 |
|
} |
221 |
|
setformat(argv[i]+2); |
501 |
|
LUENT *lep; |
502 |
|
|
503 |
|
if (ospec == NULL) { /* use stdout? */ |
504 |
< |
if (!using_stdout && header) |
505 |
< |
printheader(stdout); |
504 |
> |
if (!using_stdout) { |
505 |
> |
if (outfmt != 'a') |
506 |
> |
SET_FILE_BINARY(stdout); |
507 |
> |
if (header) |
508 |
> |
printheader(stdout); |
509 |
> |
} |
510 |
|
using_stdout = 1; |
511 |
|
return stdout; |
512 |
|
} |
548 |
|
if (lep->key == NULL) /* new entry */ |
549 |
|
lep->key = strcpy((char *)malloc(strlen(ofname)+1), ofname); |
550 |
|
if (lep->data == NULL) { /* open output file */ |
551 |
< |
FILE *fp = fopen(ofname, "w"); |
551 |
> |
FILE *fp; |
552 |
|
int i; |
553 |
+ |
if (ofname[0] == '!') /* output to command */ |
554 |
+ |
fp = popen(ofname+1, "w"); |
555 |
+ |
else |
556 |
+ |
fp = fopen(ofname, "w"); |
557 |
|
if (fp == NULL) { |
558 |
|
sprintf(errmsg, "cannot open '%s' for writing", ofname); |
559 |
|
error(SYSTEM, errmsg); |
560 |
|
} |
561 |
+ |
if (outfmt != 'a') |
562 |
+ |
SET_FILE_BINARY(fp); |
563 |
|
if (header) |
564 |
|
printheader(fp); |
565 |
|
/* play catch-up */ |
706 |
|
MODCONT *mp; |
707 |
|
/* output modifiers in order */ |
708 |
|
for (i = 0; i < nmods; i++) { |
709 |
+ |
FILE *fp; |
710 |
|
mp = (MODCONT *)lu_find(&modconttab,modname[i])->data; |
711 |
< |
for (j = 0; j < mp->nbins; j++) |
712 |
< |
putcontrib(mp->cbin[j], |
711 |
> |
fp = getofile(mp->outspec, mp->modname, 0); |
712 |
> |
putcontrib(mp->cbin[0], fp); |
713 |
> |
if (mp->nbins > 3 && /* minor optimization */ |
714 |
> |
fp == getofile(mp->outspec, mp->modname, 1)) |
715 |
> |
for (j = 1; j < mp->nbins; j++) |
716 |
> |
putcontrib(mp->cbin[j], fp); |
717 |
> |
else |
718 |
> |
for (j = 1; j < mp->nbins; j++) |
719 |
> |
putcontrib(mp->cbin[j], |
720 |
|
getofile(mp->outspec, mp->modname, j)); |
721 |
|
/* clear for next ray tree */ |
722 |
|
memset(mp->cbin, 0, sizeof(DCOLOR)*mp->nbins); |