9 |
|
*/ |
10 |
|
|
11 |
|
#include "standard.h" |
12 |
+ |
#include "view.h" |
13 |
|
#include "paths.h" |
14 |
+ |
#include "vars.h" |
15 |
|
#include <ctype.h> |
16 |
|
#include <sys/types.h> |
17 |
|
|
16 |
– |
|
17 |
– |
typedef struct { |
18 |
– |
char *name; /* variable name */ |
19 |
– |
short nick; /* # characters required for nickname */ |
20 |
– |
short nass; /* # assignments made */ |
21 |
– |
char *value; /* assigned value(s) */ |
22 |
– |
int (*fixval)(); /* assignment checking function */ |
23 |
– |
} VARIABLE; |
24 |
– |
|
25 |
– |
int onevalue(), catvalues(), boolvalue(), |
26 |
– |
qualvalue(), fltvalue(), intvalue(); |
27 |
– |
|
18 |
|
/* variables */ |
19 |
|
#define OBJECT 0 /* object files */ |
20 |
|
#define SCENE 1 /* scene files */ |
24 |
|
#define RENDER 5 /* rendering options */ |
25 |
|
#define OCONV 6 /* oconv options */ |
26 |
|
#define PFILT 7 /* pfilt options */ |
27 |
< |
#define VIEW 8 /* view(s) for picture(s) */ |
27 |
> |
#define VIEWS 8 /* view(s) for picture(s) */ |
28 |
|
#define ZONE 9 /* simulation zone */ |
29 |
|
#define QUALITY 10 /* desired rendering quality */ |
30 |
|
#define OCTREE 11 /* octree file name */ |
42 |
|
#define RAWFILE 23 /* raw picture file root name */ |
43 |
|
#define ZFILE 24 /* distance file root name */ |
44 |
|
/* total number of variables */ |
45 |
< |
#define NVARS 25 |
45 |
> |
int NVARS = 25; |
46 |
|
|
47 |
< |
VARIABLE vv[NVARS] = { /* variable-value pairs */ |
47 |
> |
VARIABLE vv[] = { /* variable-value pairs */ |
48 |
|
{"objects", 3, 0, NULL, catvalues}, |
49 |
|
{"scene", 3, 0, NULL, catvalues}, |
50 |
|
{"materials", 3, 0, NULL, catvalues}, |
72 |
|
{"ZFILE", 2, 0, NULL, onevalue}, |
73 |
|
}; |
74 |
|
|
85 |
– |
VARIABLE *matchvar(); |
86 |
– |
char *nvalue(); |
87 |
– |
|
88 |
– |
#define UPPER(c) ((c)&~0x20) /* ASCII trick */ |
89 |
– |
|
90 |
– |
#define vnam(vc) (vv[vc].name) |
91 |
– |
#define vdef(vc) (vv[vc].nass) |
92 |
– |
#define vval(vc) (vv[vc].value) |
93 |
– |
#define vint(vc) atoi(vval(vc)) |
94 |
– |
#define vlet(vc) UPPER(vval(vc)[0]) |
95 |
– |
#define vscale vlet |
96 |
– |
#define vbool(vc) (vlet(vc)=='T') |
97 |
– |
|
98 |
– |
#define HIGH 'H' |
99 |
– |
#define MEDIUM 'M' |
100 |
– |
#define LOW 'L' |
101 |
– |
|
75 |
|
/* overture calculation file */ |
76 |
|
#ifdef NIX |
77 |
|
char overfile[] = "overture.unf"; |
153 |
|
/* assign Radiance root file name */ |
154 |
|
rootname(radname, rifname); |
155 |
|
/* load variable values */ |
156 |
< |
load(rifname); |
156 |
> |
loadvars(rifname); |
157 |
|
/* get any additional assignments */ |
158 |
|
for (i++; i < argc; i++) |
159 |
< |
setvariable(argv[i]); |
159 |
> |
if (setvariable(argv[i], matchvar) < 0) { |
160 |
> |
fprintf(stderr, "%s: unknown variable: %s\n", |
161 |
> |
progname, argv[i]); |
162 |
> |
quit(1); |
163 |
> |
} |
164 |
|
/* check assignments */ |
165 |
|
checkvalues(); |
166 |
|
/* check files and dates */ |
169 |
|
setdefaults(); |
170 |
|
/* print all values if requested */ |
171 |
|
if (explicate) |
172 |
< |
printvals(); |
172 |
> |
printvars(stdout); |
173 |
|
/* build octree (and run mkillum) */ |
174 |
|
oconv(); |
175 |
|
/* check date on ambient file */ |
181 |
|
rview(ropts, popts); |
182 |
|
else |
183 |
|
rpict(ropts, popts); |
184 |
< |
exit(0); |
184 |
> |
quit(0); |
185 |
|
userr: |
186 |
|
fprintf(stderr, |
187 |
|
"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n", |
188 |
|
progname); |
189 |
< |
exit(1); |
189 |
> |
quit(1); |
190 |
|
} |
191 |
|
|
192 |
|
|
205 |
|
} |
206 |
|
|
207 |
|
|
231 |
– |
#define NOCHAR 127 /* constant for character to delete */ |
232 |
– |
|
233 |
– |
|
234 |
– |
load(rfname) /* load Radiance simulation file */ |
235 |
– |
char *rfname; |
236 |
– |
{ |
237 |
– |
FILE *fp; |
238 |
– |
char buf[512]; |
239 |
– |
register char *cp; |
240 |
– |
|
241 |
– |
if (rfname == NULL) |
242 |
– |
fp = stdin; |
243 |
– |
else if ((fp = fopen(rfname, "r")) == NULL) |
244 |
– |
syserr(rfname); |
245 |
– |
while (fgetline(buf, sizeof(buf), fp) != NULL) { |
246 |
– |
for (cp = buf; *cp; cp++) { |
247 |
– |
switch (*cp) { |
248 |
– |
case '\\': |
249 |
– |
*cp++ = NOCHAR; |
250 |
– |
continue; |
251 |
– |
case '#': |
252 |
– |
*cp = '\0'; |
253 |
– |
break; |
254 |
– |
default: |
255 |
– |
continue; |
256 |
– |
} |
257 |
– |
break; |
258 |
– |
} |
259 |
– |
setvariable(buf); |
260 |
– |
} |
261 |
– |
fclose(fp); |
262 |
– |
} |
263 |
– |
|
264 |
– |
|
265 |
– |
setvariable(ass) /* assign variable according to string */ |
266 |
– |
register char *ass; |
267 |
– |
{ |
268 |
– |
char varname[32]; |
269 |
– |
int n; |
270 |
– |
register char *cp; |
271 |
– |
register VARIABLE *vp; |
272 |
– |
register int i; |
273 |
– |
|
274 |
– |
while (isspace(*ass)) /* skip leading space */ |
275 |
– |
ass++; |
276 |
– |
cp = varname; /* extract name */ |
277 |
– |
while (cp < varname+sizeof(varname)-1 |
278 |
– |
&& *ass && !isspace(*ass) && *ass != '=') |
279 |
– |
*cp++ = *ass++; |
280 |
– |
*cp = '\0'; |
281 |
– |
if (!varname[0]) |
282 |
– |
return; /* no variable name! */ |
283 |
– |
/* trim value */ |
284 |
– |
while (isspace(*ass) || *ass == '=') |
285 |
– |
ass++; |
286 |
– |
for (n = strlen(ass); n > 0; n--) |
287 |
– |
if (!isspace(ass[n-1])) |
288 |
– |
break; |
289 |
– |
if (!n && !nowarn) { |
290 |
– |
fprintf(stderr, "%s: warning - missing value for variable '%s'\n", |
291 |
– |
progname, varname); |
292 |
– |
return; |
293 |
– |
} |
294 |
– |
/* match variable from list */ |
295 |
– |
vp = matchvar(varname); |
296 |
– |
if (vp == NULL) { |
297 |
– |
fprintf(stderr, "%s: unknown variable '%s'\n", |
298 |
– |
progname, varname); |
299 |
– |
exit(1); |
300 |
– |
} |
301 |
– |
/* assign new value */ |
302 |
– |
if (i = vp->nass) { |
303 |
– |
cp = vp->value; |
304 |
– |
while (i--) |
305 |
– |
while (*cp++) |
306 |
– |
; |
307 |
– |
i = cp - vp->value; |
308 |
– |
vp->value = realloc(vp->value, i+n+1); |
309 |
– |
} else |
310 |
– |
vp->value = malloc(n+1); |
311 |
– |
if (vp->value == NULL) |
312 |
– |
syserr(progname); |
313 |
– |
cp = vp->value+i; /* copy value, squeezing spaces */ |
314 |
– |
*cp = *ass; |
315 |
– |
for (i = 1; i <= n; i++) { |
316 |
– |
if (ass[i] == NOCHAR) |
317 |
– |
continue; |
318 |
– |
if (isspace(*cp)) |
319 |
– |
while (isspace(ass[i])) |
320 |
– |
i++; |
321 |
– |
*++cp = ass[i]; |
322 |
– |
} |
323 |
– |
if (isspace(*cp)) /* remove trailing space */ |
324 |
– |
*cp = '\0'; |
325 |
– |
vp->nass++; |
326 |
– |
} |
327 |
– |
|
328 |
– |
|
329 |
– |
VARIABLE * |
330 |
– |
matchvar(nam) /* match a variable by its name */ |
331 |
– |
char *nam; |
332 |
– |
{ |
333 |
– |
int n = strlen(nam); |
334 |
– |
register int i; |
335 |
– |
|
336 |
– |
for (i = 0; i < NVARS; i++) |
337 |
– |
if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n)) |
338 |
– |
return(vv+i); |
339 |
– |
return(NULL); |
340 |
– |
} |
341 |
– |
|
342 |
– |
|
343 |
– |
char * |
344 |
– |
nvalue(vp, n) /* return nth variable value */ |
345 |
– |
VARIABLE *vp; |
346 |
– |
register int n; |
347 |
– |
{ |
348 |
– |
register char *cp; |
349 |
– |
|
350 |
– |
if (vp == NULL | n < 0 | n >= vp->nass) |
351 |
– |
return(NULL); |
352 |
– |
cp = vp->value; |
353 |
– |
while (n--) |
354 |
– |
while (*cp++) |
355 |
– |
; |
356 |
– |
return(cp); |
357 |
– |
} |
358 |
– |
|
359 |
– |
|
360 |
– |
checkvalues() /* check assignments */ |
361 |
– |
{ |
362 |
– |
register int i; |
363 |
– |
|
364 |
– |
for (i = 0; i < NVARS; i++) |
365 |
– |
if (vv[i].fixval != NULL) |
366 |
– |
(*vv[i].fixval)(vv+i); |
367 |
– |
} |
368 |
– |
|
369 |
– |
|
370 |
– |
onevalue(vp) /* only one assignment for this variable */ |
371 |
– |
register VARIABLE *vp; |
372 |
– |
{ |
373 |
– |
if (vp->nass < 2) |
374 |
– |
return; |
375 |
– |
if (!nowarn) |
376 |
– |
fprintf(stderr, |
377 |
– |
"%s: warning - multiple assignment of variable '%s'\n", |
378 |
– |
progname, vp->name); |
379 |
– |
do |
380 |
– |
vp->value += strlen(vp->value)+1; |
381 |
– |
while (--vp->nass > 1); |
382 |
– |
} |
383 |
– |
|
384 |
– |
|
385 |
– |
catvalues(vp) /* concatenate variable values */ |
386 |
– |
register VARIABLE *vp; |
387 |
– |
{ |
388 |
– |
register char *cp; |
389 |
– |
|
390 |
– |
if (vp->nass < 2) |
391 |
– |
return; |
392 |
– |
for (cp = vp->value; vp->nass > 1; vp->nass--) { |
393 |
– |
while (*cp) |
394 |
– |
cp++; |
395 |
– |
*cp++ = ' '; |
396 |
– |
} |
397 |
– |
} |
398 |
– |
|
399 |
– |
|
400 |
– |
int |
401 |
– |
badmatch(tv, cv) /* case insensitive truncated comparison */ |
402 |
– |
register char *tv, *cv; |
403 |
– |
{ |
404 |
– |
if (!*tv) return(1); /* null string cannot match */ |
405 |
– |
do |
406 |
– |
if (UPPER(*tv) != *cv++) |
407 |
– |
return(1); |
408 |
– |
while (*++tv); |
409 |
– |
return(0); /* OK */ |
410 |
– |
} |
411 |
– |
|
412 |
– |
|
413 |
– |
boolvalue(vp) /* check boolean for legal values */ |
414 |
– |
register VARIABLE *vp; |
415 |
– |
{ |
416 |
– |
if (!vp->nass) return; |
417 |
– |
onevalue(vp); |
418 |
– |
switch (UPPER(vp->value[0])) { |
419 |
– |
case 'T': |
420 |
– |
if (badmatch(vp->value, "TRUE")) break; |
421 |
– |
return; |
422 |
– |
case 'F': |
423 |
– |
if (badmatch(vp->value, "FALSE")) break; |
424 |
– |
return; |
425 |
– |
} |
426 |
– |
fprintf(stderr, "%s: illegal value for boolean variable '%s'\n", |
427 |
– |
progname, vp->name); |
428 |
– |
exit(1); |
429 |
– |
} |
430 |
– |
|
431 |
– |
|
432 |
– |
qualvalue(vp) /* check qualitative var. for legal values */ |
433 |
– |
register VARIABLE *vp; |
434 |
– |
{ |
435 |
– |
if (!vp->nass) return; |
436 |
– |
onevalue(vp); |
437 |
– |
switch (UPPER(vp->value[0])) { |
438 |
– |
case 'L': |
439 |
– |
if (badmatch(vp->value, "LOW")) break; |
440 |
– |
return; |
441 |
– |
case 'M': |
442 |
– |
if (badmatch(vp->value, "MEDIUM")) break; |
443 |
– |
return; |
444 |
– |
case 'H': |
445 |
– |
if (badmatch(vp->value, "HIGH")) break; |
446 |
– |
return; |
447 |
– |
} |
448 |
– |
fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n", |
449 |
– |
progname, vp->name); |
450 |
– |
exit(1); |
451 |
– |
} |
452 |
– |
|
453 |
– |
|
454 |
– |
intvalue(vp) /* check integer variable for legal values */ |
455 |
– |
register VARIABLE *vp; |
456 |
– |
{ |
457 |
– |
if (!vp->nass) return; |
458 |
– |
onevalue(vp); |
459 |
– |
if (isint(vp->value)) return; |
460 |
– |
fprintf(stderr, "%s: illegal value for integer variable '%s'\n", |
461 |
– |
progname, vp->name); |
462 |
– |
exit(1); |
463 |
– |
} |
464 |
– |
|
465 |
– |
|
466 |
– |
fltvalue(vp) /* check float variable for legal values */ |
467 |
– |
register VARIABLE *vp; |
468 |
– |
{ |
469 |
– |
if (!vp->nass) return; |
470 |
– |
onevalue(vp); |
471 |
– |
if (isflt(vp->value)) return; |
472 |
– |
fprintf(stderr, "%s: illegal value for real variable '%s'\n", |
473 |
– |
progname, vp->name); |
474 |
– |
exit(1); |
475 |
– |
} |
476 |
– |
|
477 |
– |
|
208 |
|
time_t |
209 |
|
checklast(fnames) /* check files and find most recent */ |
210 |
|
register char *fnames; |
281 |
|
if (!octreedate & !scenedate & !illumdate) { |
282 |
|
fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname, |
283 |
|
vnam(OCTREE), vnam(SCENE), vnam(ILLUM)); |
284 |
< |
exit(1); |
284 |
> |
quit(1); |
285 |
|
} |
286 |
|
matdate = checklast(vval(MATERIAL)); |
287 |
|
} |
311 |
|
fprintf(stderr, |
312 |
|
"%s: error reading bounding box from getbbox\n", |
313 |
|
progname); |
314 |
< |
exit(1); |
314 |
> |
quit(1); |
315 |
|
} |
316 |
|
for (i = 0; i < 3; i++) |
317 |
|
if (max[i] - min[i] > osiz) |
329 |
|
fprintf(stderr, |
330 |
|
"%s: error reading bounding cube from getinfo\n", |
331 |
|
progname); |
332 |
< |
exit(1); |
332 |
> |
quit(1); |
333 |
|
} |
334 |
|
pclose(fp); |
335 |
|
} |
365 |
|
vval(PICTURE) = radname; |
366 |
|
vdef(PICTURE)++; |
367 |
|
} |
368 |
< |
if (!vdef(VIEW)) { |
369 |
< |
vval(VIEW) = "X"; |
370 |
< |
vdef(VIEW)++; |
368 |
> |
if (!vdef(VIEWS)) { |
369 |
> |
vval(VIEWS) = "X"; |
370 |
> |
vdef(VIEWS)++; |
371 |
|
} |
372 |
|
if (!vdef(DETAIL)) { |
373 |
|
vval(DETAIL) = "M"; |
384 |
|
} |
385 |
|
|
386 |
|
|
657 |
– |
printvals() /* print variable values */ |
658 |
– |
{ |
659 |
– |
int i, j, clipline; |
660 |
– |
register char *cp; |
661 |
– |
register int k; |
662 |
– |
|
663 |
– |
for (i = 0; i < NVARS; i++) /* print each variable */ |
664 |
– |
for (j = 0; j < vdef(i); j++) { /* print each assignment */ |
665 |
– |
fputs(vnam(i), stdout); |
666 |
– |
fputs("= ", stdout); |
667 |
– |
k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 ) |
668 |
– |
- strlen(vnam(i)) ; |
669 |
– |
cp = nvalue(vv+i, j); |
670 |
– |
while (*cp) { |
671 |
– |
putchar(*cp++); |
672 |
– |
if (--k <= 0) { /* line too long */ |
673 |
– |
while (*cp && !isspace(*cp)) |
674 |
– |
putchar(*cp++); /* finish this word */ |
675 |
– |
if (*cp) { /* start new line */ |
676 |
– |
putchar('\n'); |
677 |
– |
fputs(vnam(i), stdout); |
678 |
– |
putchar('='); |
679 |
– |
k = clipline; |
680 |
– |
} |
681 |
– |
} |
682 |
– |
} |
683 |
– |
putchar('\n'); |
684 |
– |
} |
685 |
– |
fflush(stdout); |
686 |
– |
} |
687 |
– |
|
688 |
– |
|
387 |
|
oconv() /* run oconv and mkillum if necessary */ |
388 |
|
{ |
389 |
|
static char illumtmp[] = "ilXXXXXX"; |
407 |
|
"%s: error generating octree\n\t%s removed\n", |
408 |
|
progname, vval(OCTREE)); |
409 |
|
unlink(vval(OCTREE)); |
410 |
< |
exit(1); |
410 |
> |
quit(1); |
411 |
|
} |
412 |
|
} |
413 |
|
octreedate = time((time_t *)NULL); |
438 |
|
"%s: error generating octree\n\t%s removed\n", |
439 |
|
progname, oct0name); |
440 |
|
unlink(oct0name); |
441 |
< |
exit(1); |
441 |
> |
quit(1); |
442 |
|
} |
443 |
|
} |
444 |
|
oct0date = time((time_t *)NULL); |
458 |
|
fprintf(stderr, "%s: error running mkillum\n", |
459 |
|
progname); |
460 |
|
unlink(illumtmp); |
461 |
< |
exit(1); |
461 |
> |
quit(1); |
462 |
|
} |
463 |
|
/* make octree1 (frozen) */ |
464 |
|
if (octreedate) |
476 |
|
progname, oct1name); |
477 |
|
unlink(oct1name); |
478 |
|
unlink(illumtmp); |
479 |
< |
exit(1); |
479 |
> |
quit(1); |
480 |
|
} |
481 |
|
rmfile(illumtmp); |
482 |
|
} |
540 |
|
{ |
541 |
|
if (vdef(EXPOSURE)) { |
542 |
|
if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-') |
543 |
< |
return(.5/pow(2.,atof(vval(EXPOSURE)))); |
544 |
< |
return(.5/atof(vval(EXPOSURE))); |
543 |
> |
return(.5/pow(2.,vflt(EXPOSURE))); |
544 |
> |
return(.5/vflt(EXPOSURE)); |
545 |
|
} |
546 |
|
if (vlet(ZONE) == 'E') |
547 |
|
return(10.); |
801 |
|
return; |
802 |
|
if (vdef(OPTFILE)) { |
803 |
|
for (cp = ro; cp[1]; cp++) |
804 |
< |
if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3])) |
804 |
> |
if (isspace(cp[1]) && (cp[2] == '@' || |
805 |
> |
(cp[2] == '-' && isalpha(cp[3])))) |
806 |
|
*cp = '\n'; |
807 |
|
else |
808 |
|
*cp = cp[1]; |
1000 |
|
} |
1001 |
|
/* view number? */ |
1002 |
|
if (isint(viewselect)) |
1003 |
< |
return(specview(nvalue(vv+VIEW, atoi(viewselect)-1))); |
1003 |
> |
return(specview(nvalue(VIEWS, atoi(viewselect)-1))); |
1004 |
|
/* check list */ |
1005 |
< |
while ((mv = nvalue(vv+VIEW, n++)) != NULL) |
1005 |
> |
while ((mv = nvalue(VIEWS, n++)) != NULL) |
1006 |
|
if (matchword(viewselect, mv)) |
1007 |
|
return(specview(mv)); |
1008 |
|
return(specview(viewselect)); /* standard view? */ |
1009 |
|
} |
1010 |
< |
mv = nvalue(vv+VIEW, n); /* use view n */ |
1010 |
> |
mv = nvalue(VIEWS, n); /* use view n */ |
1011 |
|
if (vn != NULL & mv != NULL) { |
1012 |
|
register char *mv2 = mv; |
1013 |
|
if (*mv2 != '-') |
1022 |
|
printview(vopts) /* print out selected view */ |
1023 |
|
register char *vopts; |
1024 |
|
{ |
1025 |
< |
extern char *atos(), *getenv(); |
1026 |
< |
char buf[256]; |
1027 |
< |
FILE *fp; |
1025 |
> |
extern char *strstr(), *atos(), *getenv(); |
1026 |
> |
VIEW vwr; |
1027 |
> |
char buf[128]; |
1028 |
|
register char *cp; |
1029 |
< |
|
1029 |
> |
again: |
1030 |
|
if (vopts == NULL) |
1031 |
|
return(-1); |
1333 |
– |
fputs("VIEW=", stdout); |
1334 |
– |
do { |
1335 |
– |
if (matchword(vopts, "-vf")) { /* expand view file */ |
1336 |
– |
vopts = sskip(vopts); |
1337 |
– |
if (!*atos(buf, sizeof(buf), vopts)) |
1338 |
– |
return(-1); |
1339 |
– |
if ((fp = fopen(buf, "r")) == NULL) |
1340 |
– |
return(-1); |
1341 |
– |
for (buf[sizeof(buf)-2] = '\n'; |
1342 |
– |
fgets(buf, sizeof(buf), fp) != NULL && |
1343 |
– |
buf[0] != '\n'; |
1344 |
– |
buf[sizeof(buf)-2] = '\n') { |
1345 |
– |
if (buf[sizeof(buf)-2] != '\n') { |
1346 |
– |
ungetc(buf[sizeof(buf)-2], fp); |
1347 |
– |
buf[sizeof(buf)-2] = '\0'; |
1348 |
– |
} |
1349 |
– |
if (matchword(buf, "VIEW=") || |
1350 |
– |
matchword(buf, "rview")) { |
1351 |
– |
for (cp = sskip(buf); *cp && *cp != '\n'; cp++) |
1352 |
– |
putchar(*cp); |
1353 |
– |
} |
1354 |
– |
} |
1355 |
– |
fclose(fp); |
1356 |
– |
vopts = sskip(vopts); |
1357 |
– |
} else { |
1358 |
– |
while (isspace(*vopts)) |
1359 |
– |
vopts++; |
1360 |
– |
putchar(' '); |
1032 |
|
#ifdef MSDOS |
1033 |
< |
if (*vopts == '$') { /* expand env. var. */ |
1034 |
< |
if (!*atos(buf, sizeof(buf), vopts+1)) |
1035 |
< |
return(-1); |
1036 |
< |
if ((cp = getenv(buf)) == NULL) |
1366 |
< |
return(-1); |
1367 |
< |
fputs(cp, stdout); |
1368 |
< |
vopts = sskip(vopts); |
1369 |
< |
} else |
1033 |
> |
if (vopts[0] == '$') { |
1034 |
> |
vopts = getenv(vopts+1); |
1035 |
> |
goto again; |
1036 |
> |
} |
1037 |
|
#endif |
1038 |
< |
while (*vopts && !isspace(*vopts)) |
1039 |
< |
putchar(*vopts++); |
1040 |
< |
} |
1041 |
< |
} while (*vopts++); |
1042 |
< |
putchar('\n'); |
1038 |
> |
copystruct(&vwr, &stdview); |
1039 |
> |
cp = vopts; /* get -vf files first */ |
1040 |
> |
while ((cp = strstr(cp, "-vf ")) != NULL && |
1041 |
> |
*atos(buf, sizeof(buf), cp += 4)) |
1042 |
> |
viewfile(buf, &vwr, NULL); |
1043 |
> |
sscanview(&vwr, vopts); /* get the rest */ |
1044 |
> |
fputs(VIEWSTR, stdout); |
1045 |
> |
fprintview(&vwr, stdout); /* print full spec. */ |
1046 |
> |
fputc('\n', stdout); |
1047 |
|
return(0); |
1048 |
|
} |
1049 |
|
|
1066 |
|
strcat(combuf, oct1name); |
1067 |
|
if (runcom(combuf)) { /* run it */ |
1068 |
|
fprintf(stderr, "%s: error running rview\n", progname); |
1069 |
< |
exit(1); |
1069 |
> |
quit(1); |
1070 |
|
} |
1071 |
|
} |
1072 |
|
|
1163 |
|
fprintf(stderr, |
1164 |
|
"%s: error in overture for view %s\n", |
1165 |
|
progname, vs); |
1166 |
< |
exit(1); |
1166 |
> |
quit(1); |
1167 |
|
} |
1168 |
|
#ifdef NIX |
1169 |
|
rmfile(overfile); |
1176 |
|
if (runcom(combuf)) { /* run rpict */ |
1177 |
|
fprintf(stderr, "%s: error rendering view %s\n", |
1178 |
|
progname, vs); |
1179 |
< |
exit(1); |
1179 |
> |
quit(1); |
1180 |
|
} |
1181 |
|
if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { |
1182 |
|
/* build pfilt command */ |
1191 |
|
"%s: error filtering view %s\n\t%s removed\n", |
1192 |
|
progname, vs, picfile); |
1193 |
|
unlink(picfile); |
1194 |
< |
exit(1); |
1194 |
> |
quit(1); |
1195 |
|
} |
1196 |
|
} |
1197 |
|
/* remove/rename raw file */ |
1274 |
|
sprintf(evp, "%s=%s", vname, value); |
1275 |
|
if (putenv(evp) != 0) { |
1276 |
|
fprintf(stderr, "%s: out of environment space\n", progname); |
1277 |
< |
exit(1); |
1277 |
> |
quit(1); |
1278 |
|
} |
1279 |
|
if (!silent) |
1280 |
|
printf("set %s\n", evp); |
1287 |
|
{ |
1288 |
|
fprintf(stderr, "%s: bad value for variable '%s'\n", |
1289 |
|
progname, vnam(vc)); |
1290 |
< |
exit(1); |
1290 |
> |
quit(1); |
1291 |
|
} |
1292 |
|
|
1293 |
|
|
1295 |
|
char *s; |
1296 |
|
{ |
1297 |
|
perror(s); |
1298 |
< |
exit(1); |
1298 |
> |
quit(1); |
1299 |
> |
} |
1300 |
> |
|
1301 |
> |
|
1302 |
> |
quit(ec) /* exit program */ |
1303 |
> |
int ec; |
1304 |
> |
{ |
1305 |
> |
exit(ec); |
1306 |
|
} |