--- ray/src/common/readoct.c	1992/08/06 09:02:38	2.5
+++ ray/src/common/readoct.c	1997/03/07 15:45:26	2.12
@@ -21,13 +21,15 @@ static char SCCSid[] = "$SunId$ LBL";
 static double  ogetflt();
 static long  ogetint();
 static char  *ogetstr();
-static int  getobj(), octerror();
+static int  nonsurfinset();
+static int  getobj(), octerror(), skiptree();
 static OCTREE  getfullnode(), gettree();
 
 static char  *infn;			/* input file name */
 static FILE  *infp;			/* input file stream */
 static int  objsize;			/* size of stored OBJECT's */
 static OBJECT  objorig;			/* zeroeth object */
+static OBJECT  fnobjects;		/* number of objects in this file */
 static short  otypmap[NUMOTYPE+8];	/* object type map */
 
 
@@ -38,10 +40,8 @@ int  load;
 CUBE  *scene;
 char  *ofn[];
 {
-	extern int  fputs();
 	char  sbuf[512];
 	int  nf;
-	OBJECT  fnobjects;
 	register int  i;
 	long  m;
 	
@@ -56,8 +56,11 @@ char  *ofn[];
 			error(SYSTEM, errmsg);
 		}
 	}
+#ifdef MSDOS
+	setmode(fileno(infp), O_BINARY);
+#endif
 					/* get header */
-	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0)
+	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
 		octerror(USER, "not an octree");
 					/* check format */
 	if ((objsize = ogetint(2)-OCTMAGIC) <= 0 ||
@@ -107,7 +110,7 @@ char  *ofn[];
 		if (nobjects != objorig+fnobjects)
 			octerror(USER, "bad object count; octree stale?");
 				/* check for non-surfaces */
-		if (nonsurfinset(objorig, fnobjects))
+		if (dosets(nonsurfinset))
 			octerror(USER, "modifier in tree; octree stale?");
 	    }
 	fclose(infp);
@@ -130,7 +133,7 @@ char  *s;
 static OCTREE
 getfullnode()			/* get a set, return fullnode */
 {
-	OBJECT  set[MAXSET+1];
+	OBJECT	set[MAXSET+1];
 	register int  i;
 	register long  m;
 
@@ -163,7 +166,7 @@ static double
 ogetflt()			/* get a floating point number */
 {
 	extern double  getflt();
-	double  r;
+	double	r;
 
 	r = getflt(infp);
 	if (feof(infp))
@@ -175,7 +178,7 @@ ogetflt()			/* get a floating point number */
 static OCTREE
 gettree()			/* get a pre-ordered octree */
 {
-	register OCTREE  ot;
+	register OCTREE	 ot;
 	register int  i;
 	
 	switch (getc(infp)) {
@@ -197,6 +200,21 @@ gettree()			/* get a pre-ordered octree */
 }
 
 
+static int
+nonsurfinset(os)			/* check set for modifier */
+register OBJECT  *os;
+{
+	register OBJECT  s;
+	register int  i;
+
+	for (i = *os; i-- > 0; )
+		if ((s = *++os) >= objorig && s < objorig+fnobjects &&
+				ismodifier(objptr(s)->otype))
+			return(1);
+	return(0);
+}
+
+
 static
 skiptree()				/* skip octree on input */
 {
@@ -206,8 +224,9 @@ skiptree()				/* skip octree on input */
 	case OT_EMPTY:
 		return;
 	case OT_FULL:
-		for (i = ogetint(objsize); i-- > 0; )
-			ogetint(objsize);
+		for (i = ogetint(objsize)*objsize; i-- > 0; )
+			if (getc(infp) == EOF)
+				octerror(USER, "truncated octree");
 		return;
 	case OT_TREE:
 		for (i = 0; i < 8; i++)
@@ -228,7 +247,7 @@ getobj()				/* get next object */
 	int  obj;
 	register int  i;
 	register long  m;
-	register OBJREC  *objp;
+	register OBJREC	 *objp;
 
 	i = ogetint(1);
 	if (i == -1)
@@ -254,7 +273,7 @@ getobj()				/* get next object */
 			objp->oargs.sarg[i] = savestr(ogetstr(sbuf));
 	} else
 		objp->oargs.sarg = NULL;
-#ifdef  IARGS
+#ifdef	IARGS
 	if (objp->oargs.niargs = ogetint(2)) {
 		objp->oargs.iarg = (long *)bmalloc
 				(objp->oargs.niargs*sizeof(long));
@@ -276,7 +295,6 @@ getobj()				/* get next object */
 		objp->oargs.farg = NULL;
 						/* initialize */
 	objp->os = NULL;
-	objp->lastrno = -1;
 						/* insert */
 	insertobject(obj);
 	return(obj);