--- ray/src/common/readobj.c 1990/09/18 09:53:35 1.5 +++ ray/src/common/readobj.c 2003/06/20 00:25:49 2.15 @@ -1,46 +1,48 @@ -/* Copyright (c) 1986 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: readobj.c,v 2.15 2003/06/20 00:25:49 greg 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 +#include +#include +#include "standard.h" +#include "platform.h" +#include "object.h" #include "otypes.h" -#include OBJREC *objblock[MAXOBJBLK]; /* our objects */ OBJECT nobjects = 0; /* # of objects */ -readobj(input) /* read in an object file or stream */ -char *input; +void +readobj(inpspec) /* read in an object file or stream */ +char *inpspec; { - FILE *popen(); - char *fgets(), *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,137 +56,143 @@ 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); + } } +void getobject(name, fp) /* read the next object */ char *name; FILE *fp; { +#define OALIAS -2 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 (!strcmp(sbuf, ALIASMOD)) + objp->omod = OALIAS; else if ((objp->omod = modifier(sbuf)) == OVOID) { sprintf(errmsg, "(%s): undefined modifier \"%s\"", name, sbuf); error(USER, errmsg); } /* get type */ - fscanf(fp, "%s", sbuf); - if (!strcmp(sbuf, ALIASID)) - objp->otype = -1; - else if ((objp->otype = otype(sbuf)) < 0) { + strcpy(sbuf, "EOF"); + fgetword(sbuf, MAXSTR, fp); + if ((objp->otype = otype(sbuf)) < 0) { sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf); 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) { + if (objp->otype == MOD_ALIAS) { 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\"", - 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); - } else if (readfargs(&objp->oargs, fp) < 0) { + 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); + } else if (rval < 0) { + 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; - objp->lastrno = -1; insertobject(obj); /* add to global structure */ +#undef OALIAS } -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 +OBJECT 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 *)calloc(OBJBLKSIZ, sizeof(OBJREC)); if (objblock[i] == NULL) return(OVOID); } return(nobjects++); +} + +void +freeobjects(firstobj, nobjs) /* free a range of objects */ +int 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; + } }