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.40 by greg, Thu Apr 21 12:22:44 1994 UTC vs.
Revision 2.76 by schorsch, Fri Mar 26 21:36:19 2004 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1994 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	<	#include "paths.h"
9	>
10		#include <ctype.h>
11	<	#include <sys/types.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"
18
19	<	typedef struct {
20	<	char    *name;          /* variable name */
21	<	short   nick;           /* # characters required for nickname */
22	<	short   nass;           /* # assignments made */
23	<	char    *value;         /* assigned value(s) */
24	<	int     (*fixval)();    /* assignment checking function */
25	<	} VARIABLE;
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	<	int     onevalue(), catvalues(), boolvalue(),
30	<	qualvalue(), fltvalue(), intvalue();
31	<
32	<	/* variables */
33	<	#define OBJECT          0               /* object files */
34	<	#define SCENE           1               /* scene files */
35	<	#define MATERIAL        2               /* material files */
36	<	#define ILLUM           3               /* mkillum input files */
37	<	#define MKILLUM         4               /* mkillum options */
38	<	#define RENDER          5               /* rendering options */
39	<	#define OCONV           6               /* oconv options */
40	<	#define PFILT           7               /* pfilt options */
41	<	#define VIEW            8               /* view(s) for picture(s) */
42	<	#define ZONE            9               /* simulation zone */
43	<	#define QUALITY         10              /* desired rendering quality */
44	<	#define OCTREE          11              /* octree file name */
45	<	#define PICTURE         12              /* picture file name */
46	<	#define AMBFILE         13              /* ambient file name */
47	<	#define OPTFILE         14              /* rendering options file */
48	<	#define EXPOSURE        15              /* picture exposure setting */
49	<	#define RESOLUTION      16              /* maximum picture resolution */
50	<	#define UP              17              /* view up (X, Y or Z) */
51	<	#define INDIRECT        18              /* indirection in lighting */
52	<	#define DETAIL          19              /* level of scene detail */
53	<	#define PENUMBRAS       20              /* shadow penumbras are desired */
54	<	#define VARIABILITY     21              /* level of light variability */
55	<	#define REPORT          22              /* report frequency and errfile */
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 SCENE           20              /* scene files */
51	>	#define UP              21              /* view up (X, Y or Z) */
52	>	#define VARIABILITY     22              /* level of light variability */
53	>	#define VIEWS           23              /* view(s) for picture(s) */
54	>	#define ZFILE           24              /* distance file root name */
55	>	#define ZONE            25              /* simulation zone */
56		/* total number of variables */
57	<	#define NVARS           23
57	>	int NVARS = 26;
58
59	<	VARIABLE        vv[NVARS] = {           /* variable-value pairs */
60	<	{"objects",     3,      0,      NULL,   catvalues},
61	<	{"scene",       3,      0,      NULL,   catvalues},
62	<	{"materials",   3,      0,      NULL,   catvalues},
59	>	VARIABLE        vv[] = {                /* variable-value pairs */
60	>	{"AMBFILE",     3,      0,      NULL,   onevalue},
61	>	{"DETAIL",      3,      0,      NULL,   qualvalue},
62	>	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
63	>	{"EYESEP",      3,      0,      NULL,   fltvalue},
64		{"illum",       3,      0,      NULL,   catvalues},
65	+	{"INDIRECT",    3,      0,      NULL,   intvalue},
66	+	{"materials",   3,      0,      NULL,   catvalues},
67		{"mkillum",     3,      0,      NULL,   catvalues},
68	<	{"render",      3,      0,      NULL,   catvalues},
68	>	{"objects",     3,      0,      NULL,   catvalues},
69		{"oconv",       3,      0,      NULL,   catvalues},
63	–	{"pfilt",       2,      0,      NULL,   catvalues},
64	–	{"view",        2,      0,      NULL,   NULL},
65	–	{"ZONE",        2,      0,      NULL,   onevalue},
66	–	{"QUALITY",     3,      0,      NULL,   qualvalue},
70		{"OCTREE",      3,      0,      NULL,   onevalue},
68	–	{"PICTURE",     3,      0,      NULL,   onevalue},
69	–	{"AMBFILE",     3,      0,      NULL,   onevalue},
71		{"OPTFILE",     3,      0,      NULL,   onevalue},
72	<	{"EXPOSURE",    3,      0,      NULL,   fltvalue},
72	>	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
73	>	{"pfilt",       2,      0,      NULL,   catvalues},
74	>	{"PICTURE",     3,      0,      NULL,   onevalue},
75	>	{"QUALITY",     3,      0,      NULL,   qualvalue},
76	>	{"RAWFILE",     3,      0,      NULL,   onevalue},
77	>	{"render",      3,      0,      NULL,   catvalues},
78	>	{"REPORT",      3,      0,      NULL,   onevalue},
79		{"RESOLUTION",  3,      0,      NULL,   onevalue},
80	+	{"scene",       3,      0,      NULL,   catvalues},
81		{"UP",          2,      0,      NULL,   onevalue},
74	–	{"INDIRECT",    3,      0,      NULL,   intvalue},
75	–	{"DETAIL",      3,      0,      NULL,   qualvalue},
76	–	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
82		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
83	<	{"REPORT",      3,      0,      NULL,   onevalue},
83	>	{"view",        2,      0,      NULL,   NULL},
84	>	{"ZFILE",       2,      0,      NULL,   onevalue},
85	>	{"ZONE",        2,      0,      NULL,   onevalue},
86		};
87
81	–	VARIABLE        *matchvar();
82	–	char    *nvalue();
83	–
84	–	#define UPPER(c)        ((c)&~0x20)     /* ASCII trick */
85	–
86	–	#define vnam(vc)        (vv[vc].name)
87	–	#define vdef(vc)        (vv[vc].nass)
88	–	#define vval(vc)        (vv[vc].value)
89	–	#define vint(vc)        atoi(vval(vc))
90	–	#define vlet(vc)        UPPER(vval(vc)[0])
91	–	#define vscale          vlet
92	–	#define vbool(vc)       (vlet(vc)=='T')
93	–
94	–	#define HIGH            'H'
95	–	#define MEDIUM          'M'
96	–	#define LOW             'L'
97	–
88		/* overture calculation file */
89	<	#ifdef NIX
90	<	char    overfile[] = "overture.raw";
89	>	#ifdef NULL_DEVICE
90	>	char    overfile[] = NULL_DEVICE;
91		#else
92	<	char    overfile[] = "/dev/null";
92	>	char    overfile[] = "overture.unf";
93		#endif
94
105	–	extern time_t   fdate(), time();
95
96		time_t  scenedate;              /* date of latest scene or object file */
97		time_t  octreedate;             /* date of octree */
#	Line 117 | Line 106 | time_t oct1date;               /* date of post-mkillum octree (>= m
106		int     nowarn = 0;             /* no warnings */
107		int     explicate = 0;          /* explicate variables */
108		int     silent = 0;             /* do work silently */
109	<	int     noaction = 0;           /* don't do anything */
109	>	int     touchonly = 0;          /* touch files only */
110	>	int     nprocs = 1;             /* maximum executing processes */
111		int     sayview = 0;            /* print view out */
112	<	char    *rvdevice = NULL;       /* rview output device */
112	>	char    *rvdevice = NULL;       /* rvu output device */
113		char    *viewselect = NULL;     /* specific view only */
114
115		int     overture = 0;           /* overture calculation needed */
116
117	+	int     children_running = 0;   /* set negative in children */
118	+
119		char    *progname;              /* global argv[0] */
120		char    *rifname;               /* global rad input file name */
121
122	<	char    radname[MAXPATH];       /* root Radiance file name */
122	>	char    radname[PATH_MAX];      /* root Radiance file name */
123
124	+	#define inchild()       (children_running < 0)
125
126	<	main(argc, argv)
127	<	int     argc;
128	<	char    *argv[];
126	>	static void rootname(char       *rn, char       *fn);
127	>	static time_t checklast(char    *fnames);
128	>	static char * newfname(char     *orig, int      pred);
129	>	static void checkfiles(void);
130	>	static void getoctcube(double   org[3], double  *sizp);
131	>	static void setdefaults(void);
132	>	static void oconv(void);
133	>	static char * addarg(char       *op, char       *arg);
134	>	static void oconvopts(char      *oo);
135	>	static void mkillumopts(char    *mo);
136	>	static void checkambfile(void);
137	>	static double ambval(void);
138	>	static void renderopts(char     *op, char       *po);
139	>	static void lowqopts(char       *op, char       *po);
140	>	static void medqopts(char       *op, char       *po);
141	>	static void hiqopts(char        *op, char       *po);
142	>	static void xferopts(char       *ro);
143	>	static void pfiltopts(char      *po);
144	>	static int matchword(char       *s1, char       *s2);
145	>	static char * specview(char     *vs);
146	>	static char * getview(int       n, char *vn);
147	>	static int myprintview(char     *vopts, FILE    *fp);
148	>	static void rvu(char    *opts, char     *po);
149	>	static void rpict(char  *opts, char     *po);
150	>	static int touch(char   *fn);
151	>	static int runcom(char  *cs);
152	>	static int rmfile(char  *fn);
153	>	static int mvfile(char  *fold, char     *fnew);
154	>	static int next_process(void);
155	>	static void wait_process(int    all);
156	>	static void finish_process(void);
157	>	static void badvalue(int        vc);
158	>	static void syserr(char *s);
159	>
160	>
161	>	int
162	>	main(
163	>	int     argc,
164	>	char    *argv[]
165	>	)
166		{
167		char    ropts[512];
168		char    popts[64];
#	Line 146 | Line 176 | char   *argv[];
176		silent++;
177		break;
178		case 'n':
179	<	noaction++;
179	>	nprocs = 0;
180		break;
181	+	case 'N':
182	+	nprocs = atoi(argv[++i]);
183	+	if (nprocs < 0)
184	+	nprocs = 0;
185	+	break;
186	+	case 't':
187	+	touchonly++;
188	+	break;
189		case 'e':
190		explicate++;
191		break;
#	Line 169 | Line 207 | char   *argv[];
207		if (i >= argc)
208		goto userr;
209		rifname = argv[i];
210	+	/* check command-line options */
211	+	if ((nprocs > 1) & (viewselect != NULL))
212	+	nprocs = 1;
213		/* assign Radiance root file name */
214		rootname(radname, rifname);
215		/* load variable values */
216	<	load(rifname);
216	>	loadvars(rifname);
217		/* get any additional assignments */
218		for (i++; i < argc; i++)
219	<	setvariable(argv[i]);
219	>	if (setvariable(argv[i], matchvar) < 0) {
220	>	fprintf(stderr, "%s: unknown variable: %s\n",
221	>	progname, argv[i]);
222	>	quit(1);
223	>	}
224		/* check assignments */
225		checkvalues();
226		/* check files and dates */
#	Line 184 | Line 229 | char   *argv[];
229		setdefaults();
230		/* print all values if requested */
231		if (explicate)
232	<	printvals();
232	>	printvars(stdout);
233		/* build octree (and run mkillum) */
234		oconv();
235		/* check date on ambient file */
#	Line 193 | Line 238 | char   *argv[];
238		renderopts(ropts, popts);
239		xferopts(ropts);
240		if (rvdevice != NULL)
241	<	rview(ropts, popts);
241	>	rvu(ropts, popts);
242		else
243		rpict(ropts, popts);
244	<	exit(0);
244	>	quit(0);
245		userr:
246		fprintf(stderr,
247	<	"Usage: %s [-s][-n][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
247	>	"Usage: %s [-w][-s][-n|-N npr][-t][-e][-V][-v view][-o dev] rfile [VAR=value ..]\n",
248		progname);
249	<	exit(1);
249	>	quit(1);
250	>	return 1; /* pro forma return */
251		}
252
253
254	<	rootname(rn, fn)                /* remove tail from end of fn */
255	<	register char   *rn, *fn;
254	>	static void
255	>	rootname(               /* remove tail from end of fn */
256	>	register char   *rn,
257	>	register char   *fn
258	>	)
259		{
260		char    *tp, *dp;
261
262	<	for (tp = NULL, dp = rn; *rn = *fn++; rn++)
262	>	for (tp = NULL, dp = rn; (*rn = *fn++); rn++)
263		if (ISDIRSEP(*rn))
264		dp = rn;
265		else if (*rn == '.')
#	Line 220 | Line 269 | register char  *rn, *fn;
269		}
270
271
272	<	#define NOCHAR  127             /* constant for character to delete */
273	<
274	<
275	<	load(rfname)                    /* load Radiance simulation file */
227	<	char    *rfname;
272	>	static time_t
273	>	checklast(                      /* check files and find most recent */
274	>	register char   *fnames
275	>	)
276		{
277	<	FILE    *fp;
230	<	char    buf[512];
231	<	register char   *cp;
232	<
233	<	if (rfname == NULL)
234	<	fp = stdin;
235	<	else if ((fp = fopen(rfname, "r")) == NULL)
236	<	syserr(rfname);
237	<	while (fgetline(buf, sizeof(buf), fp) != NULL) {
238	<	for (cp = buf; *cp; cp++) {
239	<	switch (*cp) {
240	<	case '\\':
241	<	*cp++ = NOCHAR;
242	<	continue;
243	<	case '#':
244	<	*cp = '\0';
245	<	break;
246	<	default:
247	<	continue;
248	<	}
249	<	break;
250	<	}
251	<	setvariable(buf);
252	<	}
253	<	fclose(fp);
254	<	}
255	<
256	<
257	<	setvariable(ass)                /* assign variable according to string */
258	<	register char   *ass;
259	<	{
260	<	char    varname[32];
261	<	int     n;
262	<	register char   *cp;
263	<	register VARIABLE       *vp;
264	<	register int    i;
265	<
266	<	while (isspace(*ass))           /* skip leading space */
267	<	ass++;
268	<	cp = varname;                   /* extract name */
269	<	while (cp < varname+sizeof(varname)-1
270	<	&& *ass && !isspace(*ass) && *ass != '=')
271	<	*cp++ = *ass++;
272	<	*cp = '\0';
273	<	if (!varname[0])
274	<	return;         /* no variable name! */
275	<	/* trim value */
276	<	while (isspace(*ass) || *ass == '=')
277	<	ass++;
278	<	for (n = strlen(ass); n > 0; n--)
279	<	if (!isspace(ass[n-1]))
280	<	break;
281	<	if (!n && !nowarn) {
282	<	fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
283	<	progname, varname);
284	<	return;
285	<	}
286	<	/* match variable from list */
287	<	vp = matchvar(varname);
288	<	if (vp == NULL) {
289	<	fprintf(stderr, "%s: unknown variable '%s'\n",
290	<	progname, varname);
291	<	exit(1);
292	<	}
293	<	/* assign new value */
294	<	if (i = vp->nass) {
295	<	cp = vp->value;
296	<	while (i--)
297	<	while (*cp++)
298	<	;
299	<	i = cp - vp->value;
300	<	vp->value = realloc(vp->value, i+n+1);
301	<	} else
302	<	vp->value = malloc(n+1);
303	<	if (vp->value == NULL)
304	<	syserr(progname);
305	<	cp = vp->value+i;               /* copy value, squeezing spaces */
306	<	*cp = *ass;
307	<	for (i = 1; i <= n; i++) {
308	<	if (ass[i] == NOCHAR)
309	<	continue;
310	<	if (isspace(*cp))
311	<	while (isspace(ass[i]))
312	<	i++;
313	<	*++cp = ass[i];
314	<	}
315	<	if (isspace(*cp))               /* remove trailing space */
316	<	*cp = '\0';
317	<	vp->nass++;
318	<	}
319	<
320	<
321	<	VARIABLE *
322	<	matchvar(nam)                   /* match a variable by its name */
323	<	char    *nam;
324	<	{
325	<	int     n = strlen(nam);
326	<	register int    i;
327	<
328	<	for (i = 0; i < NVARS; i++)
329	<	if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
330	<	return(vv+i);
331	<	return(NULL);
332	<	}
333	<
334	<
335	<	char *
336	<	nvalue(vp, n)                   /* return nth variable value */
337	<	VARIABLE        *vp;
338	<	register int    n;
339	<	{
340	<	register char   *cp;
341	<
342	<	if (vp == NULL | n < 0 | n >= vp->nass)
343	<	return(NULL);
344	<	cp = vp->value;
345	<	while (n--)
346	<	while (*cp++)
347	<	;
348	<	return(cp);
349	<	}
350	<
351	<
352	<	checkvalues()                   /* check assignments */
353	<	{
354	<	register int    i;
355	<
356	<	for (i = 0; i < NVARS; i++)
357	<	if (vv[i].fixval != NULL)
358	<	(*vv[i].fixval)(vv+i);
359	<	}
360	<
361	<
362	<	onevalue(vp)                    /* only one assignment for this variable */
363	<	register VARIABLE       *vp;
364	<	{
365	<	if (vp->nass < 2)
366	<	return;
367	<	if (!nowarn)
368	<	fprintf(stderr,
369	<	"%s: warning - multiple assignment of variable '%s'\n",
370	<	progname, vp->name);
371	<	do
372	<	vp->value += strlen(vp->value)+1;
373	<	while (--vp->nass > 1);
374	<	}
375	<
376	<
377	<	catvalues(vp)                   /* concatenate variable values */
378	<	register VARIABLE       *vp;
379	<	{
380	<	register char   *cp;
381	<
382	<	if (vp->nass < 2)
383	<	return;
384	<	for (cp = vp->value; vp->nass > 1; vp->nass--) {
385	<	while (*cp)
386	<	cp++;
387	<	*cp++ = ' ';
388	<	}
389	<	}
390	<
391	<
392	<	int
393	<	badmatch(tv, cv)                /* case insensitive truncated comparison */
394	<	register char   *tv, *cv;
395	<	{
396	<	if (!*tv) return(1);            /* null string cannot match */
397	<	do
398	<	if (UPPER(*tv) != *cv++)
399	<	return(1);
400	<	while (*++tv);
401	<	return(0);              /* OK */
402	<	}
403	<
404	<
405	<	boolvalue(vp)                   /* check boolean for legal values */
406	<	register VARIABLE       *vp;
407	<	{
408	<	if (!vp->nass) return;
409	<	onevalue(vp);
410	<	switch (UPPER(vp->value[0])) {
411	<	case 'T':
412	<	if (badmatch(vp->value, "TRUE")) break;
413	<	return;
414	<	case 'F':
415	<	if (badmatch(vp->value, "FALSE")) break;
416	<	return;
417	<	}
418	<	fprintf(stderr, "%s: illegal value for boolean variable '%s'\n",
419	<	progname, vp->name);
420	<	exit(1);
421	<	}
422	<
423	<
424	<	qualvalue(vp)                   /* check qualitative var. for legal values */
425	<	register VARIABLE       *vp;
426	<	{
427	<	if (!vp->nass) return;
428	<	onevalue(vp);
429	<	switch (UPPER(vp->value[0])) {
430	<	case 'L':
431	<	if (badmatch(vp->value, "LOW")) break;
432	<	return;
433	<	case 'M':
434	<	if (badmatch(vp->value, "MEDIUM")) break;
435	<	return;
436	<	case 'H':
437	<	if (badmatch(vp->value, "HIGH")) break;
438	<	return;
439	<	}
440	<	fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n",
441	<	progname, vp->name);
442	<	exit(1);
443	<	}
444	<
445	<
446	<	intvalue(vp)                    /* check integer variable for legal values */
447	<	register VARIABLE       *vp;
448	<	{
449	<	if (!vp->nass) return;
450	<	onevalue(vp);
451	<	if (isint(vp->value)) return;
452	<	fprintf(stderr, "%s: illegal value for integer variable '%s'\n",
453	<	progname, vp->name);
454	<	exit(1);
455	<	}
456	<
457	<
458	<	fltvalue(vp)                    /* check float variable for legal values */
459	<	register VARIABLE       *vp;
460	<	{
461	<	if (!vp->nass) return;
462	<	onevalue(vp);
463	<	if (isflt(vp->value)) return;
464	<	fprintf(stderr, "%s: illegal value for real variable '%s'\n",
465	<	progname, vp->name);
466	<	exit(1);
467	<	}
468	<
469	<
470	<	time_t
471	<	checklast(fnames)                       /* check files and find most recent */
472	<	register char   *fnames;
473	<	{
474	<	char    thisfile[MAXPATH];
277	>	char    thisfile[PATH_MAX];
278		time_t  thisdate, lastdate = 0;
476	–	register char   *cp;
279
280		if (fnames == NULL)
281		return(0);
282	<	while (*fnames) {
283	<	while (isspace(*fnames)) fnames++;
284	<	cp = thisfile;
285	<	while (*fnames && !isspace(*fnames))
484	<	*cp++ = *fnames++;
485	<	*cp = '\0';
282	>	while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
283	>	if (thisfile[0] == '!' ||
284	>	(thisfile[0] == '\\' && thisfile[1] == '!'))
285	>	continue;
286		if (!(thisdate = fdate(thisfile)))
287		syserr(thisfile);
288		if (thisdate > lastdate)
#	Line 492 | Line 292 | register char  *fnames;
292		}
293
294
295	<	char *
296	<	newfname(orig, pred)            /* create modified file name */
297	<	char    *orig;
298	<	int     pred;
295	>	static char *
296	>	newfname(               /* create modified file name */
297	>	char    *orig,
298	>	int     pred
299	>	)
300		{
500	–	extern char     *rindex();
301		register char   *cp;
302		register int    n;
303		int     suffix;
#	Line 518 | Line 318 | int    pred;
318		}
319
320
321	<	checkfiles()                    /* check for existence and modified times */
321	>	static void
322	>	checkfiles(void)                        /* check for existence and modified times */
323		{
324		time_t  objdate;
325
#	Line 527 | Line 328 | checkfiles()                   /* check for existence and modified tim
328		syserr(progname);
329		sprintf(vval(OCTREE), "%s.oct", radname);
330		vdef(OCTREE)++;
331	+	} else if (vval(OCTREE)[0] == '!') {
332	+	fprintf(stderr, "%s: illegal '%s' specification\n",
333	+	progname, vnam(OCTREE));
334	+	quit(1);
335		}
336		octreedate = fdate(vval(OCTREE));
337		if (vdef(ILLUM)) {              /* illum requires secondary octrees */
#	Line 543 | Line 348 | checkfiles()                   /* check for existence and modified tim
348		if (!octreedate & !scenedate & !illumdate) {
349		fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
350		vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
351	<	exit(1);
351	>	quit(1);
352		}
353		matdate = checklast(vval(MATERIAL));
354		}
355
356
357	<	getoctcube(org, sizp)           /* get octree bounding cube */
358	<	double  org[3], *sizp;
357	>	static void
358	>	getoctcube(             /* get octree bounding cube */
359	>	double  org[3],
360	>	double  *sizp
361	>	)
362		{
555	–	extern FILE     *popen();
363		static double   oorg[3], osiz = 0.;
364		double  min[3], max[3];
365	<	char    buf[512];
365	>	char    buf[1024];
366		FILE    *fp;
367		register int    i;
368
369	<	if (osiz <= FTINY)
370	<	if (noaction && fdate(oct1name) <
369	>	if (osiz <= FTINY) {
370	>	if (!nprocs && fdate(oct1name) <
371		(scenedate>illumdate?scenedate:illumdate)) {
372		/* run getbbox */
373		sprintf(buf, "getbbox -w -h %s",
#	Line 573 | Line 380 | double org[3], *sizp;
380		fprintf(stderr,
381		"%s: error reading bounding box from getbbox\n",
382		progname);
383	<	exit(1);
383	>	quit(1);
384		}
385		for (i = 0; i < 3; i++)
386		if (max[i] - min[i] > osiz)
#	Line 591 | Line 398 | double org[3], *sizp;
398		fprintf(stderr,
399		"%s: error reading bounding cube from getinfo\n",
400		progname);
401	<	exit(1);
401	>	quit(1);
402		}
403		pclose(fp);
404		}
405	+	}
406		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
407		}
408
409
410	<	setdefaults()                   /* set default values for unassigned var's */
410	>	static void
411	>	setdefaults(void)                       /* set default values for unassigned var's */
412		{
413	<	double  org[3], size;
413	>	double  org[3], lim[3], size;
414		char    buf[128];
415
416		if (!vdef(ZONE)) {
#	Line 611 | Line 420 | setdefaults()                  /* set default values for unassigned v
420		vval(ZONE) = savqstr(buf);
421		vdef(ZONE)++;
422		}
423	+	if (!vdef(EYESEP)) {
424	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
425	+	&org[0], &lim[0], &org[1], &lim[1],
426	+	&org[2], &lim[2]) != 6)
427	+	badvalue(ZONE);
428	+	sprintf(buf, "%f",
429	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
430	+	vval(EYESEP) = savqstr(buf);
431	+	vdef(EYESEP)++;
432	+	}
433		if (!vdef(INDIRECT)) {
434		vval(INDIRECT) = "0";
435		vdef(INDIRECT)++;
#	Line 627 | Line 446 | setdefaults()                  /* set default values for unassigned v
446		vval(PICTURE) = radname;
447		vdef(PICTURE)++;
448		}
449	<	if (!vdef(VIEW)) {
450	<	vval(VIEW) = "X";
451	<	vdef(VIEW)++;
449	>	if (!vdef(VIEWS)) {
450	>	vval(VIEWS) = "X";
451	>	vdef(VIEWS)++;
452		}
453		if (!vdef(DETAIL)) {
454		vval(DETAIL) = "M";
#	Line 646 | Line 465 | setdefaults()                  /* set default values for unassigned v
465		}
466
467
468	<	printvals()                     /* print variable values */
468	>	static void
469	>	oconv(void)                             /* run oconv and mkillum if necessary */
470		{
651	–	int     i, j, clipline;
652	–	register char   *cp;
653	–	register int    k;
654	–
655	–	for (i = 0; i < NVARS; i++)             /* print each variable */
656	–	for (j = 0; j < vdef(i); j++) {     /* print each assignment */
657	–	fputs(vnam(i), stdout);
658	–	fputs("= ", stdout);
659	–	k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 )
660	–	- strlen(vnam(i)) ;
661	–	cp = nvalue(vv+i, j);
662	–	while (*cp) {
663	–	putchar(*cp++);
664	–	if (--k <= 0) {             /* line too long */
665	–	while (*cp && !isspace(*cp))
666	–	putchar(*cp++);     /* finish this word */
667	–	if (*cp) {              /* start new line */
668	–	putchar('\n');
669	–	fputs(vnam(i), stdout);
670	–	putchar('=');
671	–	k = clipline;
672	–	}
673	–	}
674	–	}
675	–	putchar('\n');
676	–	}
677	–	fflush(stdout);
678	–	}
679	–
680	–
681	–	oconv()                         /* run oconv and mkillum if necessary */
682	–	{
471		static char     illumtmp[] = "ilXXXXXX";
472	<	char    combuf[512], ocopts[64], mkopts[64];
472	>	char    combuf[PATH_MAX], ocopts[64], mkopts[64];
473
474		oconvopts(ocopts);              /* get options */
475		if (octreedate < scenedate) {   /* check date on original octree */
476	<	/* build command */
477	<	if (vdef(MATERIAL))
478	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
479	<	vval(MATERIAL), vval(SCENE), vval(OCTREE));
480	<	else
481	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
482	<	vval(SCENE), vval(OCTREE));
483	<
484	<	if (runcom(combuf)) {           /* run it */
485	<	fprintf(stderr,
476	>	if (touchonly && octreedate)
477	>	touch(vval(OCTREE));
478	>	else {                          /* build command */
479	>	if (vdef(MATERIAL))
480	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
481	>	vval(MATERIAL), vval(SCENE),
482	>	vval(OCTREE));
483	>	else
484	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
485	>	vval(SCENE), vval(OCTREE));
486	>
487	>	if (runcom(combuf)) {           /* run it */
488	>	fprintf(stderr,
489		"%s: error generating octree\n\t%s removed\n",
490	<	progname, vval(OCTREE));
491	<	unlink(vval(OCTREE));
492	<	exit(1);
490	>	progname, vval(OCTREE));
491	>	unlink(vval(OCTREE));
492	>	quit(1);
493	>	}
494		}
495		octreedate = time((time_t *)NULL);
496		if (octreedate < scenedate)     /* in case clock is off */
#	Line 706 | Line 498 | oconv()                                /* run oconv and mkillum if necessary */
498		}
499		if (oct1name == vval(OCTREE))           /* no mkillum? */
500		oct1date = octreedate > matdate ? octreedate : matdate;
501	<	if (oct1date >= octreedate & oct1date >= matdate
502	<	& oct1date >= illumdate)        /* all done */
501	>	if ((oct1date >= octreedate) & (oct1date >= matdate)
502	>	& (oct1date >= illumdate))      /* all done */
503		return;
504		/* make octree0 */
505	<	if (oct0date < scenedate | oct0date < illumdate) {
506	<	/* build command */
507	<	if (octreedate)
508	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
509	<	vval(OCTREE), vval(ILLUM), oct0name);
510	<	else if (vdef(MATERIAL))
511	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
512	<	vval(MATERIAL), vval(ILLUM), oct0name);
513	<	else
514	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
515	<	vval(ILLUM), oct0name);
516	<	if (runcom(combuf)) {           /* run it */
517	<	fprintf(stderr,
505	>	if ((oct0date < scenedate) | (oct0date < illumdate)) {
506	>	if (touchonly && oct0date)
507	>	touch(oct0name);
508	>	else {                          /* build command */
509	>	if (octreedate)
510	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
511	>	vval(OCTREE), vval(ILLUM), oct0name);
512	>	else if (vdef(MATERIAL))
513	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
514	>	vval(MATERIAL), vval(ILLUM), oct0name);
515	>	else
516	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
517	>	vval(ILLUM), oct0name);
518	>	if (runcom(combuf)) {           /* run it */
519	>	fprintf(stderr,
520		"%s: error generating octree\n\t%s removed\n",
521	<	progname, oct0name);
522	<	unlink(oct0name);
523	<	exit(1);
521	>	progname, oct0name);
522	>	unlink(oct0name);
523	>	quit(1);
524	>	}
525		}
526		oct0date = time((time_t *)NULL);
527		if (oct0date < octreedate)      /* in case clock is off */
528		oct0date = octreedate;
529		if (oct0date < illumdate)       /* ditto */
530		oct0date = illumdate;
531	<	}
532	<	mkillumopts(mkopts);                    /* build mkillum command */
533	<	mktemp(illumtmp);
534	<	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
535	<	oct0name, vval(ILLUM), illumtmp);
536	<	if (runcom(combuf)) {                   /* run it */
537	<	fprintf(stderr, "%s: error running mkillum\n", progname);
538	<	unlink(illumtmp);
539	<	exit(1);
540	<	}
531	>	}
532	>	if (touchonly && oct1date)
533	>	touch(oct1name);
534	>	else {
535	>	mkillumopts(mkopts);            /* build mkillum command */
536	>	mktemp(illumtmp);
537	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
538	>	oct0name, vval(ILLUM), illumtmp);
539	>	if (runcom(combuf)) {                   /* run it */
540	>	fprintf(stderr, "%s: error running mkillum\n",
541	>	progname);
542	>	unlink(illumtmp);
543	>	quit(1);
544	>	}
545		/* make octree1 (frozen) */
546	<	if (octreedate)
547	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
548	<	vval(OCTREE), illumtmp, oct1name);
549	<	else if (vdef(MATERIAL))
550	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
551	<	vval(MATERIAL), illumtmp, oct1name);
552	<	else
553	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
554	<	illumtmp, oct1name);
555	<	if (runcom(combuf)) {           /* run it */
556	<	fprintf(stderr,
557	<	"%s: error generating octree\n\t%s removed\n",
558	<	progname, oct1name);
559	<	unlink(oct1name);
560	<	exit(1);
546	>	if (octreedate)
547	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
548	>	vval(OCTREE), illumtmp, oct1name);
549	>	else if (vdef(MATERIAL))
550	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
551	>	vval(MATERIAL), illumtmp, oct1name);
552	>	else
553	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
554	>	illumtmp, oct1name);
555	>	if (runcom(combuf)) {           /* run it */
556	>	fprintf(stderr,
557	>	"%s: error generating octree\n\t%s removed\n",
558	>	progname, oct1name);
559	>	unlink(oct1name);
560	>	unlink(illumtmp);
561	>	quit(1);
562	>	}
563	>	rmfile(illumtmp);
564		}
565		oct1date = time((time_t *)NULL);
566		if (oct1date < oct0date)        /* in case clock is off */
567		oct1date = oct0date;
766	–	rmfile(illumtmp);
568		}
569
570
571	<	char *
572	<	addarg(op, arg)                         /* add argument and advance pointer */
573	<	register char   *op, *arg;
571	>	static char *
572	>	addarg(                         /* add argument and advance pointer */
573	>	register char   *op,
574	>	register char   *arg
575	>	)
576		{
577		*op = ' ';
578	<	while (*++op = *arg++)
578	>	while ( (*++op = *arg++) )
579		;
580		return(op);
581		}
582
583
584	<	oconvopts(oo)                           /* get oconv options */
585	<	register char   *oo;
584	>	static void
585	>	oconvopts(                              /* get oconv options */
586	>	register char   *oo
587	>	)
588		{
589		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
590
#	Line 789 | Line 594 | register char  *oo;
594		}
595
596
597	<	mkillumopts(mo)                         /* get mkillum options */
598	<	register char   *mo;
597	>	static void
598	>	mkillumopts(                            /* get mkillum options */
599	>	register char   *mo
600	>	)
601		{
602		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
603
#	Line 800 | Line 607 | register char  *mo;
607		}
608
609
610	<	checkambfile()                  /* check date on ambient file */
610	>	static void
611	>	checkambfile(void)                      /* check date on ambient file */
612		{
613		time_t  afdate;
614
#	Line 808 | Line 616 | checkambfile()                 /* check date on ambient file */
616		return;
617		if (!(afdate = fdate(vval(AMBFILE))))
618		return;
619	<	if (oct1date > afdate)
620	<	rmfile(vval(AMBFILE));
619	>	if (oct1date > afdate) {
620	>	if (touchonly)
621	>	touch(vval(AMBFILE));
622	>	else
623	>	rmfile(vval(AMBFILE));
624	>	}
625		}
626
627
628	<	double
629	<	ambval()                                /* compute ambient value */
628	>	static double
629	>	ambval(void)                            /* compute ambient value */
630		{
631		if (vdef(EXPOSURE)) {
632		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
633	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
634	<	return(.5/atof(vval(EXPOSURE)));
633	>	return(.5/pow(2.,vflt(EXPOSURE)));
634	>	return(.5/vflt(EXPOSURE));
635		}
636		if (vlet(ZONE) == 'E')
637		return(10.);
638		if (vlet(ZONE) == 'I')
639		return(.01);
640		badvalue(ZONE);
641	+	return 0; /* pro forma return */
642		}
643
644
645	<	renderopts(op, po)                      /* set rendering options */
646	<	char    *op, *po;
645	>	static void
646	>	renderopts(                     /* set rendering options */
647	>	char    *op,
648	>	char    *po
649	>	)
650		{
651		switch(vscale(QUALITY)) {
652		case LOW:
#	Line 846 | Line 662 | char   *op, *po;
662		}
663
664
665	<	lowqopts(op, po)                        /* low quality rendering options */
666	<	register char   *op;
667	<	char    *po;
665	>	static void
666	>	lowqopts(                       /* low quality rendering options */
667	>	register char   *op,
668	>	char    *po
669	>	)
670		{
671		double  d, org[3], siz[3];
672
#	Line 858 | Line 676 | char   *po;
676		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
677		badvalue(ZONE);
678		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
679	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
679	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
680		badvalue(ZONE);
681		getoctcube(org, &d);
682		d *= 3./(siz[0]+siz[1]+siz[2]);
#	Line 866 | Line 684 | char   *po;
684		case LOW:
685		po = addarg(po, "-ps 16");
686		op = addarg(op, "-dp 64");
687	<	sprintf(op, " -ar %d", (int)(4*d));
687	>	sprintf(op, " -ar %d", (int)(8*d));
688		op += strlen(op);
689		break;
690		case MEDIUM:
691		po = addarg(po, "-ps 8");
692		op = addarg(op, "-dp 128");
693	<	sprintf(op, " -ar %d", (int)(8*d));
693	>	sprintf(op, " -ar %d", (int)(16*d));
694		op += strlen(op);
695		break;
696		case HIGH:
697		po = addarg(po, "-ps 4");
698		op = addarg(op, "-dp 256");
699	<	sprintf(op, " -ar %d", (int)(16*d));
699	>	sprintf(op, " -ar %d", (int)(32*d));
700		op += strlen(op);
701		break;
702		}
#	Line 895 | Line 713 | char   *po;
713		overture = 0;
714		switch (vscale(VARIABILITY)) {
715		case LOW:
716	<	op = addarg(op, "-aa .4 -ad 64");
716	>	op = addarg(op, "-aa .3 -ad 256");
717		break;
718		case MEDIUM:
719	<	op = addarg(op, "-aa .3 -ad 128");
719	>	op = addarg(op, "-aa .25 -ad 512");
720		break;
721		case HIGH:
722	<	op = addarg(op, "-aa .25 -ad 256");
722	>	op = addarg(op, "-aa .2 -ad 1024");
723		break;
724		}
725		op = addarg(op, "-as 0");
726		d = ambval();
727		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
728		op += strlen(op);
729	<	op = addarg(op, "-lr 3 -lw .02");
729	>	op = addarg(op, "-lr 6 -lw .01");
730		if (vdef(RENDER))
731		op = addarg(op, vval(RENDER));
732		}
733
734
735	<	medqopts(op, po)                        /* medium quality rendering options */
736	<	register char   *op;
737	<	char    *po;
735	>	static void
736	>	medqopts(                       /* medium quality rendering options */
737	>	register char   *op,
738	>	char    *po
739	>	)
740		{
741	<	double  d, org[3], siz[3];
741	>	double  d, org[3], siz[3], asz;
742
743		*op = '\0';
744		*po = '\0';
#	Line 926 | Line 746 | char   *po;
746		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
747		badvalue(ZONE);
748		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
749	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
749	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
750		badvalue(ZONE);
751		getoctcube(org, &d);
752	<	d *= 3./(siz[0]+siz[1]+siz[2]);
752	>	asz = (siz[0]+siz[1]+siz[2])/3.;
753	>	d /= asz;
754		switch (vscale(DETAIL)) {
755		case LOW:
756		po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
757		op = addarg(op, "-dp 256");
758	<	sprintf(op, " -ar %d", (int)(8*d));
758	>	sprintf(op, " -ar %d", (int)(16*d));
759		op += strlen(op);
760	+	sprintf(op, " -ms %.2g", asz/20.);
761	+	op += strlen(op);
762		break;
763		case MEDIUM:
764		po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
765		op = addarg(op, "-dp 512");
766	<	sprintf(op, " -ar %d", (int)(16*d));
766	>	sprintf(op, " -ar %d", (int)(32*d));
767		op += strlen(op);
768	+	sprintf(op, " -ms %.2g", asz/40.);
769	+	op += strlen(op);
770		break;
771		case HIGH:
772		po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
773		op = addarg(op, "-dp 1024");
774	<	sprintf(op, " -ar %d", (int)(32*d));
774	>	sprintf(op, " -ar %d", (int)(64*d));
775		op += strlen(op);
776	+	sprintf(op, " -ms %.2g", asz/80.);
777	+	op += strlen(op);
778		break;
779		}
780		po = addarg(po, "-pt .08");
#	Line 956 | Line 783 | char   *po;
783		else
784		op = addarg(op, "-ds .3");
785		op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
786	<	if (overture = vint(INDIRECT)) {
786	>	if ( (overture = vint(INDIRECT)) ) {
787		sprintf(op, " -ab %d", overture);
788		op += strlen(op);
789		}
#	Line 967 | Line 794 | char   *po;
794		overture = 0;
795		switch (vscale(VARIABILITY)) {
796		case LOW:
797	<	op = addarg(op, "-aa .25 -ad 196 -as 0");
797	>	op = addarg(op, "-aa .2 -ad 329 -as 42");
798		break;
799		case MEDIUM:
800	<	op = addarg(op, "-aa .2 -ad 400 -as 64");
800	>	op = addarg(op, "-aa .15 -ad 800 -as 128");
801		break;
802		case HIGH:
803	<	op = addarg(op, "-aa .15 -ad 768 -as 196");
803	>	op = addarg(op, "-aa .1 -ad 1536 -as 392");
804		break;
805		}
806		d = ambval();
807		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
808		op += strlen(op);
809	<	op = addarg(op, "-lr 6 -lw .002");
809	>	op = addarg(op, "-lr 8 -lw .002");
810		if (vdef(RENDER))
811		op = addarg(op, vval(RENDER));
812		}
813
814
815	<	hiqopts(op, po)                         /* high quality rendering options */
816	<	register char   *op;
817	<	char    *po;
815	>	static void
816	>	hiqopts(                                /* high quality rendering options */
817	>	register char   *op,
818	>	char    *po
819	>	)
820		{
821	<	double  d, org[3], siz[3];
821	>	double  d, org[3], siz[3], asz;
822
823		*op = '\0';
824		*po = '\0';
#	Line 997 | Line 826 | char   *po;
826		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
827		badvalue(ZONE);
828		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
829	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
829	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
830		badvalue(ZONE);
831		getoctcube(org, &d);
832	<	d *= 3./(siz[0]+siz[1]+siz[2]);
832	>	asz = (siz[0]+siz[1]+siz[2])/3.;
833	>	d /= asz;
834		switch (vscale(DETAIL)) {
835		case LOW:
836		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
837		op = addarg(op, "-dp 1024");
838	<	sprintf(op, " -ar %d", (int)(16*d));
838	>	sprintf(op, " -ar %d", (int)(32*d));
839		op += strlen(op);
840	+	sprintf(op, " -ms %.2g", asz/40.);
841	+	op += strlen(op);
842		break;
843		case MEDIUM:
844		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
845		op = addarg(op, "-dp 2048");
846	<	sprintf(op, " -ar %d", (int)(32*d));
846	>	sprintf(op, " -ar %d", (int)(64*d));
847		op += strlen(op);
848	+	sprintf(op, " -ms %.2g", asz/80.);
849	+	op += strlen(op);
850		break;
851		case HIGH:
852		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
853		op = addarg(op, "-dp 4096");
854	<	sprintf(op, " -ar %d", (int)(64*d));
854	>	sprintf(op, " -ar %d", (int)(128*d));
855		op += strlen(op);
856	+	sprintf(op, " -ms %.2g", asz/160.);
857	+	op += strlen(op);
858		break;
859		}
860		po = addarg(po, "-pt .04");
861		if (vbool(PENUMBRAS))
862	<	op = addarg(op, "-ds .1 -dj .7");
862	>	op = addarg(op, "-ds .1 -dj .65");
863		else
864		op = addarg(op, "-ds .2");
865		op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
#	Line 1036 | Line 872 | char   *po;
872		overture = 0;
873		switch (vscale(VARIABILITY)) {
874		case LOW:
875	<	op = addarg(op, "-aa .15 -ad 256 -as 0");
875	>	op = addarg(op, "-aa .125 -ad 512 -as 64");
876		break;
877		case MEDIUM:
878	<	op = addarg(op, "-aa .125 -ad 512 -as 256");
878	>	op = addarg(op, "-aa .1 -ad 1536 -as 768");
879		break;
880		case HIGH:
881	<	op = addarg(op, "-aa .08 -ad 1024 -as 512");
881	>	op = addarg(op, "-aa .075 -ad 4096 -as 2048");
882		break;
883		}
884		d = ambval();
#	Line 1054 | Line 890 | char   *po;
890		}
891
892
893	<	xferopts(ro)                            /* transfer options if indicated */
894	<	char    *ro;
893	>	static void
894	>	xferopts(                               /* transfer options if indicated */
895	>	char    *ro
896	>	)
897		{
898		int     fd, n;
899		register char   *cp;
#	Line 1065 | Line 903 | char   *ro;
903		return;
904		if (vdef(OPTFILE)) {
905		for (cp = ro; cp[1]; cp++)
906	<	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
906	>	if (isspace(cp[1]) && (cp[2] == '@' ||
907	>	(cp[2] == '-' && isalpha(cp[3]))))
908		*cp = '\n';
909		else
910		*cp = cp[1];
#	Line 1075 | Line 914 | char   *ro;
914		syserr(vval(OPTFILE));
915		sprintf(ro, " @%s", vval(OPTFILE));
916		}
917	<	#ifdef MSDOS
917	>	#ifdef _WIN32
918		else if (n > 50) {
919		setenv("ROPT", ro+1);
920		strcpy(ro, " $ROPT");
#	Line 1084 | Line 923 | char   *ro;
923		}
924
925
926	<	pfiltopts(po)                           /* get pfilt options */
927	<	register char   *po;
926	>	static void
927	>	pfiltopts(                              /* get pfilt options */
928	>	register char   *po
929	>	)
930		{
931		*po = '\0';
932		if (vdef(EXPOSURE)) {
#	Line 1094 | Line 935 | register char  *po;
935		}
936		switch (vscale(QUALITY)) {
937		case MEDIUM:
938	<	po = addarg(po, "-r 1");
938	>	po = addarg(po, "-r .6");
939		break;
940		case HIGH:
941		po = addarg(po, "-m .25");
#	Line 1105 | Line 946 | register char  *po;
946		}
947
948
949	<	matchword(s1, s2)                       /* match white-delimited words */
950	<	register char   *s1, *s2;
949	>	static int
950	>	matchword(                      /* match white-delimited words */
951	>	register char   *s1,
952	>	register char   *s2
953	>	)
954		{
955		while (isspace(*s1)) s1++;
956		while (isspace(*s2)) s2++;
#	Line 1117 | Line 961 | register char  *s1, *s2;
961		}
962
963
964	<	char *
965	<	specview(vs)                            /* get proper view spec from vs */
966	<	register char   *vs;
964	>	static char *
965	>	specview(                               /* get proper view spec from vs */
966	>	register char   *vs
967	>	)
968		{
969		static char     vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
970		"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
#	Line 1137 | Line 982 | register char  *vs;
982		upax = 1-'X'+UPPER(vval(UP)[1]);
983		else
984		upax = 1-'X'+vlet(UP);
985	<	if (upax < 1 | upax > 3)
985	>	if ((upax < 1) | (upax > 3))
986		badvalue(UP);
987		if (vval(UP)[0] == '-')
988		upax = -upax;
#	Line 1160 | Line 1005 | register char  *vs;
1005		zpos = -1; vs++;
1006		}
1007		viewtype = 'v';
1008	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h')
1008	>	if((*vs == 'v') | (*vs == 'l') | (*vs == 'a') | (*vs == 'h') | (*vs == 'c'))
1009		viewtype = *vs++;
1010		cp = viewopts;
1011		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
#	Line 1215 | Line 1060 | register char  *vs;
1060		case 'h':
1061		cp = addarg(cp, "-vh 180 -vv 180");
1062		break;
1063	+	case 'c':
1064	+	cp = addarg(cp, "-vh 180 -vv 90");
1065	+	break;
1066		}
1067		} else {
1068		while (!isspace(*vs))           /* else skip id */
#	Line 1228 | Line 1076 | register char  *vs;
1076		if (cp == viewopts)             /* append any additional options */
1077		vs++;           /* skip prefixed space if unneeded */
1078		strcpy(cp, vs);
1079	<	#ifdef MSDOS
1079	>	#ifdef _WIN32
1080		if (strlen(viewopts) > 40) {
1081		setenv("VIEW", viewopts);
1082		return("$VIEW");
#	Line 1238 | Line 1086 | register char  *vs;
1086		}
1087
1088
1089	<	char *
1090	<	getview(n, vn)                          /* get view n, or NULL if none */
1091	<	int     n;
1092	<	char    *vn;            /* returned view name */
1089	>	static char *
1090	>	getview(                                /* get view n, or NULL if none */
1091	>	int     n,
1092	>	char    *vn             /* returned view name */
1093	>	)
1094		{
1095		register char   *mv;
1096
#	Line 1260 | Line 1109 | char   *vn;            /* returned view name */
1109		}
1110		/* view number? */
1111		if (isint(viewselect))
1112	<	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
1112	>	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1113		/* check list */
1114	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1114	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1115		if (matchword(viewselect, mv))
1116		return(specview(mv));
1117		return(specview(viewselect));   /* standard view? */
1118		}
1119	<	mv = nvalue(vv+VIEW, n);                /* use view n */
1120	<	if (vn != NULL & mv != NULL) {
1119	>	mv = nvalue(VIEWS, n);          /* use view n */
1120	>	if ((vn != NULL) & (mv != NULL)) {
1121		register char   *mv2 = mv;
1122		if (*mv2 != '-')
1123		while (*mv2 && !isspace(*mv2))
#	Line 1279 | Line 1128 | char   *vn;            /* returned view name */
1128		}
1129
1130
1131	<	printview(vopts)                        /* print out selected view */
1132	<	register char   *vopts;
1131	>	static int
1132	>	myprintview(                    /* print out selected view */
1133	>	register char   *vopts,
1134	>	FILE    *fp
1135	>	)
1136		{
1137	<	extern char     *atos(), *getenv();
1138	<	char    buf[256];
1287	<	FILE    *fp;
1137	>	VIEW    vwr;
1138	>	char    buf[128];
1139		register char   *cp;
1289	–
1140		if (vopts == NULL)
1141		return(-1);
1142	<	fputs("VIEW=", stdout);
1143	<	do {
1144	<	if (matchword(vopts, "-vf")) {          /* expand view file */
1145	<	vopts = sskip(vopts);
1146	<	if (!*atos(buf, sizeof(buf), vopts))
1297	<	return(-1);
1298	<	if ((fp = fopen(buf, "r")) == NULL)
1299	<	return(-1);
1300	<	for (buf[sizeof(buf)-2] = '\n';
1301	<	fgets(buf, sizeof(buf), fp) != NULL &&
1302	<	buf[0] != '\n';
1303	<	buf[sizeof(buf)-2] = '\n') {
1304	<	if (buf[sizeof(buf)-2] != '\n') {
1305	<	ungetc(buf[sizeof(buf)-2], fp);
1306	<	buf[sizeof(buf)-2] = '\0';
1307	<	}
1308	<	if (matchword(buf, "VIEW=") ||
1309	<	matchword(buf, "rview")) {
1310	<	for (cp = sskip(buf); *cp && *cp != '\n'; cp++)
1311	<	putchar(*cp);
1312	<	}
1313	<	}
1314	<	fclose(fp);
1315	<	vopts = sskip(vopts);
1316	<	} else {
1317	<	while (isspace(*vopts))
1318	<	vopts++;
1319	<	putchar(' ');
1320	<	#ifdef MSDOS
1321	<	if (*vopts == '$') {            /* expand env. var. */
1322	<	if (!*atos(buf, sizeof(buf), vopts+1))
1323	<	return(-1);
1324	<	if ((cp = getenv(buf)) == NULL)
1325	<	return(-1);
1326	<	fputs(cp, stdout);
1327	<	vopts = sskip(vopts);
1328	<	} else
1142	>	#ifdef _WIN32
1143	>	if (vopts[0] == '$') {
1144	>	vopts = getenv(vopts+1);
1145	>	goto again;
1146	>	}
1147		#endif
1148	<	while (*vopts && !isspace(*vopts))
1149	<	putchar(*vopts++);
1150	<	}
1151	<	} while (*vopts++);
1152	<	putchar('\n');
1148	>	vwr = stdview;
1149	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1150	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1151	>	*atos(buf, sizeof(buf), cp += 4)) {
1152	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1153	>	sscanview(&vwr, cp);            /* reset tail */
1154	>	}
1155	>	fputs(VIEWSTR, fp);
1156	>	fprintview(&vwr, fp);                   /* print full spec. */
1157	>	fputc('\n', fp);
1158		return(0);
1159		}
1160
1161
1162	<	rview(opts, po)                         /* run rview with first view */
1163	<	char    *opts, *po;
1162	>	static void
1163	>	rvu(                            /* run rvu with first view */
1164	>	char    *opts,
1165	>	char    *po
1166	>	)
1167		{
1168		char    *vw;
1169	<	char    combuf[512];
1169	>	char    combuf[PATH_MAX];
1170		/* build command */
1171	<	if ((vw = getview(0, NULL)) == NULL)
1171	>	if (touchonly || (vw = getview(0, NULL)) == NULL)
1172		return;
1173		if (sayview)
1174	<	printview(vw);
1175	<	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1174	>	myprintview(vw, stdout);
1175	>	sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname);
1176		if (rvdevice != NULL)
1177		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1178		if (vdef(EXPOSURE))
1179		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1180		strcat(combuf, oct1name);
1181		if (runcom(combuf)) {           /* run it */
1182	<	fprintf(stderr, "%s: error running rview\n", progname);
1183	<	exit(1);
1182	>	fprintf(stderr, "%s: error running rvu\n", progname);
1183	>	quit(1);
1184		}
1185		}
1186
1187
1188	<	rpict(opts, po)                         /* run rpict and pfilt for each view */
1189	<	char    *opts, *po;
1188	>	static void
1189	>	rpict(                          /* run rpict and pfilt for each view */
1190	>	char    *opts,
1191	>	char    *po
1192	>	)
1193		{
1194	<	char    combuf[1024];
1195	<	char    rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1194	>	char    combuf[PATH_MAX];
1195	>	char    rawfile[PATH_MAX], picfile[PATH_MAX];
1196	>	char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1197	>	char    rppopt[128], *pfile = NULL;
1198		char    pfopts[128];
1199		char    vs[32], *vw;
1200		int     vn, mult;
1201	+	FILE    *fp;
1202	+	time_t  rfdt, pfdt;
1203		/* get pfilt options */
1204		pfiltopts(pfopts);
1205		/* get resolution, reporting */
#	Line 1407 | Line 1240 | char   *opts, *po;
1240		else
1241		badvalue(REPORT);
1242		}
1243	<	/* do each view */
1244	<	vn = 0;
1243	>	/* set up parallel rendering */
1244	>	if ((nprocs > 1) & (!vdef(ZFILE))) {
1245	>	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1246	>	pfile = rppopt+9;
1247	>	if (mktemp(pfile) == NULL)
1248	>	pfile = NULL;
1249	>	}
1250	>	vn = 0;                                 /* do each view */
1251		while ((vw = getview(vn++, vs)) != NULL) {
1252		if (sayview)
1253	<	printview(vw);
1253	>	myprintview(vw, stdout);
1254		if (!vs[0])
1255		sprintf(vs, "%d", vn);
1256		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1257	+	if (vdef(ZFILE))
1258	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1259	+	else
1260	+	zopt[0] = '\0';
1261		/* check date on picture */
1262	<	if (fdate(picfile) >= oct1date)
1262	>	pfdt = fdate(picfile);
1263	>	if (pfdt >= oct1date)
1264		continue;
1265	+	/* get raw file name */
1266	+	sprintf(rawfile, "%s_%s.unf",
1267	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1268	+	rfdt = fdate(rawfile);
1269	+	if (touchonly) {                /* update times only */
1270	+	if (rfdt) {
1271	+	if (rfdt < oct1date)
1272	+	touch(rawfile);
1273	+	} else if (pfdt && pfdt < oct1date)
1274	+	touch(picfile);
1275	+	continue;
1276	+	}
1277	+	if (next_process()) {           /* parallel running? */
1278	+	if (pfile != NULL)
1279	+	sleep(20);
1280	+	continue;
1281	+	}
1282	+	/* XXX Remember to call finish_process() */
1283		/* build rpict command */
1284	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1285	<	if (fdate(rawfile) >= oct1date)         /* recover */
1286	<	sprintf(combuf, "rpict%s%s%s -ro %s %s",
1287	<	rep, po, opts, rawfile, oct1name);
1288	<	else {
1284	>	if (rfdt >= oct1date) {         /* recover */
1285	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1286	>	rep, po, opts, zopt, rawfile, oct1name);
1287	>	if (runcom(combuf))     /* run rpict */
1288	>	goto rperror;
1289	>	} else {
1290		if (overture) {         /* run overture calculation */
1291		sprintf(combuf,
1292		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
#	Line 1433 | Line 1296 | char   *opts, *po;
1296		fprintf(stderr,
1297		"%s: error in overture for view %s\n",
1298		progname, vs);
1299	<	exit(1);
1299	>	quit(1);
1300		}
1301	<	#ifdef NIX
1301	>	#ifndef NULL_DEVICE
1302		rmfile(overfile);
1303		#endif
1304		}
1305	<	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1305	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1306		rep, vw, res, po, opts,
1307	<	oct1name, rawfile);
1307	>	zopt, oct1name, rawfile);
1308	>	if (pfile != NULL && inchild()) {
1309	>	/* rpict persistent mode */
1310	>	if (!silent)
1311	>	printf("\t%s\n", combuf);
1312	>	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1313	>	rep, rppopt, res, po, opts,
1314	>	oct1name, rawfile);
1315	>	fflush(stdout);
1316	>	fp = popen(combuf, "w");
1317	>	if (fp == NULL)
1318	>	goto rperror;
1319	>	myprintview(vw, fp);
1320	>	if (pclose(fp))
1321	>	goto rperror;
1322	>	} else {                /* rpict normal mode */
1323	>	if (runcom(combuf))
1324	>	goto rperror;
1325	>	}
1326		}
1327	<	if (runcom(combuf)) {           /* run rpict */
1447	<	fprintf(stderr, "%s: error rendering view %s\n",
1448	<	progname, vs);
1449	<	exit(1);
1450	<	}
1327	>	if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1328		/* build pfilt command */
1329	<	if (mult > 1)
1330	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1329	>	if (mult > 1)
1330	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1331		pfopts, mult, mult, rawfile, picfile);
1332	<	else
1333	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1334	<	rawfile, picfile);
1335	<	if (runcom(combuf)) {           /* run pfilt */
1336	<	fprintf(stderr,
1337	<	"%s: error filtering view %s\n\t%s removed\n",
1338	<	progname, vs, picfile);
1339	<	unlink(picfile);
1340	<	exit(1);
1332	>	else
1333	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1334	>	rawfile, picfile);
1335	>	if (runcom(combuf)) {   /* run pfilt */
1336	>	fprintf(stderr,
1337	>	"%s: error filtering view %s\n\t%s removed\n",
1338	>	progname, vs, picfile);
1339	>	unlink(picfile);
1340	>	quit(1);
1341	>	}
1342		}
1343	<	/* remove raw file */
1344	<	rmfile(rawfile);
1343	>	/* remove/rename raw file */
1344	>	if (vdef(RAWFILE)) {
1345	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1346	>	mvfile(rawfile, combuf);
1347	>	} else
1348	>	rmfile(rawfile);
1349	>	finish_process();               /* exit if child */
1350		}
1351	+	wait_process(1);                /* wait for children to finish */
1352	+	if (pfile != NULL) {            /* clean up rpict persistent mode */
1353	+	int     pid;
1354	+	fp = fopen(pfile, "r");
1355	+	if (fp != NULL) {
1356	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1357	+	kill(pid, 1) < 0)
1358	+	unlink(pfile);
1359	+	fclose(fp);
1360	+	}
1361	+	}
1362	+	return;
1363	+	rperror:
1364	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1365	+	quit(1);
1366		}
1367
1368
1369	<	runcom(cs)                      /* run command */
1370	<	char    *cs;
1369	>	static int
1370	>	touch(                  /* update a file */
1371	>	char    *fn
1372	>	)
1373		{
1374	+	if (!silent)
1375	+	printf("\ttouch %s\n", fn);
1376	+	if (!nprocs)
1377	+	return(0);
1378	+	#ifdef notused
1379	+	if (access(fn, F_OK) == -1)             /* create it */
1380	+	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1381	+	return(-1);
1382	+	#endif
1383	+	return(setfdate(fn, time((time_t *)NULL)));
1384	+	}
1385	+
1386	+
1387	+	static int
1388	+	runcom(                 /* run command */
1389	+	char    *cs
1390	+	)
1391	+	{
1392		if (!silent)            /* echo it */
1393		printf("\t%s\n", cs);
1394	<	if (noaction)
1394	>	if (!nprocs)
1395		return(0);
1396		fflush(stdout);         /* flush output and pass to shell */
1397		return(system(cs));
1398		}
1399
1400
1401	<	rmfile(fn)                      /* remove a file */
1402	<	char    *fn;
1401	>	static int
1402	>	rmfile(                 /* remove a file */
1403	>	char    *fn
1404	>	)
1405		{
1406		if (!silent)
1407	<	#ifdef MSDOS
1408	<	printf("\tdel %s\n", fn);
1489	<	#else
1490	<	printf("\trm -f %s\n", fn);
1491	<	#endif
1492	<	if (noaction)
1407	>	printf("\t%s %s\n", DELCMD, fn);
1408	>	if (!nprocs)
1409		return(0);
1410		return(unlink(fn));
1411		}
1412
1413
1414	<	#ifdef MSDOS
1414	>	static int
1415	>	mvfile(         /* move a file */
1416	>	char    *fold,
1417	>	char    *fnew
1418	>	)
1419	>	{
1420	>	if (!silent)
1421	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1422	>	if (!nprocs)
1423	>	return(0);
1424	>	return(rename(fold, fnew));
1425	>	}
1426	>
1427	>
1428	>	#ifdef RHAS_FORK_EXEC
1429	>	static int
1430	>	next_process(void)                      /* fork the next process (max. nprocs) */
1431	>	{
1432	>	int     child_pid;
1433	>
1434	>	if (nprocs <= 1)
1435	>	return(0);              /* it's us or no one */
1436	>	if (inchild()) {
1437	>	fprintf(stderr, "%s: internal error 1 in next_process()\n",
1438	>	progname);
1439	>	quit(1);
1440	>	}
1441	>	if (children_running >= nprocs)
1442	>	wait_process(0);        /* wait for someone to finish */
1443	>	fflush(stdout);
1444	>	child_pid = fork();             /* split process */
1445	>	if (child_pid == 0) {           /* we're the child */
1446	>	children_running = -1;
1447	>	return(0);
1448	>	}
1449	>	if (child_pid > 0) {            /* we're the parent */
1450	>	++children_running;
1451	>	return(1);
1452	>	}
1453	>	fprintf(stderr, "%s: warning -- fork() failed\n", progname);
1454	>	return(0);
1455	>	}
1456	>
1457	>	static void
1458	>	wait_process(                   /* wait for process(es) to finish */
1459	>	int     all
1460	>	)
1461	>	{
1462	>	int     ourstatus = 0;
1463	>	int     pid, status;
1464	>
1465	>	if (all)
1466	>	all = children_running;
1467	>	else if (children_running > 0)
1468	>	all = 1;
1469	>	while (all-- > 0) {
1470	>	pid = wait(&status);
1471	>	if (pid < 0)
1472	>	syserr(progname);
1473	>	status = status>>8 & 0xff;
1474	>	--children_running;
1475	>	if (status != 0) {      /* child's problem is our problem */
1476	>	if ((ourstatus == 0) & (children_running > 0))
1477	>	fprintf(stderr, "%s: waiting for remaining processes\n",
1478	>	progname);
1479	>	ourstatus = status;
1480	>	all = children_running;
1481	>	}
1482	>	}
1483	>	if (ourstatus != 0)
1484	>	quit(ourstatus);        /* bad status from child */
1485	>	}
1486	>	#else   /* ! RHAS_FORK_EXEC */
1487	>	static int
1488	>	next_process(void)
1489	>	{
1490	>	return(0);                      /* cannot start new process */
1491	>	}
1492	>	static void
1493	>	wait_process(all)
1494	>	int     all;
1495	>	{
1496	>	(void)all;                      /* no one to wait for */
1497	>	}
1498	>	int
1499	>	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1500	>	int pid, sig;
1501	>	{
1502	>	return 0;
1503	>	}
1504	>	#endif  /* ! RHAS_FORK_EXEC */
1505	>
1506	>	static void
1507	>	finish_process(void)                    /* exit a child process */
1508	>	{
1509	>	if (!inchild())
1510	>	return;                 /* in parent -- noop */
1511	>	exit(0);
1512	>	}
1513	>
1514	>	#ifdef _WIN32
1515		setenv(vname, value)            /* set an environment variable */
1516		char    *vname, *value;
1517		{
#	Line 1507 | Line 1523 | char   *vname, *value;
1523		sprintf(evp, "%s=%s", vname, value);
1524		if (putenv(evp) != 0) {
1525		fprintf(stderr, "%s: out of environment space\n", progname);
1526	<	exit(1);
1526	>	quit(1);
1527		}
1528		if (!silent)
1529		printf("set %s\n", evp);
#	Line 1515 | Line 1531 | char   *vname, *value;
1531		#endif
1532
1533
1534	<	badvalue(vc)                    /* report bad variable value and exit */
1535	<	int     vc;
1534	>	static void
1535	>	badvalue(                       /* report bad variable value and exit */
1536	>	int     vc
1537	>	)
1538		{
1539		fprintf(stderr, "%s: bad value for variable '%s'\n",
1540		progname, vnam(vc));
1541	<	exit(1);
1541	>	quit(1);
1542		}
1543
1544
1545	<	syserr(s)                       /* report a system error and exit */
1546	<	char    *s;
1545	>	static void
1546	>	syserr(                 /* report a system error and exit */
1547	>	char    *s
1548	>	)
1549		{
1550		perror(s);
1551	<	exit(1);
1551	>	quit(1);
1552	>	}
1553	>
1554	>
1555	>	void
1556	>	quit(ec)                        /* exit program */
1557	>	int     ec;
1558	>	{
1559	>	exit(ec);
1560		}

Diff Legend

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