--- ray/src/hd/rholo.c	1997/11/05 17:29:17	3.5
+++ ray/src/hd/rholo.c	1997/11/19 17:56:47	3.11
@@ -33,6 +33,8 @@ time_t	starttime;		/* time we got started */
 time_t	endtime;		/* time we should end by */
 time_t	reporttime;		/* time for next report */
 
+long	maxdisk;		/* maximum file space (bytes) */
+
 int	rtargc = 1;		/* rtrace command */
 char	*rtargv[128] = {"rtrace", NULL};
 
@@ -132,6 +134,11 @@ initrholo()			/* get our holodeck running */
 		disp_open(outdev);
 	else if (ncprocs > 0)			/* else use global ray feed */
 		init_global();
+						/* record disk space limit */
+	if (!vdef(DISKSPACE))
+		maxdisk = 0;
+	else
+		maxdisk = 1024.*1024.*vflt(DISKSPACE);
 						/* record end time */
 	if (!vdef(TIME) || vflt(TIME) <= FTINY)
 		endtime = 0;
@@ -198,14 +205,17 @@ rholo()				/* holodeck main loop */
 	if (ncprocs <= 0)
 		return(1);
 					/* check file size */
-	if ((l = 1024.*1024.*vflt(DISKSPACE)) > 0 &&
-			hdfiluse(hdlist[0]->fd, 0) + hdmemuse(0) >= l)
+	if (maxdisk > 0 && hdfilen(hdlist[0]->fd) >= maxdisk) {
+		error(WARNING, "file limit exceeded");
 		return(0);
+	}
 					/* check time */
 	if (endtime > 0 || reporttime > 0)
 		t = time(NULL);
-	if (endtime > 0 && t >= endtime)
+	if (endtime > 0 && t >= endtime) {
+		error(WARNING, "time limit exceeded");
 		return(0);
+	}
 	if (reporttime > 0 && t >= reporttime)
 		report(t);
 					/* get packets to process */
@@ -290,14 +300,6 @@ register HDGRID	*gp;
 		sprintf(vval(OCTREE), "%s.oct", froot);
 		vdef(OCTREE)++;
 	}
-	if (!vdef(DISKSPACE)) {
-		sprintf(errmsg,
-			"no %s setting, assuming 100 Mbytes available",
-				vnam(DISKSPACE));
-		error(WARNING, errmsg);
-		vval(DISKSPACE) = "100";
-		vdef(DISKSPACE)++;
-	}
 	if (!vdef(OBSTRUCTIONS)) {
 		vval(OBSTRUCTIONS) = "T";
 		vdef(OBSTRUCTIONS)++;
@@ -316,6 +318,7 @@ creatholo(gp)			/* create a holodeck output file */
 HDGRID	*gp;
 {
 	long	endloc = 0;
+	int	fd;
 	FILE	*fp;
 					/* open & truncate file */
 	if ((fp = fopen(hdkfile, "w+")) == NULL) {
@@ -329,9 +332,9 @@ HDGRID	*gp;
 	fputc('\n', fp);
 	putw(HOLOMAGIC, fp);		/* put magic number & terminus */
 	fwrite(&endloc, sizeof(long), 1, fp);
-	fflush(fp);			/* flush buffer */
-	hdinit(fileno(fp), gp);		/* allocate and initialize index */
-			/* we're dropping fp here.... */
+	fd = dup(fileno(fp));
+	fclose(fp);			/* flush and close stdio stream */
+	hdinit(fd, gp);			/* allocate and initialize index */
 }
 
 
@@ -361,8 +364,10 @@ char	*s;
 
 loadholo()			/* start loading a holodeck from fname */
 {
+	extern long	ftell();
 	FILE	*fp;
-	long	endloc;
+	int	fd;
+	long	fpos;
 					/* open holodeck file */
 	if ((fp = fopen(hdkfile, ncprocs>0 ? "r+" : "r")) == NULL) {
 		sprintf(errmsg, "cannot open \"%s\" for %s", hdkfile,
@@ -377,12 +382,14 @@ loadholo()			/* start loading a holodeck from fname */
 				hdkfile);
 		error(USER, errmsg);
 	}
-	fread(&endloc, sizeof(long), 1, fp);
-	if (endloc != 0)
+	fread(&fpos, sizeof(long), 1, fp);
+	if (fpos != 0)
 		error(WARNING, "ignoring multiple sections in holodeck file");
-	fseek(fp, 0L, 1);			/* align system file pointer */
-	hdinit(fileno(fp), NULL);		/* allocate and load index */
-			/* we're dropping fp here.... */
+	fpos = ftell(fp);			/* get stdio position */
+	fd = dup(fileno(fp));
+	fclose(fp);				/* done with stdio */
+	lseek(fd, fpos, 0);			/* align system file pointer */
+	hdinit(fd, NULL);			/* allocate and load index */
 }
 
 
@@ -399,12 +406,12 @@ PACKET	*pl;
 				(char *)hdnewrays(hdlist[p->hd],p->bi,p->nr),
 				p->nr*sizeof(RAYVAL));
 			if (outdev != NULL)	/* display it */
-				disp_packet(p);
+				disp_packet((PACKHEAD *)p);
 			else
 				nunflushed += p->nr;
+			nraysdone += p->nr;
+			npacksdone++;
 		}
-		nraysdone += p->nr;
-		npacksdone++;
 		p->nr = 0;			/* push onto free list */
 		p->next = freepacks;
 		freepacks = p;
@@ -419,7 +426,7 @@ PACKET	*pl;
 getradfile(rfargs)		/* run rad and get needed variables */
 char	*rfargs;
 {
-	static short	mvar[] = {VIEW,OCTREE,EXPOSURE,-1};
+	static short	mvar[] = {OCTREE,EXPOSURE,-1};
 	static char	tf1[] = TEMPLATE;
 	char	tf2[64];
 	char	combuf[256];
@@ -518,8 +525,6 @@ int	ec;
 {
 	int	status = 0;
 
-	if (outdev != NULL)		/* close display */
-		disp_close();
 	if (hdlist[0] != NULL) {	/* flush holodeck */
 		if (ncprocs > 0) {
 			done_packets(flush_queue());
@@ -528,7 +533,7 @@ int	ec;
 			if (vdef(REPORT)) {
 				long	fsiz, fuse;
 				report(0);
-				fsiz = lseek(hdlist[0]->fd, 0L, 2);
+				fsiz = hdfilen(hdlist[0]->fd);
 				fuse = hdfiluse(hdlist[0]->fd, 1);
 				fprintf(stderr,
 			"%s: %.1f Mbyte holodeck file, %.1f%% fragmentation\n",
@@ -538,5 +543,7 @@ int	ec;
 		} else
 			hdflush(NULL);
 	}
+	if (outdev != NULL)		/* close display */
+		disp_close();
 	exit(ec ? ec : status);		/* exit */
 }