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.77 by greg, Thu Sep 9 20:08:21 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))
286	<	*cp++ = *fnames++;
287	<	*cp = '\0';
282	>	while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
283	>	if (thisfile[0] == '!' ||
284	>	(thisfile[0] == '\\' && thisfile[1] == '!')) {
285	>	if (!lastdate)
286	>	lastdate = 1;
287	>	continue;
288	>	}
289		if (!(thisdate = fdate(thisfile)))
290		syserr(thisfile);
291		if (thisdate > lastdate)
#	Line 492 | Line 295 | register char  *fnames;
295		}
296
297
298	<	char *
299	<	newfname(orig, pred)            /* create modified file name */
300	<	char    *orig;
301	<	int     pred;
298	>	static char *
299	>	newfname(               /* create modified file name */
300	>	char    *orig,
301	>	int     pred
302	>	)
303		{
500	–	extern char     *rindex();
304		register char   *cp;
305		register int    n;
306		int     suffix;
#	Line 518 | Line 321 | int    pred;
321		}
322
323
324	<	checkfiles()                    /* check for existence and modified times */
324	>	static void
325	>	checkfiles(void)                        /* check for existence and modified times */
326		{
327		time_t  objdate;
328
#	Line 527 | Line 331 | checkfiles()                   /* check for existence and modified tim
331		syserr(progname);
332		sprintf(vval(OCTREE), "%s.oct", radname);
333		vdef(OCTREE)++;
334	+	} else if (vval(OCTREE)[0] == '!') {
335	+	fprintf(stderr, "%s: illegal '%s' specification\n",
336	+	progname, vnam(OCTREE));
337	+	quit(1);
338		}
339		octreedate = fdate(vval(OCTREE));
340		if (vdef(ILLUM)) {              /* illum requires secondary octrees */
#	Line 543 | Line 351 | checkfiles()                   /* check for existence and modified tim
351		if (!octreedate & !scenedate & !illumdate) {
352		fprintf(stderr, "%s: need '%s' or '%s' or '%s'\n", progname,
353		vnam(OCTREE), vnam(SCENE), vnam(ILLUM));
354	<	exit(1);
354	>	quit(1);
355		}
356		matdate = checklast(vval(MATERIAL));
357		}
358
359
360	<	getoctcube(org, sizp)           /* get octree bounding cube */
361	<	double  org[3], *sizp;
360	>	static void
361	>	getoctcube(             /* get octree bounding cube */
362	>	double  org[3],
363	>	double  *sizp
364	>	)
365		{
555	–	extern FILE     *popen();
366		static double   oorg[3], osiz = 0.;
367		double  min[3], max[3];
368	<	char    buf[512];
368	>	char    buf[1024];
369		FILE    *fp;
370		register int    i;
371
372	<	if (osiz <= FTINY)
373	<	if (noaction && fdate(oct1name) <
372	>	if (osiz <= FTINY) {
373	>	if (!nprocs && fdate(oct1name) <
374		(scenedate>illumdate?scenedate:illumdate)) {
375		/* run getbbox */
376		sprintf(buf, "getbbox -w -h %s",
#	Line 573 | Line 383 | double org[3], *sizp;
383		fprintf(stderr,
384		"%s: error reading bounding box from getbbox\n",
385		progname);
386	<	exit(1);
386	>	quit(1);
387		}
388		for (i = 0; i < 3; i++)
389		if (max[i] - min[i] > osiz)
#	Line 591 | Line 401 | double org[3], *sizp;
401		fprintf(stderr,
402		"%s: error reading bounding cube from getinfo\n",
403		progname);
404	<	exit(1);
404	>	quit(1);
405		}
406		pclose(fp);
407		}
408	+	}
409		org[0] = oorg[0]; org[1] = oorg[1]; org[2] = oorg[2]; *sizp = osiz;
410		}
411
412
413	<	setdefaults()                   /* set default values for unassigned var's */
413	>	static void
414	>	setdefaults(void)                       /* set default values for unassigned var's */
415		{
416	<	double  org[3], size;
416	>	double  org[3], lim[3], size;
417		char    buf[128];
418
419		if (!vdef(ZONE)) {
#	Line 611 | Line 423 | setdefaults()                  /* set default values for unassigned v
423		vval(ZONE) = savqstr(buf);
424		vdef(ZONE)++;
425		}
426	+	if (!vdef(EYESEP)) {
427	+	if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf",
428	+	&org[0], &lim[0], &org[1], &lim[1],
429	+	&org[2], &lim[2]) != 6)
430	+	badvalue(ZONE);
431	+	sprintf(buf, "%f",
432	+	0.01*(lim[0]-org[0]+lim[1]-org[1]+lim[2]-org[2]));
433	+	vval(EYESEP) = savqstr(buf);
434	+	vdef(EYESEP)++;
435	+	}
436		if (!vdef(INDIRECT)) {
437		vval(INDIRECT) = "0";
438		vdef(INDIRECT)++;
#	Line 627 | Line 449 | setdefaults()                  /* set default values for unassigned v
449		vval(PICTURE) = radname;
450		vdef(PICTURE)++;
451		}
452	<	if (!vdef(VIEW)) {
453	<	vval(VIEW) = "X";
454	<	vdef(VIEW)++;
452	>	if (!vdef(VIEWS)) {
453	>	vval(VIEWS) = "X";
454	>	vdef(VIEWS)++;
455		}
456		if (!vdef(DETAIL)) {
457		vval(DETAIL) = "M";
#	Line 646 | Line 468 | setdefaults()                  /* set default values for unassigned v
468		}
469
470
471	<	printvals()                     /* print variable values */
471	>	static void
472	>	oconv(void)                             /* run oconv and mkillum if necessary */
473		{
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	–	{
474		static char     illumtmp[] = "ilXXXXXX";
475	<	char    combuf[512], ocopts[64], mkopts[64];
475	>	char    combuf[PATH_MAX], ocopts[64], mkopts[64];
476
477		oconvopts(ocopts);              /* get options */
478		if (octreedate < scenedate) {   /* check date on original octree */
479	<	/* build command */
480	<	if (vdef(MATERIAL))
481	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
482	<	vval(MATERIAL), vval(SCENE), 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,
479	>	if (touchonly && octreedate)
480	>	touch(vval(OCTREE));
481	>	else {                          /* build command */
482	>	if (vdef(MATERIAL))
483	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
484	>	vval(MATERIAL), vval(SCENE),
485	>	vval(OCTREE));
486	>	else
487	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
488	>	vval(SCENE), vval(OCTREE));
489	>
490	>	if (runcom(combuf)) {           /* run it */
491	>	fprintf(stderr,
492		"%s: error generating octree\n\t%s removed\n",
493	<	progname, vval(OCTREE));
494	<	unlink(vval(OCTREE));
495	<	exit(1);
493	>	progname, vval(OCTREE));
494	>	unlink(vval(OCTREE));
495	>	quit(1);
496	>	}
497		}
498		octreedate = time((time_t *)NULL);
499		if (octreedate < scenedate)     /* in case clock is off */
#	Line 706 | Line 501 | oconv()                                /* run oconv and mkillum if necessary */
501		}
502		if (oct1name == vval(OCTREE))           /* no mkillum? */
503		oct1date = octreedate > matdate ? octreedate : matdate;
504	<	if (oct1date >= octreedate & oct1date >= matdate
505	<	& oct1date >= illumdate)        /* all done */
504	>	if ((oct1date >= octreedate) & (oct1date >= matdate)
505	>	& (oct1date >= illumdate))      /* all done */
506		return;
507		/* make octree0 */
508	<	if (oct0date < scenedate | oct0date < illumdate) {
509	<	/* build command */
510	<	if (octreedate)
511	<	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
512	<	vval(OCTREE), vval(ILLUM), oct0name);
513	<	else if (vdef(MATERIAL))
514	<	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
515	<	vval(MATERIAL), vval(ILLUM), oct0name);
516	<	else
517	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
518	<	vval(ILLUM), oct0name);
519	<	if (runcom(combuf)) {           /* run it */
520	<	fprintf(stderr,
508	>	if ((oct0date < scenedate) | (oct0date < illumdate)) {
509	>	if (touchonly && oct0date)
510	>	touch(oct0name);
511	>	else {                          /* build command */
512	>	if (octreedate)
513	>	sprintf(combuf, "oconv%s -i %s %s > %s", ocopts,
514	>	vval(OCTREE), vval(ILLUM), oct0name);
515	>	else if (vdef(MATERIAL))
516	>	sprintf(combuf, "oconv%s %s %s > %s", ocopts,
517	>	vval(MATERIAL), vval(ILLUM), oct0name);
518	>	else
519	>	sprintf(combuf, "oconv%s %s > %s", ocopts,
520	>	vval(ILLUM), oct0name);
521	>	if (runcom(combuf)) {           /* run it */
522	>	fprintf(stderr,
523		"%s: error generating octree\n\t%s removed\n",
524	<	progname, oct0name);
525	<	unlink(oct0name);
526	<	exit(1);
524	>	progname, oct0name);
525	>	unlink(oct0name);
526	>	quit(1);
527	>	}
528		}
529		oct0date = time((time_t *)NULL);
530		if (oct0date < octreedate)      /* in case clock is off */
531		oct0date = octreedate;
532		if (oct0date < illumdate)       /* ditto */
533		oct0date = illumdate;
534	<	}
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", progname);
541	<	unlink(illumtmp);
542	<	exit(1);
543	<	}
534	>	}
535	>	if (touchonly && oct1date)
536	>	touch(oct1name);
537	>	else {
538	>	mkillumopts(mkopts);            /* build mkillum command */
539	>	mktemp(illumtmp);
540	>	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
541	>	oct0name, vval(ILLUM), illumtmp);
542	>	if (runcom(combuf)) {                   /* run it */
543	>	fprintf(stderr, "%s: error running mkillum\n",
544	>	progname);
545	>	unlink(illumtmp);
546	>	quit(1);
547	>	}
548		/* make octree1 (frozen) */
549	<	if (octreedate)
550	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
551	<	vval(OCTREE), illumtmp, oct1name);
552	<	else if (vdef(MATERIAL))
553	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
554	<	vval(MATERIAL), illumtmp, oct1name);
555	<	else
556	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
557	<	illumtmp, oct1name);
558	<	if (runcom(combuf)) {           /* run it */
559	<	fprintf(stderr,
560	<	"%s: error generating octree\n\t%s removed\n",
561	<	progname, oct1name);
562	<	unlink(oct1name);
563	<	exit(1);
549	>	if (octreedate)
550	>	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
551	>	vval(OCTREE), illumtmp, oct1name);
552	>	else if (vdef(MATERIAL))
553	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
554	>	vval(MATERIAL), illumtmp, oct1name);
555	>	else
556	>	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
557	>	illumtmp, oct1name);
558	>	if (runcom(combuf)) {           /* run it */
559	>	fprintf(stderr,
560	>	"%s: error generating octree\n\t%s removed\n",
561	>	progname, oct1name);
562	>	unlink(oct1name);
563	>	unlink(illumtmp);
564	>	quit(1);
565	>	}
566	>	rmfile(illumtmp);
567		}
568		oct1date = time((time_t *)NULL);
569		if (oct1date < oct0date)        /* in case clock is off */
570		oct1date = oct0date;
766	–	rmfile(illumtmp);
571		}
572
573
574	<	char *
575	<	addarg(op, arg)                         /* add argument and advance pointer */
576	<	register char   *op, *arg;
574	>	static char *
575	>	addarg(                         /* add argument and advance pointer */
576	>	register char   *op,
577	>	register char   *arg
578	>	)
579		{
580		*op = ' ';
581	<	while (*++op = *arg++)
581	>	while ( (*++op = *arg++) )
582		;
583		return(op);
584		}
585
586
587	<	oconvopts(oo)                           /* get oconv options */
588	<	register char   *oo;
587	>	static void
588	>	oconvopts(                              /* get oconv options */
589	>	register char   *oo
590	>	)
591		{
592		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
593
#	Line 789 | Line 597 | register char  *oo;
597		}
598
599
600	<	mkillumopts(mo)                         /* get mkillum options */
601	<	register char   *mo;
600	>	static void
601	>	mkillumopts(                            /* get mkillum options */
602	>	register char   *mo
603	>	)
604		{
605		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
606
#	Line 800 | Line 610 | register char  *mo;
610		}
611
612
613	<	checkambfile()                  /* check date on ambient file */
613	>	static void
614	>	checkambfile(void)                      /* check date on ambient file */
615		{
616		time_t  afdate;
617
#	Line 808 | Line 619 | checkambfile()                 /* check date on ambient file */
619		return;
620		if (!(afdate = fdate(vval(AMBFILE))))
621		return;
622	<	if (oct1date > afdate)
623	<	rmfile(vval(AMBFILE));
622	>	if (oct1date > afdate) {
623	>	if (touchonly)
624	>	touch(vval(AMBFILE));
625	>	else
626	>	rmfile(vval(AMBFILE));
627	>	}
628		}
629
630
631	<	double
632	<	ambval()                                /* compute ambient value */
631	>	static double
632	>	ambval(void)                            /* compute ambient value */
633		{
634		if (vdef(EXPOSURE)) {
635		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
636	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
637	<	return(.5/atof(vval(EXPOSURE)));
636	>	return(.5/pow(2.,vflt(EXPOSURE)));
637	>	return(.5/vflt(EXPOSURE));
638		}
639		if (vlet(ZONE) == 'E')
640		return(10.);
641		if (vlet(ZONE) == 'I')
642		return(.01);
643		badvalue(ZONE);
644	+	return 0; /* pro forma return */
645		}
646
647
648	<	renderopts(op, po)                      /* set rendering options */
649	<	char    *op, *po;
648	>	static void
649	>	renderopts(                     /* set rendering options */
650	>	char    *op,
651	>	char    *po
652	>	)
653		{
654		switch(vscale(QUALITY)) {
655		case LOW:
#	Line 846 | Line 665 | char   *op, *po;
665		}
666
667
668	<	lowqopts(op, po)                        /* low quality rendering options */
669	<	register char   *op;
670	<	char    *po;
668	>	static void
669	>	lowqopts(                       /* low quality rendering options */
670	>	register char   *op,
671	>	char    *po
672	>	)
673		{
674		double  d, org[3], siz[3];
675
#	Line 858 | Line 679 | char   *po;
679		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
680		badvalue(ZONE);
681		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
682	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
682	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
683		badvalue(ZONE);
684		getoctcube(org, &d);
685		d *= 3./(siz[0]+siz[1]+siz[2]);
#	Line 866 | Line 687 | char   *po;
687		case LOW:
688		po = addarg(po, "-ps 16");
689		op = addarg(op, "-dp 64");
690	<	sprintf(op, " -ar %d", (int)(4*d));
690	>	sprintf(op, " -ar %d", (int)(8*d));
691		op += strlen(op);
692		break;
693		case MEDIUM:
694		po = addarg(po, "-ps 8");
695		op = addarg(op, "-dp 128");
696	<	sprintf(op, " -ar %d", (int)(8*d));
696	>	sprintf(op, " -ar %d", (int)(16*d));
697		op += strlen(op);
698		break;
699		case HIGH:
700		po = addarg(po, "-ps 4");
701		op = addarg(op, "-dp 256");
702	<	sprintf(op, " -ar %d", (int)(16*d));
702	>	sprintf(op, " -ar %d", (int)(32*d));
703		op += strlen(op);
704		break;
705		}
#	Line 895 | Line 716 | char   *po;
716		overture = 0;
717		switch (vscale(VARIABILITY)) {
718		case LOW:
719	<	op = addarg(op, "-aa .4 -ad 64");
719	>	op = addarg(op, "-aa .3 -ad 256");
720		break;
721		case MEDIUM:
722	<	op = addarg(op, "-aa .3 -ad 128");
722	>	op = addarg(op, "-aa .25 -ad 512");
723		break;
724		case HIGH:
725	<	op = addarg(op, "-aa .25 -ad 256");
725	>	op = addarg(op, "-aa .2 -ad 1024");
726		break;
727		}
728		op = addarg(op, "-as 0");
729		d = ambval();
730		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
731		op += strlen(op);
732	<	op = addarg(op, "-lr 3 -lw .02");
732	>	op = addarg(op, "-lr 6 -lw .01");
733		if (vdef(RENDER))
734		op = addarg(op, vval(RENDER));
735		}
736
737
738	<	medqopts(op, po)                        /* medium quality rendering options */
739	<	register char   *op;
740	<	char    *po;
738	>	static void
739	>	medqopts(                       /* medium quality rendering options */
740	>	register char   *op,
741	>	char    *po
742	>	)
743		{
744	<	double  d, org[3], siz[3];
744	>	double  d, org[3], siz[3], asz;
745
746		*op = '\0';
747		*po = '\0';
#	Line 926 | Line 749 | char   *po;
749		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
750		badvalue(ZONE);
751		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
752	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
752	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
753		badvalue(ZONE);
754		getoctcube(org, &d);
755	<	d *= 3./(siz[0]+siz[1]+siz[2]);
755	>	asz = (siz[0]+siz[1]+siz[2])/3.;
756	>	d /= asz;
757		switch (vscale(DETAIL)) {
758		case LOW:
759		po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
760		op = addarg(op, "-dp 256");
761	<	sprintf(op, " -ar %d", (int)(8*d));
761	>	sprintf(op, " -ar %d", (int)(16*d));
762		op += strlen(op);
763	+	sprintf(op, " -ms %.2g", asz/20.);
764	+	op += strlen(op);
765		break;
766		case MEDIUM:
767		po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
768		op = addarg(op, "-dp 512");
769	<	sprintf(op, " -ar %d", (int)(16*d));
769	>	sprintf(op, " -ar %d", (int)(32*d));
770		op += strlen(op);
771	+	sprintf(op, " -ms %.2g", asz/40.);
772	+	op += strlen(op);
773		break;
774		case HIGH:
775		po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
776		op = addarg(op, "-dp 1024");
777	<	sprintf(op, " -ar %d", (int)(32*d));
777	>	sprintf(op, " -ar %d", (int)(64*d));
778		op += strlen(op);
779	+	sprintf(op, " -ms %.2g", asz/80.);
780	+	op += strlen(op);
781		break;
782		}
783		po = addarg(po, "-pt .08");
#	Line 956 | Line 786 | char   *po;
786		else
787		op = addarg(op, "-ds .3");
788		op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
789	<	if (overture = vint(INDIRECT)) {
789	>	if ( (overture = vint(INDIRECT)) ) {
790		sprintf(op, " -ab %d", overture);
791		op += strlen(op);
792		}
#	Line 967 | Line 797 | char   *po;
797		overture = 0;
798		switch (vscale(VARIABILITY)) {
799		case LOW:
800	<	op = addarg(op, "-aa .25 -ad 196 -as 0");
800	>	op = addarg(op, "-aa .2 -ad 329 -as 42");
801		break;
802		case MEDIUM:
803	<	op = addarg(op, "-aa .2 -ad 400 -as 64");
803	>	op = addarg(op, "-aa .15 -ad 800 -as 128");
804		break;
805		case HIGH:
806	<	op = addarg(op, "-aa .15 -ad 768 -as 196");
806	>	op = addarg(op, "-aa .1 -ad 1536 -as 392");
807		break;
808		}
809		d = ambval();
810		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
811		op += strlen(op);
812	<	op = addarg(op, "-lr 6 -lw .002");
812	>	op = addarg(op, "-lr 8 -lw .002");
813		if (vdef(RENDER))
814		op = addarg(op, vval(RENDER));
815		}
816
817
818	<	hiqopts(op, po)                         /* high quality rendering options */
819	<	register char   *op;
820	<	char    *po;
818	>	static void
819	>	hiqopts(                                /* high quality rendering options */
820	>	register char   *op,
821	>	char    *po
822	>	)
823		{
824	<	double  d, org[3], siz[3];
824	>	double  d, org[3], siz[3], asz;
825
826		*op = '\0';
827		*po = '\0';
#	Line 997 | Line 829 | char   *po;
829		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
830		badvalue(ZONE);
831		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
832	<	if (siz[0] <= FTINY | siz[1] <= FTINY | siz[2] <= FTINY)
832	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
833		badvalue(ZONE);
834		getoctcube(org, &d);
835	<	d *= 3./(siz[0]+siz[1]+siz[2]);
835	>	asz = (siz[0]+siz[1]+siz[2])/3.;
836	>	d /= asz;
837		switch (vscale(DETAIL)) {
838		case LOW:
839		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
840		op = addarg(op, "-dp 1024");
841	<	sprintf(op, " -ar %d", (int)(16*d));
841	>	sprintf(op, " -ar %d", (int)(32*d));
842		op += strlen(op);
843	+	sprintf(op, " -ms %.2g", asz/40.);
844	+	op += strlen(op);
845		break;
846		case MEDIUM:
847		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
848		op = addarg(op, "-dp 2048");
849	<	sprintf(op, " -ar %d", (int)(32*d));
849	>	sprintf(op, " -ar %d", (int)(64*d));
850		op += strlen(op);
851	+	sprintf(op, " -ms %.2g", asz/80.);
852	+	op += strlen(op);
853		break;
854		case HIGH:
855		po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
856		op = addarg(op, "-dp 4096");
857	<	sprintf(op, " -ar %d", (int)(64*d));
857	>	sprintf(op, " -ar %d", (int)(128*d));
858		op += strlen(op);
859	+	sprintf(op, " -ms %.2g", asz/160.);
860	+	op += strlen(op);
861		break;
862		}
863		po = addarg(po, "-pt .04");
864		if (vbool(PENUMBRAS))
865	<	op = addarg(op, "-ds .1 -dj .7");
865	>	op = addarg(op, "-ds .1 -dj .65");
866		else
867		op = addarg(op, "-ds .2");
868		op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
#	Line 1036 | Line 875 | char   *po;
875		overture = 0;
876		switch (vscale(VARIABILITY)) {
877		case LOW:
878	<	op = addarg(op, "-aa .15 -ad 256 -as 0");
878	>	op = addarg(op, "-aa .125 -ad 512 -as 64");
879		break;
880		case MEDIUM:
881	<	op = addarg(op, "-aa .125 -ad 512 -as 256");
881	>	op = addarg(op, "-aa .1 -ad 1536 -as 768");
882		break;
883		case HIGH:
884	<	op = addarg(op, "-aa .08 -ad 1024 -as 512");
884	>	op = addarg(op, "-aa .075 -ad 4096 -as 2048");
885		break;
886		}
887		d = ambval();
#	Line 1054 | Line 893 | char   *po;
893		}
894
895
896	<	xferopts(ro)                            /* transfer options if indicated */
897	<	char    *ro;
896	>	static void
897	>	xferopts(                               /* transfer options if indicated */
898	>	char    *ro
899	>	)
900		{
901		int     fd, n;
902		register char   *cp;
#	Line 1065 | Line 906 | char   *ro;
906		return;
907		if (vdef(OPTFILE)) {
908		for (cp = ro; cp[1]; cp++)
909	<	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
909	>	if (isspace(cp[1]) && (cp[2] == '@' ||
910	>	(cp[2] == '-' && isalpha(cp[3]))))
911		*cp = '\n';
912		else
913		*cp = cp[1];
#	Line 1075 | Line 917 | char   *ro;
917		syserr(vval(OPTFILE));
918		sprintf(ro, " @%s", vval(OPTFILE));
919		}
920	<	#ifdef MSDOS
920	>	#ifdef _WIN32
921		else if (n > 50) {
922		setenv("ROPT", ro+1);
923		strcpy(ro, " $ROPT");
#	Line 1084 | Line 926 | char   *ro;
926		}
927
928
929	<	pfiltopts(po)                           /* get pfilt options */
930	<	register char   *po;
929	>	static void
930	>	pfiltopts(                              /* get pfilt options */
931	>	register char   *po
932	>	)
933		{
934		*po = '\0';
935		if (vdef(EXPOSURE)) {
#	Line 1094 | Line 938 | register char  *po;
938		}
939		switch (vscale(QUALITY)) {
940		case MEDIUM:
941	<	po = addarg(po, "-r 1");
941	>	po = addarg(po, "-r .6");
942		break;
943		case HIGH:
944		po = addarg(po, "-m .25");
#	Line 1105 | Line 949 | register char  *po;
949		}
950
951
952	<	matchword(s1, s2)                       /* match white-delimited words */
953	<	register char   *s1, *s2;
952	>	static int
953	>	matchword(                      /* match white-delimited words */
954	>	register char   *s1,
955	>	register char   *s2
956	>	)
957		{
958		while (isspace(*s1)) s1++;
959		while (isspace(*s2)) s2++;
#	Line 1117 | Line 964 | register char  *s1, *s2;
964		}
965
966
967	<	char *
968	<	specview(vs)                            /* get proper view spec from vs */
969	<	register char   *vs;
967	>	static char *
968	>	specview(                               /* get proper view spec from vs */
969	>	register char   *vs
970	>	)
971		{
972		static char     vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
973		"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
#	Line 1137 | Line 985 | register char  *vs;
985		upax = 1-'X'+UPPER(vval(UP)[1]);
986		else
987		upax = 1-'X'+vlet(UP);
988	<	if (upax < 1 | upax > 3)
988	>	if ((upax < 1) | (upax > 3))
989		badvalue(UP);
990		if (vval(UP)[0] == '-')
991		upax = -upax;
#	Line 1160 | Line 1008 | register char  *vs;
1008		zpos = -1; vs++;
1009		}
1010		viewtype = 'v';
1011	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h')
1011	>	if((*vs == 'v') | (*vs == 'l') | (*vs == 'a') | (*vs == 'h') | (*vs == 'c'))
1012		viewtype = *vs++;
1013		cp = viewopts;
1014		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
#	Line 1215 | Line 1063 | register char  *vs;
1063		case 'h':
1064		cp = addarg(cp, "-vh 180 -vv 180");
1065		break;
1066	+	case 'c':
1067	+	cp = addarg(cp, "-vh 180 -vv 90");
1068	+	break;
1069		}
1070		} else {
1071		while (!isspace(*vs))           /* else skip id */
#	Line 1228 | Line 1079 | register char  *vs;
1079		if (cp == viewopts)             /* append any additional options */
1080		vs++;           /* skip prefixed space if unneeded */
1081		strcpy(cp, vs);
1082	<	#ifdef MSDOS
1082	>	#ifdef _WIN32
1083		if (strlen(viewopts) > 40) {
1084		setenv("VIEW", viewopts);
1085		return("$VIEW");
#	Line 1238 | Line 1089 | register char  *vs;
1089		}
1090
1091
1092	<	char *
1093	<	getview(n, vn)                          /* get view n, or NULL if none */
1094	<	int     n;
1095	<	char    *vn;            /* returned view name */
1092	>	static char *
1093	>	getview(                                /* get view n, or NULL if none */
1094	>	int     n,
1095	>	char    *vn             /* returned view name */
1096	>	)
1097		{
1098		register char   *mv;
1099
#	Line 1260 | Line 1112 | char   *vn;            /* returned view name */
1112		}
1113		/* view number? */
1114		if (isint(viewselect))
1115	<	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
1115	>	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1116		/* check list */
1117	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1117	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1118		if (matchword(viewselect, mv))
1119		return(specview(mv));
1120		return(specview(viewselect));   /* standard view? */
1121		}
1122	<	mv = nvalue(vv+VIEW, n);                /* use view n */
1123	<	if (vn != NULL & mv != NULL) {
1122	>	mv = nvalue(VIEWS, n);          /* use view n */
1123	>	if ((vn != NULL) & (mv != NULL)) {
1124		register char   *mv2 = mv;
1125		if (*mv2 != '-')
1126		while (*mv2 && !isspace(*mv2))
#	Line 1279 | Line 1131 | char   *vn;            /* returned view name */
1131		}
1132
1133
1134	<	printview(vopts)                        /* print out selected view */
1135	<	register char   *vopts;
1134	>	static int
1135	>	myprintview(                    /* print out selected view */
1136	>	register char   *vopts,
1137	>	FILE    *fp
1138	>	)
1139		{
1140	<	extern char     *atos(), *getenv();
1141	<	char    buf[256];
1287	<	FILE    *fp;
1140	>	VIEW    vwr;
1141	>	char    buf[128];
1142		register char   *cp;
1289	–
1143		if (vopts == NULL)
1144		return(-1);
1145	<	fputs("VIEW=", stdout);
1146	<	do {
1147	<	if (matchword(vopts, "-vf")) {          /* expand view file */
1148	<	vopts = sskip(vopts);
1149	<	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
1145	>	#ifdef _WIN32
1146	>	if (vopts[0] == '$') {
1147	>	vopts = getenv(vopts+1);
1148	>	goto again;
1149	>	}
1150		#endif
1151	<	while (*vopts && !isspace(*vopts))
1152	<	putchar(*vopts++);
1153	<	}
1154	<	} while (*vopts++);
1155	<	putchar('\n');
1151	>	vwr = stdview;
1152	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1153	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1154	>	*atos(buf, sizeof(buf), cp += 4)) {
1155	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1156	>	sscanview(&vwr, cp);            /* reset tail */
1157	>	}
1158	>	fputs(VIEWSTR, fp);
1159	>	fprintview(&vwr, fp);                   /* print full spec. */
1160	>	fputc('\n', fp);
1161		return(0);
1162		}
1163
1164
1165	<	rview(opts, po)                         /* run rview with first view */
1166	<	char    *opts, *po;
1165	>	static void
1166	>	rvu(                            /* run rvu with first view */
1167	>	char    *opts,
1168	>	char    *po
1169	>	)
1170		{
1171		char    *vw;
1172	<	char    combuf[512];
1172	>	char    combuf[PATH_MAX];
1173		/* build command */
1174	<	if ((vw = getview(0, NULL)) == NULL)
1174	>	if (touchonly || (vw = getview(0, NULL)) == NULL)
1175		return;
1176		if (sayview)
1177	<	printview(vw);
1178	<	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1177	>	myprintview(vw, stdout);
1178	>	sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname);
1179		if (rvdevice != NULL)
1180		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1181		if (vdef(EXPOSURE))
1182		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1183		strcat(combuf, oct1name);
1184		if (runcom(combuf)) {           /* run it */
1185	<	fprintf(stderr, "%s: error running rview\n", progname);
1186	<	exit(1);
1185	>	fprintf(stderr, "%s: error running rvu\n", progname);
1186	>	quit(1);
1187		}
1188		}
1189
1190
1191	<	rpict(opts, po)                         /* run rpict and pfilt for each view */
1192	<	char    *opts, *po;
1191	>	static void
1192	>	rpict(                          /* run rpict and pfilt for each view */
1193	>	char    *opts,
1194	>	char    *po
1195	>	)
1196		{
1197	<	char    combuf[1024];
1198	<	char    rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1197	>	char    combuf[PATH_MAX];
1198	>	char    rawfile[PATH_MAX], picfile[PATH_MAX];
1199	>	char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1200	>	char    rppopt[128], *pfile = NULL;
1201		char    pfopts[128];
1202		char    vs[32], *vw;
1203		int     vn, mult;
1204	+	FILE    *fp;
1205	+	time_t  rfdt, pfdt;
1206		/* get pfilt options */
1207		pfiltopts(pfopts);
1208		/* get resolution, reporting */
#	Line 1407 | Line 1243 | char   *opts, *po;
1243		else
1244		badvalue(REPORT);
1245		}
1246	<	/* do each view */
1247	<	vn = 0;
1246	>	/* set up parallel rendering */
1247	>	if ((nprocs > 1) & (!vdef(ZFILE))) {
1248	>	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1249	>	pfile = rppopt+9;
1250	>	if (mktemp(pfile) == NULL)
1251	>	pfile = NULL;
1252	>	}
1253	>	vn = 0;                                 /* do each view */
1254		while ((vw = getview(vn++, vs)) != NULL) {
1255		if (sayview)
1256	<	printview(vw);
1256	>	myprintview(vw, stdout);
1257		if (!vs[0])
1258		sprintf(vs, "%d", vn);
1259		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1260	+	if (vdef(ZFILE))
1261	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1262	+	else
1263	+	zopt[0] = '\0';
1264		/* check date on picture */
1265	<	if (fdate(picfile) >= oct1date)
1265	>	pfdt = fdate(picfile);
1266	>	if (pfdt >= oct1date)
1267		continue;
1268	+	/* get raw file name */
1269	+	sprintf(rawfile, "%s_%s.unf",
1270	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1271	+	rfdt = fdate(rawfile);
1272	+	if (touchonly) {                /* update times only */
1273	+	if (rfdt) {
1274	+	if (rfdt < oct1date)
1275	+	touch(rawfile);
1276	+	} else if (pfdt && pfdt < oct1date)
1277	+	touch(picfile);
1278	+	continue;
1279	+	}
1280	+	if (next_process()) {           /* parallel running? */
1281	+	if (pfile != NULL)
1282	+	sleep(20);
1283	+	continue;
1284	+	}
1285	+	/* XXX Remember to call finish_process() */
1286		/* build rpict command */
1287	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1288	<	if (fdate(rawfile) >= oct1date)         /* recover */
1289	<	sprintf(combuf, "rpict%s%s%s -ro %s %s",
1290	<	rep, po, opts, rawfile, oct1name);
1291	<	else {
1287	>	if (rfdt >= oct1date) {         /* recover */
1288	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1289	>	rep, po, opts, zopt, rawfile, oct1name);
1290	>	if (runcom(combuf))     /* run rpict */
1291	>	goto rperror;
1292	>	} else {
1293		if (overture) {         /* run overture calculation */
1294		sprintf(combuf,
1295		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
#	Line 1433 | Line 1299 | char   *opts, *po;
1299		fprintf(stderr,
1300		"%s: error in overture for view %s\n",
1301		progname, vs);
1302	<	exit(1);
1302	>	quit(1);
1303		}
1304	<	#ifdef NIX
1304	>	#ifndef NULL_DEVICE
1305		rmfile(overfile);
1306		#endif
1307		}
1308	<	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1308	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1309		rep, vw, res, po, opts,
1310	<	oct1name, rawfile);
1310	>	zopt, oct1name, rawfile);
1311	>	if (pfile != NULL && inchild()) {
1312	>	/* rpict persistent mode */
1313	>	if (!silent)
1314	>	printf("\t%s\n", combuf);
1315	>	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1316	>	rep, rppopt, res, po, opts,
1317	>	oct1name, rawfile);
1318	>	fflush(stdout);
1319	>	fp = popen(combuf, "w");
1320	>	if (fp == NULL)
1321	>	goto rperror;
1322	>	myprintview(vw, fp);
1323	>	if (pclose(fp))
1324	>	goto rperror;
1325	>	} else {                /* rpict normal mode */
1326	>	if (runcom(combuf))
1327	>	goto rperror;
1328	>	}
1329		}
1330	<	if (runcom(combuf)) {           /* run rpict */
1447	<	fprintf(stderr, "%s: error rendering view %s\n",
1448	<	progname, vs);
1449	<	exit(1);
1450	<	}
1330	>	if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1331		/* build pfilt command */
1332	<	if (mult > 1)
1333	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1332	>	if (mult > 1)
1333	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1334		pfopts, mult, mult, rawfile, picfile);
1335	<	else
1336	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1337	<	rawfile, picfile);
1338	<	if (runcom(combuf)) {           /* run pfilt */
1339	<	fprintf(stderr,
1340	<	"%s: error filtering view %s\n\t%s removed\n",
1341	<	progname, vs, picfile);
1342	<	unlink(picfile);
1343	<	exit(1);
1335	>	else
1336	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1337	>	rawfile, picfile);
1338	>	if (runcom(combuf)) {   /* run pfilt */
1339	>	fprintf(stderr,
1340	>	"%s: error filtering view %s\n\t%s removed\n",
1341	>	progname, vs, picfile);
1342	>	unlink(picfile);
1343	>	quit(1);
1344	>	}
1345		}
1346	<	/* remove raw file */
1347	<	rmfile(rawfile);
1346	>	/* remove/rename raw file */
1347	>	if (vdef(RAWFILE)) {
1348	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1349	>	mvfile(rawfile, combuf);
1350	>	} else
1351	>	rmfile(rawfile);
1352	>	finish_process();               /* exit if child */
1353		}
1354	+	wait_process(1);                /* wait for children to finish */
1355	+	if (pfile != NULL) {            /* clean up rpict persistent mode */
1356	+	int     pid;
1357	+	fp = fopen(pfile, "r");
1358	+	if (fp != NULL) {
1359	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1360	+	kill(pid, 1) < 0)
1361	+	unlink(pfile);
1362	+	fclose(fp);
1363	+	}
1364	+	}
1365	+	return;
1366	+	rperror:
1367	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1368	+	quit(1);
1369		}
1370
1371
1372	<	runcom(cs)                      /* run command */
1373	<	char    *cs;
1372	>	static int
1373	>	touch(                  /* update a file */
1374	>	char    *fn
1375	>	)
1376		{
1377	+	if (!silent)
1378	+	printf("\ttouch %s\n", fn);
1379	+	if (!nprocs)
1380	+	return(0);
1381	+	#ifdef notused
1382	+	if (access(fn, F_OK) == -1)             /* create it */
1383	+	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1384	+	return(-1);
1385	+	#endif
1386	+	return(setfdate(fn, time((time_t *)NULL)));
1387	+	}
1388	+
1389	+
1390	+	static int
1391	+	runcom(                 /* run command */
1392	+	char    *cs
1393	+	)
1394	+	{
1395		if (!silent)            /* echo it */
1396		printf("\t%s\n", cs);
1397	<	if (noaction)
1397	>	if (!nprocs)
1398		return(0);
1399		fflush(stdout);         /* flush output and pass to shell */
1400		return(system(cs));
1401		}
1402
1403
1404	<	rmfile(fn)                      /* remove a file */
1405	<	char    *fn;
1404	>	static int
1405	>	rmfile(                 /* remove a file */
1406	>	char    *fn
1407	>	)
1408		{
1409		if (!silent)
1410	<	#ifdef MSDOS
1411	<	printf("\tdel %s\n", fn);
1489	<	#else
1490	<	printf("\trm -f %s\n", fn);
1491	<	#endif
1492	<	if (noaction)
1410	>	printf("\t%s %s\n", DELCMD, fn);
1411	>	if (!nprocs)
1412		return(0);
1413		return(unlink(fn));
1414		}
1415
1416
1417	<	#ifdef MSDOS
1417	>	static int
1418	>	mvfile(         /* move a file */
1419	>	char    *fold,
1420	>	char    *fnew
1421	>	)
1422	>	{
1423	>	if (!silent)
1424	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1425	>	if (!nprocs)
1426	>	return(0);
1427	>	return(rename(fold, fnew));
1428	>	}
1429	>
1430	>
1431	>	#ifdef RHAS_FORK_EXEC
1432	>	static int
1433	>	next_process(void)                      /* fork the next process (max. nprocs) */
1434	>	{
1435	>	int     child_pid;
1436	>
1437	>	if (nprocs <= 1)
1438	>	return(0);              /* it's us or no one */
1439	>	if (inchild()) {
1440	>	fprintf(stderr, "%s: internal error 1 in next_process()\n",
1441	>	progname);
1442	>	quit(1);
1443	>	}
1444	>	if (children_running >= nprocs)
1445	>	wait_process(0);        /* wait for someone to finish */
1446	>	fflush(stdout);
1447	>	child_pid = fork();             /* split process */
1448	>	if (child_pid == 0) {           /* we're the child */
1449	>	children_running = -1;
1450	>	return(0);
1451	>	}
1452	>	if (child_pid > 0) {            /* we're the parent */
1453	>	++children_running;
1454	>	return(1);
1455	>	}
1456	>	fprintf(stderr, "%s: warning -- fork() failed\n", progname);
1457	>	return(0);
1458	>	}
1459	>
1460	>	static void
1461	>	wait_process(                   /* wait for process(es) to finish */
1462	>	int     all
1463	>	)
1464	>	{
1465	>	int     ourstatus = 0;
1466	>	int     pid, status;
1467	>
1468	>	if (all)
1469	>	all = children_running;
1470	>	else if (children_running > 0)
1471	>	all = 1;
1472	>	while (all-- > 0) {
1473	>	pid = wait(&status);
1474	>	if (pid < 0)
1475	>	syserr(progname);
1476	>	status = status>>8 & 0xff;
1477	>	--children_running;
1478	>	if (status != 0) {      /* child's problem is our problem */
1479	>	if ((ourstatus == 0) & (children_running > 0))
1480	>	fprintf(stderr, "%s: waiting for remaining processes\n",
1481	>	progname);
1482	>	ourstatus = status;
1483	>	all = children_running;
1484	>	}
1485	>	}
1486	>	if (ourstatus != 0)
1487	>	quit(ourstatus);        /* bad status from child */
1488	>	}
1489	>	#else   /* ! RHAS_FORK_EXEC */
1490	>	static int
1491	>	next_process(void)
1492	>	{
1493	>	return(0);                      /* cannot start new process */
1494	>	}
1495	>	static void
1496	>	wait_process(all)
1497	>	int     all;
1498	>	{
1499	>	(void)all;                      /* no one to wait for */
1500	>	}
1501	>	int
1502	>	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1503	>	int pid, sig;
1504	>	{
1505	>	return 0;
1506	>	}
1507	>	#endif  /* ! RHAS_FORK_EXEC */
1508	>
1509	>	static void
1510	>	finish_process(void)                    /* exit a child process */
1511	>	{
1512	>	if (!inchild())
1513	>	return;                 /* in parent -- noop */
1514	>	exit(0);
1515	>	}
1516	>
1517	>	#ifdef _WIN32
1518		setenv(vname, value)            /* set an environment variable */
1519		char    *vname, *value;
1520		{
#	Line 1507 | Line 1526 | char   *vname, *value;
1526		sprintf(evp, "%s=%s", vname, value);
1527		if (putenv(evp) != 0) {
1528		fprintf(stderr, "%s: out of environment space\n", progname);
1529	<	exit(1);
1529	>	quit(1);
1530		}
1531		if (!silent)
1532		printf("set %s\n", evp);
#	Line 1515 | Line 1534 | char   *vname, *value;
1534		#endif
1535
1536
1537	<	badvalue(vc)                    /* report bad variable value and exit */
1538	<	int     vc;
1537	>	static void
1538	>	badvalue(                       /* report bad variable value and exit */
1539	>	int     vc
1540	>	)
1541		{
1542		fprintf(stderr, "%s: bad value for variable '%s'\n",
1543		progname, vnam(vc));
1544	<	exit(1);
1544	>	quit(1);
1545		}
1546
1547
1548	<	syserr(s)                       /* report a system error and exit */
1549	<	char    *s;
1548	>	static void
1549	>	syserr(                 /* report a system error and exit */
1550	>	char    *s
1551	>	)
1552		{
1553		perror(s);
1554	<	exit(1);
1554	>	quit(1);
1555	>	}
1556	>
1557	>
1558	>	void
1559	>	quit(ec)                        /* exit program */
1560	>	int     ec;
1561	>	{
1562	>	exit(ec);
1563		}

Diff Legend

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