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.20 by greg, Tue Mar 30 12:42:33 2010 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  "rtprocess.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 */
# Line 82 | Line 30 | char  *inpspec;
30   {
31          OBJECT  lastobj;
32          FILE  *infp;
33 <        char  buf[1024];
33 >        char  buf[2048];
34          register int  c;
35  
36          lastobj = nobjects;
# Line 128 | Line 76 | getobject(name, fp)                    /* read the next object */
76   char  *name;
77   FILE  *fp;
78   {
79 + #define OALIAS  -2
80          OBJECT  obj;
81          char  sbuf[MAXSTR];
82          int  rval;
# Line 139 | Line 88 | FILE  *fp;
88                                          /* get modifier */
89          strcpy(sbuf, "EOF");
90          fgetword(sbuf, MAXSTR, fp);
91 +        if (strchr(sbuf, '\t')) {
92 +                sprintf(errmsg, "(%s): illegal tab in modifier \"%s\"",
93 +                                        name, sbuf);
94 +                error(USER, errmsg);
95 +        }
96          if (!strcmp(sbuf, VOIDID))
97                  objp->omod = OVOID;
98 +        else if (!strcmp(sbuf, ALIASMOD))
99 +                objp->omod = OALIAS;
100          else if ((objp->omod = modifier(sbuf)) == OVOID) {
101                  sprintf(errmsg, "(%s): undefined modifier \"%s\"", name, sbuf);
102                  error(USER, errmsg);
# Line 148 | Line 104 | FILE  *fp;
104                                          /* get type */
105          strcpy(sbuf, "EOF");
106          fgetword(sbuf, MAXSTR, fp);
107 <        if (!strcmp(sbuf, ALIASID))
152 <                objp->otype = -1;
153 <        else if ((objp->otype = otype(sbuf)) < 0) {
107 >        if ((objp->otype = otype(sbuf)) < 0) {
108                  sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
109                  error(USER, errmsg);
110          }
111                                          /* get identifier */
112          sbuf[0] = '\0';
113          fgetword(sbuf, MAXSTR, fp);
114 +        if (strchr(sbuf, '\t')) {
115 +                sprintf(errmsg, "(%s): illegal tab in identifier \"%s\"",
116 +                                        name, sbuf);
117 +                error(USER, errmsg);
118 +        }
119          objp->oname = savqstr(sbuf);
120                                          /* get arguments */
121 <        if (objp->otype == -1) {
121 >        if (objp->otype == MOD_ALIAS) {
122                  register OBJECT  alias;
123                  strcpy(sbuf, "EOF");
124                  fgetword(sbuf, MAXSTR, fp);
125                  if ((alias = modifier(sbuf)) == OVOID) {
126 <                        sprintf(errmsg,
127 <                        "(%s): bad reference \"%s\" for %s \"%s\"",
128 <                                        name, sbuf, ALIASID, objp->oname);
170 <                        error(USER, errmsg);
126 >                        sprintf(errmsg, "(%s): bad reference \"%s\"",
127 >                                        name, sbuf);
128 >                        objerror(objp, USER, errmsg);
129                  }
130 <                objp->otype = objptr(alias)->otype;
131 <                copystruct(&objp->oargs, &objptr(alias)->oargs);
130 >                if (objp->omod == OALIAS ||
131 >                                objp->omod == objptr(alias)->omod) {
132 >                        objp->omod = alias;
133 >                } else {
134 >                        objp->oargs.sarg = (char **)malloc(sizeof(char *));
135 >                        if (objp->oargs.sarg == NULL)
136 >                                error(SYSTEM, "out of memory in getobject");
137 >                        objp->oargs.nsargs = 1;
138 >                        objp->oargs.sarg[0] = savestr(sbuf);
139 >                }
140          } else if ((rval = readfargs(&objp->oargs, fp)) == 0) {
141                  sprintf(errmsg, "(%s): bad arguments", name);
142                  objerror(objp, USER, errmsg);
# Line 178 | Line 144 | FILE  *fp;
144                  sprintf(errmsg, "(%s): error reading scene", name);
145                  error(SYSTEM, errmsg);
146          }
147 +        if (objp->omod == OALIAS) {
148 +                sprintf(errmsg, "(%s): inappropriate use of '%s' modifier",
149 +                                name, ALIASMOD);
150 +                objerror(objp, USER, errmsg);
151 +        }
152                                          /* initialize */
153          objp->os = NULL;
154  
155          insertobject(obj);              /* add to global structure */
156 + #undef OALIAS
157   }
158  
159  
160 < int
160 > OBJECT
161   newobject()                             /* get a new object */
162   {
163          register int  i;
# Line 204 | Line 176 | newobject()                            /* get a new object */
176  
177   void
178   freeobjects(firstobj, nobjs)            /* free a range of objects */
179 < OBJECT  firstobj, nobjs;
179 > int  firstobj, nobjs;
180   {
181          register int  obj;
182                                          /* check bounds */
# Line 220 | Line 192 | OBJECT  firstobj, nobjs;
192                  free_os(o);             /* free client memory */
193                  freeqstr(o->oname);
194                  freefargs(&o->oargs);
195 <                bzero(o, sizeof(OBJREC));
195 >                memset((void *)o, '\0', sizeof(OBJREC));
196          }
197          clearobjndx();
198                                          /* free objects off end */

Diff Legend

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