--- ray/src/ot/readobj2.c	1991/05/29 17:44:18	1.2
+++ ray/src/ot/readobj2.c	2003/06/26 00:58:10	2.6
@@ -1,32 +1,26 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: readobj2.c,v 2.6 2003/06/26 00:58:10 schorsch Exp $";
 #endif
-
 /*
  *  readobj2.c - routines for reading in object descriptions.
  */
 
-#include  "standard.h"
+#include  <ctype.h>
 
+#include  "standard.h"
+#include  "platform.h"
 #include  "object.h"
-
 #include  "otypes.h"
 
-#include  <ctype.h>
 
-OBJREC  *objblock[MAXOBJBLK];		/* our objects */
-OBJECT  nobjects = 0;			/* # of objects */
-int newobject() {return(0);}
+extern char  *fgetword();
 
-
-readobj(input, callback)	/* read in an object file or stream */
+readobj2(input, callback)	/* read in an object file or stream */
 char  *input;
 int  (*callback)();
 {
 	FILE  *popen();
-	char  *fgets(), *fgetline();
+	char  *fgetline();
 	FILE  *infp;
 	char  buf[512];
 	register int  c;
@@ -51,10 +45,10 @@ int  (*callback)();
 		} else if (c == '!') {			/* command */
 			ungetc(c, infp);
 			fgetline(buf, sizeof(buf), infp);
-			readobj(buf, callback);
+			readobj2(buf, callback);
 		} else {				/* object */
 			ungetc(c, infp);
-			getobject(input, infp, callback);
+			getobject2(input, infp, callback);
 		}
 	}
 	if (input[0] == '!')
@@ -64,7 +58,7 @@ int  (*callback)();
 }
 
 
-getobject(name, fp, f)			/* read the next object */
+getobject2(name, fp, f)			/* read the next object */
 char  *name;
 FILE  *fp;
 int  (*f)();
@@ -72,121 +66,30 @@ int  (*f)();
 	char  sbuf[MAXSTR];
 	OBJREC  thisobj;
 					/* get modifier */
-	fscanf(fp, "%*s");
+	fgetword(sbuf, MAXSTR, fp);
 	thisobj.omod = OVOID;
 					/* get type */
-	fscanf(fp, "%s", sbuf);
-	if (!strcmp(sbuf, ALIASID))
-		thisobj.otype = -1;
-	else if ((thisobj.otype = otype(sbuf)) < 0) {
+	fgetword(sbuf, MAXSTR, fp);
+	if ((thisobj.otype = otype(sbuf)) < 0) {
 		sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
 		error(USER, errmsg);
 	}
 					/* get identifier */
-	fscanf(fp, "%s", sbuf);
+	fgetword(sbuf, MAXSTR, fp);
 	thisobj.oname = sbuf;
 					/* get arguments */
-	if (thisobj.otype == -1) {
+	if (thisobj.otype == MOD_ALIAS) {
 		fscanf(fp, "%*s");
 		return;
 	}
-	if (readfargs(&thisobj.oargs, fp) < 0) {
+	if (readfargs(&thisobj.oargs, fp) <= 0) {
 		sprintf(errmsg, "(%s): bad arguments", name);
 		objerror(&thisobj, USER, errmsg);
 	}
 	thisobj.os = NULL;
-	thisobj.lastrno = -1;
 					/* call function */
 	(*f)(&thisobj);
 					/* free memory */
-	if (thisobj.os != NULL)
-		switch (thisobj.otype) {
-		case OBJ_CONE:
-		case OBJ_CUP:
-		case OBJ_CYLINDER:
-		case OBJ_TUBE:
-		case OBJ_RING:
-			freecone(&thisobj);
-			break;
-		case OBJ_FACE:
-			freeface(&thisobj);
-			break;
-		case OBJ_INSTANCE:
-			freeinstance(&thisobj);
-			break;
-		}
 	freefargs(&thisobj.oargs);
-}
-
-
-readfargs(fa, fp)		/* read function arguments from stream */
-register FUNARGS  *fa;
-FILE  *fp;
-{
-	char  sbuf[MAXSTR];
-	int  n;
-	register int  i;
-
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(-1);
-	if (fa->nsargs = n) {
-		fa->sarg = (char **)malloc(n*sizeof(char *));
-		if (fa->sarg == NULL)
-			goto memerr;
-		for (i = 0; i < fa->nsargs; i++) {
-			if (fscanf(fp, "%s", sbuf) != 1)
-				return(-1);
-			fa->sarg[i] = savestr(sbuf);
-		}
-	} else
-		fa->sarg = NULL;
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(-1);
-#ifdef  IARGS
-	if (fa->niargs = n) {
-		fa->iarg = (long *)malloc(n*sizeof(long));
-		if (fa->iarg == NULL)
-			goto memerr;
-		for (i = 0; i < n; i++)
-			if (fscanf(fp, "%ld", &fa->iarg[i]) != 1)
-				return(-1);
-	} else
-		fa->iarg = NULL;
-#else
-	if (n != 0)
-		return(-1);
-#endif
-	if (fscanf(fp, "%d", &n) != 1 || n < 0)
-		return(-1);
-	if (fa->nfargs = n) {
-		fa->farg = (double *)malloc(n*sizeof(double));
-		if (fa->farg == NULL)
-			goto memerr;
-		for (i = 0; i < n; i++)
-			if (fscanf(fp, "%lf", &fa->farg[i]) != 1)
-				return(-1);
-	} else
-		fa->farg = NULL;
-	return(0);
-memerr:
-	error(SYSTEM, "out of memory in readfargs");
-}
-
-
-freefargs(fa)		/* free arguments */
-register FUNARGS  *fa;
-{
-	register int  i;
-
-	if (fa->nsargs) {
-		for (i = 0; i < fa->nsargs; i++)
-			free(fa->sarg[i]);
-		free((char *)fa->sarg);
-	}
-#ifdef  IARGS
-	if (fa->niargs)
-		free((char *)fa->iarg);
-#endif
-	if (fa->nfargs)
-		free((char *)fa->farg);
+	free_os(&thisobj);
 }