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.18 by greg, Sat Jul 12 15:14:44 2003 UTC vs.
Revision 2.26 by greg, Thu May 27 19:32:12 2010 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  Externals declared in resolu.h
8   *
9   *  newheader(t,fp)     start new information header identified by string t
10 – *  isheadid(s)         returns true if s is a header id line
10   *  headidval(r,s)      copy header identifier value in s to r
11 < *  dateval(t,s)        get capture date value
12 < *  isdate(s)           returns true if s is a date line
13 < *  fputdate(t,fp)      put out the given capture date and time
11 > *  dateval(t,s)        get capture date value as UTC
12 > *  gmtval(t,s)         get GMT as UTC
13 > *  fputdate(t,fp)      put out the given UTC
14   *  fputnow(fp)         put out the current date and time
15   *  printargs(ac,av,fp) print an argument list to fp, followed by '\n'
17 – *  isformat(s)         returns true if s is of the form "FORMAT=*"
16   *  formatval(r,s)      copy the format value in s to r
17   *  fputformat(s,fp)    write "FORMAT=%s" to fp
18   *  getheader(fp,f,p)   read header from fp, calling f(s,p) on each line
# Line 26 | Line 24 | static const char      RCSid[] = "$Id$";
24  
25   #include "copyright.h"
26  
29 – #include  <time.h>
27   #include  <ctype.h>
28  
29   #include  "rtio.h"
30   #include  "resolu.h"
31  
32 < #define  MAXLINE        512
32 > #define  MAXLINE        2048
33  
34 < char  HDRSTR[] = "#?";          /* information header magic number */
34 > extern time_t           timegm(struct tm *tm);
35  
36 < char  FMTSTR[] = "FORMAT=";     /* format identifier */
36 > const char  HDRSTR[] = "#?";            /* information header magic number */
37  
38 < char  TMSTR[] = "CAPDATE=";     /* capture date identifier */
38 > const char  FMTSTR[] = "FORMAT=";       /* format identifier */
39  
40 < static int mycheck();
40 > const char  TMSTR[] = "CAPDATE=";       /* capture date identifier */
41 > const char  GMTSTR[] = "GMT=";          /* GMT identifier */
42  
43 + static gethfunc mycheck;
44  
45 < void
46 < newheader(s, fp)                /* identifying line of information header */
47 < char  *s;
48 < register FILE  *fp;
45 >
46 > extern void
47 > newheader(              /* identifying line of information header */
48 >        char  *s,
49 >        FILE  *fp
50 > )
51   {
52          fputs(HDRSTR, fp);
53          fputs(s, fp);
# Line 54 | Line 55 | register FILE  *fp;
55   }
56  
57  
58 < int
59 < headidval(r,s)                  /* get header id (return true if is id) */
60 < register char  *r, *s;
58 > extern int
59 > headidval(                      /* get header id (return true if is id) */
60 >        char  *r,
61 >        char    *s
62 > )
63   {
64 <        register char  *cp = HDRSTR;
64 >        const char  *cp = HDRSTR;
65  
66          while (*cp) if (*cp++ != *s++) return(0);
67          if (r == NULL) return(1);
# Line 68 | Line 71 | register char  *r, *s;
71   }
72  
73  
74 < int
75 < isheadid(s)                     /* check to see if line is header id */
76 < char  *s;
74 > extern int
75 > dateval(                /* convert capture date line to UTC */
76 >        time_t  *tloc,
77 >        char    *s
78 > )
79   {
75 –        return(headidval(NULL, s));
76 – }
77 –
78 –
79 – int
80 – dateval(tloc, s)                /* get capture date value */
81 – time_t  *tloc;
82 – char    *s;
83 – {
80          struct tm       tms;
81 <        register char  *cp = TMSTR;
81 >        const char      *cp = TMSTR;
82  
83          while (*cp) if (*cp++ != *s++) return(0);
84          while (isspace(*s)) s++;
# Line 101 | Line 97 | char   *s;
97   }
98  
99  
100 < int
101 < isdate(s)                       /* is the given line a capture date? */
102 < char *s;
100 > extern int
101 > gmtval(                 /* convert GMT date line to UTC */
102 >        time_t  *tloc,
103 >        char    *s
104 > )
105   {
106 <        return(dateval(NULL, s));
106 >        struct tm       tms;
107 >        const char      *cp = GMTSTR;
108 >
109 >        while (*cp) if (*cp++ != *s++) return(0);
110 >        while (isspace(*s)) s++;
111 >        if (!*s) return(0);
112 >        if (sscanf(s, "%d:%d:%d %d:%d:%d",
113 >                        &tms.tm_year, &tms.tm_mon, &tms.tm_mday,
114 >                        &tms.tm_hour, &tms.tm_min, &tms.tm_sec) != 6)
115 >                return(0);
116 >        if (tloc == NULL)
117 >                return(1);
118 >        tms.tm_mon--;
119 >        tms.tm_year -= 1900;
120 >        *tloc = timegm(&tms);
121 >        return(1);
122   }
123  
124  
125 < void
126 < fputdate(tv, fp)                /* write out the given time value */
127 < time_t  tv;
128 < FILE    *fp;
125 > extern void
126 > fputdate(               /* write out the given time value (local & GMT) */
127 >        time_t  tv,
128 >        FILE    *fp
129 > )
130   {
131 <        struct tm       *tm = localtime(&tv);
132 <        if (tm == NULL)
133 <                return;
134 <        fprintf(fp, "%s %04d:%02d:%02d %02d:%02d:%02d\n", TMSTR,
135 <                        tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
136 <                        tm->tm_hour, tm->tm_min, tm->tm_sec);
131 >        struct tm       *tms;
132 >
133 >        tms = localtime(&tv);
134 >        if (tms != NULL)
135 >                fprintf(fp, "%s %04d:%02d:%02d %02d:%02d:%02d\n", TMSTR,
136 >                                tms->tm_year+1900, tms->tm_mon+1, tms->tm_mday,
137 >                                tms->tm_hour, tms->tm_min, tms->tm_sec);
138 >        tms = gmtime(&tv);
139 >        if (tms != NULL)
140 >                fprintf(fp, "%s %04d:%02d:%02d %02d:%02d:%02d\n", GMTSTR,
141 >                                tms->tm_year+1900, tms->tm_mon+1, tms->tm_mday,
142 >                                tms->tm_hour, tms->tm_min, tms->tm_sec);
143   }
144  
145  
146 < void
147 < fputnow(fp)                     /* write out the current time */
148 < FILE    *fp;
146 > extern void
147 > fputnow(                        /* write out the current time */
148 >        FILE    *fp
149 > )
150   {
151          time_t  tv;
152          time(&tv);
# Line 133 | Line 154 | FILE   *fp;
154   }
155  
156  
157 < void
158 < printargs(ac, av, fp)           /* print arguments to a file */
159 < int  ac;
160 < char  **av;
161 < FILE  *fp;
157 > extern void
158 > printargs(              /* print arguments to a file */
159 >        int  ac,
160 >        char  **av,
161 >        FILE  *fp
162 > )
163   {
164          while (ac-- > 0) {
165                  fputword(*av++, fp);
# Line 146 | Line 168 | FILE  *fp;
168   }
169  
170  
171 < int
172 < formatval(r, s)                 /* get format value (return true if format) */
173 < register char  *r;
174 < register char  *s;
171 > extern int
172 > formatval(                      /* get format value (return true if format) */
173 >        char  *r,
174 >        char  *s
175 > )
176   {
177 <        register char  *cp = FMTSTR;
177 >        const char  *cp = FMTSTR;
178  
179          while (*cp) if (*cp++ != *s++) return(0);
180          while (isspace(*s)) s++;
# Line 165 | Line 188 | register char  *s;
188   }
189  
190  
191 < int
192 < isformat(s)                     /* is line a format line? */
193 < char  *s;
191 > extern void
192 > fputformat(             /* put out a format value */
193 >        char  *s,
194 >        FILE  *fp
195 > )
196   {
172 –        return(formatval(NULL, s));
173 – }
174 –
175 –
176 – void
177 – fputformat(s, fp)               /* put out a format value */
178 – char  *s;
179 – FILE  *fp;
180 – {
197          fputs(FMTSTR, fp);
198          fputs(s, fp);
199          putc('\n', fp);
200   }
201  
202  
203 < int
204 < getheader(fp, f, p)             /* get header from file */
205 < FILE  *fp;
206 < int  (*f)();
207 < char  *p;
203 > extern int
204 > getheader(              /* get header from file */
205 >        FILE  *fp,
206 >        gethfunc *f,
207 >        void  *p
208 > )
209   {
210          char  buf[MAXLINE];
211  
# Line 219 | Line 236 | struct check {
236  
237  
238   static int
239 < mycheck(s, cp)                  /* check a header line for format info. */
240 < char  *s;
241 < register struct check  *cp;
239 > mycheck(                        /* check a header line for format info. */
240 >        char  *s,
241 >        void  *cp
242 > )
243   {
244 <        if (!formatval(cp->fs, s) && cp->fp != NULL)
245 <                fputs(s, cp->fp);
244 >        if (!formatval(((struct check*)cp)->fs, s)
245 >                        && ((struct check*)cp)->fp != NULL) {
246 >                fputs(s, ((struct check*)cp)->fp);
247 >        }
248          return(0);
249   }
250  
251  
252 < int
253 < globmatch(p, s)                 /* check for match of s against pattern p */
254 < register char   *p, *s;
252 > extern int
253 > globmatch(                      /* check for match of s against pattern p */
254 >        char    *p,
255 >        char    *s
256 > )
257   {
258          int     setmatch;
259  
# Line 295 | Line 317 | register char  *p, *s;
317   * if fout is not NULL.
318   */
319  
320 < int
321 < checkheader(fin, fmt, fout)
322 < FILE  *fin;
323 < char  *fmt;
324 < FILE  *fout;
320 > extern int
321 > checkheader(
322 >        FILE  *fin,
323 >        char  *fmt,
324 >        FILE  *fout
325 > )
326   {
327          struct check    cdat;
328 <        register char   *cp;
328 >        char    *cp;
329  
330          cdat.fp = fout;
331          cdat.fs[0] = '\0';
332 <        if (getheader(fin, mycheck, (char *)&cdat) < 0)
332 >        if (getheader(fin, mycheck, &cdat) < 0)
333                  return(-1);
334          if (!cdat.fs[0])
335                  return(0);
336          for (cp = fmt; *cp; cp++)               /* check for globbing */
337 <                if (*cp == '?' | *cp == '*')
337 >                if ((*cp == '?') | (*cp == '*')) {
338                          if (globmatch(fmt, cdat.fs)) {
339                                  strcpy(fmt, cdat.fs);
340                                  return(1);
341                          } else
342                                  return(-1);
343 +                }
344          return(strcmp(fmt, cdat.fs) ? -1 : 1);  /* literal match */
345   }

Diff Legend

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