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.31 by greg, Wed May 10 18:02:08 2017 UTC vs.
Revision 2.38 by greg, Tue Sep 24 21:25:59 2019 UTC

# Line 4 | Line 4 | static const char      RCSid[] = "$Id$";
4   /*
5   *  header.c - routines for reading and writing information headers.
6   *
7 < *  Externals declared in resolu.h
7 > *  Externals declared in rtio.h
8   *
9   *  newheader(t,fp)     start new information header identified by string t
10   *  headidval(r,s)      copy header identifier value in s to r
# Line 15 | Line 15 | static const char      RCSid[] = "$Id$";
15   *  printargs(ac,av,fp) print an argument list to fp, followed by '\n'
16   *  formatval(r,s)      copy the format value in s to r
17   *  fputformat(s,fp)    write "FORMAT=%s" to fp
18 + *  nativebigendian()   are we native on big-endian machine?
19 + *  isbigendian(s)      header line matches "BigEndian=1" (-1 if irrelevant)
20 + *  fputendian(fp)      write native endianness in BigEndian= line
21   *  getheader(fp,f,p)   read header from fp, calling f(s,p) on each line
22   *  globmatch(pat, str) check for glob match of str against pat
23   *  checkheader(i,p,o)  check header format from i against p and copy to o
# Line 26 | Line 29 | static const char      RCSid[] = "$Id$";
29  
30   #include  <ctype.h>
31  
32 + #include  "tiff.h"      /* for int32 */
33   #include  "rtio.h"
34   #include  "resolu.h"
35  
# Line 40 | Line 44 | const char  FMTSTR[] = "FORMAT=";      /* format identifier
44   const char  TMSTR[] = "CAPDATE=";       /* capture date identifier */
45   const char  GMTSTR[] = "GMT=";          /* GMT identifier */
46  
47 + const char  BIGEND[] = "BigEndian=";    /* big-endian variable */
48 +
49   static gethfunc mycheck;
50  
51  
# Line 170 | Line 176 | printargs(             /* print arguments to a file */
176  
177   int
178   formatval(                      /* get format value (return true if format) */
179 <        char  *r,
179 >        char  fmt[MAXFMTLEN],
180          const char  *s
181   )
182   {
183          const char  *cp = FMTSTR;
184 +        char  *r = fmt;
185  
186          while (*cp) if (*cp++ != *s++) return(0);
187          while (isspace(*s)) s++;
# Line 182 | Line 189 | formatval(                     /* get format value (return true if forma
189          if (r == NULL) return(1);
190          do
191                  *r++ = *s++;
192 <        while (*s && !isspace(*s));
192 >        while (*s && !isspace(*s) && r-fmt < MAXFMTLEN-1);
193          *r = '\0';
194          return(1);
195   }
# Line 201 | Line 208 | fputformat(            /* put out a format value */
208  
209  
210   int
211 + nativebigendian()       /* are we native on a big-endian machine? */
212 + {
213 +        union { int32 i; char c[4]; } u;
214 +
215 +        u.i = 1;
216 +
217 +        return(u.c[0] == 0);
218 + }
219 +
220 +
221 + int
222 + isbigendian(            /* header line says "BigEndian=1" (-1 if irrelevant) */
223 +        const char *s
224 + )
225 + {
226 +        const char      *be = BIGEND;
227 +
228 +        while ((*s != '\0') & (*be != '=') && *s++ == *be)
229 +                ++be;
230 +        if (*be != '=')
231 +                return(-1);     /* irrelevant */
232 +        while (isspace(*s))
233 +                s++;
234 +        if (*s++ != '=')
235 +                return(-1);
236 +        while (isspace(*s))
237 +                s++;
238 +        return(*s == '1');
239 + }
240 +
241 +
242 + void
243 + fputendian(             /* write native endianness in BigEndian= line */
244 +        FILE *fp
245 + )
246 + {
247 +        fputs(BIGEND, fp);
248 +        if (nativebigendian())
249 +                fputs("1\n", fp);
250 +        else
251 +                fputs("0\n", fp);
252 + }
253 +
254 +
255 + int
256   getheader(              /* get header from file */
257          FILE  *fp,
258          gethfunc *f,
# Line 209 | Line 261 | getheader(             /* get header from file */
261   {
262          int   rtotal = 0;
263          char  buf[MAXLINE];
264 +        int   firstc = fgetc(fp);
265  
266 +        if (!isprint(firstc))
267 +                return(-1);                             /* messed up */
268 +        ungetc(firstc, fp);
269          for ( ; ; ) {
270                  int     rval = 0;
271                  buf[MAXLINE-2] = '\n';
272                  if (fgets(buf, MAXLINE, fp) == NULL)
273                          return(-1);
274 <                if (buf[buf[0]=='\r'] == '\n')
274 >                if (buf[buf[0]=='\r'] == '\n')          /* end of header? */
275                          return(rtotal);
276                  if (buf[MAXLINE-2] != '\n') {
277                          ungetc(buf[MAXLINE-2], fp);     /* prevent false end */
# Line 230 | Line 286 | getheader(             /* get header from file */
286  
287   struct check {
288          FILE    *fp;
289 <        char    fs[64];
289 >        char    fs[MAXFMTLEN];
290   };
291  
292  
# Line 240 | Line 296 | mycheck(                       /* check a header line for format info. */
296          void  *cp
297   )
298   {
299 <        if (!formatval(((struct check*)cp)->fs, s)
300 <                        && ((struct check*)cp)->fp != NULL) {
301 <                fputs(s, ((struct check*)cp)->fp);
302 <        }
299 >        struct check    *scp = (struct check *)cp;
300 >
301 >        if (!formatval(scp->fs, s) && scp->fp != NULL)
302 >                return(fputs(s, scp->fp));
303 >
304          return(0);
305   }
306  
# Line 319 | Line 376 | globmatch(                     /* check for match of s against pattern p
376   int
377   checkheader(
378          FILE  *fin,
379 <        char  *fmt,
379 >        char  fmt[MAXFMTLEN],
380          FILE  *fout
381   )
382   {

Diff Legend

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