ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/rtcontrib.c
(Generate patch)

Comparing ray/src/util/rtcontrib.c (file contents):
Revision 1.18 by greg, Fri Jun 10 20:38:38 2005 UTC vs.
Revision 1.20 by greg, Fri Jun 10 20:53:55 2005 UTC

# Line 16 | Line 16 | static const char RCSid[] = "$Id$";
16   #include  "lookup.h"
17   #include  "calcomp.h"
18  
19 + #ifndef MAXMODLIST
20   #define MAXMODLIST      1024            /* maximum modifiers we'll track */
21 + #endif
22  
23   int     treebufsiz = BUFSIZ;            /* current tree buffer size */
24  
# Line 261 | Line 263 | main(int argc, char *argv[])
263                                  continue;
264                          case 'M':               /* modifier file */
265                                  if (argv[i][2] || i >= argc-1) break;
266 <                                addmodfile(argv[++i], curout, binval);
266 >                                rtargv[rtargc++] = "-tI";
267 >                                rtargv[rtargc++] = argv[++i];
268 >                                addmodfile(argv[i], curout, binval);
269                                  continue;
270                          }
271                  rtargv[rtargc++] = argv[i];     /* assume rtrace option */
# Line 464 | Line 468 | addmodfile(char *fname, char *outf, char *binv)
468   {
469          char    *mname[MAXMODLIST];
470          int     i;
471 <                                        /* load the file & store strings */
472 <        wordfile(mname, fname);
471 >                                        /* find the file & store strings */
472 >        if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) {
473 >                sprintf(errmsg, "cannot find modifier file '%s'", fname);
474 >                error(SYSTEM, errmsg);
475 >        }
476          for (i = 0; mname[i]; i++)      /* add each one */
477                  addmodifier(mname[i], outf, binv);
478   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)