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.33 by greg, Sat May 25 04:00:54 2019 UTC vs.
Revision 2.40 by greg, Sat Jul 25 01:10:38 2020 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 161 | Line 167 | printargs(             /* print arguments to a file */
167          FILE  *fp
168   )
169   {
170 + #if defined(_WIN32) || defined(_WIN64)
171 +        extern char     *fixargv0(char *arg0);
172 +        char            myav0[128];
173 +                                /* clean up Windows executable path */
174 +        if (ac-- <= 0) return;
175 +        fputs(fixargv0(strcpy(myav0, *av++)), fp);
176 +        fputc(ac ? ' ' : '\n', fp);
177 + #endif
178          while (ac-- > 0) {
179                  fputword(*av++, fp);
180                  fputc(ac ? ' ' : '\n', fp);
# Line 202 | Line 216 | fputformat(            /* put out a format value */
216  
217  
218   int
219 + nativebigendian()       /* are we native on a big-endian machine? */
220 + {
221 +        union { int32 i; char c[4]; } u;
222 +
223 +        u.i = 1;
224 +
225 +        return(u.c[0] == 0);
226 + }
227 +
228 +
229 + int
230 + isbigendian(            /* header line says "BigEndian=1" (-1 if irrelevant) */
231 +        const char *s
232 + )
233 + {
234 +        const char      *be = BIGEND;
235 +
236 +        while ((*s != '\0') & (*be != '=') && *s++ == *be)
237 +                ++be;
238 +        if (*be != '=')
239 +                return(-1);     /* irrelevant */
240 +        while (isspace(*s))
241 +                s++;
242 +        if (*s++ != '=')
243 +                return(-1);
244 +        while (isspace(*s))
245 +                s++;
246 +        return(*s == '1');
247 + }
248 +
249 +
250 + void
251 + fputendian(             /* write native endianness in BigEndian= line */
252 +        FILE *fp
253 + )
254 + {
255 +        fputs(BIGEND, fp);
256 +        if (nativebigendian())
257 +                fputs("1\n", fp);
258 +        else
259 +                fputs("0\n", fp);
260 + }
261 +
262 +
263 + int
264   getheader(              /* get header from file */
265          FILE  *fp,
266          gethfunc *f,
# Line 210 | Line 269 | getheader(             /* get header from file */
269   {
270          int   rtotal = 0;
271          char  buf[MAXLINE];
272 +        int   firstc = fgetc(fp);
273  
274 +        if (!isprint(firstc))
275 +                return(-1);                             /* messed up */
276 +        ungetc(firstc, fp);
277          for ( ; ; ) {
278                  int     rval = 0;
279                  buf[MAXLINE-2] = '\n';
280                  if (fgets(buf, MAXLINE, fp) == NULL)
281                          return(-1);
282 <                if (buf[buf[0]=='\r'] == '\n')
282 >                if (buf[buf[0]=='\r'] == '\n')          /* end of header? */
283                          return(rtotal);
284                  if (buf[MAXLINE-2] != '\n') {
285                          ungetc(buf[MAXLINE-2], fp);     /* prevent false end */
# Line 244 | Line 307 | mycheck(                       /* check a header line for format info. */
307          struct check    *scp = (struct check *)cp;
308  
309          if (!formatval(scp->fs, s) && scp->fp != NULL)
310 <                fputs(s, scp->fp);
310 >                return(fputs(s, scp->fp));
311  
312          return(0);
313   }

Diff Legend

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