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

Comparing ray/src/util/rad.c (file contents):
Revision 2.64 by schorsch, Thu Jun 26 00:58:11 2003 UTC vs.
Revision 2.65 by schorsch, Mon Jun 30 14:59:13 2003 UTC

# Line 74 | Line 74 | VARIABLE       vv[] = {                /* variable-value pairs */
74   };
75  
76                                  /* overture calculation file */
77 < #ifdef NIX
78 < char    overfile[] = "overture.unf";
77 > #ifdef NULL_DEVICE
78 > char    overfile[] = NULL_DEVICE;
79   #else
80 < char    overfile[] = "/dev/null";
80 > char    overfile[] = "overture.unf";
81   #endif
82  
83   extern time_t   time();
# Line 106 | Line 106 | int    overture = 0;           /* overture calculation needed */
106   char    *progname;              /* global argv[0] */
107   char    *rifname;               /* global rad input file name */
108  
109 < char    radname[MAXPATH];       /* root Radiance file name */
109 > char    radname[PATH_MAX];      /* root Radiance file name */
110  
111  
112   main(argc, argv)
# Line 210 | Line 210 | time_t
210   checklast(fnames)                       /* check files and find most recent */
211   register char   *fnames;
212   {
213 <        char    thisfile[MAXPATH];
213 >        char    thisfile[PATH_MAX];
214          time_t  thisdate, lastdate = 0;
215  
216          if (fnames == NULL)
217                  return(0);
218 <        while ((fnames = nextword(thisfile, MAXPATH, fnames)) != NULL) {
218 >        while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) {
219                  if (thisfile[0] == '!' ||
220                                  (thisfile[0] == '\\' && thisfile[1] == '!'))
221                          continue;
# Line 233 | Line 233 | newfname(orig, pred)           /* create modified file name */
233   char    *orig;
234   int     pred;
235   {
236 –        extern char     *rindex();
236          register char   *cp;
237          register int    n;
238          int     suffix;
# Line 399 | Line 398 | setdefaults()                  /* set default values for unassigned v
398   oconv()                         /* run oconv and mkillum if necessary */
399   {
400          static char     illumtmp[] = "ilXXXXXX";
401 <        char    combuf[1024], ocopts[64], mkopts[64];
401 >        char    combuf[PATH_MAX], ocopts[64], mkopts[64];
402  
403          oconvopts(ocopts);              /* get options */
404          if (octreedate < scenedate) {   /* check date on original octree */
# Line 1064 | Line 1063 | rview(opts, po)                                /* run rview with first view */
1063   char    *opts, *po;
1064   {
1065          char    *vw;
1066 <        char    combuf[512];
1066 >        char    combuf[PATH_MAX];
1067                                          /* build command */
1068          if (touchonly || (vw = getview(0, NULL)) == NULL)
1069                  return;
# Line 1086 | Line 1085 | char   *opts, *po;
1085   rpict(opts, po)                         /* run rpict and pfilt for each view */
1086   char    *opts, *po;
1087   {
1088 <        char    combuf[1024];
1089 <        char    rawfile[MAXPATH], picfile[MAXPATH];
1090 <        char    zopt[MAXPATH+4], rep[MAXPATH+16], res[32];
1088 >        char    combuf[PATH_MAX];
1089 >        char    rawfile[PATH_MAX], picfile[PATH_MAX];
1090 >        char    zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32];
1091          char    pfopts[128];
1092          char    vs[32], *vw;
1093          int     vn, mult;
# Line 1177 | Line 1176 | char   *opts, *po;
1176                                                  progname, vs);
1177                                          quit(1);
1178                                  }
1179 < #ifdef NIX
1179 > #ifndef NULL_DEVICE
1180                                  rmfile(overfile);
1181   #endif
1182                          }

Diff Legend

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