--- ray/src/ot/readobj2.c	1991/05/29 17:33:18	1.1
+++ ray/src/ot/readobj2.c	1993/06/04 17:02:19	2.3
@@ -16,6 +16,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <ctype.h>
 
+extern char  *fgetword();
+
 OBJREC  *objblock[MAXOBJBLK];		/* our objects */
 OBJECT  nobjects = 0;			/* # of objects */
 int newobject() {return(0);}
@@ -26,7 +28,7 @@ char  *input;
 int  (*callback)();
 {
 	FILE  *popen();
-	char  *fgets(), *fgetline();
+	char  *fgetline();
 	FILE  *infp;
 	char  buf[512];
 	register int  c;
@@ -51,7 +53,7 @@ int  (*callback)();
 		} else if (c == '!') {			/* command */
 			ungetc(c, infp);
 			fgetline(buf, sizeof(buf), infp);
-			readobj(buf);
+			readobj(buf, callback);
 		} else {				/* object */
 			ungetc(c, infp);
 			getobject(input, infp, callback);
@@ -72,10 +74,10 @@ int  (*f)();
 	char  sbuf[MAXSTR];
 	OBJREC  thisobj;
 					/* get modifier */
-	fscanf(fp, "%s", sbuf);
-	thisobj.omod = modifier(sbuf);
+	fgetword(sbuf, MAXSTR, fp);
+	thisobj.omod = OVOID;
 					/* get type */
-	fscanf(fp, "%s", sbuf);
+	fgetword(sbuf, MAXSTR, fp);
 	if (!strcmp(sbuf, ALIASID))
 		thisobj.otype = -1;
 	else if ((thisobj.otype = otype(sbuf)) < 0) {
@@ -83,19 +85,18 @@ int  (*f)();
 		error(USER, errmsg);
 	}
 					/* get identifier */
-	fscanf(fp, "%s", sbuf);
+	fgetword(sbuf, MAXSTR, fp);
 	thisobj.oname = sbuf;
 					/* get arguments */
 	if (thisobj.otype == -1) {
 		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 */
@@ -116,77 +117,4 @@ int  (*f)();
 			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);
 }