ViewVC Help

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

root/Development/ray/src/hd/rholo.c

Comparing ray/src/hd/rholo.c (file contents):
Revision 3.50 by gwlarson, Tue Mar 9 08:51:39 1999 UTC vs.
Revision 3.52 by greg, Sat Feb 22 02:07:25 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1999 Silicon Graphics, Inc. */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ SGI";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* Radiance holodeck generation controller
6		*/
#	Line 42 | Line 39 | char   *outdev = NULL;         /* output device name */
39
40		int     readinp = 0;            /* read commands from stdin */
41
42	<	int     force = 0;              /* allow overwrite of holodeck */
42	>	int     force = 0;              /* allow overwrite of holodeck (-1 == read-only) */
43
44		time_t  starttime;              /* time we got started */
45		time_t  endtime;                /* time we should end by */
#	Line 82 | Line 79 | char   *argv[];
79		nowarn++;
80		break;
81		case 'f':                       /* force overwrite */
82	<	force++;
82	>	force = 1;
83		break;
84	+	case 'r':                       /* read-only mode */
85	+	force = -1;
86	+	break;
87		case 'i':                       /* read input from stdin */
88		readinp++;
89		break;
#	Line 126 | Line 126 | char   *argv[];
126		HDGRID  hdg[HDMAX];
127		/* set defaults */
128		setdefaults(hdg);
129	+	/* check read-only */
130	+	if (force < 0)
131	+	error(USER, "cannot create read-only holodeck");
132		/* holodeck exists? */
133		if (!force && access(hdkfile, R_OK|W_OK) == 0)
134		error(USER,
#	Line 143 | Line 146 | char   *argv[];
146		quit(0);
147		userr:
148		fprintf(stderr,
149	<	"Usage: %s [-n nprocs][-o disp][-w][-f] output.hdk [control.hif|+|- [VAR=val ..]]\n",
149	>	"Usage: %s [-n nprocs][-o disp][-w][-r|-f] output.hdk [control.hif|+|- [VAR=val ..]]\n",
150		progname);
151		quit(1);
152		}
#	Line 211 | Line 214 | initrholo()                    /* get our holodeck running */
214		init_global();
215		/* record disk space limit */
216		if (!vdef(DISKSPACE))
217	<	maxdisk = 0;
217	>	maxdisk = (1L<<(sizeof(long)*8-2)) - 1024;
218		else
219		maxdisk = 1024.*1024.*vflt(DISKSPACE);
220		/* set up memory cache */
#	Line 272 | Line 275 | initrholo()                    /* get our holodeck running */
275		sigdie(SIGXFSZ, "File size exceeded");
276		#endif
277		/* protect holodeck file */
278	<	orig_mode = resfmode(hdlist[0]->fd, ncprocs>0 ? 0 : 0444);
278	>	orig_mode = resfmode(hdlist[0]->fd, ncprocs>0&force>=0 ? 0 : 0444);
279		return;
280		memerr:
281		error(SYSTEM, "out of memory in initrholo");
#	Line 427 | Line 430 | HDGRID *gp;
430		putw(HOLOMAGIC, fp);            /* put magic number */
431		fd = dup(fileno(fp));
432		fclose(fp);                     /* flush and close stdio stream */
433	<	lastloc = lseek(fd, 0L, 2);
433	>	lastloc = lseek(fd, (off_t)0L, 2);
434		for (n = vdef(SECTION); n--; gp++) {    /* initialize each section */
435		nextloc = 0L;
436		write(fd, (char *)&nextloc, sizeof(nextloc));
#	Line 435 | Line 438 | HDGRID *gp;
438		if (!n)
439		break;
440		nextloc = hdfilen(fd);          /* write section pointer */
441	<	if (lseek(fd, (long)lastloc, 0) < 0)
441	>	if (lseek(fd, (off_t)lastloc, 0) < 0)
442		error(SYSTEM,
443		"cannot seek on holodeck file in creatholo");
444		write(fd, (char *)&nextloc, sizeof(nextloc));
445	<	lseek(fd, (long)(lastloc=nextloc), 0);
445	>	lseek(fd, (off_t)(lastloc=nextloc), 0);
446		}
447		}
448
#	Line 477 | Line 480 | loadholo()                     /* start loading a holodeck from fname */
480		int     fd;
481		int     n;
482		int4    nextloc;
483	<	/* open holodeck file */
484	<	if ((fp = fopen(hdkfile, ncprocs>0 ? "r+" : "r")) == NULL) {
485	<	sprintf(errmsg, "cannot %s \"%s\"",
486	<	ncprocs>0 ? "append" : "read", hdkfile);
487	<	error(SYSTEM, errmsg);
483	>
484	>	if (ncprocs > 0 & force >= 0)
485	>	fp = fopen(hdkfile, "r+");
486	>	else
487	>	fp = NULL;
488	>	if (fp == NULL) {
489	>	if ((fp = fopen(hdkfile, "r")) == NULL) {
490	>	sprintf(errmsg, "cannot open \"%s\"", hdkfile);
491	>	error(SYSTEM, errmsg);
492	>	}
493	>	if (ncprocs > 0) {
494	>	sprintf(errmsg,
495	>	"\"%s\" opened read-only; new rays will be discarded",
496	>	hdkfile);
497	>	error(WARNING, errmsg);
498	>	force = -1;
499	>	}
500		}
501		/* load variables from header */
502		getheader(fp, headline, NULL);
#	Line 495 | Line 510 | loadholo()                     /* start loading a holodeck from fname */
510		fd = dup(fileno(fp));
511		fclose(fp);                             /* done with stdio */
512		for (n = 0; nextloc > 0L; n++) {        /* initialize each section */
513	<	lseek(fd, (long)nextloc, 0);
513	>	lseek(fd, (off_t)nextloc, 0);
514		read(fd, (char *)&nextloc, sizeof(nextloc));
515		hdinit(fd, NULL);
516		}
#	Line 563 | Line 578 | int    vc;
578		}
579
580
581	+	void
582		eputs(s)                        /* put error message to stderr */
583		register char  *s;
584		{
#	Line 582 | Line 598 | register char  *s;
598		}
599
600
601	+	void
602		quit(ec)                        /* exit program gracefully */
603		int     ec;
604		{
#	Line 590 | Line 607 | int    ec;
607		if (hdlist[0] != NULL) {        /* close holodeck */
608		if (nprocs > 0)
609		status = done_rtrace();         /* calls hdsync() */
610	<	if (ncprocs > 0 && vdef(REPORT)) {
610	>	if (ncprocs > 0 & force >= 0 && vdef(REPORT)) {
611		long    fsiz, fuse;
612		fsiz = hdfilen(hdlist[0]->fd);
613		fuse = hdfiluse(hdlist[0]->fd, 1);

Diff Legend

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