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.27 by greg, Sat Sep 25 13:21:35 1993 UTC vs.
Revision 2.80 by schorsch, Sat Oct 23 18:55:53 2004 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1993 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 <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();
30	<
31	<	/* variables */
32	<	#define OBJECT          0               /* object files */
33	<	#define SCENE           1               /* scene files */
34	<	#define MATERIAL        2               /* material files */
35	<	#define ILLUM           3               /* mkillum input files */
36	<	#define MKILLUM         4               /* mkillum options */
37	<	#define RENDER          5               /* rendering options */
38	<	#define OCONV           6               /* oconv options */
39	<	#define PFILT           7               /* pfilt options */
40	<	#define VIEW            8               /* view(s) for picture(s) */
41	<	#define ZONE            9               /* simulation zone */
42	<	#define QUALITY         10              /* desired rendering quality */
43	<	#define OCTREE          11              /* octree file name */
44	<	#define PICTURE         12              /* picture file name */
45	<	#define AMBFILE         13              /* ambient file name */
46	<	#define OPTFILE         14              /* rendering options file */
47	<	#define EXPOSURE        15              /* picture exposure setting */
48	<	#define RESOLUTION      16              /* maximum picture resolution */
49	<	#define UP              17              /* view up (X, Y or Z) */
50	<	#define INDIRECT        18              /* indirection in lighting */
51	<	#define DETAIL          19              /* level of scene detail */
52	<	#define PENUMBRAS       20              /* shadow penumbras are desired */
53	<	#define VARIABILITY     21              /* level of light variability */
54	<	#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},
61	–	{"pfilt",       2,      0,      NULL,   catvalues},
62	–	{"view",        2,      0,      NULL,   NULL},
63	–	{"ZONE",        2,      0,      NULL,   onevalue},
64	–	{"QUALITY",     3,      0,      NULL,   onevalue},
70		{"OCTREE",      3,      0,      NULL,   onevalue},
66	–	{"PICTURE",     3,      0,      NULL,   onevalue},
67	–	{"AMBFILE",     3,      0,      NULL,   onevalue},
71		{"OPTFILE",     3,      0,      NULL,   onevalue},
72	<	{"EXPOSURE",    3,      0,      NULL,   onevalue},
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},
82	<	{"INDIRECT",    3,      0,      NULL,   onevalue},
83	<	{"DETAIL",      3,      0,      NULL,   onevalue},
84	<	{"PENUMBRAS",   3,      0,      NULL,   onevalue},
85	<	{"VARIABILITY", 3,      0,      NULL,   onevalue},
76	<	{"REPORT",      3,      0,      NULL,   onevalue},
82	>	{"VARIABILITY", 3,      0,      NULL,   qualvalue},
83	>	{"view",        2,      0,      NULL,   NULL},
84	>	{"ZFILE",       2,      0,      NULL,   onevalue},
85	>	{"ZONE",        2,      0,      NULL,   onevalue},
86		};
87
79	–	VARIABLE        *matchvar();
80	–	char    *nvalue();
81	–	int     vscale();
82	–
83	–	#define UPPER(c)        ((c)&~0x20)     /* ASCII trick */
84	–
85	–	#define vnam(vc)        (vv[vc].name)
86	–	#define vdef(vc)        (vv[vc].nass)
87	–	#define vval(vc)        (vv[vc].value)
88	–	#define vint(vc)        atoi(vval(vc))
89	–	#define vlet(vc)        UPPER(vval(vc)[0])
90	–	#define vbool(vc)       (vlet(vc)=='T')
91	–
92	–	#define HIGH            2
93	–	#define MEDIUM          1
94	–	#define LOW             0
95	–
96	–	int     lowqopts(), medqopts(), hiqopts();
97	–	int     (*setqopts[3])() = {lowqopts, medqopts, hiqopts};
98	–
99	–	#define renderopts      (*setqopts[vscale(QUALITY)])
100	–
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
108	–	extern unsigned long    fdate(), time();
95
96	<	unsigned long   scenedate;      /* date of latest scene or object file */
97	<	unsigned long   octreedate;     /* date of octree */
98	<	unsigned long   matdate;        /* date of latest material file */
99	<	unsigned long   illumdate;      /* date of last illum file */
96	>	time_t  scenedate;              /* date of latest scene or object file */
97	>	time_t  octreedate;             /* date of octree */
98	>	time_t  matdate;                /* date of latest material file */
99	>	time_t  illumdate;              /* date of last illum file */
100
101		char    *oct0name;              /* name of pre-mkillum octree */
102	<	unsigned long   oct0date;       /* date of pre-mkillum octree */
102	>	time_t  oct0date;               /* date of pre-mkillum octree */
103		char    *oct1name;              /* name of post-mkillum octree */
104	<	unsigned long   oct1date;       /* date of post-mkillum octree (>= matdate) */
104	>	time_t  oct1date;               /* date of post-mkillum octree (>= matdate) */
105
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];
169		int     i;
170
171		progname = argv[0];
#	Line 147 | 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 161 | Line 198 | char   *argv[];
198		case 'v':
199		viewselect = argv[++i];
200		break;
201	+	case 'w':
202	+	nowarn++;
203	+	break;
204		default:
205		goto userr;
206		}
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 182 | 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 */
236		checkambfile();
237		/* run simulation */
238	<	renderopts(ropts);
238	>	renderopts(ropts, popts);
239		xferopts(ropts);
240		if (rvdevice != NULL)
241	<	rview(ropts);
241	>	rvu(ropts, popts);
242		else
243	<	rpict(ropts);
244	<	exit(0);
243	>	rpict(ropts, popts);
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 218 | 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 */
225	<	char    *rfname;
272	>	static time_t
273	>	checklast(                      /* check files and find most recent */
274	>	register char   *fnames
275	>	)
276		{
277	<	FILE    *fp;
278	<	char    buf[512];
229	<	register char   *cp;
277	>	char    thisfile[PATH_MAX];
278	>	time_t  thisdate, lastdate = 0;
279
231	–	if (rfname == NULL)
232	–	fp = stdin;
233	–	else if ((fp = fopen(rfname, "r")) == NULL)
234	–	syserr(rfname);
235	–	while (fgetline(buf, sizeof(buf), fp) != NULL) {
236	–	for (cp = buf; *cp; cp++) {
237	–	switch (*cp) {
238	–	case '\\':
239	–	*cp++ = NOCHAR;
240	–	continue;
241	–	case '#':
242	–	*cp = '\0';
243	–	break;
244	–	default:
245	–	continue;
246	–	}
247	–	break;
248	–	}
249	–	setvariable(buf);
250	–	}
251	–	fclose(fp);
252	–	}
253	–
254	–
255	–	setvariable(ass)                /* assign variable according to string */
256	–	register char   *ass;
257	–	{
258	–	char    varname[32];
259	–	char    varval[512];
260	–	int     n;
261	–	register char   *cp;
262	–	register VARIABLE       *vp;
263	–	register int    i;
264	–
265	–	while (isspace(*ass))           /* skip leading space */
266	–	ass++;
267	–	cp = varname;                   /* extract name */
268	–	while (cp < varname+sizeof(varname)-1
269	–	&& *ass && !isspace(*ass) && *ass != '=')
270	–	*cp++ = *ass++;
271	–	*cp = '\0';
272	–	if (!varname[0])
273	–	return;         /* no variable name! */
274	–	/* trim value */
275	–	while (isspace(*ass) || *ass == '=')
276	–	ass++;
277	–	for (n = strlen(ass); n > 0; n--)
278	–	if (!isspace(ass[n-1]))
279	–	break;
280	–	if (!n) {
281	–	fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
282	–	progname, varname);
283	–	return;
284	–	}
285	–	/* match variable from list */
286	–	vp = matchvar(varname);
287	–	if (vp == NULL) {
288	–	fprintf(stderr, "%s: unknown variable '%s'\n",
289	–	progname, varname);
290	–	exit(1);
291	–	}
292	–	/* assign new value */
293	–	if (i = vp->nass) {
294	–	cp = vp->value;
295	–	while (i--)
296	–	while (*cp++)
297	–	;
298	–	i = cp - vp->value;
299	–	vp->value = realloc(vp->value, i+n+1);
300	–	} else
301	–	vp->value = malloc(n+1);
302	–	if (vp->value == NULL)
303	–	syserr(progname);
304	–	cp = vp->value+i;               /* copy value, squeezing spaces */
305	–	*cp = *ass;
306	–	for (i = 1; i <= n; i++) {
307	–	if (ass[i] == NOCHAR)
308	–	continue;
309	–	if (isspace(*cp))
310	–	while (isspace(ass[i]))
311	–	i++;
312	–	*++cp = ass[i];
313	–	}
314	–	if (isspace(*cp))               /* remove trailing space */
315	–	*cp = '\0';
316	–	vp->nass++;
317	–	}
318	–
319	–
320	–	VARIABLE *
321	–	matchvar(nam)                   /* match a variable by its name */
322	–	char    *nam;
323	–	{
324	–	int     n = strlen(nam);
325	–	register int    i;
326	–
327	–	for (i = 0; i < NVARS; i++)
328	–	if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
329	–	return(vv+i);
330	–	return(NULL);
331	–	}
332	–
333	–
334	–	char *
335	–	nvalue(vp, n)                   /* return nth variable value */
336	–	VARIABLE        *vp;
337	–	register int    n;
338	–	{
339	–	register char   *cp;
340	–
341	–	if (vp == NULL | n < 0 | n >= vp->nass)
342	–	return(NULL);
343	–	cp = vp->value;
344	–	while (n--)
345	–	while (*cp++)
346	–	;
347	–	return(cp);
348	–	}
349	–
350	–
351	–	int
352	–	vscale(vc)                      /* return scale for variable vc */
353	–	int     vc;
354	–	{
355	–	switch(vlet(vc)) {
356	–	case 'H':
357	–	return(HIGH);
358	–	case 'M':
359	–	return(MEDIUM);
360	–	case 'L':
361	–	return(LOW);
362	–	}
363	–	badvalue(vc);
364	–	}
365	–
366	–
367	–	checkvalues()                   /* check assignments */
368	–	{
369	–	register int    i;
370	–
371	–	for (i = 0; i < NVARS; i++)
372	–	if (vv[i].fixval != NULL)
373	–	(*vv[i].fixval)(vv+i);
374	–	}
375	–
376	–
377	–	onevalue(vp)                    /* only one assignment for this variable */
378	–	register VARIABLE       *vp;
379	–	{
380	–	if (vp->nass < 2)
381	–	return;
382	–	fprintf(stderr, "%s: warning - multiple assignment of variable '%s'\n",
383	–	progname, vp->name);
384	–	do
385	–	vp->value += strlen(vp->value)+1;
386	–	while (--vp->nass > 1);
387	–	}
388	–
389	–
390	–	catvalues(vp)                   /* concatenate variable values */
391	–	register VARIABLE       *vp;
392	–	{
393	–	register char   *cp;
394	–
395	–	if (vp->nass < 2)
396	–	return;
397	–	for (cp = vp->value; vp->nass > 1; vp->nass--) {
398	–	while (*cp)
399	–	cp++;
400	–	*cp++ = ' ';
401	–	}
402	–	}
403	–
404	–
405	–	unsigned long
406	–	checklast(fnames)                       /* check files and find most recent */
407	–	register char   *fnames;
408	–	{
409	–	char    thisfile[MAXPATH];
410	–	unsigned long   thisdate, lastdate = 0;
411	–	register char   *cp;
412	–
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 427 | 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		{
435	–	extern char     *rindex();
304		register char   *cp;
305		register int    n;
306		int     suffix;
#	Line 453 | 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	<	unsigned long   objdate;
327	>	time_t  objdate;
328
329		if (!vdef(OCTREE)) {
330		if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL)
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 478 | 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		{
490	–	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 508 | 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 526 | 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 546 | 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 562 | 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 581 | 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		{
586	–	register int    i, j;
587	–
588	–	for (i = 0; i < NVARS; i++)
589	–	for (j = 0; j < vdef(i); j++)
590	–	printf("%s= %s\n", vnam(i), nvalue(vv+i, j));
591	–	fflush(stdout);
592	–	}
593	–
594	–
595	–	oconv()                         /* run oconv and mkillum if necessary */
596	–	{
474		static char     illumtmp[] = "ilXXXXXX";
475	<	char    combuf[512], ocopts[64], mkopts[64];
475	>	char    combuf[PATH_MAX], ocopts[64], mkopts[1024];
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(0);
498	>	octreedate = time((time_t *)NULL);
499	>	if (octreedate < scenedate)     /* in case clock is off */
500	>	octreedate = scenedate;
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 */
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	>	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	>	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 -i %s %s > %s", ocopts,
551	<	vval(OCTREE), vval(ILLUM), oct0name);
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 %s %s > %s", ocopts,
554	<	vval(MATERIAL), vval(ILLUM), oct0name);
553	>	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
554	>	vval(MATERIAL), illumtmp, oct1name);
555		else
556	<	sprintf(combuf, "oconv%s %s > %s", ocopts,
557	<	vval(ILLUM), oct0name);
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, oct0name);
562	<	unlink(oct0name);
563	<	exit(1);
561	>	progname, oct1name);
562	>	unlink(oct1name);
563	>	unlink(illumtmp);
564	>	quit(1);
565		}
566	<	oct0date = time(0);
566	>	rmfile(illumtmp);
567		}
568	<	mkillumopts(mkopts);                    /* build mkillum command */
569	<	mktemp(illumtmp);
570	<	sprintf(combuf, "mkillum%s %s \"<\" %s > %s", mkopts,
648	<	oct0name, vval(ILLUM), illumtmp);
649	<	if (runcom(combuf)) {                   /* run it */
650	<	fprintf(stderr, "%s: error running mkillum\n", progname);
651	<	unlink(illumtmp);
652	<	exit(1);
653	<	}
654	<	/* make octree1 (frozen) */
655	<	if (octreedate)
656	<	sprintf(combuf, "oconv%s -f -i %s %s > %s", ocopts,
657	<	vval(OCTREE), illumtmp, oct1name);
658	<	else if (vdef(MATERIAL))
659	<	sprintf(combuf, "oconv%s -f %s %s > %s", ocopts,
660	<	vval(MATERIAL), illumtmp, oct1name);
661	<	else
662	<	sprintf(combuf, "oconv%s -f %s > %s", ocopts,
663	<	illumtmp, oct1name);
664	<	if (runcom(combuf)) {           /* run it */
665	<	fprintf(stderr,
666	<	"%s: error generating octree\n\t%s removed\n",
667	<	progname, oct1name);
668	<	unlink(oct1name);
669	<	exit(1);
670	<	}
671	<	oct1date = time(0);
672	<	rmfile(illumtmp);
568	>	oct1date = time((time_t *)NULL);
569	>	if (oct1date < oct0date)        /* in case clock is off */
570	>	oct1date = oct0date;
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 695 | 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	>	char    *mo
603	>	)
604		{
605		/* BEWARE:  This may be called via setdefaults(), so no assumptions */
606
607	<	*mo = '\0';
607	>	if (nprocs > 1) {
608	>	sprintf(mo, " -n %d", nprocs);
609	>	while (*mo)
610	>	mo++;
611	>	} else
612	>	*mo = '\0';
613		if (vdef(MKILLUM))
614		addarg(mo, vval(MKILLUM));
615		}
616
617
618	<	checkambfile()                  /* check date on ambient file */
618	>	static void
619	>	checkambfile(void)                      /* check date on ambient file */
620		{
621	<	unsigned long   afdate;
621	>	time_t  afdate;
622
623		if (!vdef(AMBFILE))
624		return;
625		if (!(afdate = fdate(vval(AMBFILE))))
626		return;
627	<	if (oct1date > afdate)
628	<	rmfile(vval(AMBFILE));
627	>	if (oct1date > afdate) {
628	>	if (touchonly)
629	>	touch(vval(AMBFILE));
630	>	else
631	>	rmfile(vval(AMBFILE));
632	>	}
633		}
634
635
636	<	double
637	<	ambval()                                /* compute ambient value */
636	>	static double
637	>	ambval(void)                            /* compute ambient value */
638		{
639		if (vdef(EXPOSURE)) {
726	–	if (!isflt(vval(EXPOSURE)))
727	–	badvalue(EXPOSURE);
640		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
641	<	return(.5/pow(2.,atof(vval(EXPOSURE))));
642	<	return(.5/atof(vval(EXPOSURE)));
641	>	return(.5/pow(2.,vflt(EXPOSURE)));
642	>	return(.5/vflt(EXPOSURE));
643		}
644		if (vlet(ZONE) == 'E')
645		return(10.);
646		if (vlet(ZONE) == 'I')
647		return(.01);
648		badvalue(ZONE);
649	+	return 0; /* pro forma return */
650		}
651
652
653	<	lowqopts(op)                            /* low quality rendering options */
654	<	register char   *op;
653	>	static void
654	>	renderopts(                     /* set rendering options */
655	>	char    *op,
656	>	char    *po
657	>	)
658		{
659	+	switch(vscale(QUALITY)) {
660	+	case LOW:
661	+	lowqopts(op, po);
662	+	break;
663	+	case MEDIUM:
664	+	medqopts(op, po);
665	+	break;
666	+	case HIGH:
667	+	hiqopts(op, po);
668	+	break;
669	+	}
670	+	}
671	+
672	+
673	+	static void
674	+	lowqopts(                       /* low quality rendering options */
675	+	register char   *op,
676	+	char    *po
677	+	)
678	+	{
679		double  d, org[3], siz[3];
680
681		*op = '\0';
682	+	*po = '\0';
683		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
684		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
685		badvalue(ZONE);
686		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
687	+	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
688	+	badvalue(ZONE);
689		getoctcube(org, &d);
690		d *= 3./(siz[0]+siz[1]+siz[2]);
691		switch (vscale(DETAIL)) {
692		case LOW:
693	<	op = addarg(op, "-ps 16 -dp 64");
694	<	sprintf(op, " -ar %d", (int)(4*d));
693	>	po = addarg(po, "-ps 16");
694	>	op = addarg(op, "-dp 64");
695	>	sprintf(op, " -ar %d", (int)(8*d));
696		op += strlen(op);
697		break;
698		case MEDIUM:
699	<	op = addarg(op, "-ps 8 -dp 128");
700	<	sprintf(op, " -ar %d", (int)(8*d));
699	>	po = addarg(po, "-ps 8");
700	>	op = addarg(op, "-dp 128");
701	>	sprintf(op, " -ar %d", (int)(16*d));
702		op += strlen(op);
703		break;
704		case HIGH:
705	<	op = addarg(op, "-ps 4 -dp 256");
706	<	sprintf(op, " -ar %d", (int)(16*d));
705	>	po = addarg(po, "-ps 4");
706	>	op = addarg(op, "-dp 256");
707	>	sprintf(op, " -ar %d", (int)(32*d));
708		op += strlen(op);
709		break;
710		}
711	<	op = addarg(op, "-pt .16");
711	>	po = addarg(po, "-pt .16");
712		if (vbool(PENUMBRAS))
713		op = addarg(op, "-ds .4");
714		else
#	Line 779 | Line 721 | register char  *op;
721		overture = 0;
722		switch (vscale(VARIABILITY)) {
723		case LOW:
724	<	op = addarg(op, "-aa .4 -ad 64");
724	>	op = addarg(op, "-aa .3 -ad 256");
725		break;
726		case MEDIUM:
727	<	op = addarg(op, "-aa .3 -ad 128");
727	>	op = addarg(op, "-aa .25 -ad 512");
728		break;
729		case HIGH:
730	<	op = addarg(op, "-aa .25 -ad 256");
730	>	op = addarg(op, "-aa .2 -ad 1024");
731		break;
732		}
733		op = addarg(op, "-as 0");
734		d = ambval();
735		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
736		op += strlen(op);
737	<	op = addarg(op, "-lr 3 -lw .02");
737	>	op = addarg(op, "-lr 6 -lw .01");
738		if (vdef(RENDER))
739		op = addarg(op, vval(RENDER));
740		}
741
742
743	<	medqopts(op)                            /* medium quality rendering options */
744	<	register char   *op;
743	>	static void
744	>	medqopts(                       /* medium quality rendering options */
745	>	register char   *op,
746	>	char    *po
747	>	)
748		{
749	<	double  d, org[3], siz[3];
749	>	double  d, org[3], siz[3], asz;
750
751		*op = '\0';
752	+	*po = '\0';
753		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
754		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
755		badvalue(ZONE);
756		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
757	+	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
758	+	badvalue(ZONE);
759		getoctcube(org, &d);
760	<	d *= 3./(siz[0]+siz[1]+siz[2]);
760	>	asz = (siz[0]+siz[1]+siz[2])/3.;
761	>	d /= asz;
762		switch (vscale(DETAIL)) {
763		case LOW:
764	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
764	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8");
765		op = addarg(op, "-dp 256");
766	<	sprintf(op, " -ar %d", (int)(8*d));
766	>	sprintf(op, " -ar %d", (int)(16*d));
767		op += strlen(op);
768	+	sprintf(op, " -ms %.2g", asz/20.);
769	+	op += strlen(op);
770		break;
771		case MEDIUM:
772	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
772	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6");
773		op = addarg(op, "-dp 512");
774	<	sprintf(op, " -ar %d", (int)(16*d));
774	>	sprintf(op, " -ar %d", (int)(32*d));
775		op += strlen(op);
776	+	sprintf(op, " -ms %.2g", asz/40.);
777	+	op += strlen(op);
778		break;
779		case HIGH:
780	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
780	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4");
781		op = addarg(op, "-dp 1024");
782	<	sprintf(op, " -ar %d", (int)(32*d));
782	>	sprintf(op, " -ar %d", (int)(64*d));
783		op += strlen(op);
784	+	sprintf(op, " -ms %.2g", asz/80.);
785	+	op += strlen(op);
786		break;
787		}
788	<	op = addarg(op, "-pt .08");
788	>	po = addarg(po, "-pt .08");
789		if (vbool(PENUMBRAS))
790	<	op = addarg(op, "-ds .2 -dj .35");
790	>	op = addarg(op, "-ds .2 -dj .5");
791		else
792		op = addarg(op, "-ds .3");
793		op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
794	<	if (overture = vint(INDIRECT)) {
794	>	if ( (overture = vint(INDIRECT)) ) {
795		sprintf(op, " -ab %d", overture);
796		op += strlen(op);
797		}
#	Line 847 | Line 802 | register char  *op;
802		overture = 0;
803		switch (vscale(VARIABILITY)) {
804		case LOW:
805	<	op = addarg(op, "-aa .25 -ad 196 -as 0");
805	>	op = addarg(op, "-aa .2 -ad 329 -as 42");
806		break;
807		case MEDIUM:
808	<	op = addarg(op, "-aa .2 -ad 400 -as 64");
808	>	op = addarg(op, "-aa .15 -ad 800 -as 128");
809		break;
810		case HIGH:
811	<	op = addarg(op, "-aa .15 -ad 768 -as 196");
811	>	op = addarg(op, "-aa .1 -ad 1536 -as 392");
812		break;
813		}
814		d = ambval();
815		sprintf(op, " -av %.2g %.2g %.2g", d, d, d);
816		op += strlen(op);
817	<	op = addarg(op, "-lr 6 -lw .002");
817	>	op = addarg(op, "-lr 8 -lw .002");
818		if (vdef(RENDER))
819		op = addarg(op, vval(RENDER));
820		}
821
822
823	<	hiqopts(op)                             /* high quality rendering options */
824	<	register char   *op;
823	>	static void
824	>	hiqopts(                                /* high quality rendering options */
825	>	register char   *op,
826	>	char    *po
827	>	)
828		{
829	<	double  d, org[3], siz[3];
829	>	double  d, org[3], siz[3], asz;
830
831		*op = '\0';
832	+	*po = '\0';
833		if (sscanf(vval(ZONE), "%*s %lf %lf %lf %lf %lf %lf", &org[0],
834		&siz[0], &org[1], &siz[1], &org[2], &siz[2]) != 6)
835		badvalue(ZONE);
836		siz[0] -= org[0]; siz[1] -= org[1]; siz[2] -= org[2];
837	+	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
838	+	badvalue(ZONE);
839		getoctcube(org, &d);
840	<	d *= 3./(siz[0]+siz[1]+siz[2]);
840	>	asz = (siz[0]+siz[1]+siz[2])/3.;
841	>	d /= asz;
842		switch (vscale(DETAIL)) {
843		case LOW:
844	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
844	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8");
845		op = addarg(op, "-dp 1024");
846	<	sprintf(op, " -ar %d", (int)(16*d));
846	>	sprintf(op, " -ar %d", (int)(32*d));
847		op += strlen(op);
848	+	sprintf(op, " -ms %.2g", asz/40.);
849	+	op += strlen(op);
850		break;
851		case MEDIUM:
852	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
852	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5");
853		op = addarg(op, "-dp 2048");
854	<	sprintf(op, " -ar %d", (int)(32*d));
854	>	sprintf(op, " -ar %d", (int)(64*d));
855		op += strlen(op);
856	+	sprintf(op, " -ms %.2g", asz/80.);
857	+	op += strlen(op);
858		break;
859		case HIGH:
860	<	op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
860	>	po = addarg(po, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3");
861		op = addarg(op, "-dp 4096");
862	<	sprintf(op, " -ar %d", (int)(64*d));
862	>	sprintf(op, " -ar %d", (int)(128*d));
863		op += strlen(op);
864	+	sprintf(op, " -ms %.2g", asz/160.);
865	+	op += strlen(op);
866		break;
867		}
868	<	op = addarg(op, "-pt .04");
868	>	po = addarg(po, "-pt .04");
869		if (vbool(PENUMBRAS))
870	<	op = addarg(op, "-ds .1 -dj .7");
870	>	op = addarg(op, "-ds .1 -dj .65");
871		else
872		op = addarg(op, "-ds .2");
873		op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
#	Line 912 | Line 880 | register char  *op;
880		overture = 0;
881		switch (vscale(VARIABILITY)) {
882		case LOW:
883	<	op = addarg(op, "-aa .15 -ad 256 -as 0");
883	>	op = addarg(op, "-aa .125 -ad 512 -as 64");
884		break;
885		case MEDIUM:
886	<	op = addarg(op, "-aa .125 -ad 512 -as 256");
886	>	op = addarg(op, "-aa .1 -ad 1536 -as 768");
887		break;
888		case HIGH:
889	<	op = addarg(op, "-aa .08 -ad 1024 -as 512");
889	>	op = addarg(op, "-aa .075 -ad 4096 -as 2048");
890		break;
891		}
892		d = ambval();
#	Line 930 | Line 898 | register char  *op;
898		}
899
900
901	<	xferopts(ro)                            /* transfer options if indicated */
902	<	char    *ro;
901	>	static void
902	>	xferopts(                               /* transfer options if indicated */
903	>	char    *ro
904	>	)
905		{
906		int     fd, n;
907		register char   *cp;
#	Line 941 | Line 911 | char   *ro;
911		return;
912		if (vdef(OPTFILE)) {
913		for (cp = ro; cp[1]; cp++)
914	<	if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
914	>	if (isspace(cp[1]) && (cp[2] == '@' ||
915	>	(cp[2] == '-' && isalpha(cp[3]))))
916		*cp = '\n';
917		else
918		*cp = cp[1];
#	Line 951 | Line 922 | char   *ro;
922		syserr(vval(OPTFILE));
923		sprintf(ro, " @%s", vval(OPTFILE));
924		}
925	<	#ifdef MSDOS
925	>	#ifdef _WIN32
926		else if (n > 50) {
927		setenv("ROPT", ro+1);
928		strcpy(ro, " $ROPT");
#	Line 960 | Line 931 | char   *ro;
931		}
932
933
934	<	pfiltopts(po)                           /* get pfilt options */
935	<	register char   *po;
934	>	static void
935	>	pfiltopts(                              /* get pfilt options */
936	>	register char   *po
937	>	)
938		{
939		*po = '\0';
940		if (vdef(EXPOSURE)) {
#	Line 970 | Line 943 | register char  *po;
943		}
944		switch (vscale(QUALITY)) {
945		case MEDIUM:
946	<	po = addarg(po, "-r 1");
946	>	po = addarg(po, "-r .6");
947		break;
948		case HIGH:
949		po = addarg(po, "-m .25");
#	Line 981 | Line 954 | register char  *po;
954		}
955
956
957	<	matchword(s1, s2)                       /* match white-delimited words */
958	<	register char   *s1, *s2;
957	>	static int
958	>	matchword(                      /* match white-delimited words */
959	>	register char   *s1,
960	>	register char   *s2
961	>	)
962		{
963		while (isspace(*s1)) s1++;
964		while (isspace(*s2)) s2++;
#	Line 993 | Line 969 | register char  *s1, *s2;
969		}
970
971
972	<	char *
973	<	specview(vs)                            /* get proper view spec from vs */
974	<	register char   *vs;
972	>	static char *
973	>	specview(                               /* get proper view spec from vs */
974	>	register char   *vs
975	>	)
976		{
977		static char     vup[7][12] = {"-vu 0 0 -1","-vu 0 -1 0","-vu -1 0 0",
978		"-vu 0 0 1", "-vu 1 0 0","-vu 0 1 0","-vu 0 0 1"};
#	Line 1013 | Line 990 | register char  *vs;
990		upax = 1-'X'+UPPER(vval(UP)[1]);
991		else
992		upax = 1-'X'+vlet(UP);
993	<	if (upax < 1 | upax > 3)
993	>	if ((upax < 1) | (upax > 3))
994		badvalue(UP);
995		if (vval(UP)[0] == '-')
996		upax = -upax;
#	Line 1036 | Line 1013 | register char  *vs;
1013		zpos = -1; vs++;
1014		}
1015		viewtype = 'v';
1016	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h')
1016	>	if((*vs == 'v') | (*vs == 'l') | (*vs == 'a') | (*vs == 'h') | (*vs == 'c'))
1017		viewtype = *vs++;
1018		cp = viewopts;
1019		if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {       /* got one! */
#	Line 1047 | Line 1024 | register char  *vs;
1024		badvalue(ZONE);
1025		for (i = 0; i < 3; i++) {
1026		dim[i] -= cent[i];
1027	+	if (dim[i] <= FTINY)
1028	+	badvalue(ZONE);
1029		cent[i] += .5*dim[i];
1030		}
1031		mult = vlet(ZONE)=='E' ? 2. : .45 ;
#	Line 1089 | Line 1068 | register char  *vs;
1068		case 'h':
1069		cp = addarg(cp, "-vh 180 -vv 180");
1070		break;
1071	+	case 'c':
1072	+	cp = addarg(cp, "-vh 180 -vv 90");
1073	+	break;
1074		}
1075		} else {
1076		while (!isspace(*vs))           /* else skip id */
#	Line 1102 | Line 1084 | register char  *vs;
1084		if (cp == viewopts)             /* append any additional options */
1085		vs++;           /* skip prefixed space if unneeded */
1086		strcpy(cp, vs);
1087	<	#ifdef MSDOS
1087	>	#ifdef _WIN32
1088		if (strlen(viewopts) > 40) {
1089		setenv("VIEW", viewopts);
1090		return("$VIEW");
#	Line 1112 | Line 1094 | register char  *vs;
1094		}
1095
1096
1097	<	char *
1098	<	getview(n, vn)                          /* get view n, or NULL if none */
1099	<	int     n;
1100	<	char    *vn;            /* returned view name */
1097	>	static char *
1098	>	getview(                                /* get view n, or NULL if none */
1099	>	int     n,
1100	>	char    *vn             /* returned view name */
1101	>	)
1102		{
1103		register char   *mv;
1104
#	Line 1134 | Line 1117 | char   *vn;            /* returned view name */
1117		}
1118		/* view number? */
1119		if (isint(viewselect))
1120	<	return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
1120	>	return(specview(nvalue(VIEWS, atoi(viewselect)-1)));
1121		/* check list */
1122	<	while ((mv = nvalue(vv+VIEW, n++)) != NULL)
1122	>	while ((mv = nvalue(VIEWS, n++)) != NULL)
1123		if (matchword(viewselect, mv))
1124		return(specview(mv));
1125		return(specview(viewselect));   /* standard view? */
1126		}
1127	<	mv = nvalue(vv+VIEW, n);                /* use view n */
1128	<	if (vn != NULL & mv != NULL) {
1127	>	mv = nvalue(VIEWS, n);          /* use view n */
1128	>	if ((vn != NULL) & (mv != NULL)) {
1129		register char   *mv2 = mv;
1130		if (*mv2 != '-')
1131		while (*mv2 && !isspace(*mv2))
#	Line 1153 | Line 1136 | char   *vn;            /* returned view name */
1136		}
1137
1138
1139	<	printview(vopts)                        /* print out selected view */
1140	<	register char   *vopts;
1139	>	static int
1140	>	myprintview(                    /* print out selected view */
1141	>	register char   *vopts,
1142	>	FILE    *fp
1143	>	)
1144		{
1145	<	extern char     *atos(), *getenv();
1146	<	char    buf[256];
1161	<	FILE    *fp;
1145	>	VIEW    vwr;
1146	>	char    buf[128];
1147		register char   *cp;
1148	<
1148	>	#ifdef _WIN32
1149	>	/* XXX Should we allow something like this for all platforms? */
1150	>	/* XXX Or is it still required at all? */
1151	>	again:
1152	>	#endif
1153		if (vopts == NULL)
1154		return(-1);
1155	<	fputs("VIEW=", stdout);
1156	<	do {
1157	<	if (matchword(vopts, "-vf")) {          /* expand view file */
1158	<	vopts = sskip(vopts);
1159	<	if (!*atos(buf, sizeof(buf), vopts))
1171	<	return(-1);
1172	<	if ((fp = fopen(buf, "r")) == NULL)
1173	<	return(-1);
1174	<	for (buf[sizeof(buf)-2] = '\n';
1175	<	fgets(buf, sizeof(buf), fp) != NULL &&
1176	<	buf[0] != '\n';
1177	<	buf[sizeof(buf)-2] = '\n') {
1178	<	if (buf[sizeof(buf)-2] != '\n') {
1179	<	ungetc(buf[sizeof(buf)-2], fp);
1180	<	buf[sizeof(buf)-2] = '\0';
1181	<	}
1182	<	if (matchword(buf, "VIEW=") ||
1183	<	matchword(buf, "rview")) {
1184	<	for (cp = sskip(buf); *cp && *cp != '\n'; cp++)
1185	<	putchar(*cp);
1186	<	}
1187	<	}
1188	<	fclose(fp);
1189	<	vopts = sskip(vopts);
1190	<	} else {
1191	<	while (isspace(*vopts))
1192	<	vopts++;
1193	<	putchar(' ');
1194	<	#ifdef MSDOS
1195	<	if (*vopts == '$') {            /* expand env. var. */
1196	<	if (!*atos(buf, sizeof(buf), vopts+1))
1197	<	return(-1);
1198	<	if ((cp = getenv(buf)) == NULL)
1199	<	return(-1);
1200	<	fputs(cp, stdout);
1201	<	vopts = sskip(vopts);
1202	<	} else
1155	>	#ifdef _WIN32
1156	>	if (vopts[0] == '$') {
1157	>	vopts = getenv(vopts+1);
1158	>	goto again;
1159	>	}
1160		#endif
1161	<	while (*vopts && !isspace(*vopts))
1162	<	putchar(*vopts++);
1163	<	}
1164	<	} while (*vopts++);
1165	<	putchar('\n');
1161	>	vwr = stdview;
1162	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1163	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1164	>	*atos(buf, sizeof(buf), cp += 4)) {
1165	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1166	>	sscanview(&vwr, cp);            /* reset tail */
1167	>	}
1168	>	fputs(VIEWSTR, fp);
1169	>	fprintview(&vwr, fp);                   /* print full spec. */
1170	>	fputc('\n', fp);
1171		return(0);
1172		}
1173
1174
1175	<	rview(opts)                             /* run rview with first view */
1176	<	char    *opts;
1175	>	static void
1176	>	rvu(                            /* run rvu with first view */
1177	>	char    *opts,
1178	>	char    *po
1179	>	)
1180		{
1181		char    *vw;
1182	<	char    combuf[512];
1182	>	char    combuf[PATH_MAX];
1183		/* build command */
1184	<	if ((vw = getview(0, NULL)) == NULL)
1184	>	if (touchonly || (vw = getview(0, NULL)) == NULL)
1185		return;
1186		if (sayview)
1187	<	printview(vw);
1188	<	sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname);
1187	>	myprintview(vw, stdout);
1188	>	sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname);
1189		if (rvdevice != NULL)
1190		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1191	+	if (vdef(EXPOSURE))
1192	+	sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1193		strcat(combuf, oct1name);
1194		if (runcom(combuf)) {           /* run it */
1195	<	fprintf(stderr, "%s: error running rview\n", progname);
1196	<	exit(1);
1195	>	fprintf(stderr, "%s: error running rvu\n", progname);
1196	>	quit(1);
1197		}
1198		}
1199
1200
1201	<	rpict(opts)                             /* run rpict and pfilt for each view */
1202	<	char    *opts;
1201	>	static void
1202	>	rpict(                          /* run rpict and pfilt for each view */
1203	>	char    *opts,
1204	>	char    *po
1205	>	)
1206		{
1207	<	char    combuf[1024];
1208	<	char    rawfile[MAXPATH], picfile[MAXPATH], rep[MAXPATH+16], res[32];
1207	>	char    combuf[PATH_MAX];
1208	>	char    rawfile[PATH_MAX], picfile[PATH_MAX];
1209	>	char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1210	>	char    rppopt[128], *pfile = NULL;
1211		char    pfopts[128];
1212		char    vs[32], *vw;
1213		int     vn, mult;
1214	+	FILE    *fp;
1215	+	time_t  rfdt, pfdt;
1216		/* get pfilt options */
1217		pfiltopts(pfopts);
1218		/* get resolution, reporting */
1219	<	mult = vscale(QUALITY)+1;
1219	>	switch (vscale(QUALITY)) {
1220	>	case LOW:
1221	>	mult = 1;
1222	>	break;
1223	>	case MEDIUM:
1224	>	mult = 2;
1225	>	break;
1226	>	case HIGH:
1227	>	mult = 3;
1228	>	break;
1229	>	}
1230		{
1231		int     xres, yres;
1232		double  aspect;
#	Line 1269 | Line 1253 | char   *opts;
1253		else
1254		badvalue(REPORT);
1255		}
1256	<	/* do each view */
1257	<	vn = 0;
1256	>	/* set up parallel rendering */
1257	>	if ((nprocs > 1) & (!vdef(ZFILE))) {
1258	>	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1259	>	pfile = rppopt+9;
1260	>	if (mktemp(pfile) == NULL)
1261	>	pfile = NULL;
1262	>	}
1263	>	vn = 0;                                 /* do each view */
1264		while ((vw = getview(vn++, vs)) != NULL) {
1265		if (sayview)
1266	<	printview(vw);
1266	>	myprintview(vw, stdout);
1267		if (!vs[0])
1268		sprintf(vs, "%d", vn);
1269		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1270	+	if (vdef(ZFILE))
1271	+	sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1272	+	else
1273	+	zopt[0] = '\0';
1274		/* check date on picture */
1275	<	if (fdate(picfile) >= oct1date)
1275	>	pfdt = fdate(picfile);
1276	>	if (pfdt >= oct1date)
1277		continue;
1278	+	/* get raw file name */
1279	+	sprintf(rawfile, "%s_%s.unf",
1280	+	vdef(RAWFILE) ? vval(RAWFILE) : vval(PICTURE), vs);
1281	+	rfdt = fdate(rawfile);
1282	+	if (touchonly) {                /* update times only */
1283	+	if (rfdt) {
1284	+	if (rfdt < oct1date)
1285	+	touch(rawfile);
1286	+	} else if (pfdt && pfdt < oct1date)
1287	+	touch(picfile);
1288	+	continue;
1289	+	}
1290	+	if (next_process()) {           /* parallel running? */
1291	+	if (pfile != NULL)
1292	+	sleep(20);
1293	+	continue;
1294	+	}
1295	+	/* XXX Remember to call finish_process() */
1296		/* build rpict command */
1297	<	sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
1298	<	if (fdate(rawfile) >= oct1date)         /* recover */
1299	<	sprintf(combuf, "rpict%s%s -ro %s %s",
1300	<	rep, opts, rawfile, oct1name);
1301	<	else {
1297	>	if (rfdt >= oct1date) {         /* recover */
1298	>	sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1299	>	rep, po, opts, zopt, rawfile, oct1name);
1300	>	if (runcom(combuf))     /* run rpict */
1301	>	goto rperror;
1302	>	} else {
1303		if (overture) {         /* run overture calculation */
1304		sprintf(combuf,
1305		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
#	Line 1295 | Line 1309 | char   *opts;
1309		fprintf(stderr,
1310		"%s: error in overture for view %s\n",
1311		progname, vs);
1312	<	exit(1);
1312	>	quit(1);
1313		}
1314	<	#ifdef NIX
1314	>	#ifndef NULL_DEVICE
1315		rmfile(overfile);
1316		#endif
1317		}
1318	<	sprintf(combuf, "rpict%s %s %s%s %s > %s",
1319	<	rep, vw, res, opts,
1320	<	oct1name, rawfile);
1318	>	sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1319	>	rep, vw, res, po, opts,
1320	>	zopt, oct1name, rawfile);
1321	>	if (pfile != NULL && inchild()) {
1322	>	/* rpict persistent mode */
1323	>	if (!silent) {
1324	>	printf("\t%s\n", combuf);
1325	>	fflush(stdout);
1326	>	}
1327	>	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1328	>	rep, rppopt, res, po, opts,
1329	>	oct1name, rawfile);
1330	>	fflush(stdout);
1331	>	fp = popen(combuf, "w");
1332	>	if (fp == NULL)
1333	>	goto rperror;
1334	>	myprintview(vw, fp);
1335	>	if (pclose(fp))
1336	>	goto rperror;
1337	>	} else {                /* rpict normal mode */
1338	>	if (runcom(combuf))
1339	>	goto rperror;
1340	>	}
1341		}
1342	<	if (runcom(combuf)) {           /* run rpict */
1309	<	fprintf(stderr, "%s: error rendering view %s\n",
1310	<	progname, vs);
1311	<	exit(1);
1312	<	}
1342	>	if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1343		/* build pfilt command */
1344	<	if (mult > 1)
1345	<	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1344	>	if (mult > 1)
1345	>	sprintf(combuf, "pfilt%s -x /%d -y /%d %s > %s",
1346		pfopts, mult, mult, rawfile, picfile);
1347	<	else
1348	<	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1349	<	rawfile, picfile);
1350	<	if (runcom(combuf)) {           /* run pfilt */
1351	<	fprintf(stderr,
1352	<	"%s: error filtering view %s\n\t%s removed\n",
1353	<	progname, vs, picfile);
1354	<	unlink(picfile);
1355	<	exit(1);
1347	>	else
1348	>	sprintf(combuf, "pfilt%s %s > %s", pfopts,
1349	>	rawfile, picfile);
1350	>	if (runcom(combuf)) {   /* run pfilt */
1351	>	fprintf(stderr,
1352	>	"%s: error filtering view %s\n\t%s removed\n",
1353	>	progname, vs, picfile);
1354	>	unlink(picfile);
1355	>	quit(1);
1356	>	}
1357		}
1358	<	/* remove raw file */
1359	<	rmfile(rawfile);
1358	>	/* remove/rename raw file */
1359	>	if (vdef(RAWFILE)) {
1360	>	sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1361	>	mvfile(rawfile, combuf);
1362	>	} else
1363	>	rmfile(rawfile);
1364	>	finish_process();               /* exit if child */
1365		}
1366	+	wait_process(1);                /* wait for children to finish */
1367	+	if (pfile != NULL) {            /* clean up rpict persistent mode */
1368	+	int     pid;
1369	+	fp = fopen(pfile, "r");
1370	+	if (fp != NULL) {
1371	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1372	+	kill(pid, 1) < 0)
1373	+	unlink(pfile);
1374	+	fclose(fp);
1375	+	}
1376	+	}
1377	+	return;
1378	+	rperror:
1379	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1380	+	quit(1);
1381		}
1382
1383
1384	<	runcom(cs)                      /* run command */
1385	<	char    *cs;
1384	>	static int
1385	>	touch(                  /* update a file */
1386	>	char    *fn
1387	>	)
1388		{
1389	+	if (!silent)
1390	+	printf("\ttouch %s\n", fn);
1391	+	if (!nprocs)
1392	+	return(0);
1393	+	#ifdef notused
1394	+	if (access(fn, F_OK) == -1)             /* create it */
1395	+	if (close(open(fn, O_WRONLY|O_CREAT, 0666)) == -1)
1396	+	return(-1);
1397	+	#endif
1398	+	return(setfdate(fn, time((time_t *)NULL)));
1399	+	}
1400	+
1401	+
1402	+	static int
1403	+	runcom(                 /* run command */
1404	+	char    *cs
1405	+	)
1406	+	{
1407		if (!silent)            /* echo it */
1408		printf("\t%s\n", cs);
1409	<	if (noaction)
1409	>	if (!nprocs)
1410		return(0);
1411		fflush(stdout);         /* flush output and pass to shell */
1412		return(system(cs));
1413		}
1414
1415
1416	<	rmfile(fn)                      /* remove a file */
1417	<	char    *fn;
1416	>	static int
1417	>	rmfile(                 /* remove a file */
1418	>	char    *fn
1419	>	)
1420		{
1421		if (!silent)
1422	<	#ifdef MSDOS
1423	<	printf("\tdel %s\n", fn);
1351	<	#else
1352	<	printf("\trm -f %s\n", fn);
1353	<	#endif
1354	<	if (noaction)
1422	>	printf("\t%s %s\n", DELCMD, fn);
1423	>	if (!nprocs)
1424		return(0);
1425		return(unlink(fn));
1426		}
1427
1428
1429	<	#ifdef MSDOS
1429	>	static int
1430	>	mvfile(         /* move a file */
1431	>	char    *fold,
1432	>	char    *fnew
1433	>	)
1434	>	{
1435	>	if (!silent)
1436	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1437	>	if (!nprocs)
1438	>	return(0);
1439	>	return(rename(fold, fnew));
1440	>	}
1441	>
1442	>
1443	>	#ifdef RHAS_FORK_EXEC
1444	>	static int
1445	>	next_process(void)                      /* fork the next process (max. nprocs) */
1446	>	{
1447	>	int     child_pid;
1448	>
1449	>	if (nprocs <= 1)
1450	>	return(0);              /* it's us or no one */
1451	>	if (inchild()) {
1452	>	fprintf(stderr, "%s: internal error 1 in next_process()\n",
1453	>	progname);
1454	>	quit(1);
1455	>	}
1456	>	if (children_running >= nprocs)
1457	>	wait_process(0);        /* wait for someone to finish */
1458	>	fflush(stdout);
1459	>	child_pid = fork();             /* split process */
1460	>	if (child_pid == 0) {           /* we're the child */
1461	>	children_running = -1;
1462	>	return(0);
1463	>	}
1464	>	if (child_pid > 0) {            /* we're the parent */
1465	>	++children_running;
1466	>	return(1);
1467	>	}
1468	>	fprintf(stderr, "%s: warning -- fork() failed\n", progname);
1469	>	return(0);
1470	>	}
1471	>
1472	>	static void
1473	>	wait_process(                   /* wait for process(es) to finish */
1474	>	int     all
1475	>	)
1476	>	{
1477	>	int     ourstatus = 0;
1478	>	int     pid, status;
1479	>
1480	>	if (all)
1481	>	all = children_running;
1482	>	else if (children_running > 0)
1483	>	all = 1;
1484	>	while (all-- > 0) {
1485	>	pid = wait(&status);
1486	>	if (pid < 0)
1487	>	syserr(progname);
1488	>	status = status>>8 & 0xff;
1489	>	--children_running;
1490	>	if (status != 0) {      /* child's problem is our problem */
1491	>	if ((ourstatus == 0) & (children_running > 0))
1492	>	fprintf(stderr, "%s: waiting for remaining processes\n",
1493	>	progname);
1494	>	ourstatus = status;
1495	>	all = children_running;
1496	>	}
1497	>	}
1498	>	if (ourstatus != 0)
1499	>	quit(ourstatus);        /* bad status from child */
1500	>	}
1501	>	#else   /* ! RHAS_FORK_EXEC */
1502	>	static int
1503	>	next_process(void)
1504	>	{
1505	>	return(0);                      /* cannot start new process */
1506	>	}
1507	>	static void
1508	>	wait_process(all)
1509	>	int     all;
1510	>	{
1511	>	(void)all;                      /* no one to wait for */
1512	>	}
1513	>	int
1514	>	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1515	>	int pid, sig;
1516	>	{
1517	>	return 0;
1518	>	}
1519	>	#endif  /* ! RHAS_FORK_EXEC */
1520	>
1521	>	static void
1522	>	finish_process(void)                    /* exit a child process */
1523	>	{
1524	>	if (!inchild())
1525	>	return;                 /* in parent -- noop */
1526	>	exit(0);
1527	>	}
1528	>
1529	>	#ifdef _WIN32
1530		setenv(vname, value)            /* set an environment variable */
1531		char    *vname, *value;
1532		{
#	Line 1369 | Line 1538 | char   *vname, *value;
1538		sprintf(evp, "%s=%s", vname, value);
1539		if (putenv(evp) != 0) {
1540		fprintf(stderr, "%s: out of environment space\n", progname);
1541	<	exit(1);
1541	>	quit(1);
1542		}
1543		if (!silent)
1544		printf("set %s\n", evp);
#	Line 1377 | Line 1546 | char   *vname, *value;
1546		#endif
1547
1548
1549	<	badvalue(vc)                    /* report bad variable value and exit */
1550	<	int     vc;
1549	>	static void
1550	>	badvalue(                       /* report bad variable value and exit */
1551	>	int     vc
1552	>	)
1553		{
1554		fprintf(stderr, "%s: bad value for variable '%s'\n",
1555		progname, vnam(vc));
1556	<	exit(1);
1556	>	quit(1);
1557		}
1558
1559
1560	<	syserr(s)                       /* report a system error and exit */
1561	<	char    *s;
1560	>	static void
1561	>	syserr(                 /* report a system error and exit */
1562	>	char    *s
1563	>	)
1564		{
1565		perror(s);
1566	<	exit(1);
1566	>	quit(1);
1567	>	}
1568	>
1569	>
1570	>	void
1571	>	quit(ec)                        /* exit program */
1572	>	int     ec;
1573	>	{
1574	>	exit(ec);
1575		}

Diff Legend

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