--- ray/src/hd/holofile.c	1997/12/11 19:57:58	3.11
+++ ray/src/hd/holofile.c	1997/12/12 21:29:34	3.13
@@ -38,7 +38,8 @@ HOLO	*hdlist[HDMAX+1];	/* holodeck pointers (NULL term
 
 static struct fragment {
 	short	nlinks;		/* number of holodeck sections using us */
-	short	nfrags;		/* number of known fragments */
+	short	writerr;	/* write error encountered */
+	int	nfrags;		/* number of known fragments */
 	BEAMI	*fi;		/* fragments, descending file position */
 	long	flen;		/* last known file length */
 } *hdfrag;		/* fragment lists, indexed by file descriptor */
@@ -138,17 +139,23 @@ HDGRID	*hproto;		/* holodeck section grid */
 	hp->fd = fd;	
 	hp->dirty = 0;
 	biglob(hp)->fo = fpos + sizeof(HDGRID);
-	biglob(hp)->nrd = 0;		/* count rays on disk */
-	for (n = nbeams(hp); n > 0; n--)
-		biglob(hp)->nrd += hp->bi[n].nrd;
+					/* start tracking fragments */
+	hdattach(fd);
+					/* check rays on disk */
+	fpos = hdfilen(fd);
+	biglob(hp)->nrd = 0;
+	for (n = hproto == NULL ? nbeams(hp) : 0; n > 0; n--)
+		if (hp->bi[n].nrd)
+			if (hp->bi[n].fo + hp->bi[n].nrd > fpos)
+				hp->bi[n].nrd = 0;	/* off end */
+			else
+				biglob(hp)->nrd += hp->bi[n].nrd;
 					/* add to holodeck list */
 	for (n = 0; n < HDMAX; n++)
 		if (hdlist[n] == NULL) {
 			hdlist[n] = hp;
 			break;
 		}
-					/* start tracking fragments (last) */
-	hdattach(fd);
 					/* all done */
 	return(hp);
 memerr:
@@ -157,18 +164,23 @@ memerr:
 
 
 int
-hdsync(hp)			/* update directory on disk if necessary */
+hdsync(hp, all)			/* update beams and directory on disk */
 register HOLO	*hp;
+int	all;
 {
 	register int	j, n;
 
-	if (hp == NULL) {		/* do all */
+	if (hp == NULL) {		/* do all holodecks */
 		n = 0;
 		for (j = 0; hdlist[j] != NULL; j++)
-			n += hdsync(hdlist[j]);
+			n += hdsync(hdlist[j], all);
 		return(n);
 	}
-	if (!hp->dirty)			/* check first */
+					/* sync the beams */
+	for (j = all ? nbeams(hp) : 0; j > 0; j--)
+		if (hp->bl[j] != NULL)
+			hdsyncbeam(hp, j);
+	if (!hp->dirty)			/* directory clean? */
 		return(0);
 	errno = 0;
 	if (lseek(hp->fd, biglob(hp)->fo, 0) < 0)
@@ -335,20 +347,24 @@ register int	i;
 
 
 int
-hdsyncbi(hp, i)			/* sync beam in memory with beam on disk */
+hdsyncbeam(hp, i)		/* sync beam in memory with beam on disk */
 register HOLO	*hp;
 register int	i;
 {
-	unsigned int	nrays = hp->bl[i]->nrm;
+	unsigned int	nrays;
 	long	nfo;
 	unsigned int	n;
-					/* is current fragment OK? */
-	if (nrays == hp->bi[i].nrd)
-		return(0);
 					/* check file status */
-	if (hp->dirty < 0)
+	if (hdfrag[hp->fd].writerr)
 		return(-1);
-
+#ifdef DEBUG
+	if (i < 1 | i > nbeams(hp))
+		error(CONSISTENCY, "bad beam index in hdsyncbeam");
+#endif
+					/* is current fragment OK? */
+	if (hp->bl[i] == NULL || (nrays = hp->bl[i]->nrm) == hp->bi[i].nrd)
+		return(0);
+					/* locate fragment */
 	if (hp->fd >= nhdfrags || !hdfrag[hp->fd].nlinks) /* untracked */
 		hp->bi[i].fo = lseek(hp->fd, 0L, 2);
 
@@ -375,7 +391,7 @@ register int	i;
 						(j+FRAGBLK)*sizeof(BEAMI));
 				if (f->fi == NULL)
 					error(SYSTEM,
-						"out of memory in hdsyncbi");
+						"out of memory in hdsyncbeam");
 			}
 			for ( ; ; j--) {	/* insert in descending list */
 				if (!j || hp->bi[i].fo < f->fi[j-1].fo) {
@@ -426,8 +442,9 @@ register int	i;
 			error(SYSTEM, "cannot seek on holodeck file");
 		n = hp->bl[i]->nrm * sizeof(RAYVAL);
 		if (write(hp->fd, (char *)hdbray(hp->bl[i]), n) != n) {
-			hp->dirty = -1;		/* avoid recursive error */
-			error(SYSTEM, "write error in hdsyncbi");
+			hdfrag[hp->fd].writerr++;
+			hdsync(hp, 0);		/* sync directory */
+			error(SYSTEM, "write error in hdsyncbeam");
 		}
 	}
 	biglob(hp)->nrd += nrays - hp->bi[i].nrd;
@@ -451,6 +468,8 @@ register int	i;
 			nchanged += hdfreebeam(hdlist[i], 0);
 		return(nchanged);
 	}
+	if (hdfrag[hp->fd].writerr)	/* check for file error */
+		return(0);
 	if (i == 0) {			/* clear entire holodeck */
 		nchanged = 0;
 		for (i = nbeams(hp); i > 0; i--)
@@ -458,14 +477,16 @@ register int	i;
 				nchanged += hdfreebeam(hp, i);
 		return(nchanged);
 	}
+#ifdef DEBUG
 	if (i < 1 | i > nbeams(hp))
 		error(CONSISTENCY, "bad beam index to hdfreebeam");
+#endif
 	if (hp->bl[i] == NULL)
 		return(0);
 					/* check for additions */
 	nchanged = hp->bl[i]->nrm - hp->bi[i].nrd;
 	if (nchanged)
-		hdsyncbi(hp, i);			/* write new fragment */
+		hdsyncbeam(hp, i);		/* write new fragment */
 	blglob(hp)->nrm -= hp->bl[i]->nrm;
 	free((char *)hp->bl[i]);		/* free memory */
 	hp->bl[i] = NULL;
@@ -498,8 +519,10 @@ register int	i;
 #endif
 		return(nchanged);
 	}
+#ifdef DEBUG
 	if (i < 1 | i > nbeams(hp))
 		error(CONSISTENCY, "bad beam index to hdkillbeam");
+#endif
 	if (hp->bl[i] != NULL) {	/* free memory */
 		blglob(hp)->nrm -= nchanged = hp->bl[i]->nrm;
 		free((char *)hp->bl[i]);
@@ -507,7 +530,7 @@ register int	i;
 		nchanged = hp->bi[i].nrd;
 	if (hp->bi[i].nrd) {		/* free file fragment */
 		hp->bl[i] = &emptybeam;
-		hdsyncbi(hp, i);
+		hdsyncbeam(hp, i);
 	}
 	hp->bl[i] = NULL;
 	return(nchanged);
@@ -574,7 +597,7 @@ register HOLO	*honly;			/* NULL means check all */
 		if ((freetarget -= hp[i]->bi[bn[i]].nrd) <= 0)
 			break;
 	}
-	hdsync(honly);		/* synchronize directories as necessary */
+	hdsync(honly, 0);	/* synchronize directories as necessary */
 }