--- ray/src/common/readoct.c	2003/06/07 12:50:20	2.17
+++ ray/src/common/readoct.c	2004/12/15 22:02:04	2.27
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: readoct.c,v 2.17 2003/06/07 12:50:20 schorsch Exp $";
+static const char	RCSid[] = "$Id: readoct.c,v 2.27 2004/12/15 22:02:04 greg Exp $";
 #endif
 /*
  *  readoct.c - routines to read octree information.
@@ -8,24 +8,28 @@ static const char	RCSid[] = "$Id: readoct.c,v 2.17 200
 #include "copyright.h"
 
 #include  <stdio.h>
-#ifdef _WIN32
- #define popen _popen
- #define pclose _pclose
-#endif
+#include  <time.h>
 
+#include  "platform.h"
+#include  "rtprocess.h"
 #include  "standard.h"
 #include  "octree.h"
 #include  "object.h"
 #include  "otypes.h"
 #include  "resolu.h"
 
-static double  ogetflt();
-static long  ogetint();
-static char  *ogetstr();
-static int  nonsurfinset();
+#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
+#undef getc
+#define getc    getc_unlocked
+#endif
+
+static double  ogetflt(void);
+static long  ogetint(int);
+static char  *ogetstr(char *);
+static int  nonsurfintree(OCTREE ot);
 static void  octerror(int  etyp, char  *msg);
 static void  skiptree(void);
-static OCTREE  getfullnode(), gettree();
+static OCTREE  getfullnode(void), gettree(void);
 
 static char  *infn;			/* input file specification */
 static FILE  *infp;			/* input file stream */
@@ -35,11 +39,12 @@ static OBJECT  fnobjects;		/* number of objects in thi
 
 
 int
-readoct(inpspec, load, scene, ofn)	/* read in octree file or stream */
-char  *inpspec;
-int  load;
-CUBE  *scene;
-char  *ofn[];
+readoct(				/* read in octree file or stream */
+	char  *inpspec,
+	int  load,
+	CUBE  *scene,
+	char  *ofn[]
+)
 {
 	char  sbuf[512];
 	int  nf;
@@ -101,7 +106,7 @@ char  *ofn[];
 	else if (load & IO_SCENE && nf == 0)
 		skiptree();
 		
-	if (load & IO_SCENE)		/* get the scene */
+	if (load & IO_SCENE) {		/* get the scene */
 	    if (nf == 0) {
 					/* load binary scene data */
 		readscene(infp, objsize);
@@ -111,9 +116,10 @@ char  *ofn[];
 		if (nobjects != objorig+fnobjects)
 			octerror(USER, "bad object count; octree stale?");
 				/* check for non-surfaces */
-		if (dosets(nonsurfinset))
+		if (nonsurfintree(scene->cutree))
 			octerror(USER, "modifier in tree; octree stale?");
 	    }
+	}
 				/* close the input */
 	if (infn[0] == '!')
 		pclose(infp);
@@ -124,8 +130,7 @@ char  *ofn[];
 
 
 static char *
-ogetstr(s)			/* get null-terminated string */
-char  *s;
+ogetstr(char *s)		/* get null-terminated string */
 {
 	extern char  *getstr();
 
@@ -154,8 +159,7 @@ getfullnode()			/* get a set, return fullnode */
 
 
 static long
-ogetint(siz)			/* get a siz-byte integer */
-int  siz;
+ogetint(int siz)		/* get a siz-byte integer */
 {
 	extern long  getint();
 	register long  r;
@@ -202,20 +206,27 @@ gettree()			/* get a pre-ordered octree */
 	default:
 		octerror(USER, "damaged octree");
 	}
-	return NULL; /* pro forma return */
+	return EMPTY; /* pro forma return */
 }
 
 
 static int
-nonsurfinset(os)			/* check set for modifier */
-register OBJECT  *os;
+nonsurfintree(OCTREE ot)		/* check tree for modifiers */
 {
-	register OBJECT  s;
+	OBJECT  set[MAXSET+1];
 	register int  i;
 
-	for (i = *os; i-- > 0; )
-		if ((s = *++os) >= objorig && s < objorig+fnobjects &&
-				ismodifier(objptr(s)->otype))
+	if (isempty(ot))
+		return(0);
+	if (istree(ot)) {
+		for (i = 0; i < 8; i++)
+			if (nonsurfintree(octkid(ot, i)))
+				return(1);
+		return(0);
+	}
+	objset(set, ot);
+	for (i = set[0]; i-- > 0; )
+		if (ismodifier(objptr(set[i])->otype))
 			return(1);
 	return(0);
 }
@@ -247,9 +258,7 @@ skiptree(void)				/* skip octree on input */
 
 
 static void
-octerror(etyp, msg)			/* octree error */
-int  etyp;
-char  *msg;
+octerror(int etyp, char *msg)		/* octree error */
 {
 	char  msgbuf[128];