--- ray/src/hd/rholo.c	1997/11/10 18:05:24	3.8
+++ ray/src/hd/rholo.c	1997/11/19 17:04:56	3.10
@@ -138,7 +138,7 @@ initrholo()			/* get our holodeck running */
 	if (!vdef(DISKSPACE))
 		maxdisk = 0;
 	else
-		maxdisk = 1024.*1024.*vflt(DISKSPACE));
+		maxdisk = 1024.*1024.*vflt(DISKSPACE);
 						/* record end time */
 	if (!vdef(TIME) || vflt(TIME) <= FTINY)
 		endtime = 0;
@@ -205,7 +205,7 @@ rholo()				/* holodeck main loop */
 	if (ncprocs <= 0)
 		return(1);
 					/* check file size */
-	if (maxdisk > 0 && hdfiluse(hdlist[0]->fd,0)+hdmemuse(0) >= maxdisk) {
+	if (maxdisk > 0 && hdfilen(hdlist[0]->fd) >= maxdisk) {
 		error(WARNING, "file limit exceeded");
 		return(0);
 	}
@@ -318,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) {
@@ -331,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 */
 }
 
 
@@ -363,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,
@@ -379,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 */
 }
 
 
@@ -421,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];
@@ -530,7 +535,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",