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

Comparing ray/src/common/header.c (file contents):
Revision 2.16 by greg, Fri Jun 27 06:53:21 2003 UTC vs.
Revision 2.20 by schorsch, Sun Jul 27 22:12:01 2003 UTC

# Line 25 | Line 25 | static const char      RCSid[] = "$Id$";
25   */
26  
27   #include "copyright.h"
28 #include "resolu.h"
28  
30 #include  <stdio.h>
31 #include  <string.h>
29   #include  <time.h>
30   #include  <ctype.h>
31  
32 + #include  "rtio.h"
33 + #include  "resolu.h"
34 +
35   #define  MAXLINE        512
36  
37   char  HDRSTR[] = "#?";          /* information header magic number */
# Line 40 | Line 40 | char  FMTSTR[] = "FORMAT=";    /* format identifier */
40  
41   char  TMSTR[] = "CAPDATE=";     /* capture date identifier */
42  
43 extern void     fputword(char *s, FILE *fp);
44
43   static int mycheck();
44  
45  
# Line 313 | Line 311 | FILE  *fout;
311          if (!cdat.fs[0])
312                  return(0);
313          for (cp = fmt; *cp; cp++)               /* check for globbing */
314 <                if (*cp == '?' | *cp == '*')
314 >                if ((*cp == '?') | (*cp == '*')) {
315                          if (globmatch(fmt, cdat.fs)) {
316                                  strcpy(fmt, cdat.fs);
317                                  return(1);
318                          } else
319                                  return(-1);
320 +                }
321          return(strcmp(fmt, cdat.fs) ? -1 : 1);  /* literal match */
322   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines