ViewVC Help

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

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

Comparing ray/src/util/rad.c (file contents):
Revision 2.50 by greg, Fri Jan 5 14:43:03 1996 UTC vs.
Revision 2.78 by greg, Fri Sep 17 21:43:50 2004 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1995 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* Executive program for oconv, rpict and pfilt
6		*/
7
8		#include "standard.h"
9	+
10	+	#include <ctype.h>
11	+	#include <time.h>
12	+
13	+	#include "platform.h"
14	+	#include "rtprocess.h"
15	+	#include "view.h"
16		#include "paths.h"
17		#include "vars.h"
14	–	#include <ctype.h>
15	–	#include <sys/types.h>
18
19	<	/* variables */
20	<	#define OBJECT          0               /* object files */
21	<	#define SCENE           1               /* scene files */
22	<	#define MATERIAL        2               /* material files */
23	<	#define ILLUM           3               /* mkillum input files */
24	<	#define MKILLUM         4               /* mkillum options */
25	<	#define RENDER          5               /* rendering options */
26	<	#define OCONV           6               /* oconv options */
27	<	#define PFILT           7               /* pfilt options */
28	<	#define VIEW            8               /* view(s) for picture(s) */
29	<	#define ZONE            9               /* simulation zone */
30	<	#define QUALITY         10              /* desired rendering quality */
31	<	#define OCTREE          11              /* octree file name */
32	<	#define PICTURE         12              /* picture file root name */
33	<	#define AMBFILE         13              /* ambient file name */
34	<	#define OPTFILE         14              /* rendering options file */
35	<	#define EXPOSURE        15              /* picture exposure setting */
36	<	#define RESOLUTION      16              /* maximum picture resolution */
37	<	#define UP              17              /* view up (X, Y or Z) */
38	<	#define INDIRECT        18              /* indirection in lighting */
39	<	#define DETAIL          19              /* level of scene detail */
40	<	#define PENUMBRAS       20              /* shadow penumbras are desired */
41	<	#define VARIABILITY     21              /* level of light variability */
42	<	#define REPORT          22              /* report frequency and errfile */
43	<	#define RAWFILE         23              /* raw picture file root name */
19	>	#ifdef _WIN32
20	>	#define DELCMD "del"
21	>	#define RENAMECMD "rename"
22	>	#else
23	>	#define DELCMD "rm -f"
24	>	#define RENAMECMD "mv"
25	>	#include <sys/types.h>
26	>	#include <sys/wait.h>
27	>	#endif
28	>
29	>	/* variables (alphabetical by name) */
30	>	#define AMBFILE         0               /* ambient file name */
31	>	#define DETAIL          1               /* level of scene detail */
32	>	#define EXPOSURE        2               /* picture exposure setting */
33	>	#define EYESEP          3               /* interocular distance */
34	>	#define ILLUM           4               /* mkillum input files */
35	>	#define INDIRECT        5               /* indirection in lighting */
36	>	#define MATERIAL        6               /* material files */
37	>	#define MKILLUM         7               /* mkillum options */
38	>	#define OBJECT          8               /* object files */
39	>	#define OCONV           9               /* oconv options */
40	>	#define OCTREE          10              /* octree file name */
41	>	#define OPTFILE         11              /* rendering options file */
42	>	#define PENUMBRAS       12              /* shadow penumbras are desired */
43	>	#define PFILT           13              /* pfilt options */
44	>	#define PICTURE         14              /* picture file root name */
45	>	#define QUALITY         15              /* desired rendering quality */
46	>	#define RAWFILE         16              /* raw picture file root name */
47	>	#define RENDER          17              /* rendering options */
48	>	#define REPORT          18              /* report frequency and errfile */
49	>	#define RESOLUTION      19              /* maximum picture resolution */
50	>	#define 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	<	int NVARS = 25;
57	>	int NVARS = 26;
58
59		VARIABLE        vv[] = {                /* variable-value pairs */
60	<	{"objects",     3,      0,      NULL,   catvalues},
61	<	{"scene",       3,      0,      NULL,   catvalues},
62	<	{"materials",   3,      0,      NULL,   catvalues},
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},
54	–	{"pfilt",       2,      0,      NULL,   catvalues},
55	–	{"view",        2,      0,      NULL,   NULL},
56	–	{"ZONE",        2,      0,      NULL,   onevalue},
57	–	{"QUALITY",     3,      0,      NULL,   qualvalue},
70		{"OCTREE",      3,      0,      NULL,   onevalue},
59	–	{"PICTURE",     3,      0,      NULL,   onevalue},
60	–	{"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},
65	–	{"INDIRECT",    3,      0,      NULL,   intvalue},
66	–	{"DETAIL",      3,      0,      NULL,   qualvalue},
67	–	{"PENUMBRAS",   3,      0,      NULL,   boolvalue},
82		{"VARIABILITY", 3,      0,      NULL,   qualvalue},
83	<	{"REPORT",      3,      0,      NULL,   onevalue},
70	<	{"RAWFILE",     3,      0,      NULL,   onevalue},
83	>	{"view",        2,      0,      NULL,   NULL},
84		{"ZFILE",       2,      0,      NULL,   onevalue},
85	+	{"ZONE",        2,      0,      NULL,   onevalue},
86		};
87
88		/* overture calculation file */
89	<	#ifdef NIX
90	<	char    overfile[] = "overture.unf";
89	>	#ifdef NULL_DEVICE
90	>	char    overfile[] = NULL_DEVICE;
91		#else
92	<	char    overfile[] = "/dev/null";
92	>	char    overfile[] = "overture.unf";
93		#endif
94
81	–	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 94 | Line 107 | int    nowarn = 0;             /* no warnings */
107		int     explicate = 0;          /* explicate variables */
108		int     silent = 0;             /* do work silently */
109		int     touchonly = 0;          /* touch files only */
110	<	int     noaction = 0;           /* don't do anything */
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 123 | 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;
#	Line 149 | 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		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 173 | 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][-t][-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 200 | Line 269 | register char  *rn, *fn;
269		}
270
271
272	<	time_t
273	<	checklast(fnames)                       /* check files and find most recent */
274	<	register char   *fnames;
272	>	static time_t
273	>	checklast(                      /* check files and find most recent */
274	>	register char   *fnames
275	>	)
276		{
277	<	char    thisfile[MAXPATH];
277	>	char    thisfile[PATH_MAX];
278		time_t  thisdate, lastdate = 0;
209	–	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 225 | 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		{
233	–	extern char     *rindex();
304		register char   *cp;
305		register int    n;
306		int     suffix;
#	Line 251 | 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 260 | 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 276 | 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		{
288	–	extern FILE     *popen();
366		static double   oorg[3], osiz = 0.;
367		double  min[3], max[3];
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 306 | 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 324 | 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 344 | 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 360 | 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 379 | Line 468 | setdefaults()                  /* set default values for unassigned v
468		}
469
470
471	<	oconv()                         /* run oconv and mkillum if necessary */
471	>	static void
472	>	oconv(void)                             /* run oconv and mkillum if necessary */
473		{
474		static char     illumtmp[] = "ilXXXXXX";
475	<	char    combuf[1024], 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 */
#	Line 402 | Line 492 | oconv()                                /* run oconv and mkillum if necessary */
492		"%s: error generating octree\n\t%s removed\n",
493		progname, vval(OCTREE));
494		unlink(vval(OCTREE));
495	<	exit(1);
495	>	quit(1);
496		}
497		}
498		octreedate = time((time_t *)NULL);
#	Line 411 | 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) {
508	>	if ((oct0date < scenedate) | (oct0date < illumdate)) {
509		if (touchonly && oct0date)
510		touch(oct0name);
511		else {                          /* build command */
#	Line 433 | Line 523 | oconv()                                /* run oconv and mkillum if necessary */
523		"%s: error generating octree\n\t%s removed\n",
524		progname, oct0name);
525		unlink(oct0name);
526	<	exit(1);
526	>	quit(1);
527		}
528		}
529		oct0date = time((time_t *)NULL);
#	Line 453 | Line 543 | oconv()                                /* run oconv and mkillum if necessary */
543		fprintf(stderr, "%s: error running mkillum\n",
544		progname);
545		unlink(illumtmp);
546	<	exit(1);
546	>	quit(1);
547		}
548		/* make octree1 (frozen) */
549		if (octreedate)
#	Line 471 | Line 561 | oconv()                                /* run oconv and mkillum if necessary */
561		progname, oct1name);
562		unlink(oct1name);
563		unlink(illumtmp);
564	<	exit(1);
564	>	quit(1);
565		}
566		rmfile(illumtmp);
567		}
#	Line 481 | Line 571 | oconv()                                /* run oconv and mkillum if necessary */
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 503 | 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		time_t  afdate;
622
#	Line 522 | Line 624 | checkambfile()                 /* check date on ambient file */
624		return;
625		if (!(afdate = fdate(vval(AMBFILE))))
626		return;
627	<	if (oct1date > afdate)
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)) {
640		if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-')
#	Line 543 | Line 646 | ambval()                               /* compute ambient value */
646		if (vlet(ZONE) == 'I')
647		return(.01);
648		badvalue(ZONE);
649	+	return 0; /* pro forma return */
650		}
651
652
653	<	renderopts(op, po)                      /* set rendering options */
654	<	char    *op, *po;
653	>	static void
654	>	renderopts(                     /* set rendering options */
655	>	char    *op,
656	>	char    *po
657	>	)
658		{
659		switch(vscale(QUALITY)) {
660		case LOW:
#	Line 563 | Line 670 | char   *op, *po;
670		}
671
672
673	<	lowqopts(op, po)                        /* low quality rendering options */
674	<	register char   *op;
675	<	char    *po;
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
#	Line 575 | Line 684 | char   *po;
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)
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]);
#	Line 583 | Line 692 | char   *po;
692		case LOW:
693		po = addarg(po, "-ps 16");
694		op = addarg(op, "-dp 64");
695	<	sprintf(op, " -ar %d", (int)(4*d));
695	>	sprintf(op, " -ar %d", (int)(8*d));
696		op += strlen(op);
697		break;
698		case MEDIUM:
699		po = addarg(po, "-ps 8");
700		op = addarg(op, "-dp 128");
701	<	sprintf(op, " -ar %d", (int)(8*d));
701	>	sprintf(op, " -ar %d", (int)(16*d));
702		op += strlen(op);
703		break;
704		case HIGH:
705		po = addarg(po, "-ps 4");
706		op = addarg(op, "-dp 256");
707	<	sprintf(op, " -ar %d", (int)(16*d));
707	>	sprintf(op, " -ar %d", (int)(32*d));
708		op += strlen(op);
709		break;
710		}
#	Line 612 | Line 721 | char   *po;
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, po)                        /* medium quality rendering options */
744	<	register char   *op;
745	<	char    *po;
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], asz;
750
#	Line 643 | Line 754 | char   *po;
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)
757	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
758		badvalue(ZONE);
759		getoctcube(org, &d);
760		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 652 | Line 763 | char   *po;
763		case LOW:
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);
#	Line 660 | Line 771 | char   *po;
771		case MEDIUM:
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);
#	Line 668 | Line 779 | char   *po;
779		case HIGH:
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);
#	Line 680 | Line 791 | char   *po;
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 691 | Line 802 | char   *po;
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, po)                         /* high quality rendering options */
824	<	register char   *op;
825	<	char    *po;
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], asz;
830
#	Line 721 | Line 834 | char   *po;
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)
837	>	if ((siz[0] <= FTINY) | (siz[1] <= FTINY) | (siz[2] <= FTINY))
838		badvalue(ZONE);
839		getoctcube(org, &d);
840		asz = (siz[0]+siz[1]+siz[2])/3.;
#	Line 730 | Line 843 | char   *po;
843		case LOW:
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);
#	Line 738 | Line 851 | char   *po;
851		case MEDIUM:
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);
#	Line 746 | Line 859 | char   *po;
859		case HIGH:
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);
#	Line 767 | Line 880 | char   *po;
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 785 | Line 898 | char   *po;
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 807 | 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 816 | 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 826 | 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 837 | 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 849 | 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 869 | 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 892 | Line 1013 | register char  *vs;
1013		zpos = -1; vs++;
1014		}
1015		viewtype = 'v';
1016	<	if (*vs == 'v' | *vs == 'l' | *vs == 'a' | *vs == 'h' | *vs == 'c')
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 963 | 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 973 | 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 995 | 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 1014 | 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];
1022	<	FILE    *fp;
1145	>	VIEW    vwr;
1146	>	char    buf[128];
1147		register char   *cp;
1024	–
1148		if (vopts == NULL)
1149		return(-1);
1150	<	fputs("VIEW=", stdout);
1151	<	do {
1152	<	if (matchword(vopts, "-vf")) {          /* expand view file */
1153	<	vopts = sskip(vopts);
1154	<	if (!*atos(buf, sizeof(buf), vopts))
1032	<	return(-1);
1033	<	if ((fp = fopen(buf, "r")) == NULL)
1034	<	return(-1);
1035	<	for (buf[sizeof(buf)-2] = '\n';
1036	<	fgets(buf, sizeof(buf), fp) != NULL &&
1037	<	buf[0] != '\n';
1038	<	buf[sizeof(buf)-2] = '\n') {
1039	<	if (buf[sizeof(buf)-2] != '\n') {
1040	<	ungetc(buf[sizeof(buf)-2], fp);
1041	<	buf[sizeof(buf)-2] = '\0';
1042	<	}
1043	<	if (matchword(buf, "VIEW=") ||
1044	<	matchword(buf, "rview")) {
1045	<	for (cp = sskip(buf); *cp && *cp != '\n'; cp++)
1046	<	putchar(*cp);
1047	<	}
1048	<	}
1049	<	fclose(fp);
1050	<	vopts = sskip(vopts);
1051	<	} else {
1052	<	while (isspace(*vopts))
1053	<	vopts++;
1054	<	putchar(' ');
1055	<	#ifdef MSDOS
1056	<	if (*vopts == '$') {            /* expand env. var. */
1057	<	if (!*atos(buf, sizeof(buf), vopts+1))
1058	<	return(-1);
1059	<	if ((cp = getenv(buf)) == NULL)
1060	<	return(-1);
1061	<	fputs(cp, stdout);
1062	<	vopts = sskip(vopts);
1063	<	} else
1150	>	#ifdef _WIN32
1151	>	if (vopts[0] == '$') {
1152	>	vopts = getenv(vopts+1);
1153	>	goto again;
1154	>	}
1155		#endif
1156	<	while (*vopts && !isspace(*vopts))
1157	<	putchar(*vopts++);
1158	<	}
1159	<	} while (*vopts++);
1160	<	putchar('\n');
1156	>	vwr = stdview;
1157	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1158	>	while ((cp = strstr(cp, "-vf ")) != NULL &&
1159	>	*atos(buf, sizeof(buf), cp += 4)) {
1160	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1161	>	sscanview(&vwr, cp);            /* reset tail */
1162	>	}
1163	>	fputs(VIEWSTR, fp);
1164	>	fprintview(&vwr, fp);                   /* print full spec. */
1165	>	fputc('\n', fp);
1166		return(0);
1167		}
1168
1169
1170	<	rview(opts, po)                         /* run rview with first view */
1171	<	char    *opts, *po;
1170	>	static void
1171	>	rvu(                            /* run rvu with first view */
1172	>	char    *opts,
1173	>	char    *po
1174	>	)
1175		{
1176		char    *vw;
1177	<	char    combuf[512];
1177	>	char    combuf[PATH_MAX];
1178		/* build command */
1179		if (touchonly || (vw = getview(0, NULL)) == NULL)
1180		return;
1181		if (sayview)
1182	<	printview(vw);
1183	<	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
1182	>	myprintview(vw, stdout);
1183	>	sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname);
1184		if (rvdevice != NULL)
1185		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1186		if (vdef(EXPOSURE))
1187		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
1188		strcat(combuf, oct1name);
1189		if (runcom(combuf)) {           /* run it */
1190	<	fprintf(stderr, "%s: error running rview\n", progname);
1191	<	exit(1);
1190	>	fprintf(stderr, "%s: error running rvu\n", progname);
1191	>	quit(1);
1192		}
1193		}
1194
1195
1196	<	rpict(opts, po)                         /* run rpict and pfilt for each view */
1197	<	char    *opts, *po;
1196	>	static void
1197	>	rpict(                          /* run rpict and pfilt for each view */
1198	>	char    *opts,
1199	>	char    *po
1200	>	)
1201		{
1202	<	char    combuf[1024];
1203	<	char    rawfile[MAXPATH], picfile[MAXPATH];
1204	<	char    zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1202	>	char    combuf[PATH_MAX];
1203	>	char    rawfile[PATH_MAX], picfile[PATH_MAX];
1204	>	char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1205	>	char    rppopt[128], *pfile = NULL;
1206		char    pfopts[128];
1207		char    vs[32], *vw;
1208		int     vn, mult;
1209	+	FILE    *fp;
1210		time_t  rfdt, pfdt;
1211		/* get pfilt options */
1212		pfiltopts(pfopts);
#	Line 1144 | Line 1248 | char   *opts, *po;
1248		else
1249		badvalue(REPORT);
1250		}
1251	<	/* do each view */
1252	<	vn = 0;
1251	>	/* set up parallel rendering */
1252	>	if ((nprocs > 1) & (!vdef(ZFILE))) {
1253	>	strcpy(rppopt, "-S 1 -PP pfXXXXXX");
1254	>	pfile = rppopt+9;
1255	>	if (mktemp(pfile) == NULL)
1256	>	pfile = NULL;
1257	>	}
1258	>	vn = 0;                                 /* do each view */
1259		while ((vw = getview(vn++, vs)) != NULL) {
1260		if (sayview)
1261	<	printview(vw);
1261	>	myprintview(vw, stdout);
1262		if (!vs[0])
1263		sprintf(vs, "%d", vn);
1264		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
#	Line 1172 | Line 1282 | char   *opts, *po;
1282		touch(picfile);
1283		continue;
1284		}
1285	+	if (next_process()) {           /* parallel running? */
1286	+	if (pfile != NULL)
1287	+	sleep(20);
1288	+	continue;
1289	+	}
1290	+	/* XXX Remember to call finish_process() */
1291		/* build rpict command */
1292	<	if (rfdt >= oct1date)           /* recover */
1292	>	if (rfdt >= oct1date) {         /* recover */
1293		sprintf(combuf, "rpict%s%s%s%s -ro %s %s",
1294		rep, po, opts, zopt, rawfile, oct1name);
1295	<	else {
1295	>	if (runcom(combuf))     /* run rpict */
1296	>	goto rperror;
1297	>	} else {
1298		if (overture) {         /* run overture calculation */
1299		sprintf(combuf,
1300		"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s",
#	Line 1186 | Line 1304 | char   *opts, *po;
1304		fprintf(stderr,
1305		"%s: error in overture for view %s\n",
1306		progname, vs);
1307	<	exit(1);
1307	>	quit(1);
1308		}
1309	<	#ifdef NIX
1309	>	#ifndef NULL_DEVICE
1310		rmfile(overfile);
1311		#endif
1312		}
1313		sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s",
1314	<	rep, vw, res, po, opts, zopt,
1315	<	oct1name, rawfile);
1314	>	rep, vw, res, po, opts,
1315	>	zopt, oct1name, rawfile);
1316	>	if (pfile != NULL && inchild()) {
1317	>	/* rpict persistent mode */
1318	>	if (!silent)
1319	>	printf("\t%s\n", combuf);
1320	>	sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
1321	>	rep, rppopt, res, po, opts,
1322	>	oct1name, rawfile);
1323	>	fflush(stdout);
1324	>	fp = popen(combuf, "w");
1325	>	if (fp == NULL)
1326	>	goto rperror;
1327	>	myprintview(vw, fp);
1328	>	if (pclose(fp))
1329	>	goto rperror;
1330	>	} else {                /* rpict normal mode */
1331	>	if (runcom(combuf))
1332	>	goto rperror;
1333	>	}
1334		}
1199	–	if (runcom(combuf)) {           /* run rpict */
1200	–	fprintf(stderr, "%s: error rendering view %s\n",
1201	–	progname, vs);
1202	–	exit(1);
1203	–	}
1335		if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) {
1336		/* build pfilt command */
1337		if (mult > 1)
#	Line 1209 | Line 1340 | char   *opts, *po;
1340		else
1341		sprintf(combuf, "pfilt%s %s > %s", pfopts,
1342		rawfile, picfile);
1343	<	if (runcom(combuf)) {           /* run pfilt */
1343	>	if (runcom(combuf)) {   /* run pfilt */
1344		fprintf(stderr,
1345		"%s: error filtering view %s\n\t%s removed\n",
1346		progname, vs, picfile);
1347		unlink(picfile);
1348	<	exit(1);
1348	>	quit(1);
1349		}
1350		}
1351		/* remove/rename raw file */
#	Line 1223 | Line 1354 | char   *opts, *po;
1354		mvfile(rawfile, combuf);
1355		} else
1356		rmfile(rawfile);
1357	+	finish_process();               /* exit if child */
1358		}
1359	+	wait_process(1);                /* wait for children to finish */
1360	+	if (pfile != NULL) {            /* clean up rpict persistent mode */
1361	+	int     pid;
1362	+	fp = fopen(pfile, "r");
1363	+	if (fp != NULL) {
1364	+	if (fscanf(fp, "%*s %d", &pid) != 1 ||
1365	+	kill(pid, 1) < 0)
1366	+	unlink(pfile);
1367	+	fclose(fp);
1368	+	}
1369	+	}
1370	+	return;
1371	+	rperror:
1372	+	fprintf(stderr, "%s: error rendering view %s\n", progname, vs);
1373	+	quit(1);
1374		}
1375
1376
1377	<	touch(fn)                       /* update a file */
1378	<	char    *fn;
1377	>	static int
1378	>	touch(                  /* update a file */
1379	>	char    *fn
1380	>	)
1381		{
1382		if (!silent)
1383		printf("\ttouch %s\n", fn);
1384	<	if (noaction)
1384	>	if (!nprocs)
1385		return(0);
1386		#ifdef notused
1387		if (access(fn, F_OK) == -1)             /* create it */
#	Line 1243 | Line 1392 | char   *fn;
1392		}
1393
1394
1395	<	runcom(cs)                      /* run command */
1396	<	char    *cs;
1395	>	static int
1396	>	runcom(                 /* run command */
1397	>	char    *cs
1398	>	)
1399		{
1400		if (!silent)            /* echo it */
1401		printf("\t%s\n", cs);
1402	<	if (noaction)
1402	>	if (!nprocs)
1403		return(0);
1404		fflush(stdout);         /* flush output and pass to shell */
1405		return(system(cs));
1406		}
1407
1408
1409	<	rmfile(fn)                      /* remove a file */
1410	<	char    *fn;
1409	>	static int
1410	>	rmfile(                 /* remove a file */
1411	>	char    *fn
1412	>	)
1413		{
1414		if (!silent)
1415	<	#ifdef MSDOS
1416	<	printf("\tdel %s\n", fn);
1264	<	#else
1265	<	printf("\trm -f %s\n", fn);
1266	<	#endif
1267	<	if (noaction)
1415	>	printf("\t%s %s\n", DELCMD, fn);
1416	>	if (!nprocs)
1417		return(0);
1418		return(unlink(fn));
1419		}
1420
1421
1422	<	mvfile(fold, fnew)              /* move a file */
1423	<	char    *fold, *fnew;
1422	>	static int
1423	>	mvfile(         /* move a file */
1424	>	char    *fold,
1425	>	char    *fnew
1426	>	)
1427		{
1428		if (!silent)
1429	<	#ifdef MSDOS
1430	<	printf("\trename %s %s\n", fold, fnew);
1279	<	#else
1280	<	printf("\tmv %s %s\n", fold, fnew);
1281	<	#endif
1282	<	if (noaction)
1429	>	printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1430	>	if (!nprocs)
1431		return(0);
1432		return(rename(fold, fnew));
1433		}
1434
1435
1436	<	#ifdef MSDOS
1436	>	#ifdef RHAS_FORK_EXEC
1437	>	static int
1438	>	next_process(void)                      /* fork the next process (max. nprocs) */
1439	>	{
1440	>	int     child_pid;
1441	>
1442	>	if (nprocs <= 1)
1443	>	return(0);              /* it's us or no one */
1444	>	if (inchild()) {
1445	>	fprintf(stderr, "%s: internal error 1 in next_process()\n",
1446	>	progname);
1447	>	quit(1);
1448	>	}
1449	>	if (children_running >= nprocs)
1450	>	wait_process(0);        /* wait for someone to finish */
1451	>	fflush(stdout);
1452	>	child_pid = fork();             /* split process */
1453	>	if (child_pid == 0) {           /* we're the child */
1454	>	children_running = -1;
1455	>	return(0);
1456	>	}
1457	>	if (child_pid > 0) {            /* we're the parent */
1458	>	++children_running;
1459	>	return(1);
1460	>	}
1461	>	fprintf(stderr, "%s: warning -- fork() failed\n", progname);
1462	>	return(0);
1463	>	}
1464	>
1465	>	static void
1466	>	wait_process(                   /* wait for process(es) to finish */
1467	>	int     all
1468	>	)
1469	>	{
1470	>	int     ourstatus = 0;
1471	>	int     pid, status;
1472	>
1473	>	if (all)
1474	>	all = children_running;
1475	>	else if (children_running > 0)
1476	>	all = 1;
1477	>	while (all-- > 0) {
1478	>	pid = wait(&status);
1479	>	if (pid < 0)
1480	>	syserr(progname);
1481	>	status = status>>8 & 0xff;
1482	>	--children_running;
1483	>	if (status != 0) {      /* child's problem is our problem */
1484	>	if ((ourstatus == 0) & (children_running > 0))
1485	>	fprintf(stderr, "%s: waiting for remaining processes\n",
1486	>	progname);
1487	>	ourstatus = status;
1488	>	all = children_running;
1489	>	}
1490	>	}
1491	>	if (ourstatus != 0)
1492	>	quit(ourstatus);        /* bad status from child */
1493	>	}
1494	>	#else   /* ! RHAS_FORK_EXEC */
1495	>	static int
1496	>	next_process(void)
1497	>	{
1498	>	return(0);                      /* cannot start new process */
1499	>	}
1500	>	static void
1501	>	wait_process(all)
1502	>	int     all;
1503	>	{
1504	>	(void)all;                      /* no one to wait for */
1505	>	}
1506	>	int
1507	>	kill(pid, sig) /* win|unix_process.c should also wait and kill */
1508	>	int pid, sig;
1509	>	{
1510	>	return 0;
1511	>	}
1512	>	#endif  /* ! RHAS_FORK_EXEC */
1513	>
1514	>	static void
1515	>	finish_process(void)                    /* exit a child process */
1516	>	{
1517	>	if (!inchild())
1518	>	return;                 /* in parent -- noop */
1519	>	exit(0);
1520	>	}
1521	>
1522	>	#ifdef _WIN32
1523		setenv(vname, value)            /* set an environment variable */
1524		char    *vname, *value;
1525		{
#	Line 1297 | Line 1531 | char   *vname, *value;
1531		sprintf(evp, "%s=%s", vname, value);
1532		if (putenv(evp) != 0) {
1533		fprintf(stderr, "%s: out of environment space\n", progname);
1534	<	exit(1);
1534	>	quit(1);
1535		}
1536		if (!silent)
1537		printf("set %s\n", evp);
#	Line 1305 | Line 1539 | char   *vname, *value;
1539		#endif
1540
1541
1542	<	badvalue(vc)                    /* report bad variable value and exit */
1543	<	int     vc;
1542	>	static void
1543	>	badvalue(                       /* report bad variable value and exit */
1544	>	int     vc
1545	>	)
1546		{
1547		fprintf(stderr, "%s: bad value for variable '%s'\n",
1548		progname, vnam(vc));
1549	<	exit(1);
1549	>	quit(1);
1550		}
1551
1552
1553	<	syserr(s)                       /* report a system error and exit */
1554	<	char    *s;
1553	>	static void
1554	>	syserr(                 /* report a system error and exit */
1555	>	char    *s
1556	>	)
1557		{
1558		perror(s);
1559	<	exit(1);
1559	>	quit(1);
1560	>	}
1561	>
1562	>
1563	>	void
1564	>	quit(ec)                        /* exit program */
1565	>	int     ec;
1566	>	{
1567	>	exit(ec);
1568		}

Diff Legend

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