--- ray/src/common/readobj.c	1998/11/05 16:51:26	2.7
+++ ray/src/common/readobj.c	2003/06/07 12:50:20	2.13
@@ -1,34 +1,34 @@
-/* Copyright (c) 1994 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: readobj.c,v 2.13 2003/06/07 12:50:20 schorsch Exp $";
 #endif
-
 /*
  *  readobj.c - routines for reading in object descriptions.
  *
- *     7/28/85
+ *  External symbols declared in object.h
  */
 
-#include  "standard.h"
+#include "copyright.h"
 
-#include  "object.h"
+#include  <ctype.h>
+#include  <stdio.h>
+#ifdef _WIN32
+ #define popen _popen
+ #define pclose _pclose
+#endif
 
+#include  "standard.h"
+#include  "object.h"
 #include  "otypes.h"
 
-#include  <ctype.h>
 
-extern char  *fgetword(), *strcpy();
-
 OBJREC  *objblock[MAXOBJBLK];		/* our objects */
 OBJECT  nobjects = 0;			/* # of objects */
 
 
+void
 readobj(inpspec)		/* read in an object file or stream */
 char  *inpspec;
 {
-	FILE  *popen();
-	char  *fgetline();
 	OBJECT  lastobj;
 	FILE  *infp;
 	char  buf[1024];
@@ -72,10 +72,12 @@ char  *inpspec;
 }
 
 
+void
 getobject(name, fp)			/* read the next object */
 char  *name;
 FILE  *fp;
 {
+#define	OALIAS	-2
 	OBJECT  obj;
 	char  sbuf[MAXSTR];
 	int  rval;
@@ -89,6 +91,8 @@ FILE  *fp;
 	fgetword(sbuf, MAXSTR, fp);
 	if (!strcmp(sbuf, VOIDID))
 		objp->omod = OVOID;
+	else if (!strcmp(sbuf, ALIASMOD))
+		objp->omod = OALIAS;
 	else if ((objp->omod = modifier(sbuf)) == OVOID) {
 		sprintf(errmsg, "(%s): undefined modifier \"%s\"", name, sbuf);
 		error(USER, errmsg);
@@ -96,9 +100,7 @@ FILE  *fp;
 					/* get type */
 	strcpy(sbuf, "EOF");
 	fgetword(sbuf, MAXSTR, fp);
-	if (!strcmp(sbuf, ALIASID))
-		objp->otype = -1;
-	else if ((objp->otype = otype(sbuf)) < 0) {
+	if ((objp->otype = otype(sbuf)) < 0) {
 		sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
 		error(USER, errmsg);
 	}
@@ -107,18 +109,25 @@ FILE  *fp;
 	fgetword(sbuf, MAXSTR, fp);
 	objp->oname = savqstr(sbuf);
 					/* get arguments */
-	if (objp->otype == -1) {
+	if (objp->otype == MOD_ALIAS) {
 		register OBJECT  alias;
 		strcpy(sbuf, "EOF");
 		fgetword(sbuf, MAXSTR, fp);
 		if ((alias = modifier(sbuf)) == OVOID) {
-			sprintf(errmsg,
-			"(%s): bad reference \"%s\" for %s \"%s\"",
-					name, sbuf, ALIASID, objp->oname);
-			error(USER, errmsg);
+			sprintf(errmsg, "(%s): bad reference \"%s\"",
+					name, sbuf);
+			objerror(objp, USER, errmsg);
 		}
-		objp->otype = objptr(alias)->otype;
-		copystruct(&objp->oargs, &objptr(alias)->oargs);
+		if (objp->omod == OALIAS || 
+				objp->omod == objptr(alias)->omod) {
+			objp->omod = alias;
+		} else {
+			objp->oargs.sarg = (char **)malloc(sizeof(char *));
+			if (objp->oargs.sarg == NULL)
+				error(SYSTEM, "out of memory in getobject");
+			objp->oargs.nsargs = 1;
+			objp->oargs.sarg[0] = savestr(sbuf);
+		}
 	} else if ((rval = readfargs(&objp->oargs, fp)) == 0) {
 		sprintf(errmsg, "(%s): bad arguments", name);
 		objerror(objp, USER, errmsg);
@@ -126,14 +135,20 @@ FILE  *fp;
 		sprintf(errmsg, "(%s): error reading scene", name);
 		error(SYSTEM, errmsg);
 	}
+	if (objp->omod == OALIAS) {
+		sprintf(errmsg, "(%s): inappropriate use of '%s' modifier",
+				name, ALIASMOD);
+		objerror(objp, USER, errmsg);
+	}
 					/* initialize */
 	objp->os = NULL;
 
 	insertobject(obj);		/* add to global structure */
+#undef OALIAS
 }
 
 
-int
+OBJECT
 newobject()				/* get a new object */
 {
 	register int  i;
@@ -143,9 +158,43 @@ newobject()				/* get a new object */
 		i = nobjects >> OBJBLKSHFT;
 		if (i >= MAXOBJBLK)
 			return(OVOID);
-		objblock[i] = (OBJREC *)bmalloc(OBJBLKSIZ*sizeof(OBJREC));
+		objblock[i] = (OBJREC *)calloc(OBJBLKSIZ, sizeof(OBJREC));
 		if (objblock[i] == NULL)
 			return(OVOID);
 	}
 	return(nobjects++);
+}
+
+void
+freeobjects(firstobj, nobjs)		/* free a range of objects */
+OBJECT  firstobj, nobjs;
+{
+	register int  obj;
+					/* check bounds */
+	if (firstobj < 0)
+		return;
+	if (nobjs <= 0)
+		return;
+	if (firstobj + nobjs > nobjects)
+		return;
+					/* clear objects */
+	for (obj = firstobj+nobjs; obj-- > firstobj; ) {
+		register OBJREC  *o = objptr(obj);
+		free_os(o);		/* free client memory */
+		freeqstr(o->oname);
+		freefargs(&o->oargs);
+		bzero((void *)o, sizeof(OBJREC));
+	}
+	clearobjndx();
+					/* free objects off end */
+	for (obj = nobjects; obj-- > 0; )
+		if (objptr(obj)->oname != NULL)
+			break;
+	++obj;
+	while (nobjects > obj)		/* free empty end blocks */
+		if ((--nobjects & (OBJBLKSIZ-1)) == 0) {
+			int	i = nobjects >> OBJBLKSHFT;
+			free((void *)objblock[i]);
+			objblock[i] = NULL;
+		}
 }