--- ray/src/common/readobj.c 1993/01/25 12:41:24 2.2
+++ ray/src/common/readobj.c 2003/02/22 02:07:22 2.8
@@ -1,15 +1,69 @@
-/* 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.8 2003/02/22 02:07:22 greg Exp $";
#endif
-
/*
* readobj.c - routines for reading in object descriptions.
*
- * 7/28/85
+ * External symbols declared in object.h
*/
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes Radiance software
+ * (http://radsite.lbl.gov/)
+ * developed by the Lawrence Berkeley National Laboratory
+ * (http://www.lbl.gov/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ * and "The Regents of the University of California" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ * nor may "Radiance" appear in their name, without prior written
+ * permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory. For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * .
+ */
+
#include "standard.h"
#include "object.h"
@@ -18,31 +72,30 @@ static char SCCSid[] = "$SunId$ LBL";
#include
-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;
+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) {
@@ -56,16 +109,21 @@ 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;
@@ -132,14 +190,48 @@ 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 */
+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(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;
+ }
}