ViewVC Help

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

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

Comparing ray/src/util/rad.c (file contents):
Revision 2.112 by greg, Tue May 26 10:00:47 2015 UTC vs.
Revision 2.119 by greg, Sat Aug 1 23:27:04 2015 UTC

#	Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9
10		#include <ctype.h>
11		#include <time.h>
12	+	#include <signal.h>
13
14		#include "platform.h"
15		#include "rtprocess.h"
#	Line 401 | Line 402 | checkfiles(void)                       /* check for existence and modified
402		atos(fntemp, sizeof(fntemp), vval(PCMAP));
403		pcmapname = savqstr(fntemp);
404		pcmapdate = fdate(pcmapname);
404	–	if (pgmapname == NULL && !nowarn)
405	–	fprintf(stderr, "%s: '%s' assigned without '%s'\n",
406	–	progname, vnam(PCMAP), vnam(PGMAP));
405		}
406		matdate = checklast(vval(MATERIAL));
407		}
#	Line 647 | Line 645 | mkpmap(void)                   /* run mkpmap if indicated */
645		for (cp = combuf; *cp; cp++)
646		;
647		mkpmapopts(cp);
648	+	/* force file overwrite */
649	+	cp = addarg(cp, "-fo+");
650		if (vdef(REPORT)) {
651		char    errfile[256];
652		int     n;
#	Line 659 | Line 659 | mkpmap(void)                   /* run mkpmap if indicated */
659		else
660		badvalue(REPORT);
661		}
662	<	if (vdef(PGMAP)) {
662	>	if (pgmapname != NULL && pgmapdate < oct1date) {
663		cp = addarg(cp, "-apg");
664		addarg(cp, vval(PGMAP));
665		cp = sskip(sskip(cp));  /* remove any bandwidth */
666		*cp = '\0';
667		}
668	<	if (vdef(PCMAP)) {
668	>	if (pcmapname != NULL && pcmapdate < oct1date) {
669		cp = addarg(cp, "-apc");
670		addarg(cp, vval(PCMAP));
671		cp = sskip(sskip(cp));  /* remove any bandwidth */
#	Line 675 | Line 675 | mkpmap(void)                   /* run mkpmap if indicated */
675		if (runcom(combuf)) {
676		fprintf(stderr, "%s: error running %s\n",
677		progname, c_mkpmap);
678	<	if (pgmapname != NULL)
678	>	if (pgmapname != NULL && pgmapdate < oct1date)
679		unlink(pgmapname);
680	<	if (pcmapname != NULL)
680	>	if (pcmapname != NULL && pcmapdate < oct1date)
681		unlink(pcmapname);
682		quit(1);
683		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)