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

Comparing src/meta/expand.c (file contents):
Revision 1.2 by schorsch, Sun Jun 8 12:03:10 2003 UTC vs.
Revision 1.3 by schorsch, Mon Jul 21 22:30:18 2003 UTC

# Line 85 | Line 85 | register PRIMITIVE  *p
85   {
86      int  xflag = xlist[comndx(p->com)];
87                                  /* 1==expand, 0==pass, -1==discard */
88 <    if (xflag != -1)
88 >    if (xflag != -1) {
89         if (xflag == 1)
90            switch (p->com)  {
91  
# Line 126 | Line 126 | register PRIMITIVE  *p
126            segprim(p);
127         else
128            writep(p, stdout);
129 <
129 >    }
130   }
131  
132  
# Line 247 | Line 247 | char  *fname
247      if (fname == NULL)
248          error(USER, "missing include file name in include");
249      
250 <    if (code == 2 || (fp = fopen(fname, "r")) == NULL)
250 >    if (code == 2 || (fp = fopen(fname, "r")) == NULL) {
251          if (code != 0)
252              fp = mfopen(fname, "r");
253          else {
254              sprintf(errmsg, "cannot open user include file \"%s\"", fname);
255              error(USER, errmsg);
256          }
257 +    }
258      
259      exfile(fp);
260      fclose(fp);

Diff Legend

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