--- ray/src/common/readobj.c	1990/09/18 09:53:35	1.5
+++ ray/src/common/readobj.c	1998/11/05 16:51:26	2.7
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1994 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -18,29 +18,33 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <ctype.h>
 
+extern char  *fgetword(), *strcpy();
+
 OBJREC  *objblock[MAXOBJBLK];		/* our objects */
 OBJECT  nobjects = 0;			/* # of objects */
 
 
-readobj(input)			/* read in an object file or stream */
-char  *input;
+readobj(inpspec)		/* read in an object file or stream */
+char  *inpspec;
 {
 	FILE  *popen();
-	char  *fgets(), *fgetline();
+	char  *fgetline();
+	OBJECT  lastobj;
 	FILE  *infp;
-	char  buf[512];
+	char  buf[1024];
 	register int  c;
 
-	if (input == NULL) {
+	lastobj = nobjects;
+	if (inpspec == NULL) {
 		infp = stdin;
-		input = "standard input";
-	} else if (input[0] == '!') {
-		if ((infp = popen(input+1, "r")) == NULL) {
-			sprintf(errmsg, "cannot execute \"%s\"", input);
+		inpspec = "standard input";
+	} else if (inpspec[0] == '!') {
+		if ((infp = popen(inpspec+1, "r")) == NULL) {
+			sprintf(errmsg, "cannot execute \"%s\"", inpspec);
 			error(SYSTEM, errmsg);
 		}
-	} else if ((infp = fopen(input, "r")) == NULL) {
-		sprintf(errmsg, "cannot open scene file \"%s\"", input);
+	} else if ((infp = fopen(inpspec, "r")) == NULL) {
+		sprintf(errmsg, "cannot open scene file \"%s\"", inpspec);
 		error(SYSTEM, errmsg);
 	}
 	while ((c = getc(infp)) != EOF) {
@@ -54,13 +58,17 @@ char  *input;
 			readobj(buf);
 		} else {				/* object */
 			ungetc(c, infp);
-			getobject(input, infp);
+			getobject(inpspec, infp);
 		}
 	}
-	if (input[0] == '!')
+	if (inpspec[0] == '!')
 		pclose(infp);
 	else
 		fclose(infp);
+	if (nobjects == lastobj) {
+		sprintf(errmsg, "(%s): empty file", inpspec);
+		error(WARNING, errmsg);
+	}
 }
 
 
@@ -70,13 +78,15 @@ FILE  *fp;
 {
 	OBJECT  obj;
 	char  sbuf[MAXSTR];
+	int  rval;
 	register OBJREC  *objp;
 
 	if ((obj = newobject()) == OVOID)
 		error(SYSTEM, "out of object space");
 	objp = objptr(obj);
 					/* get modifier */
-	fscanf(fp, "%s", sbuf);
+	strcpy(sbuf, "EOF");
+	fgetword(sbuf, MAXSTR, fp);
 	if (!strcmp(sbuf, VOIDID))
 		objp->omod = OVOID;
 	else if ((objp->omod = modifier(sbuf)) == OVOID) {
@@ -84,7 +94,8 @@ FILE  *fp;
 		error(USER, errmsg);
 	}
 					/* get type */
-	fscanf(fp, "%s", sbuf);
+	strcpy(sbuf, "EOF");
+	fgetword(sbuf, MAXSTR, fp);
 	if (!strcmp(sbuf, ALIASID))
 		objp->otype = -1;
 	else if ((objp->otype = otype(sbuf)) < 0) {
@@ -92,12 +103,14 @@ FILE  *fp;
 		error(USER, errmsg);
 	}
 					/* get identifier */
-	fscanf(fp, "%s", sbuf);
+	sbuf[0] = '\0';
+	fgetword(sbuf, MAXSTR, fp);
 	objp->oname = savqstr(sbuf);
 					/* get arguments */
 	if (objp->otype == -1) {
 		register OBJECT  alias;
-		fscanf(fp, "%s", sbuf);
+		strcpy(sbuf, "EOF");
+		fgetword(sbuf, MAXSTR, fp);
 		if ((alias = modifier(sbuf)) == OVOID) {
 			sprintf(errmsg,
 			"(%s): bad reference \"%s\" for %s \"%s\"",
@@ -106,83 +119,31 @@ FILE  *fp;
 		}
 		objp->otype = objptr(alias)->otype;
 		copystruct(&objp->oargs, &objptr(alias)->oargs);
-	} else if (readfargs(&objp->oargs, fp) < 0) {
+	} else if ((rval = readfargs(&objp->oargs, fp)) == 0) {
 		sprintf(errmsg, "(%s): bad arguments", name);
 		objerror(objp, USER, errmsg);
+	} else if (rval < 0) {
+		sprintf(errmsg, "(%s): error reading scene", name);
+		error(SYSTEM, errmsg);
 	}
 					/* initialize */
 	objp->os = NULL;
-	objp->lastrno = -1;
 
 	insertobject(obj);		/* add to global structure */
 }
 
 
-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 **)bmalloc(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 *)bmalloc(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 *)bmalloc(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");
-}
-
-
 int
 newobject()				/* get a new object */
 {
 	register int  i;
 
-	if ((nobjects & 077) == 0) {		/* new block */
+	if ((nobjects & (OBJBLKSIZ-1)) == 0) {	/* new block */
 		errno = 0;
-		i = nobjects >> 6;
+		i = nobjects >> OBJBLKSHFT;
 		if (i >= MAXOBJBLK)
 			return(OVOID);
-		objblock[i] = (OBJREC *)bmalloc(0100*sizeof(OBJREC));
+		objblock[i] = (OBJREC *)bmalloc(OBJBLKSIZ*sizeof(OBJREC));
 		if (objblock[i] == NULL)
 			return(OVOID);
 	}