1 |
– |
/* Copyright (c) 1995 Regents of the University of California */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* Executive program for oconv, rpict and pfilt |
6 |
|
*/ |
7 |
|
|
8 |
|
#include "standard.h" |
9 |
+ |
|
10 |
+ |
#include <ctype.h> |
11 |
+ |
|
12 |
+ |
#include "platform.h" |
13 |
+ |
#include "view.h" |
14 |
|
#include "paths.h" |
15 |
|
#include "vars.h" |
14 |
– |
#include <ctype.h> |
15 |
– |
#include <sys/types.h> |
16 |
|
|
17 |
< |
/* variables */ |
18 |
< |
#define OBJECT 0 /* object files */ |
19 |
< |
#define SCENE 1 /* scene files */ |
20 |
< |
#define MATERIAL 2 /* material files */ |
21 |
< |
#define ILLUM 3 /* mkillum input files */ |
22 |
< |
#define MKILLUM 4 /* mkillum options */ |
23 |
< |
#define RENDER 5 /* rendering options */ |
24 |
< |
#define OCONV 6 /* oconv options */ |
25 |
< |
#define PFILT 7 /* pfilt options */ |
26 |
< |
#define VIEW 8 /* view(s) for picture(s) */ |
27 |
< |
#define ZONE 9 /* simulation zone */ |
28 |
< |
#define QUALITY 10 /* desired rendering quality */ |
29 |
< |
#define OCTREE 11 /* octree file name */ |
30 |
< |
#define PICTURE 12 /* picture file root name */ |
31 |
< |
#define AMBFILE 13 /* ambient file name */ |
32 |
< |
#define OPTFILE 14 /* rendering options file */ |
33 |
< |
#define EXPOSURE 15 /* picture exposure setting */ |
34 |
< |
#define RESOLUTION 16 /* maximum picture resolution */ |
35 |
< |
#define UP 17 /* view up (X, Y or Z) */ |
36 |
< |
#define INDIRECT 18 /* indirection in lighting */ |
37 |
< |
#define DETAIL 19 /* level of scene detail */ |
38 |
< |
#define PENUMBRAS 20 /* shadow penumbras are desired */ |
39 |
< |
#define VARIABILITY 21 /* level of light variability */ |
40 |
< |
#define REPORT 22 /* report frequency and errfile */ |
41 |
< |
#define RAWFILE 23 /* raw picture file root name */ |
17 |
> |
/* variables (alphabetical by name) */ |
18 |
> |
#define AMBFILE 0 /* ambient file name */ |
19 |
> |
#define DETAIL 1 /* level of scene detail */ |
20 |
> |
#define EXPOSURE 2 /* picture exposure setting */ |
21 |
> |
#define EYESEP 3 /* interocular distance */ |
22 |
> |
#define ILLUM 4 /* mkillum input files */ |
23 |
> |
#define INDIRECT 5 /* indirection in lighting */ |
24 |
> |
#define MATERIAL 6 /* material files */ |
25 |
> |
#define MKILLUM 7 /* mkillum options */ |
26 |
> |
#define OBJECT 8 /* object files */ |
27 |
> |
#define OCONV 9 /* oconv options */ |
28 |
> |
#define OCTREE 10 /* octree file name */ |
29 |
> |
#define OPTFILE 11 /* rendering options file */ |
30 |
> |
#define PENUMBRAS 12 /* shadow penumbras are desired */ |
31 |
> |
#define PFILT 13 /* pfilt options */ |
32 |
> |
#define PICTURE 14 /* picture file root name */ |
33 |
> |
#define QUALITY 15 /* desired rendering quality */ |
34 |
> |
#define RAWFILE 16 /* raw picture file root name */ |
35 |
> |
#define RENDER 17 /* rendering options */ |
36 |
> |
#define REPORT 18 /* report frequency and errfile */ |
37 |
> |
#define RESOLUTION 19 /* maximum picture resolution */ |
38 |
> |
#define SCENE 20 /* scene files */ |
39 |
> |
#define UP 21 /* view up (X, Y or Z) */ |
40 |
> |
#define VARIABILITY 22 /* level of light variability */ |
41 |
> |
#define VIEWS 23 /* view(s) for picture(s) */ |
42 |
|
#define ZFILE 24 /* distance file root name */ |
43 |
+ |
#define ZONE 25 /* simulation zone */ |
44 |
|
/* total number of variables */ |
45 |
< |
int NVARS = 25; |
45 |
> |
int NVARS = 26; |
46 |
|
|
47 |
|
VARIABLE vv[] = { /* variable-value pairs */ |
48 |
< |
{"objects", 3, 0, NULL, catvalues}, |
49 |
< |
{"scene", 3, 0, NULL, catvalues}, |
50 |
< |
{"materials", 3, 0, NULL, catvalues}, |
48 |
> |
{"AMBFILE", 3, 0, NULL, onevalue}, |
49 |
> |
{"DETAIL", 3, 0, NULL, qualvalue}, |
50 |
> |
{"EXPOSURE", 3, 0, NULL, fltvalue}, |
51 |
> |
{"EYESEP", 3, 0, NULL, fltvalue}, |
52 |
|
{"illum", 3, 0, NULL, catvalues}, |
53 |
+ |
{"INDIRECT", 3, 0, NULL, intvalue}, |
54 |
+ |
{"materials", 3, 0, NULL, catvalues}, |
55 |
|
{"mkillum", 3, 0, NULL, catvalues}, |
56 |
< |
{"render", 3, 0, NULL, catvalues}, |
56 |
> |
{"objects", 3, 0, NULL, catvalues}, |
57 |
|
{"oconv", 3, 0, NULL, catvalues}, |
54 |
– |
{"pfilt", 2, 0, NULL, catvalues}, |
55 |
– |
{"view", 2, 0, NULL, NULL}, |
56 |
– |
{"ZONE", 2, 0, NULL, onevalue}, |
57 |
– |
{"QUALITY", 3, 0, NULL, qualvalue}, |
58 |
|
{"OCTREE", 3, 0, NULL, onevalue}, |
59 |
– |
{"PICTURE", 3, 0, NULL, onevalue}, |
60 |
– |
{"AMBFILE", 3, 0, NULL, onevalue}, |
59 |
|
{"OPTFILE", 3, 0, NULL, onevalue}, |
60 |
< |
{"EXPOSURE", 3, 0, NULL, fltvalue}, |
60 |
> |
{"PENUMBRAS", 3, 0, NULL, boolvalue}, |
61 |
> |
{"pfilt", 2, 0, NULL, catvalues}, |
62 |
> |
{"PICTURE", 3, 0, NULL, onevalue}, |
63 |
> |
{"QUALITY", 3, 0, NULL, qualvalue}, |
64 |
> |
{"RAWFILE", 3, 0, NULL, onevalue}, |
65 |
> |
{"render", 3, 0, NULL, catvalues}, |
66 |
> |
{"REPORT", 3, 0, NULL, onevalue}, |
67 |
|
{"RESOLUTION", 3, 0, NULL, onevalue}, |
68 |
+ |
{"scene", 3, 0, NULL, catvalues}, |
69 |
|
{"UP", 2, 0, NULL, onevalue}, |
65 |
– |
{"INDIRECT", 3, 0, NULL, intvalue}, |
66 |
– |
{"DETAIL", 3, 0, NULL, qualvalue}, |
67 |
– |
{"PENUMBRAS", 3, 0, NULL, boolvalue}, |
70 |
|
{"VARIABILITY", 3, 0, NULL, qualvalue}, |
71 |
< |
{"REPORT", 3, 0, NULL, onevalue}, |
70 |
< |
{"RAWFILE", 3, 0, NULL, onevalue}, |
71 |
> |
{"view", 2, 0, NULL, NULL}, |
72 |
|
{"ZFILE", 2, 0, NULL, onevalue}, |
73 |
+ |
{"ZONE", 2, 0, NULL, onevalue}, |
74 |
|
}; |
75 |
|
|
76 |
|
/* overture calculation file */ |
77 |
< |
#ifdef NIX |
78 |
< |
char overfile[] = "overture.unf"; |
77 |
> |
#ifdef NULL_DEVICE |
78 |
> |
char overfile[] = NULL_DEVICE; |
79 |
|
#else |
80 |
< |
char overfile[] = "/dev/null"; |
80 |
> |
char overfile[] = "overture.unf"; |
81 |
|
#endif |
82 |
|
|
83 |
< |
extern time_t fdate(), time(); |
83 |
> |
extern time_t time(); |
84 |
|
|
85 |
|
time_t scenedate; /* date of latest scene or object file */ |
86 |
|
time_t octreedate; /* date of octree */ |
106 |
|
char *progname; /* global argv[0] */ |
107 |
|
char *rifname; /* global rad input file name */ |
108 |
|
|
109 |
< |
char radname[MAXPATH]; /* root Radiance file name */ |
109 |
> |
char radname[PATH_MAX]; /* root Radiance file name */ |
110 |
|
|
111 |
|
|
112 |
|
main(argc, argv) |
157 |
|
loadvars(rifname); |
158 |
|
/* get any additional assignments */ |
159 |
|
for (i++; i < argc; i++) |
160 |
< |
setvariable(argv[i]); |
160 |
> |
if (setvariable(argv[i], matchvar) < 0) { |
161 |
> |
fprintf(stderr, "%s: unknown variable: %s\n", |
162 |
> |
progname, argv[i]); |
163 |
> |
quit(1); |
164 |
> |
} |
165 |
|
/* check assignments */ |
166 |
|
checkvalues(); |
167 |
|
/* check files and dates */ |
182 |
|
rview(ropts, popts); |
183 |
|
else |
184 |
|
rpict(ropts, popts); |
185 |
< |
exit(0); |
185 |
> |
quit(0); |
186 |
|
userr: |
187 |
|
fprintf(stderr, |
188 |
< |
"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n", |
188 |
> |
"Usage: %s [-w][-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n", |
189 |
|
progname); |
190 |
< |
exit(1); |
190 |
> |
quit(1); |
191 |
|
} |
192 |
|
|
193 |
|
|
210 |
|
checklast(fnames) /* check files and find most recent */ |
211 |
|
register char *fnames; |
212 |
|
{ |
213 |
< |
char thisfile[MAXPATH]; |
213 |
> |
char thisfile[PATH_MAX]; |
214 |
|
time_t thisdate, lastdate = 0; |
209 |
– |
register char *cp; |
215 |
|
|
216 |
|
if (fnames == NULL) |
217 |
|
return(0); |
218 |
< |
while (*fnames) { |
219 |
< |
while (isspace(*fnames)) fnames++; |
220 |
< |
cp = thisfile; |
221 |
< |
while (*fnames && !isspace(*fnames)) |
217 |
< |
*cp++ = *fnames++; |
218 |
< |
*cp = '\0'; |
218 |
> |
while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) { |
219 |
> |
if (thisfile[0] == '!' || |
220 |
> |
(thisfile[0] == '\\' && thisfile[1] == '!')) |
221 |
> |
continue; |
222 |
|
if (!(thisdate = fdate(thisfile))) |
223 |
|
syserr(thisfile); |
224 |
|
if (thisdate > lastdate) |
233 |
|
char *orig; |
234 |
|
int pred; |
235 |
|
{ |
233 |
– |
extern char *rindex(); |
236 |
|
register char *cp; |
237 |
|
register int n; |
238 |
|
int suffix; |
262 |
|
syserr(progname); |
263 |
|
sprintf(vval(OCTREE), "%s.oct", radname); |
264 |
|
vdef(OCTREE)++; |
265 |
+ |
} else if (vval(OCTREE)[0] == '!') { |
266 |
+ |
fprintf(stderr, "%s: illegal '%s' specification\n", |
267 |
+ |
progname, vnam(OCTREE)); |
268 |
+ |
quit(1); |
269 |
|
} |
270 |
|
octreedate = fdate(vval(OCTREE)); |
271 |
|
if (vdef(ILLUM)) { /* illum requires secondary octrees */ |
282 |
|
if (!octreedate & !scenedate & !illumdate) { |
283 |
|
fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname, |
284 |
|
vnam(OCTREE), vnam(SCENE), vnam(ILLUM)); |
285 |
< |
exit(1); |
285 |
> |
quit(1); |
286 |
|
} |
287 |
|
matdate = checklast(vval(MATERIAL)); |
288 |
|
} |
312 |
|
fprintf(stderr, |
313 |
|
"%s: error reading bounding box from getbbox\n", |
314 |
|
progname); |
315 |
< |
exit(1); |
315 |
> |
quit(1); |
316 |
|
} |
317 |
|
for (i = 0; i < 3; i++) |
318 |
|
if (max[i] - min[i] > osiz) |
330 |
|
fprintf(stderr, |
331 |
|
"%s: error reading bounding cube from getinfo\n", |
332 |
|
progname); |
333 |
< |
exit(1); |
333 |
> |
quit(1); |
334 |
|
} |
335 |
|
pclose(fp); |
336 |
|
} |
340 |
|
|
341 |
|
setdefaults() /* set default values for unassigned var's */ |
342 |
|
{ |
343 |
< |
double org[3], size; |
343 |
> |
double org[3], lim[3], size; |
344 |
|
char buf[128]; |
345 |
|
|
346 |
|
if (!vdef(ZONE)) { |
350 |
|
vval(ZONE) = savqstr(buf); |
351 |
|
vdef(ZONE)++; |
352 |
|
} |
353 |
+ |
if (!vdef(EYESEP)) { |
354 |
+ |
if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", |
355 |
+ |
&org[0], &lim[0], &org[1], &lim[1], |
356 |
+ |
&org[2], &lim[2]) != 6) |
357 |
+ |
badvalue(ZONE); |
358 |
+ |
sprintf(buf, "%f", |
359 |
+ |
0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2])); |
360 |
+ |
vval(EYESEP) = savqstr(buf); |
361 |
+ |
vdef(EYESEP)++; |
362 |
+ |
} |
363 |
|
if (!vdef(INDIRECT)) { |
364 |
|
vval(INDIRECT) = "0"; |
365 |
|
vdef(INDIRECT)++; |
376 |
|
vval(PICTURE) = radname; |
377 |
|
vdef(PICTURE)++; |
378 |
|
} |
379 |
< |
if (!vdef(VIEW)) { |
380 |
< |
vval(VIEW) = "X"; |
381 |
< |
vdef(VIEW)++; |
379 |
> |
if (!vdef(VIEWS)) { |
380 |
> |
vval(VIEWS) = "X"; |
381 |
> |
vdef(VIEWS)++; |
382 |
|
} |
383 |
|
if (!vdef(DETAIL)) { |
384 |
|
vval(DETAIL) = "M"; |
398 |
|
oconv() /* run oconv and mkillum if necessary */ |
399 |
|
{ |
400 |
|
static char illumtmp[] = "ilXXXXXX"; |
401 |
< |
char combuf[1024], ocopts[64], mkopts[64]; |
401 |
> |
char combuf[PATH_MAX], ocopts[64], mkopts[64]; |
402 |
|
|
403 |
|
oconvopts(ocopts); /* get options */ |
404 |
|
if (octreedate < scenedate) { /* check date on original octree */ |
418 |
|
"%s: error generating octree\n\t%s removed\n", |
419 |
|
progname, vval(OCTREE)); |
420 |
|
unlink(vval(OCTREE)); |
421 |
< |
exit(1); |
421 |
> |
quit(1); |
422 |
|
} |
423 |
|
} |
424 |
|
octreedate = time((time_t *)NULL); |
449 |
|
"%s: error generating octree\n\t%s removed\n", |
450 |
|
progname, oct0name); |
451 |
|
unlink(oct0name); |
452 |
< |
exit(1); |
452 |
> |
quit(1); |
453 |
|
} |
454 |
|
} |
455 |
|
oct0date = time((time_t *)NULL); |
469 |
|
fprintf(stderr, "%s: error running mkillum\n", |
470 |
|
progname); |
471 |
|
unlink(illumtmp); |
472 |
< |
exit(1); |
472 |
> |
quit(1); |
473 |
|
} |
474 |
|
/* make octree1 (frozen) */ |
475 |
|
if (octreedate) |
487 |
|
progname, oct1name); |
488 |
|
unlink(oct1name); |
489 |
|
unlink(illumtmp); |
490 |
< |
exit(1); |
490 |
> |
quit(1); |
491 |
|
} |
492 |
|
rmfile(illumtmp); |
493 |
|
} |
551 |
|
{ |
552 |
|
if (vdef(EXPOSURE)) { |
553 |
|
if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-') |
554 |
< |
return(.5/pow(2.,atof(vval(EXPOSURE)))); |
555 |
< |
return(.5/atof(vval(EXPOSURE))); |
554 |
> |
return(.5/pow(2.,vflt(EXPOSURE))); |
555 |
> |
return(.5/vflt(EXPOSURE)); |
556 |
|
} |
557 |
|
if (vlet(ZONE) == 'E') |
558 |
|
return(10.); |
823 |
|
syserr(vval(OPTFILE)); |
824 |
|
sprintf(ro, " @%s", vval(OPTFILE)); |
825 |
|
} |
826 |
< |
#ifdef MSDOS |
826 |
> |
#ifdef _WIN32 |
827 |
|
else if (n > 50) { |
828 |
|
setenv("ROPT", ro+1); |
829 |
|
strcpy(ro, " $ROPT"); |
842 |
|
} |
843 |
|
switch (vscale(QUALITY)) { |
844 |
|
case MEDIUM: |
845 |
< |
po = addarg(po, "-r 1"); |
845 |
> |
po = addarg(po, "-r .6"); |
846 |
|
break; |
847 |
|
case HIGH: |
848 |
|
po = addarg(po, "-m .25"); |
979 |
|
if (cp == viewopts) /* append any additional options */ |
980 |
|
vs++; /* skip prefixed space if unneeded */ |
981 |
|
strcpy(cp, vs); |
982 |
< |
#ifdef MSDOS |
982 |
> |
#ifdef _WIN32 |
983 |
|
if (strlen(viewopts) > 40) { |
984 |
|
setenv("VIEW", viewopts); |
985 |
|
return("$VIEW"); |
1011 |
|
} |
1012 |
|
/* view number? */ |
1013 |
|
if (isint(viewselect)) |
1014 |
< |
return(specview(nvalue(vv+VIEW, atoi(viewselect)-1))); |
1014 |
> |
return(specview(nvalue(VIEWS, atoi(viewselect)-1))); |
1015 |
|
/* check list */ |
1016 |
< |
while ((mv = nvalue(vv+VIEW, n++)) != NULL) |
1016 |
> |
while ((mv = nvalue(VIEWS, n++)) != NULL) |
1017 |
|
if (matchword(viewselect, mv)) |
1018 |
|
return(specview(mv)); |
1019 |
|
return(specview(viewselect)); /* standard view? */ |
1020 |
|
} |
1021 |
< |
mv = nvalue(vv+VIEW, n); /* use view n */ |
1021 |
> |
mv = nvalue(VIEWS, n); /* use view n */ |
1022 |
|
if (vn != NULL & mv != NULL) { |
1023 |
|
register char *mv2 = mv; |
1024 |
|
if (*mv2 != '-') |
1033 |
|
printview(vopts) /* print out selected view */ |
1034 |
|
register char *vopts; |
1035 |
|
{ |
1036 |
< |
extern char *atos(), *getenv(); |
1037 |
< |
char buf[256]; |
1022 |
< |
FILE *fp; |
1036 |
> |
VIEW vwr; |
1037 |
> |
char buf[128]; |
1038 |
|
register char *cp; |
1039 |
< |
|
1039 |
> |
again: |
1040 |
|
if (vopts == NULL) |
1041 |
|
return(-1); |
1042 |
< |
fputs("VIEW=", stdout); |
1043 |
< |
do { |
1044 |
< |
if (matchword(vopts, "-vf")) { /* expand view file */ |
1045 |
< |
vopts = sskip(vopts); |
1046 |
< |
if (!*atos(buf, sizeof(buf), vopts)) |
1032 |
< |
return(-1); |
1033 |
< |
if ((fp = fopen(buf, "r")) == NULL) |
1034 |
< |
return(-1); |
1035 |
< |
for (buf[sizeof(buf)-2] = '\n'; |
1036 |
< |
fgets(buf, sizeof(buf), fp) != NULL && |
1037 |
< |
buf[0] != '\n'; |
1038 |
< |
buf[sizeof(buf)-2] = '\n') { |
1039 |
< |
if (buf[sizeof(buf)-2] != '\n') { |
1040 |
< |
ungetc(buf[sizeof(buf)-2], fp); |
1041 |
< |
buf[sizeof(buf)-2] = '\0'; |
1042 |
< |
} |
1043 |
< |
if (matchword(buf, "VIEW=") || |
1044 |
< |
matchword(buf, "rview")) { |
1045 |
< |
for (cp = sskip(buf); *cp && *cp != '\n'; cp++) |
1046 |
< |
putchar(*cp); |
1047 |
< |
} |
1048 |
< |
} |
1049 |
< |
fclose(fp); |
1050 |
< |
vopts = sskip(vopts); |
1051 |
< |
} else { |
1052 |
< |
while (isspace(*vopts)) |
1053 |
< |
vopts++; |
1054 |
< |
putchar(' '); |
1055 |
< |
#ifdef MSDOS |
1056 |
< |
if (*vopts == '$') { /* expand env. var. */ |
1057 |
< |
if (!*atos(buf, sizeof(buf), vopts+1)) |
1058 |
< |
return(-1); |
1059 |
< |
if ((cp = getenv(buf)) == NULL) |
1060 |
< |
return(-1); |
1061 |
< |
fputs(cp, stdout); |
1062 |
< |
vopts = sskip(vopts); |
1063 |
< |
} else |
1042 |
> |
#ifdef _WIN32 |
1043 |
> |
if (vopts[0] == '$') { |
1044 |
> |
vopts = getenv(vopts+1); |
1045 |
> |
goto again; |
1046 |
> |
} |
1047 |
|
#endif |
1048 |
< |
while (*vopts && !isspace(*vopts)) |
1049 |
< |
putchar(*vopts++); |
1050 |
< |
} |
1051 |
< |
} while (*vopts++); |
1052 |
< |
putchar('\n'); |
1048 |
> |
copystruct(&vwr, &stdview); |
1049 |
> |
sscanview(&vwr, cp=vopts); /* set initial options */ |
1050 |
> |
while ((cp = strstr(cp, "-vf ")) != NULL && |
1051 |
> |
*atos(buf, sizeof(buf), cp += 4)) { |
1052 |
> |
viewfile(buf, &vwr, NULL); /* load -vf file */ |
1053 |
> |
sscanview(&vwr, cp); /* reset tail */ |
1054 |
> |
} |
1055 |
> |
fputs(VIEWSTR, stdout); |
1056 |
> |
fprintview(&vwr, stdout); /* print full spec. */ |
1057 |
> |
fputc('\n', stdout); |
1058 |
|
return(0); |
1059 |
|
} |
1060 |
|
|
1063 |
|
char *opts, *po; |
1064 |
|
{ |
1065 |
|
char *vw; |
1066 |
< |
char combuf[512]; |
1066 |
> |
char combuf[PATH_MAX]; |
1067 |
|
/* build command */ |
1068 |
|
if (touchonly || (vw = getview(0, NULL)) == NULL) |
1069 |
|
return; |
1077 |
|
strcat(combuf, oct1name); |
1078 |
|
if (runcom(combuf)) { /* run it */ |
1079 |
|
fprintf(stderr, "%s: error running rview\n", progname); |
1080 |
< |
exit(1); |
1080 |
> |
quit(1); |
1081 |
|
} |
1082 |
|
} |
1083 |
|
|
1085 |
|
rpict(opts, po) /* run rpict and pfilt for each view */ |
1086 |
|
char *opts, *po; |
1087 |
|
{ |
1088 |
< |
char combuf[1024]; |
1089 |
< |
char rawfile[MAXPATH], picfile[MAXPATH]; |
1090 |
< |
char zopt[MAXPATH+4], rep[MAXPATH+16], res[32]; |
1088 |
> |
char combuf[PATH_MAX]; |
1089 |
> |
char rawfile[PATH_MAX], picfile[PATH_MAX]; |
1090 |
> |
char zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32]; |
1091 |
|
char pfopts[128]; |
1092 |
|
char vs[32], *vw; |
1093 |
|
int vn, mult; |
1174 |
|
fprintf(stderr, |
1175 |
|
"%s: error in overture for view %s\n", |
1176 |
|
progname, vs); |
1177 |
< |
exit(1); |
1177 |
> |
quit(1); |
1178 |
|
} |
1179 |
< |
#ifdef NIX |
1179 |
> |
#ifndef NULL_DEVICE |
1180 |
|
rmfile(overfile); |
1181 |
|
#endif |
1182 |
|
} |
1187 |
|
if (runcom(combuf)) { /* run rpict */ |
1188 |
|
fprintf(stderr, "%s: error rendering view %s\n", |
1189 |
|
progname, vs); |
1190 |
< |
exit(1); |
1190 |
> |
quit(1); |
1191 |
|
} |
1192 |
|
if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { |
1193 |
|
/* build pfilt command */ |
1202 |
|
"%s: error filtering view %s\n\t%s removed\n", |
1203 |
|
progname, vs, picfile); |
1204 |
|
unlink(picfile); |
1205 |
< |
exit(1); |
1205 |
> |
quit(1); |
1206 |
|
} |
1207 |
|
} |
1208 |
|
/* remove/rename raw file */ |
1247 |
|
char *fn; |
1248 |
|
{ |
1249 |
|
if (!silent) |
1250 |
< |
#ifdef MSDOS |
1250 |
> |
#ifdef _WIN32 |
1251 |
|
printf("\tdel %s\n", fn); |
1252 |
|
#else |
1253 |
|
printf("\trm -f %s\n", fn); |
1262 |
|
char *fold, *fnew; |
1263 |
|
{ |
1264 |
|
if (!silent) |
1265 |
< |
#ifdef MSDOS |
1265 |
> |
#ifdef _WIN32 |
1266 |
|
printf("\trename %s %s\n", fold, fnew); |
1267 |
|
#else |
1268 |
|
printf("\tmv %s %s\n", fold, fnew); |
1273 |
|
} |
1274 |
|
|
1275 |
|
|
1276 |
< |
#ifdef MSDOS |
1276 |
> |
#ifdef _WIN32 |
1277 |
|
setenv(vname, value) /* set an environment variable */ |
1278 |
|
char *vname, *value; |
1279 |
|
{ |
1285 |
|
sprintf(evp, "%s=%s", vname, value); |
1286 |
|
if (putenv(evp) != 0) { |
1287 |
|
fprintf(stderr, "%s: out of environment space\n", progname); |
1288 |
< |
exit(1); |
1288 |
> |
quit(1); |
1289 |
|
} |
1290 |
|
if (!silent) |
1291 |
|
printf("set %s\n", evp); |
1298 |
|
{ |
1299 |
|
fprintf(stderr, "%s: bad value for variable '%s'\n", |
1300 |
|
progname, vnam(vc)); |
1301 |
< |
exit(1); |
1301 |
> |
quit(1); |
1302 |
|
} |
1303 |
|
|
1304 |
|
|
1306 |
|
char *s; |
1307 |
|
{ |
1308 |
|
perror(s); |
1309 |
< |
exit(1); |
1309 |
> |
quit(1); |
1310 |
> |
} |
1311 |
> |
|
1312 |
> |
|
1313 |
> |
void |
1314 |
> |
quit(ec) /* exit program */ |
1315 |
> |
int ec; |
1316 |
> |
{ |
1317 |
> |
exit(ec); |
1318 |
|
} |