ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/radiance/ray/src/util/rad.c

Comparing ray/src/util/rad.c (file contents):
Revision 2.50 by greg, Fri Jan 5 14:43:03 1996 UTC vs.
Revision 2.106 by greg, Wed Aug 24 05:54:42 2011 UTC

#	Line 1 | Line 1
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	+	#include <time.h>
12	+
13	+	#include "platform.h"
14	+	#include "rtprocess.h"
15	+	#include "view.h"
16		#include "paths.h"
17		#include "vars.h"
14	–	#include <ctype.h>
15	–	#include <sys/types.h>
18
19	<	/* variables */
20	<	#define OBJECT          0               /* object files */
21	<	#define SCENE           1               /* scene files */
22	<	#define MATERIAL        2               /* material files */
23	<	#define ILLUM           3               /* mkillum input files */
24	<	#define MKILLUM         4               /* mkillum options */
25	<	#define RENDER          5               /* rendering options */
26	<	#define OCONV           6               /* oconv options */
27	<	#define PFILT           7               /* pfilt options */
28	<	#define VIEW            8               /* view(s) for picture(s) */
29	<	#define ZONE            9               /* simulation zone */
30	<	#define QUALITY         10              /* desired rendering quality */
31	<	#define OCTREE          11              /* octree file name */
32	<	#define PICTURE         12              /* picture file root name */
33	<	#define AMBFILE         13              /* ambient file name */
34	<	#define OPTFILE         14              /* rendering options file */
35	<	#define EXPOSURE        15              /* picture exposure setting */
36	<	#define RESOLUTION      16              /* maximum picture resolution */
37	<	#define UP              17              /* view up (X, Y or Z) */
38	<	#define INDIRECT        18              /* indirection in lighting */
39	<	#define DETAIL          19              /* level of scene detail */
40	<	#define PENUMBRAS       20              /* shadow penumbras are desired */
41	<	#define VARIABILITY     21              /* level of light variability */
42	<	#define REPORT          22              /* report frequency and errfile */
43	<	#define RAWFILE         23              /* raw picture file root name */
44	<	#define ZFILE           24              /* distance file root name */
19	>	#ifdef _WIN32
20	>	#define DELCMD "del"
21	>	#define RENAMECMD "rename"
22	>	#else
23	>	#define DELCMD "rm -f"
24	>	#define RENAMECMD "mv"
25	>	#include <sys/types.h>
26	>	#include <sys/wait.h>
27	>	#endif
28	>
29	>	/* variables (alphabetical by name) */
30	>	#define AMBFILE         0               /* ambient file name */
31	>	#define DETAIL          1               /* level of scene detail */
32	>	#define EXPOSURE        2               /* picture exposure setting */
33	>	#define EYESEP          3               /* interocular distance */
34	>	#define ILLUM           4               /* mkillum input files */
35	>	#define INDIRECT        5               /* indirection in lighting */
36	>	#define MATERIAL        6               /* material files */
37	>	#define MKILLUM         7               /* mkillum options */
38	>	#define OBJECT          8               /* object files */
39	>	#define OCONV           9               /* oconv options */
40	>	#define OCTREE          10              /* octree file name */
41	>	#define OPTFILE         11              /* rendering options file */
42	>	#define PENUMBRAS       12              /* shadow penumbras are desired */
43	>	#define PFILT           13              /* pfilt options */
44	>	#define PICTURE         14              /* picture file root name */
45	>	#define QUALITY         15              /* desired rendering quality */
46	>	#define RAWFILE         16              /* raw picture file root name */
47	>	#define RENDER          17              /* rendering options */
48	>	#define REPORT          18              /* report frequency and errfile */
49	>	#define RESOLUTION      19              /* maximum picture resolution */
50	>	#define RPICT           20              /* rpict parameters */
51	>	#define RVU             21              /* rvu parameters */
52	>	#define SCENE           22              /* scene files */
53	>	#define UP              23              /* view up (X, Y or Z) */
54	>	#define VARIABILITY     24              /* level of light variability */
55	>	#define VIEWS           25              /* view(s) for picture(s) */
56	>	#define ZFILE           26              /* distance file root name */
57	>	#define ZONE            27              /* simulation zone */
58		/* total number of variables */
59	<	int NVARS = 25;
59	>	int NVARS = 28;
60
61		VARIABLE        vv[] = {                /* variable-value pairs */
62	<	{"objects",     3,      0,      NULL,   catvalues},
63	<	{"scene",       3,      0,      NULL,   catvalues},
64	<	{"materials",   3,      0,      NULL,   catvalues},
62	>	{"AMBFILE",     3,      0,      NULL,   onevalue},
63	>	{"DETAIL",      3,      0,      NULL,   qualvalue},
64	>	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
65	>	{"EYESEP",      3,      0,      NULL,   fltvalue},
66		{"illum",       3,      0,      NULL,   catvalues},
67	+	{"INDIRECT",    3,      0,      NULL,   intvalue},
68	+	{"materials",   3,      0,      NULL,   catvalues},
69		{"mkillum",     3,      0,      NULL,   catvalues},
70	<	{"render",      3,      0,      NULL,   catvalues},
70	>	{"objects",     3,      0,      NULL,   catvalues},
71		{"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},
72		{"OCTREE",      3,      0,      NULL,   onevalue},
59	–	{"PICTURE",     3,      0,      NULL,   onevalue},
60	–	{"AMBFILE",     3,      0,      NULL,   onevalue},
73		{"OPTFILE",     3,      0,      NULL,   onevalue},
74	<	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
74	>	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
75	>	{"pfilt",       2,      0,      NULL,   catvalues},
76	>	{"PICTURE",     3,      0,      NULL,   onevalue},
77	>	{"QUALITY",     3,      0,      NULL,   qualvalue},
78	>	{"RAWFILE",     3,      0,      NULL,   onevalue},
79	>	{"render",      3,      0,      NULL,   catvalues},
80	>	{"REPORT",      3,      0,      NULL,   onevalue},
81		{"RESOLUTION",  3,      0,      NULL,   onevalue},
82	+	{"rpict",       3,      0,      NULL,   catvalues},
83	+	{"rvu",         3,      0,      NULL,   catvalues},
84	+	{"scene",       3,      0,      NULL,   catvalues},
85		{"UP",          2,      0,      NULL,   onevalue},
65	–	{"INDIRECT",    3,      0,      NULL,   intvalue},
66	–	{"DETAIL",      3,      0,      NULL,   qualvalue},
67	–	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
86		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
87	<	{"REPORT",      3,      0,      NULL,   onevalue},
70	<	{"RAWFILE",     3,      0,      NULL,   onevalue},
87	>	{"view",        2,      0,      NULL,   NULL},
88		{"ZFILE",       2,      0,      NULL,   onevalue},
89	+	{"ZONE",        2,      0,      NULL,   onevalue},
90		};
91
92		/* overture calculation file */
93	<	#ifdef NIX
94	<	char    overfile[] = "overture.unf";
93	>	#ifdef NULL_DEVICE
94	>	char    overfile[] = NULL_DEVICE;
95		#else
96	<	char    overfile[] = "/dev/null";
96	>	char    overfile[] = "overture.unf";
97		#endif
98
81	–	extern time_t   fdate(), time();
99
100		time_t  scenedate;              /* date of latest scene or object file */
101		time_t  octreedate;             /* date of octree */
#	Line 94 | Line 111 | int    nowarn = 0;             /* no warnings */
111		int     explicate = 0;          /* explicate variables */
112		int     silent = 0;             /* do work silently */
113		int     touchonly = 0;          /* touch files only */
114	<	int     noaction = 0;           /* don't do anything */
114	>	int     nprocs = 1;             /* maximum executing processes */
115		int     sayview = 0;            /* print view out */
116	<	char    *rvdevice = NULL;       /* rview output device */
116	>	char    *rvdevice = NULL;       /* rvu output device */
117		char    *viewselect = NULL;     /* specific view only */
118
119	+	#define DEF_RPICT_PATH  "rpict"         /* default rpict path */
120	+
121	+	/* command paths */
122	+	char    c_oconv[256] = "oconv";
123	+	char    c_mkillum[256] = "mkillum";
124	+	char    c_rvu[256] = "rvu";
125	+	char    c_rpict[256] = DEF_RPICT_PATH;
126	+	char    c_rpiece[] = "rpiece";
127	+	char    c_pfilt[256] = "pfilt";
128	+
129		int     overture = 0;           /* overture calculation needed */
130
131	+	int     children_running = 0;   /* set negative in children */
132	+
133		char    *progname;              /* global argv[0] */
134		char    *rifname;               /* global rad input file name */
135
136	<	char    radname[MAXPATH];       /* root Radiance file name */
136	>	char    radname[PATH_MAX];      /* root Radiance file name */
137
138	+	#define inchild()       (children_running < 0)
139
140	<	main(argc, argv)
141	<	int     argc;
142	<	char    *argv[];
140	>	static void rootname(char       *rn, char       *fn);
141	>	static time_t checklast(char    *fnames);
142	>	static char * newfname(char     *orig, int      pred);
143	>	static void checkfiles(void);
144	>	static void getoctcube(double   org[3], double  *sizp);
145	>	static void setdefaults(void);
146	>	static void oconv(void);
147	>	static char * addarg(char       *op, char       *arg);
148	>	static void oconvopts(char      *oo);
149	>	static void mkillumopts(char    *mo);
150	>	static void checkambfile(void);
151	>	static double ambval(void);
152	>	static void renderopts(char     *op, char       *po);
153	>	static void lowqopts(char       *op, char       *po);
154	>	static void medqopts(char       *op, char       *po);
155	>	static void hiqopts(char        *op, char       *po);
156	>	static void xferopts(char       *ro);
157	>	static void pfiltopts(char      *po);
158	>	static int matchword(char       *s1, char       *s2);
159	>	static char * specview(char     *vs);
160	>	static char * getview(int       n, char *vn);
161	>	static int myprintview(char     *vopts, FILE    *fp);
162	>	static void rvu(char    *opts, char     *po);
163	>	static void rpict(char  *opts, char     *po);
164	>	static int touch(char   *fn);
165	>	static int runcom(char  *cs);
166	>	static int rmfile(char  *fn);
167	>	static int mvfile(char  *fold, char     *fnew);
168	>	static int next_process(int     reserve);
169	>	static void wait_process(int    all);
170	>	static void finish_process(void);
171	>	static void badvalue(int        vc);
172	>	static void syserr(char *s);
173	>
174	>
175	>	int
176	>	main(
177	>	int     argc,
178	>	char    *argv[]
179	>	)
180		{
181		char    ropts[512];
182		char    popts[64];
#	Line 123 | Line 190 | char   *argv[];
190		silent++;
191		break;
192		case 'n':
193	<	noaction++;
193	>	nprocs = 0;
194		break;
195	+	case 'N':
196	+	nprocs = atoi(argv[++i]);
197	+	if (nprocs < 0)
198	+	nprocs = 0;
199	+	break;
200		case 't':
201		touchonly++;
202		break;
#	Line 155 | Line 227 | char   *argv[];
227		loadvars(rifname);
228		/* get any additional assignments */
229		for (i++; i < argc; i++)
230	<	setvariable(argv[i]);
230	>	if (setvariable(argv[i], matchvar) < 0) {
231	>	fprintf(stderr, "%s: unknown variable: %s\n",
232	>	progname, argv[i]);
233	>	quit(1);
234	>	}
235		/* check assignments */
236		checkvalues();
237		/* check files and dates */
#	Line 173 | Line 249 | char   *argv[];
249		renderopts(ropts, popts);
250		xferopts(ropts);
251		if (rvdevice != NULL)
252	<	rview(ropts, popts);
252	>	rvu(ropts, popts);
253		else
254		rpict(ropts, popts);
255	<	exit(0);
255	>	quit(0);
256		userr:
257		fprintf(stderr,
258	<	"Usage: %s [-s][-n][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
258	>	"Usage: %s [-w][-s][-n|-N npr][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
259		progname);
260	<	exit(1);
260	>	quit(1);
261	>	return 1; /* pro forma return */
262		}
263
264
265	<	rootname(rn, fn)                /* remove tail from end of fn */
266	<	register char   *rn, *fn;
265	>	static void
266	>	rootname(               /* remove tail from end of fn */
267	>	register char   *rn,
268	>	register char   *fn
269	>	)
270		{
271		char    *tp, *dp;
272
273	<	for (tp = NULL, dp = rn; *rn = *fn++; rn++)
273	>	for (tp = NULL, dp = rn; (*rn = *fn++); rn++)
274		if (ISDIRSEP(*rn))
275		dp = rn;
276		else if (*rn == '.')
#	Line 200 | Line 280 | register char  *rn, *fn;
280		}
281
282
283	<	time_t
284	<	checklast(fnames)                       /* check files and find most recent */
285	<	register char   *fnames;
283	>	static time_t
284	>	checklast(                      /* check files and find most recent */
285	>	register char   *fnames
286	>	)
287		{
288	<	char    thisfile[MAXPATH];
288	>	char    thisfile[PATH_MAX];
289		time_t  thisdate, lastdate = 0;
209	–	register char   *cp;
290
291		if (fnames == NULL)
292		return(0);
293	<	while (*fnames) {
294	<	while (isspace(*fnames)) fnames++;
295	<	cp = thisfile;
296	<	while (*fnames && !isspace(*fnames))
297	<	*cp++ = *fnames++;
298	<	*cp = '\0';
293	>	while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
294	>	if (thisfile[0] == '!' ||
295	>	(thisfile[0] == '\\' && thisfile[1] == '!')) {
296	>	if (!lastdate)
297	>	lastdate = 1;
298	>	continue;
299	>	}
300		if (!(thisdate = fdate(thisfile)))
301		syserr(thisfile);
302		if (thisdate > lastdate)
#	Line 225 | Line 306 | register char  *fnames;
306		}
307
308
309	<	char *
310	<	newfname(orig, pred)            /* create modified file name */
311	<	char    *orig;
312	<	int     pred;
309	>	static char *
310	>	newfname(               /* create modified file name */
311	>	char    *orig,
312	>	int     pred
313	>	)
314		{
233	–	extern char     *rindex();
315		register char   *cp;
316		register int    n;
317		int     suffix;
#	Line 251 | Line 332 | int    pred;
332		}
333
334
335	<	checkfiles()                    /* check for existence and modified times */
335	>	static void
336	>	checkfiles(void)                        /* check for existence and modified times */
337		{
338		time_t  objdate;
339
#	Line 260 | Line 342 | checkfiles()                   /* check for existence and modified tim
342		syserr(progname);
343		sprintf(vval(OCTREE), "%s.oct", radname);
344		vdef(OCTREE)++;
345	+	} else if (vval(OCTREE)[0] == '!') {
346	+	fprintf(stderr, "%s: illegal '%s' specification\n",
347	+	progname, vnam(OCTREE));
348	+	quit(1);
349		}
350		octreedate = fdate(vval(OCTREE));
351		if (vdef(ILLUM)) {              /* illum requires secondary octrees */
#	Line 276 | Line 362 | checkfiles()                   /* check for existence and modified tim
362		if (!octreedate & !scenedate & !illumdate) {
363		fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
364		vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
365	<	exit(1);
365	>	quit(1);
366		}
367		matdate = checklast(vval(MATERIAL));
368		}
369
370
371	<	getoctcube(org, sizp)           /* get octree bounding cube */
372	<	double  org[3], *sizp;
371	>	static void
372	>	getoctcube(             /* get octree bounding cube */
373	>	double  org[3],
374	>	double  *sizp
375	>	)
376		{
288	–	extern FILE     *popen();
377		static double   oorg[3], osiz = 0.;
378		double  min[3], max[3];
379		char    buf[1024];
380		FILE    *fp;
381		register int    i;
382
383	<	if (osiz <= FTINY)
384	<	if (noaction && fdate(oct1name) <
383	>	if (osiz <= FTINY) {
384	>	if (!nprocs && fdate(oct1name) <
385		(scenedate>illumdate?scenedate:illumdate)) {
386		/* run getbbox */
387		sprintf(buf, "getbbox -w -h %s",
#	Line 306 | Line 394 | double org[3], *sizp;
394		fprintf(stderr,
395		"%s: error reading bounding box from getbbox\n",
396		progname);
397	<	exit(1);
397	>	quit(1);
398		}
399		for (i = 0; i < 3; i++)
400		if (max[i] - min[i] > osiz)
#	Line 324 | Line 412 | double org[3], *sizp;
412		fprintf(stderr,
413		"%s: error reading bounding cube from getinfo\n",
414		progname);
415	<	exit(1);
415	>	quit(1);
416		}
417		pclose(fp);
418		}
419	+	}
420		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
421		}
422
423
424	<	setdefaults()                   /* set default values for unassigned var's */
424	>	static void
425	>	setdefaults(void)                       /* set default values for unassigned var's */
426		{
427	<	double  org[3], size;
427	>	double  org[3], lim[3], size;
428		char    buf[128];
429
430		if (!vdef(ZONE)) {
#	Line 344 | Line 434 | setdefaults()                  /* set default values for unassigned v
434		vval(ZONE) = savqstr(buf);
435		vdef(ZONE)++;
436		}
437	+	if (!vdef(EYESEP)) {
438	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
439	+	&org[0], &lim[0], &org[1], &lim[1],
440	+	&org[2], &lim[2]) != 6)
441	+	badvalue(ZONE);
442	+	sprintf(buf, "%f",
443	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
444	+	vval(EYESEP) = savqstr(buf);
445	+	vdef(EYESEP)++;
446	+	}
447		if (!vdef(INDIRECT)) {
448		vval(INDIRECT) = "0";
449		vdef(INDIRECT)++;
#	Line 360 | Line 460 | setdefaults()                  /* set default values for unassigned v
460		vval(PICTURE) = radname;
461		vdef(PICTURE)++;
462		}
463	<	if (!vdef(VIEW)) {
464	<	vval(VIEW) = "X";
465	<	vdef(VIEW)++;
463	>	if (!vdef(VIEWS)) {
464	>	vval(VIEWS) = "X";
465	>	vdef(VIEWS)++;
466		}
467		if (!vdef(DETAIL)) {
468		vval(DETAIL) = "M";
#	Line 379 | Line 479 | setdefaults()                  /* set default values for unassigned v
479		}
480
481
482	<	oconv()                         /* run oconv and mkillum if necessary */
482	>	static void
483	>	oconv(void)                             /* run oconv and mkillum if necessary */
484		{
485		static char     illumtmp[] = "ilXXXXXX";
486	<	char    combuf[1024], ocopts[64], mkopts[64];
486	>	char    combuf[PATH_MAX], ocopts[64], mkopts[1024];
487
488		oconvopts(ocopts);              /* get options */
489		if (octreedate < scenedate) {   /* check date on original octree */
#	Line 390 | Line 491 | oconv()                                /* run oconv and mkillum if necessary */
491		touch(vval(OCTREE));
492		else {                          /* build command */
493		if (vdef(MATERIAL))
494	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
495	<	vval(MATERIAL), vval(SCENE),
496	<	vval(OCTREE));
494	>	sprintf(combuf, "%s%s %s %s > %s", c_oconv,
495	>	ocopts, vval(MATERIAL),
496	>	vval(SCENE), vval(OCTREE));
497		else
498	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
498	>	sprintf(combuf, "%s%s %s > %s", c_oconv, ocopts,
499		vval(SCENE), vval(OCTREE));
500
501		if (runcom(combuf)) {           /* run it */
#	Line 402 | Line 503 | oconv()                                /* run oconv and mkillum if necessary */
503		"%s: error generating octree\n\t%s removed\n",
504		progname, vval(OCTREE));
505		unlink(vval(OCTREE));
506	<	exit(1);
506	>	quit(1);
507		}
508		}
509		octreedate = time((time_t *)NULL);
#	Line 411 | Line 512 | oconv()                                /* run oconv and mkillum if necessary */
512		}
513		if (oct1name == vval(OCTREE))           /* no mkillum? */
514		oct1date = octreedate > matdate ? octreedate : matdate;
515	<	if (oct1date >= octreedate & oct1date >= matdate
516	<	& oct1date >= illumdate)        /* all done */
515	>	if ((oct1date >= octreedate) & (oct1date >= matdate)
516	>	& (oct1date >= illumdate))      /* all done */
517		return;
518		/* make octree0 */
519	<	if (oct0date < scenedate | oct0date < illumdate) {
519	>	if ((oct0date < scenedate) | (oct0date < illumdate)) {
520		if (touchonly && oct0date)
521		touch(oct0name);
522		else {                          /* build command */
523		if (octreedate)
524	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
525	<	vval(OCTREE), vval(ILLUM), oct0name);
524	>	sprintf(combuf, "%s%s -i %s %s > %s", c_oconv,
525	>	ocopts, vval(OCTREE),
526	>	vval(ILLUM), oct0name);
527		else if (vdef(MATERIAL))
528	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
529	<	vval(MATERIAL), vval(ILLUM), oct0name);
428	<	else
429	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
528	>	sprintf(combuf, "%s%s %s %s > %s", c_oconv,
529	>	ocopts, vval(MATERIAL),
530		vval(ILLUM), oct0name);
531	+	else
532	+	sprintf(combuf, "%s%s %s > %s", c_oconv,
533	+	ocopts, vval(ILLUM), oct0name);
534		if (runcom(combuf)) {           /* run it */
535		fprintf(stderr,
536		"%s: error generating octree\n\t%s removed\n",
537		progname, oct0name);
538		unlink(oct0name);
539	<	exit(1);
539	>	quit(1);
540		}
541		}
542		oct0date = time((time_t *)NULL);
#	Line 447 | Line 550 | oconv()                                /* run oconv and mkillum if necessary */
550		else {
551		mkillumopts(mkopts);            /* build mkillum command */
552		mktemp(illumtmp);
553	<	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
553	>	sprintf(combuf, "%s%s %s \"<\" %s > %s", c_mkillum, mkopts,
554		oct0name, vval(ILLUM), illumtmp);
555		if (runcom(combuf)) {                   /* run it */
556	<	fprintf(stderr, "%s: error running mkillum\n",
557	<	progname);
556	>	fprintf(stderr, "%s: error running %s\n",
557	>	progname, c_mkillum);
558		unlink(illumtmp);
559	<	exit(1);
559	>	quit(1);
560		}
561		/* make octree1 (frozen) */
562		if (octreedate)
563	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
564	<	vval(OCTREE), illumtmp, oct1name);
563	>	sprintf(combuf, "%s%s -f -i %s %s > %s", c_oconv,
564	>	ocopts, vval(OCTREE), illumtmp, oct1name);
565		else if (vdef(MATERIAL))
566	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
567	<	vval(MATERIAL), illumtmp, oct1name);
566	>	sprintf(combuf, "%s%s -f %s %s > %s", c_oconv,
567	>	ocopts, vval(MATERIAL), illumtmp, oct1name);
568		else
569	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
569	>	sprintf(combuf, "%s%s -f %s > %s", c_oconv, ocopts,
570		illumtmp, oct1name);
571		if (runcom(combuf)) {           /* run it */
572		fprintf(stderr,
#	Line 471 | Line 574 | oconv()                                /* run oconv and mkillum if necessary */
574		progname, oct1name);
575		unlink(oct1name);
576		unlink(illumtmp);
577	<	exit(1);
577	>	quit(1);
578		}
579		rmfile(illumtmp);
580		}
#	Line 481 | Line 584 | oconv()                                /* run oconv and mkillum if necessary */
584		}
585
586
587	<	char *
588	<	addarg(op, arg)                         /* add argument and advance pointer */
589	<	register char   *op, *arg;
587	>	static char *
588	>	addarg(                         /* append argument and advance pointer */
589	>	register char   *op,
590	>	register char   *arg
591	>	)
592		{
593	+	while (*op)
594	+	op++;
595		*op = ' ';
596	<	while (*++op = *arg++)
596	>	while ( (*++op = *arg++) )
597		;
598		return(op);
599		}
600
601
602	<	oconvopts(oo)                           /* get oconv options */
603	<	register char   *oo;
602	>	static void
603	>	oconvopts(                              /* get oconv options */
604	>	register char   *oo
605	>	)
606		{
607		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
608
609		*oo = '\0';
610		if (vdef(OCONV))
611	<	addarg(oo, vval(OCONV));
611	>	if (vval(OCONV)[0] != '-') {
612	>	atos(c_oconv, sizeof(c_oconv), vval(OCONV));
613	>	oo = addarg(oo, sskip2(vval(OCONV), 1));
614	>	} else
615	>	oo = addarg(oo, vval(OCONV));
616		}
617
618
619	<	mkillumopts(mo)                         /* get mkillum options */
620	<	register char   *mo;
619	>	static void
620	>	mkillumopts(                            /* get mkillum options */
621	>	char    *mo
622	>	)
623		{
624		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
625
626	<	*mo = '\0';
626	>	if (nprocs > 1)
627	>	sprintf(mo, " -n %d", nprocs);
628	>	else
629	>	*mo = '\0';
630		if (vdef(MKILLUM))
631	<	addarg(mo, vval(MKILLUM));
631	>	if (vval(MKILLUM)[0] != '-') {
632	>	atos(c_mkillum, sizeof(c_mkillum), vval(MKILLUM));
633	>	mo = addarg(mo, sskip2(vval(MKILLUM), 1));
634	>	} else
635	>	mo = addarg(mo, vval(MKILLUM));
636		}
637
638
639	<	checkambfile()                  /* check date on ambient file */
639	>	static void
640	>	checkambfile(void)                      /* check date on ambient file */
641		{
642		time_t  afdate;
643
#	Line 522 | Line 645 | checkambfile()                 /* check date on ambient file */
645		return;
646		if (!(afdate = fdate(vval(AMBFILE))))
647		return;
648	<	if (oct1date > afdate)
648	>	if (oct1date > afdate) {
649		if (touchonly)
650		touch(vval(AMBFILE));
651		else
652		rmfile(vval(AMBFILE));
653	+	}
654		}
655
656
657	<	double
658	<	ambval()                                /* compute ambient value */
657	>	static double
658	>	ambval(void)                            /* compute ambient value */
659		{
660		if (vdef(EXPOSURE)) {
661		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
#	Line 543 | Line 667 | ambval()                               /* compute ambient value */
667		if (vlet(ZONE) == 'I')
668		return(.01);
669		badvalue(ZONE);
670	+	return 0; /* pro forma return */
671		}
672
673
674	<	renderopts(op, po)                      /* set rendering options */
675	<	char    *op, *po;
674	>	static void
675	>	renderopts(                     /* set rendering options */
676	>	char    *op,
677	>	char    *po
678	>	)
679		{
680		switch(vscale(QUALITY)) {
681		case LOW:
#	Line 560 | Line 688 | char   *op, *po;
688		hiqopts(op, po);
689		break;
690		}
691	+	if (vdef(RENDER))
692	+	op = addarg(op, vval(RENDER));
693	+	if (rvdevice != NULL) {
694	+	if (vdef(RVU))
695	+	if (vval(RVU)[0] != '-') {
696	+	atos(c_rvu, sizeof(c_rvu), vval(RVU));
697	+	po = addarg(po, sskip2(vval(RVU), 1));
698	+	} else
699	+	po = addarg(po, vval(RVU));
700	+	} else {
701	+	if (vdef(RPICT))
702	+	if (vval(RPICT)[0] != '-') {
703	+	atos(c_rpict, sizeof(c_rpict), vval(RPICT));
704	+	po = addarg(po, sskip2(vval(RPICT), 1));
705	+	} else
706	+	po = addarg(po, vval(RPICT));
707	+	}
708		}
709
710
711	<	lowqopts(op, po)                        /* low quality rendering options */
712	<	register char   *op;
713	<	char    *po;
711	>	static void
712	>	lowqopts(                       /* low quality rendering options */
713	>	register char   *op,
714	>	char    *po
715	>	)
716		{
717		double  d, org[3], siz[3];
718
#	Line 575 | Line 722 | char   *po;
722		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
723		badvalue(ZONE);
724		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
725	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
725	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
726		badvalue(ZONE);
727		getoctcube(org, &d);
728		d *= 3./(siz[0]+siz[1]+siz[2]);
#	Line 583 | Line 730 | char   *po;
730		case LOW:
731		po = addarg(po, "-ps 16");
732		op = addarg(op, "-dp 64");
733	<	sprintf(op, " -ar %d", (int)(4*d));
733	>	sprintf(op, " -ar %d", (int)(8*d));
734		op += strlen(op);
735		break;
736		case MEDIUM:
737		po = addarg(po, "-ps 8");
738		op = addarg(op, "-dp 128");
739	<	sprintf(op, " -ar %d", (int)(8*d));
739	>	sprintf(op, " -ar %d", (int)(16*d));
740		op += strlen(op);
741		break;
742		case HIGH:
743		po = addarg(po, "-ps 4");
744		op = addarg(op, "-dp 256");
745	<	sprintf(op, " -ar %d", (int)(16*d));
745	>	sprintf(op, " -ar %d", (int)(32*d));
746		op += strlen(op);
747		break;
748		}
#	Line 604 | Line 751 | char   *po;
751		op = addarg(op, "-ds .4");
752		else
753		op = addarg(op, "-ds 0");
754	<	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
754	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -ss 0 -st .5");
755		if (vdef(AMBFILE)) {
756		sprintf(op, " -af %s", vval(AMBFILE));
757		op += strlen(op);
#	Line 612 | Line 759 | char   *po;
759		overture = 0;
760		switch (vscale(VARIABILITY)) {
761		case LOW:
762	<	op = addarg(op, "-aa .4 -ad 64");
762	>	op = addarg(op, "-aa .3 -ad 256");
763		break;
764		case MEDIUM:
765	<	op = addarg(op, "-aa .3 -ad 128");
765	>	op = addarg(op, "-aa .25 -ad 512");
766		break;
767		case HIGH:
768	<	op = addarg(op, "-aa .25 -ad 256");
768	>	op = addarg(op, "-aa .2 -ad 1024");
769		break;
770		}
771		op = addarg(op, "-as 0");
772		d = ambval();
773		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
774		op += strlen(op);
775	<	op = addarg(op, "-lr 3 -lw .02");
629	<	if (vdef(RENDER))
630	<	op = addarg(op, vval(RENDER));
775	>	op = addarg(op, "-lr 6 -lw .003");
776		}
777
778
779	<	medqopts(op, po)                        /* medium quality rendering options */
780	<	register char   *op;
781	<	char    *po;
779	>	static void
780	>	medqopts(                       /* medium quality rendering options */
781	>	register char   *op,
782	>	char    *po
783	>	)
784		{
785		double  d, org[3], siz[3], asz;
786
#	Line 643 | Line 790 | char   *po;
790		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
791		badvalue(ZONE);
792		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
793	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
793	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
794		badvalue(ZONE);
795		getoctcube(org, &d);
796		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 652 | Line 799 | char   *po;
799		case LOW:
800		po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
801		op = addarg(op, "-dp 256");
802	<	sprintf(op, " -ar %d", (int)(8*d));
802	>	sprintf(op, " -ar %d", (int)(16*d));
803		op += strlen(op);
804		sprintf(op, " -ms %.2g", asz/20.);
805		op += strlen(op);
#	Line 660 | Line 807 | char   *po;
807		case MEDIUM:
808		po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
809		op = addarg(op, "-dp 512");
810	<	sprintf(op, " -ar %d", (int)(16*d));
810	>	sprintf(op, " -ar %d", (int)(32*d));
811		op += strlen(op);
812		sprintf(op, " -ms %.2g", asz/40.);
813		op += strlen(op);
#	Line 668 | Line 815 | char   *po;
815		case HIGH:
816		po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
817		op = addarg(op, "-dp 1024");
818	<	sprintf(op, " -ar %d", (int)(32*d));
818	>	sprintf(op, " -ar %d", (int)(64*d));
819		op += strlen(op);
820		sprintf(op, " -ms %.2g", asz/80.);
821		op += strlen(op);
#	Line 676 | Line 823 | char   *po;
823		}
824		po = addarg(po, "-pt .08");
825		if (vbool(PENUMBRAS))
826	<	op = addarg(op, "-ds .2 -dj .5");
826	>	op = addarg(op, "-ds .2 -dj .9");
827		else
828		op = addarg(op, "-ds .3");
829	<	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
830	<	if (overture = vint(INDIRECT)) {
829	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss 1 -st .1");
830	>	if ( (overture = vint(INDIRECT)) ) {
831		sprintf(op, " -ab %d", overture);
832		op += strlen(op);
833		}
#	Line 691 | Line 838 | char   *po;
838		overture = 0;
839		switch (vscale(VARIABILITY)) {
840		case LOW:
841	<	op = addarg(op, "-aa .25 -ad 196 -as 0");
841	>	op = addarg(op, "-aa .2 -ad 329 -as 42");
842		break;
843		case MEDIUM:
844	<	op = addarg(op, "-aa .2 -ad 400 -as 64");
844	>	op = addarg(op, "-aa .15 -ad 800 -as 128");
845		break;
846		case HIGH:
847	<	op = addarg(op, "-aa .15 -ad 768 -as 196");
847	>	op = addarg(op, "-aa .1 -ad 1536 -as 392");
848		break;
849		}
850		d = ambval();
851		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
852		op += strlen(op);
853	<	op = addarg(op, "-lr 6 -lw .002");
707	<	if (vdef(RENDER))
708	<	op = addarg(op, vval(RENDER));
853	>	op = addarg(op, "-lr 8 -lw 1e-4");
854		}
855
856
857	<	hiqopts(op, po)                         /* high quality rendering options */
858	<	register char   *op;
859	<	char    *po;
857	>	static void
858	>	hiqopts(                                /* high quality rendering options */
859	>	register char   *op,
860	>	char    *po
861	>	)
862		{
863		double  d, org[3], siz[3], asz;
864
#	Line 721 | Line 868 | char   *po;
868		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
869		badvalue(ZONE);
870		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
871	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
871	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
872		badvalue(ZONE);
873		getoctcube(org, &d);
874		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 730 | Line 877 | char   *po;
877		case LOW:
878		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
879		op = addarg(op, "-dp 1024");
880	<	sprintf(op, " -ar %d", (int)(16*d));
880	>	sprintf(op, " -ar %d", (int)(32*d));
881		op += strlen(op);
882		sprintf(op, " -ms %.2g", asz/40.);
883		op += strlen(op);
#	Line 738 | Line 885 | char   *po;
885		case MEDIUM:
886		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
887		op = addarg(op, "-dp 2048");
888	<	sprintf(op, " -ar %d", (int)(32*d));
888	>	sprintf(op, " -ar %d", (int)(64*d));
889		op += strlen(op);
890		sprintf(op, " -ms %.2g", asz/80.);
891		op += strlen(op);
#	Line 746 | Line 893 | char   *po;
893		case HIGH:
894		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
895		op = addarg(op, "-dp 4096");
896	<	sprintf(op, " -ar %d", (int)(64*d));
896	>	sprintf(op, " -ar %d", (int)(128*d));
897		op += strlen(op);
898		sprintf(op, " -ms %.2g", asz/160.);
899		op += strlen(op);
#	Line 754 | Line 901 | char   *po;
901		}
902		po = addarg(po, "-pt .04");
903		if (vbool(PENUMBRAS))
904	<	op = addarg(op, "-ds .1 -dj .65");
904	>	op = addarg(op, "-ds .1 -dj .9");
905		else
906		op = addarg(op, "-ds .2");
907	<	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
907	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 16 -st .01");
908		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
909		op += strlen(op);
910		if (vdef(AMBFILE)) {
#	Line 767 | Line 914 | char   *po;
914		overture = 0;
915		switch (vscale(VARIABILITY)) {
916		case LOW:
917	<	op = addarg(op, "-aa .15 -ad 256 -as 0");
917	>	op = addarg(op, "-aa .125 -ad 512 -as 64");
918		break;
919		case MEDIUM:
920	<	op = addarg(op, "-aa .125 -ad 512 -as 256");
920	>	op = addarg(op, "-aa .1 -ad 1536 -as 768");
921		break;
922		case HIGH:
923	<	op = addarg(op, "-aa .08 -ad 1024 -as 512");
923	>	op = addarg(op, "-aa .075 -ad 4096 -as 2048");
924		break;
925		}
926		d = ambval();
927		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
928		op += strlen(op);
929	<	op = addarg(op, "-lr 12 -lw .0005");
783	<	if (vdef(RENDER))
784	<	op = addarg(op, vval(RENDER));
929	>	op = addarg(op, "-lr 12 -lw 1e-5");
930		}
931
932
933	<	xferopts(ro)                            /* transfer options if indicated */
934	<	char    *ro;
933	>	static void
934	>	xferopts(                               /* transfer options if indicated */
935	>	char    *ro
936	>	)
937		{
938		int     fd, n;
939		register char   *cp;
#	Line 807 | Line 954 | char   *ro;
954		syserr(vval(OPTFILE));
955		sprintf(ro, " @%s", vval(OPTFILE));
956		}
957	<	#ifdef MSDOS
957	>	#ifdef _WIN32
958		else if (n > 50) {
959		setenv("ROPT", ro+1);
960		strcpy(ro, " $ROPT");
#	Line 816 | Line 963 | char   *ro;
963		}
964
965
966	<	pfiltopts(po)                           /* get pfilt options */
967	<	register char   *po;
966	>	static void
967	>	pfiltopts(                              /* get pfilt options */
968	>	register char   *po
969	>	)
970		{
971		*po = '\0';
972		if (vdef(EXPOSURE)) {
#	Line 826 | Line 975 | register char  *po;
975		}
976		switch (vscale(QUALITY)) {
977		case MEDIUM:
978	<	po = addarg(po, "-r 1");
978	>	po = addarg(po, "-r .6");
979		break;
980		case HIGH:
981		po = addarg(po, "-m .25");
982		break;
983		}
984		if (vdef(PFILT))
985	<	po = addarg(po, vval(PFILT));
985	>	if (vval(PFILT)[0] != '-') {
986	>	atos(c_pfilt, sizeof(c_pfilt), vval(PFILT));
987	>	po = addarg(po, sskip2(vval(PFILT), 1));
988	>	} else
989	>	po = addarg(po, vval(PFILT));
990		}
991
992
993	<	matchword(s1, s2)                       /* match white-delimited words */
994	<	register char   *s1, *s2;
993	>	static int
994	>	matchword(                      /* match white-delimited words */
995	>	register char   *s1,
996	>	register char   *s2
997	>	)
998		{
999		while (isspace(*s1)) s1++;
1000		while (isspace(*s2)) s2++;
#	Line 849 | Line 1005 | register char  *s1, *s2;
1005		}
1006
1007
1008	<	char *
1009	<	specview(vs)                            /* get proper view spec from vs */
1010	<	register char   *vs;
1008	>	static char *
1009	>	specview(                               /* get proper view spec from vs */
1010	>	register char   *vs
1011	>	)
1012		{
1013		static char     vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
1014		"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
#	Line 869 | Line 1026 | register char  *vs;
1026		upax = 1-'X'+UPPER(vval(UP)[1]);
1027		else
1028		upax = 1-'X'+vlet(UP);
1029	<	if (upax < 1 | upax > 3)
1029	>	if ((upax < 1) | (upax > 3))
1030		badvalue(UP);
1031		if (vval(UP)[0] == '-')
1032		upax = -upax;
#	Line 891 | Line 1048 | register char  *vs;
1048		} else if (*vs == 'z') {
1049		zpos = -1; vs++;
1050		}
1051	<	viewtype = 'v';
1052	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
1051	>	switch (*vs) {
1052	>	case VT_PER:
1053	>	case VT_PAR:
1054	>	case VT_ANG:
1055	>	case VT_HEM:
1056	>	case VT_PLS:
1057	>	case VT_CYL:
1058		viewtype = *vs++;
1059	+	break;
1060	+	default:
1061	+	viewtype = VT_PER;
1062	+	break;
1063	+	}
1064		cp = viewopts;
1065		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
1066		*cp++ = '-'; *cp++ = 'v'; *cp++ = 't'; *cp++ = viewtype;
#	Line 935 | Line 1102 | register char  *vs;
1102		}
1103		cp = addarg(cp, vup[upax+3]);
1104		switch (viewtype) {
1105	<	case 'v':
1105	>	case VT_PER:
1106		cp = addarg(cp, "-vh 45 -vv 45");
1107		break;
1108	<	case 'l':
1108	>	case VT_PAR:
1109		d = sqrt(dim[0]*dim[0]+dim[1]*dim[1]+dim[2]*dim[2]);
1110		sprintf(cp, " -vh %.2g -vv %.2g", d, d);
1111		cp += strlen(cp);
1112		break;
1113	<	case 'a':
1114	<	case 'h':
1113	>	case VT_ANG:
1114	>	case VT_HEM:
1115	>	case VT_PLS:
1116		cp = addarg(cp, "-vh 180 -vv 180");
1117		break;
1118	<	case 'c':
1118	>	case VT_CYL:
1119		cp = addarg(cp, "-vh 180 -vv 90");
1120		break;
1121		}
#	Line 955 | Line 1123 | register char  *vs;
1123		while (!isspace(*vs))           /* else skip id */
1124		if (!*vs++)
1125		return(NULL);
1126	<	if (upax) {                     /* specify up vector */
1126	>	if (upax) {                     /* prepend up vector */
1127		strcpy(cp, vup[upax+3]);
1128		cp += strlen(cp);
1129		}
#	Line 963 | Line 1131 | register char  *vs;
1131		if (cp == viewopts)             /* append any additional options */
1132		vs++;           /* skip prefixed space if unneeded */
1133		strcpy(cp, vs);
1134	<	#ifdef MSDOS
1134	>	#ifdef _WIN32
1135		if (strlen(viewopts) > 40) {
1136		setenv("VIEW", viewopts);
1137		return("$VIEW");
#	Line 973 | Line 1141 | register char  *vs;
1141		}
1142
1143
1144	<	char *
1145	<	getview(n, vn)                          /* get view n, or NULL if none */
1146	<	int     n;
1147	<	char    *vn;            /* returned view name */
1144	>	static char *
1145	>	getview(                                /* get view n, or NULL if none */
1146	>	int     n,
1147	>	char    *vn             /* returned view name */
1148	>	)
1149		{
1150		register char   *mv;
1151
1152		if (viewselect != NULL) {               /* command-line selected */
1153		if (n)                          /* only do one */
1154		return(NULL);
1155	+
1156	+	if (isint(viewselect)) {        /* view number? */
1157	+	n = atoi(viewselect)-1;
1158	+	goto numview;
1159	+	}
1160		if (viewselect[0] == '-') {     /* already specified */
1161	<	if (vn != NULL) *vn = '\0';
1161	>	if (vn != NULL)
1162	>	strcpy(vn, "0");
1163		return(viewselect);
1164		}
1165		if (vn != NULL) {
#	Line 993 | Line 1168 | char   *vn;            /* returned view name */
1168		;
1169		*vn = '\0';
1170		}
996	–	/* view number? */
997	–	if (isint(viewselect))
998	–	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
1171		/* check list */
1172	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1172	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1173		if (matchword(viewselect, mv))
1174		return(specview(mv));
1175	+
1176		return(specview(viewselect));   /* standard view? */
1177		}
1178	<	mv = nvalue(vv+VIEW, n);                /* use view n */
1179	<	if (vn != NULL & mv != NULL) {
1180	<	register char   *mv2 = mv;
1181	<	if (*mv2 != '-')
1178	>	numview:
1179	>	mv = nvalue(VIEWS, n);          /* use view n */
1180	>	if ((vn != NULL) & (mv != NULL))
1181	>	if (*mv != '-') {
1182	>	register char   *mv2 = mv;
1183		while (*mv2 && !isspace(*mv2))
1184		*vn++ = *mv2++;
1185	<	*vn = '\0';
1186	<	}
1185	>	*vn = '\0';
1186	>	} else
1187	>	sprintf(vn, "%d", n+1);
1188	>
1189		return(specview(mv));
1190		}
1191
1192
1193	<	printview(vopts)                        /* print out selected view */
1194	<	register char   *vopts;
1193	>	static int
1194	>	myprintview(                    /* print out selected view */
1195	>	register char   *vopts,
1196	>	FILE    *fp
1197	>	)
1198		{
1199	<	extern char     *atos(), *getenv();
1200	<	char    buf[256];
1022	<	FILE    *fp;
1199	>	VIEW    vwr;
1200	>	char    buf[128];
1201		register char   *cp;
1202	<
1202	>	#ifdef _WIN32
1203	>	/* XXX Should we allow something like this for all platforms? */
1204	>	/* XXX Or is it still required at all? */
1205	>	again:
1206	>	#endif
1207		if (vopts == NULL)
1208		return(-1);
1209	<	fputs("VIEW=", stdout);
1210	<	do {
1211	<	if (matchword(vopts, "-vf")) {          /* expand view file */
1212	<	vopts = sskip(vopts);
1213	<	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
1209	>	#ifdef _WIN32
1210	>	if (vopts[0] == '$') {
1211	>	vopts = getenv(vopts+1);
1212	>	goto again;
1213	>	}
1214		#endif
1215	<	while (*vopts && !isspace(*vopts))
1216	<	putchar(*vopts++);
1217	<	}
1218	<	} while (*vopts++);
1219	<	putchar('\n');
1215	>	vwr = stdview;
1216	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1217	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1218	>	*atos(buf, sizeof(buf), cp += 4)) {
1219	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1220	>	sscanview(&vwr, cp);            /* reset tail */
1221	>	}
1222	>	fputs(VIEWSTR, fp);
1223	>	fprintview(&vwr, fp);                   /* print full spec. */
1224	>	fputc('\n', fp);
1225		return(0);
1226		}
1227
1228
1229	<	rview(opts, po)                         /* run rview with first view */
1230	<	char    *opts, *po;
1229	>	static void
1230	>	rvu(                            /* run rvu with first view */
1231	>	char    *opts,
1232	>	char    *po
1233	>	)
1234		{
1235		char    *vw;
1236	<	char    combuf[512];
1236	>	char    combuf[PATH_MAX];
1237		/* build command */
1238		if (touchonly || (vw = getview(0, NULL)) == NULL)
1239		return;
1240		if (sayview)
1241	<	printview(vw);
1242	<	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1241	>	myprintview(vw, stdout);
1242	>	sprintf(combuf, "%s %s%s%s -R %s ", c_rvu, vw, opts, po, rifname);
1243	>	if (nprocs > 1)
1244	>	sprintf(combuf+strlen(combuf), "-n %d ", nprocs);
1245		if (rvdevice != NULL)
1246		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1247		if (vdef(EXPOSURE))
1248		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1249		strcat(combuf, oct1name);
1250		if (runcom(combuf)) {           /* run it */
1251	<	fprintf(stderr, "%s: error running rview\n", progname);
1252	<	exit(1);
1251	>	fprintf(stderr, "%s: error running %s\n", progname, c_rvu);
1252	>	quit(1);
1253		}
1254		}
1255
1256
1257	<	rpict(opts, po)                         /* run rpict and pfilt for each view */
1258	<	char    *opts, *po;
1257	>	static int
1258	>	syncf_done(                     /* check if an rpiece sync file is complete */
1259	>	char *sfname
1260	>	)
1261		{
1262	<	char    combuf[1024];
1263	<	char    rawfile[MAXPATH], picfile[MAXPATH];
1264	<	char    zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1262	>	FILE    *fp = fopen(sfname, "r");
1263	>	int     todo = 1;
1264	>	int     x, y;
1265	>
1266	>	if (fp == NULL)
1267	>	return(0);
1268	>	if (fscanf(fp, "%d %d", &x, &y) != 2)
1269	>	goto checked;
1270	>	todo = x*y;             /* total number of tiles */
1271	>	if (fscanf(fp, "%d %d", &x, &y) != 2 || (x != 0) | (y != 0))
1272	>	goto checked;
1273	>	/* XXX assume no redundant tiles */
1274	>	while (fscanf(fp, "%d %d", &x, &y) == 2)
1275	>	if (!--todo)
1276	>	break;
1277	>	checked:
1278	>	fclose(fp);
1279	>	return(!todo);
1280	>	}
1281	>
1282	>
1283	>	static void
1284	>	rpict(                          /* run rpict and pfilt for each view */
1285	>	char    *opts,
1286	>	char    *po
1287	>	)
1288	>	{
1289	>	#define do_rpiece       (sfile[0]!='\0')
1290	>	char    combuf[5*PATH_MAX+512];
1291	>	char    rawfile[PATH_MAX], picfile[PATH_MAX];
1292	>	char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1293	>	char    rppopt[32], sfile[PATH_MAX], *pfile = NULL;
1294		char    pfopts[128];
1295		char    vs[32], *vw;
1296		int     vn, mult;
1297	+	FILE    *fp;
1298		time_t  rfdt, pfdt;
1299	+	int     xres, yres;
1300	+	double  aspect;
1301	+	int     n;
1302		/* get pfilt options */
1303		pfiltopts(pfopts);
1304		/* get resolution, reporting */
#	Line 1118 | Line 1313 | char   *opts, *po;
1313		mult = 3;
1314		break;
1315		}
1316	<	{
1317	<	int     xres, yres;
1318	<	double  aspect;
1319	<	int     n;
1320	<	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1321	<	if (n == 3)
1322	<	sprintf(res, "-x %d -y %d -pa %.3f",
1323	<	mult*xres, mult*yres, aspect);
1324	<	else if (n) {
1325	<	if (n == 1) yres = xres;
1131	<	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1132	<	} else
1133	<	badvalue(RESOLUTION);
1134	<	}
1316	>	n = sscanf(vval(RESOLUTION), "%d %d %lf", &xres, &yres, &aspect);
1317	>	if (n == 3)
1318	>	sprintf(res, "-x %d -y %d -pa %.3f",
1319	>	mult*xres, mult*yres, aspect);
1320	>	else if (n) {
1321	>	aspect = 1.;
1322	>	if (n == 1) yres = xres;
1323	>	sprintf(res, "-x %d -y %d", mult*xres, mult*yres);
1324	>	} else
1325	>	badvalue(RESOLUTION);
1326		rep[0] = '\0';
1327		if (vdef(REPORT)) {
1328		double  minutes;
1138	–	int     n;
1329		n = sscanf(vval(REPORT), "%lf %s", &minutes, rawfile);
1330		if (n == 2)
1331		sprintf(rep, " -t %d -e %s", (int)(minutes*60), rawfile);
#	Line 1144 | Line 1334 | char   *opts, *po;
1334		else
1335		badvalue(REPORT);
1336		}
1337	<	/* do each view */
1338	<	vn = 0;
1337	>	/* set up parallel rendering */
1338	>	sfile[0] = '\0';
1339	>	if ((nprocs > 1) & !touchonly & !vdef(ZFILE) &&
1340	>	getview(0, vs) != NULL) {
1341	>	if (!strcmp(c_rpict, DEF_RPICT_PATH) &&
1342	>	getview(1, NULL) == NULL) {
1343	>	sprintf(sfile, "%s_%s_rpsync.txt",
1344	>	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE),
1345	>	vs);
1346	>	strcpy(rppopt, "-PP pfXXXXXX");
1347	>	} else {
1348	>	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1349	>	}
1350	>	pfile = rppopt + strlen(rppopt) - 8;
1351	>	if (mktemp(pfile) == NULL) {
1352	>	if (do_rpiece) {
1353	>	fprintf(stderr, "%s: cannot create\n", pfile);
1354	>	quit(1);
1355	>	}
1356	>	pfile = NULL;
1357	>	}
1358	>	}
1359	>	vn = 0;                                 /* do each view */
1360		while ((vw = getview(vn++, vs)) != NULL) {
1361		if (sayview)
1362	<	printview(vw);
1363	<	if (!vs[0])
1153	<	sprintf(vs, "%d", vn);
1154	<	sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1362	>	myprintview(vw, stdout);
1363	>	sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs);
1364		if (vdef(ZFILE))
1365		sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1366		else
#	Line 1172 | Line 1381 | char   *opts, *po;
1381		touch(picfile);
1382		continue;
1383		}
1384	+	/* parallel running? */
1385	+	if (do_rpiece) {
1386	+	if (rfdt < oct1date || !fdate(sfile)) {
1387	+	int     xdiv = 8+nprocs/3, ydiv = 8+nprocs/3;
1388	+	if (rfdt >= oct1date) {
1389	+	fprintf(stderr,
1390	+	"%s: partial output not created with rpiece\n", rawfile);
1391	+	quit(1);
1392	+	}
1393	+	if (rfdt) {     /* start fresh */
1394	+	rmfile(rawfile);
1395	+	rfdt = 0;
1396	+	}
1397	+	if (!silent)
1398	+	printf("\techo %d %d > %s\n",
1399	+	xdiv, ydiv, sfile);
1400	+	if ((fp = fopen(sfile, "w")) == NULL) {
1401	+	fprintf(stderr, "%s: cannot create\n",
1402	+	sfile);
1403	+	quit(1);
1404	+	}
1405	+	fprintf(fp, "%d %d\n", xdiv, ydiv);
1406	+	fclose(fp);
1407	+	}
1408	+	} else if (next_process(0)) {
1409	+	if (pfile != NULL)
1410	+	sleep(10);
1411	+	continue;
1412	+	} else if (!inchild())
1413	+	pfile = NULL;
1414	+	/* XXX Remember to call finish_process() */
1415		/* build rpict command */
1416	<	if (rfdt >= oct1date)           /* recover */
1417	<	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1418	<	rep, po, opts, zopt, rawfile, oct1name);
1419	<	else {
1416	>	if (rfdt >= oct1date) {         /* already in progress */
1417	>	if (do_rpiece) {
1418	>	sprintf(combuf, "%s -R %s %s%s %s %s%s%s -o %s %s",
1419	>	c_rpiece, sfile, rppopt, rep, vw,
1420	>	res, opts, po, rawfile, oct1name);
1421	>	while (next_process(1)) {
1422	>	sleep(10);
1423	>	combuf[strlen(c_rpiece)+2] = 'F';
1424	>	}
1425	>	} else
1426	>	sprintf(combuf, "%s%s%s%s%s -ro %s %s", c_rpict,
1427	>	rep, opts, po, zopt, rawfile, oct1name);
1428	>	if (runcom(combuf))     /* run rpict/rpiece */
1429	>	goto rperror;
1430	>	} else {
1431		if (overture) {         /* run overture calculation */
1432		sprintf(combuf,
1433	<	"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1434	<	rep, vw, opts,
1433	>	"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1434	>	c_rpict, rep, vw, opts,
1435		oct1name, overfile);
1436	<	if (runcom(combuf)) {
1437	<	fprintf(stderr,
1436	>	if (!do_rpiece || !next_process(0)) {
1437	>	if (runcom(combuf)) {
1438	>	fprintf(stderr,
1439		"%s: error in overture for view %s\n",
1440	<	progname, vs);
1441	<	exit(1);
1442	<	}
1443	<	#ifdef NIX
1444	<	rmfile(overfile);
1440	>	progname, vs);
1441	>	quit(1);
1442	>	}
1443	>	#ifndef NULL_DEVICE
1444	>	rmfile(overfile);
1445		#endif
1446	+	} else if (do_rpiece)
1447	+	sleep(20);
1448		}
1449	<	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1450	<	rep, vw, res, po, opts, zopt,
1451	<	oct1name, rawfile);
1449	>	if (do_rpiece) {
1450	>	sprintf(combuf, "%s -F %s %s%s %s %s%s%s -o %s %s",
1451	>	c_rpiece, sfile, rppopt, rep, vw,
1452	>	res, opts, po, rawfile, oct1name);
1453	>	while (next_process(1))
1454	>	sleep(10);
1455	>	} else {
1456	>	sprintf(combuf, "%s%s %s %s%s%s%s %s > %s",
1457	>	c_rpict, rep, vw, res, opts, po,
1458	>	zopt, oct1name, rawfile);
1459	>	}
1460	>	if ((pfile != NULL) & !do_rpiece) {
1461	>	if (!silent)
1462	>	printf("\t%s\n", combuf);
1463	>	fflush(stdout);
1464	>	sprintf(combuf, "%s%s %s %s%s%s %s > %s",
1465	>	c_rpict, rep, rppopt, res,
1466	>	opts, po, oct1name, rawfile);
1467	>	fp = popen(combuf, "w");
1468	>	if (fp == NULL)
1469	>	goto rperror;
1470	>	myprintview(vw, fp);
1471	>	if (pclose(fp))
1472	>	goto rperror;
1473	>	} else if (runcom(combuf))
1474	>	goto rperror;
1475		}
1476	<	if (runcom(combuf)) {           /* run rpict */
1477	<	fprintf(stderr, "%s: error rendering view %s\n",
1478	<	progname, vs);
1479	<	exit(1);
1476	>	if (do_rpiece) {                /* need to finish raw, first */
1477	>	finish_process();
1478	>	wait_process(1);
1479	>	if (!syncf_done(sfile)) {
1480	>	fprintf(stderr,
1481	>	"%s: rpiece did not complete rendering of view %s\n",
1482	>	progname, vs);
1483	>	quit(1);
1484	>	}
1485		}
1486		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1487		/* build pfilt command */
1488	<	if (mult > 1)
1489	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1490	<	pfopts, mult, mult, rawfile, picfile);
1488	>	if (do_rpiece)
1489	>	sprintf(combuf,
1490	>	"%s%s -x %d -y %d -p %.3f %s > %s",
1491	>	c_pfilt, pfopts, xres, yres, aspect,
1492	>	rawfile, picfile);
1493	>	else if (mult > 1)
1494	>	sprintf(combuf, "%s%s -x /%d -y /%d %s > %s",
1495	>	c_pfilt, pfopts, mult, mult,
1496	>	rawfile, picfile);
1497		else
1498	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1499	<	rawfile, picfile);
1500	<	if (runcom(combuf)) {           /* run pfilt */
1498	>	sprintf(combuf, "%s%s %s > %s", c_pfilt,
1499	>	pfopts, rawfile, picfile);
1500	>	if (runcom(combuf)) {   /* run pfilt */
1501		fprintf(stderr,
1502		"%s: error filtering view %s\n\t%s removed\n",
1503		progname, vs, picfile);
1504		unlink(picfile);
1505	<	exit(1);
1505	>	quit(1);
1506		}
1507		}
1508		/* remove/rename raw file */
1509		if (vdef(RAWFILE)) {
1510	<	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1510	>	sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs);
1511		mvfile(rawfile, combuf);
1512		} else
1513		rmfile(rawfile);
1514	+	if (do_rpiece)                  /* done with sync file */
1515	+	rmfile(sfile);
1516	+	else
1517	+	finish_process();       /* exit if child */
1518		}
1519	+	wait_process(1);                /* wait for children to finish */
1520	+	if (pfile != NULL) {            /* clean up persistent rpict */
1521	+	RT_PID  pid;
1522	+	fp = fopen(pfile, "r");
1523	+	if (fp != NULL) {
1524	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1525	+	kill(pid, 1) < 0)
1526	+	unlink(pfile);
1527	+	fclose(fp);
1528	+	}
1529	+	}
1530	+	return;
1531	+	rperror:
1532	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1533	+	quit(1);
1534	+	#undef do_rpiece
1535		}
1536
1537
1538	<	touch(fn)                       /* update a file */
1539	<	char    *fn;
1538	>	static int
1539	>	touch(                  /* update a file */
1540	>	char    *fn
1541	>	)
1542		{
1543		if (!silent)
1544		printf("\ttouch %s\n", fn);
1545	<	if (noaction)
1545	>	if (!nprocs)
1546		return(0);
1237	–	#ifdef notused
1238	–	if (access(fn, F_OK) == -1)             /* create it */
1239	–	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1240	–	return(-1);
1241	–	#endif
1547		return(setfdate(fn, time((time_t *)NULL)));
1548		}
1549
1550
1551	<	runcom(cs)                      /* run command */
1552	<	char    *cs;
1551	>	static int
1552	>	runcom(                 /* run command */
1553	>	char    *cs
1554	>	)
1555		{
1556		if (!silent)            /* echo it */
1557		printf("\t%s\n", cs);
1558	<	if (noaction)
1558	>	if (!nprocs)
1559		return(0);
1560	<	fflush(stdout);         /* flush output and pass to shell */
1560	>	fflush(NULL);           /* flush output and pass to shell */
1561		return(system(cs));
1562		}
1563
1564
1565	<	rmfile(fn)                      /* remove a file */
1566	<	char    *fn;
1565	>	static int
1566	>	rmfile(                 /* remove a file */
1567	>	char    *fn
1568	>	)
1569		{
1570		if (!silent)
1571	<	#ifdef MSDOS
1572	<	printf("\tdel %s\n", fn);
1264	<	#else
1265	<	printf("\trm -f %s\n", fn);
1266	<	#endif
1267	<	if (noaction)
1571	>	printf("\t%s %s\n", DELCMD, fn);
1572	>	if (!nprocs)
1573		return(0);
1574		return(unlink(fn));
1575		}
1576
1577
1578	<	mvfile(fold, fnew)              /* move a file */
1579	<	char    *fold, *fnew;
1578	>	static int
1579	>	mvfile(         /* move a file */
1580	>	char    *fold,
1581	>	char    *fnew
1582	>	)
1583		{
1584		if (!silent)
1585	<	#ifdef MSDOS
1586	<	printf("\trename %s %s\n", fold, fnew);
1279	<	#else
1280	<	printf("\tmv %s %s\n", fold, fnew);
1281	<	#endif
1282	<	if (noaction)
1585	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1586	>	if (!nprocs)
1587		return(0);
1588		return(rename(fold, fnew));
1589		}
1590
1591
1592	<	#ifdef MSDOS
1592	>	#ifdef RHAS_FORK_EXEC
1593	>	static int
1594	>	next_process(int reserve)               /* fork the next process */
1595	>	{
1596	>	RT_PID  child_pid;
1597	>
1598	>	if (nprocs <= 1)
1599	>	return(0);              /* it's us or no one */
1600	>	if (inchild()) {
1601	>	fprintf(stderr, "%s: internal error 1 in next_process()\n",
1602	>	progname);
1603	>	quit(1);
1604	>	}
1605	>	if (reserve > 0 && children_running >= nprocs-reserve)
1606	>	return(0);              /* caller holding back process(es) */
1607	>	if (children_running >= nprocs)
1608	>	wait_process(0);        /* wait for someone to finish */
1609	>	fflush(NULL);                   /* flush output */
1610	>	child_pid = fork();             /* split process */
1611	>	if (child_pid == 0) {           /* we're the child */
1612	>	children_running = -1;
1613	>	nprocs = 1;
1614	>	return(0);
1615	>	}
1616	>	if (child_pid > 0) {            /* we're the parent */
1617	>	++children_running;
1618	>	return(1);
1619	>	}
1620	>	fprintf(stderr, "%s: warning -- fork() failed\n", progname);
1621	>	return(0);
1622	>	}
1623	>
1624	>	static void
1625	>	wait_process(                   /* wait for process(es) to finish */
1626	>	int     all
1627	>	)
1628	>	{
1629	>	int     ourstatus = 0, status;
1630	>	RT_PID  pid;
1631	>
1632	>	if (all)
1633	>	all = children_running;
1634	>	else if (children_running > 0)
1635	>	all = 1;
1636	>	while (all-- > 0) {
1637	>	pid = wait(&status);
1638	>	if (pid < 0)
1639	>	syserr(progname);
1640	>	status = status>>8 & 0xff;
1641	>	--children_running;
1642	>	if (status != 0) {      /* child's problem is our problem */
1643	>	if ((ourstatus == 0) & (children_running > 0))
1644	>	fprintf(stderr, "%s: waiting for remaining processes\n",
1645	>	progname);
1646	>	ourstatus = status;
1647	>	all = children_running;
1648	>	}
1649	>	}
1650	>	if (ourstatus != 0)
1651	>	quit(ourstatus);        /* bad status from child */
1652	>	}
1653	>	#else   /* ! RHAS_FORK_EXEC */
1654	>	static int
1655	>	next_process(int reserve)
1656	>	{
1657	>	return(0);                      /* cannot start new process */
1658	>	}
1659	>	static void
1660	>	wait_process(all)
1661	>	int     all;
1662	>	{
1663	>	(void)all;                      /* no one to wait for */
1664	>	}
1665	>	int
1666	>	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1667	>	RT_PID pid;
1668	>	int sig;
1669	>	{
1670	>	return 0;
1671	>	}
1672	>	#endif  /* ! RHAS_FORK_EXEC */
1673	>
1674	>	static void
1675	>	finish_process(void)                    /* exit a child process */
1676	>	{
1677	>	if (!inchild())
1678	>	return;                 /* in parent -- noop */
1679	>	exit(0);
1680	>	}
1681	>
1682	>	#ifdef _WIN32
1683		setenv(vname, value)            /* set an environment variable */
1684		char    *vname, *value;
1685		{
#	Line 1297 | Line 1691 | char   *vname, *value;
1691		sprintf(evp, "%s=%s", vname, value);
1692		if (putenv(evp) != 0) {
1693		fprintf(stderr, "%s: out of environment space\n", progname);
1694	<	exit(1);
1694	>	quit(1);
1695		}
1696		if (!silent)
1697		printf("set %s\n", evp);
#	Line 1305 | Line 1699 | char   *vname, *value;
1699		#endif
1700
1701
1702	<	badvalue(vc)                    /* report bad variable value and exit */
1703	<	int     vc;
1702	>	static void
1703	>	badvalue(                       /* report bad variable value and exit */
1704	>	int     vc
1705	>	)
1706		{
1707		fprintf(stderr, "%s: bad value for variable '%s'\n",
1708		progname, vnam(vc));
1709	<	exit(1);
1709	>	quit(1);
1710		}
1711
1712
1713	<	syserr(s)                       /* report a system error and exit */
1714	<	char    *s;
1713	>	static void
1714	>	syserr(                 /* report a system error and exit */
1715	>	char    *s
1716	>	)
1717		{
1718		perror(s);
1719	<	exit(1);
1719	>	quit(1);
1720	>	}
1721	>
1722	>
1723	>	void
1724	>	quit(ec)                        /* exit program */
1725	>	int     ec;
1726	>	{
1727	>	exit(ec);
1728		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines