ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/readobj.c
(Generate patch)

Comparing ray/src/common/readobj.c (file contents):
Revision 2.8 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.27 by greg, Tue Apr 22 04:45:25 2025 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  readobj.c - routines for reading in object descriptions.
# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in object.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12 < #include  "standard.h"
12 > #include  <ctype.h>
13 > #include  <string.h>
14 > #include  <stdio.h>
15  
16 + #include  "platform.h"
17 + #include  "paths.h"
18 + #include  "standard.h"
19   #include  "object.h"
70 –
20   #include  "otypes.h"
21  
73 – #include  <ctype.h>
22  
23   OBJREC  *objblock[MAXOBJBLK];           /* our objects */
24   OBJECT  nobjects = 0;                   /* # of objects */
25  
26  
27   void
28 < readobj(inpspec)                /* read in an object file or stream */
29 < char  *inpspec;
28 > readobj(                                /* read in an object file or stream */
29 >        char  *inpspec
30 > )
31   {
32          OBJECT  lastobj;
33          FILE  *infp;
34 <        char  buf[1024];
35 <        register int  c;
34 >        char  buf[2048];
35 >        int  c;
36  
37          lastobj = nobjects;
38          if (inpspec == NULL) {
# Line 98 | Line 47 | char  *inpspec;
47                  sprintf(errmsg, "cannot open scene file \"%s\"", inpspec);
48                  error(SYSTEM, errmsg);
49          }
50 + #ifdef getc_unlocked                    /* avoid stupid semaphores */
51 +        flockfile(infp);
52 + #endif
53          while ((c = getc(infp)) != EOF) {
54                  if (isspace(c))
55                          continue;
# Line 112 | Line 64 | char  *inpspec;
64                          getobject(inpspec, infp);
65                  }
66          }
67 <        if (inpspec[0] == '!')
68 <                pclose(infp);
69 <        else
67 >        if (inpspec[0] == '!') {
68 >                if (pclose(infp) != 0) {
69 >                        sprintf(errmsg, "bad status from \"%s\"", inpspec);
70 >                        error(USER, errmsg);
71 >                }
72 >        } else if (infp != stdin)
73                  fclose(infp);
74 + #ifdef getc_unlocked
75 +        else
76 +                funlockfile(infp);
77 + #endif
78          if (nobjects == lastobj) {
79                  sprintf(errmsg, "(%s): empty file", inpspec);
80                  error(WARNING, errmsg);
# Line 124 | Line 83 | char  *inpspec;
83  
84  
85   void
86 < getobject(name, fp)                     /* read the next object */
87 < char  *name;
88 < FILE  *fp;
86 > getobject(                              /* read the next object */
87 >        char  *name,
88 >        FILE  *fp
89 > )
90   {
91 + #define OALIAS  -2
92          OBJECT  obj;
93          char  sbuf[MAXSTR];
94          int  rval;
95 <        register OBJREC  *objp;
95 >        OBJREC  *objp;
96  
97          if ((obj = newobject()) == OVOID)
98                  error(SYSTEM, "out of object space");
# Line 139 | Line 100 | FILE  *fp;
100                                          /* get modifier */
101          strcpy(sbuf, "EOF");
102          fgetword(sbuf, MAXSTR, fp);
103 +        if (strchr(sbuf, '\t')) {
104 +                sprintf(errmsg, "(%s): illegal tab in modifier \"%s\"",
105 +                                        name, sbuf);
106 +                error(USER, errmsg);
107 +        }
108          if (!strcmp(sbuf, VOIDID))
109                  objp->omod = OVOID;
110 +        else if (!strcmp(sbuf, ALIASMOD))
111 +                objp->omod = OALIAS;
112          else if ((objp->omod = modifier(sbuf)) == OVOID) {
113                  sprintf(errmsg, "(%s): undefined modifier \"%s\"", name, sbuf);
114                  error(USER, errmsg);
# Line 148 | Line 116 | FILE  *fp;
116                                          /* get type */
117          strcpy(sbuf, "EOF");
118          fgetword(sbuf, MAXSTR, fp);
119 <        if (!strcmp(sbuf, ALIASID))
152 <                objp->otype = -1;
153 <        else if ((objp->otype = otype(sbuf)) < 0) {
119 >        if ((objp->otype = otype(sbuf)) < 0) {
120                  sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
121                  error(USER, errmsg);
122          }
123                                          /* get identifier */
124          sbuf[0] = '\0';
125          fgetword(sbuf, MAXSTR, fp);
126 +        if (strchr(sbuf, '\t')) {
127 +                sprintf(errmsg, "(%s): illegal tab in identifier \"%s\"",
128 +                                        name, sbuf);
129 +                error(USER, errmsg);
130 +        }
131          objp->oname = savqstr(sbuf);
132                                          /* get arguments */
133 <        if (objp->otype == -1) {
134 <                register OBJECT  alias;
133 >        if (objp->otype == MOD_ALIAS) {
134 >                OBJECT  ref;
135 >                OBJREC  *rfp;
136                  strcpy(sbuf, "EOF");
137                  fgetword(sbuf, MAXSTR, fp);
138 <                if ((alias = modifier(sbuf)) == OVOID) {
139 <                        sprintf(errmsg,
140 <                        "(%s): bad reference \"%s\" for %s \"%s\"",
141 <                                        name, sbuf, ALIASID, objp->oname);
142 <                        error(USER, errmsg);
138 >                if ((ref = modifier(sbuf)) == OVOID) {
139 >                        sprintf(errmsg, "(%s): bad reference \"%s\"",
140 >                                        name, sbuf);
141 >                        objerror(objp, USER, errmsg);
142 >                }                       /* skip pass-thru aliases */
143 >                while ((rfp=objptr(ref))->otype == MOD_ALIAS &&
144 >                                !rfp->oargs.nsargs & (rfp->omod != OVOID))
145 >                        ref = rfp->omod;
146 >
147 >                if ((objp->omod == OALIAS) | (objp->omod == rfp->omod)) {
148 >                        objp->omod = ref;
149 >                } else {
150 >                        objp->oargs.sarg = (char **)malloc(sizeof(char *));
151 >                        if (objp->oargs.sarg == NULL)
152 >                                error(SYSTEM, "out of memory in getobject");
153 >                        objp->oargs.nsargs = 1;
154 >                        objp->oargs.sarg[0] = savestr(sbuf);
155                  }
172 –                objp->otype = objptr(alias)->otype;
173 –                copystruct(&objp->oargs, &objptr(alias)->oargs);
156          } else if ((rval = readfargs(&objp->oargs, fp)) == 0) {
157                  sprintf(errmsg, "(%s): bad arguments", name);
158                  objerror(objp, USER, errmsg);
# Line 178 | Line 160 | FILE  *fp;
160                  sprintf(errmsg, "(%s): error reading scene", name);
161                  error(SYSTEM, errmsg);
162          }
163 +        if (objp->omod == OALIAS) {
164 +                sprintf(errmsg, "(%s): inappropriate use of '%s' modifier",
165 +                                name, ALIASMOD);
166 +                objerror(objp, USER, errmsg);
167 +        }
168                                          /* initialize */
169          objp->os = NULL;
170  
171          insertobject(obj);              /* add to global structure */
172 + #undef OALIAS
173   }
174  
175  
176 < int
177 < newobject()                             /* get a new object */
176 > OBJECT
177 > newobject(void)                         /* get a new object */
178   {
179 <        register int  i;
179 >        int  i;
180  
181          if ((nobjects & (OBJBLKSIZ-1)) == 0) {  /* new block */
182                  errno = 0;
# Line 203 | Line 191 | newobject()                            /* get a new object */
191   }
192  
193   void
194 < freeobjects(firstobj, nobjs)            /* free a range of objects */
195 < OBJECT  firstobj, nobjs;
194 > freeobjects(                            /* free a range of objects */
195 >        int firstobj,
196 >        int nobjs
197 > )
198   {
199 <        register int  obj;
199 >        int  obj;
200                                          /* check bounds */
201          if (firstobj < 0)
202                  return;
# Line 216 | Line 206 | OBJECT  firstobj, nobjs;
206                  return;
207                                          /* clear objects */
208          for (obj = firstobj+nobjs; obj-- > firstobj; ) {
209 <                register OBJREC  *o = objptr(obj);
209 >                OBJREC  *o = objptr(obj);
210                  free_os(o);             /* free client memory */
211                  freeqstr(o->oname);
212                  freefargs(&o->oargs);
213 <                bzero(o, sizeof(OBJREC));
213 >                memset((void *)o, '\0', sizeof(OBJREC));
214          }
225 –        clearobjndx();
215                                          /* free objects off end */
216          for (obj = nobjects; obj-- > 0; )
217                  if (objptr(obj)->oname != NULL)
218                          break;
219 <        ++obj;
219 >        if (++obj >= nobjects)
220 >                return;
221          while (nobjects > obj)          /* free empty end blocks */
222                  if ((--nobjects & (OBJBLKSIZ-1)) == 0) {
223                          int     i = nobjects >> OBJBLKSHFT;
224                          free((void *)objblock[i]);
225                          objblock[i] = NULL;
226                  }
227 +        truncobjndx();                  /* truncate modifier look-up */
228   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines