--- ray/src/common/header.c 2019/05/25 04:00:54 2.33 +++ ray/src/common/header.c 2019/08/14 19:52:39 2.37 @@ -1,10 +1,10 @@ #ifndef lint -static const char RCSid[] = "$Id: header.c,v 2.33 2019/05/25 04:00:54 greg Exp $"; +static const char RCSid[] = "$Id: header.c,v 2.37 2019/08/14 19:52:39 greg Exp $"; #endif /* * header.c - routines for reading and writing information headers. * - * Externals declared in resolu.h + * Externals declared in rtio.h * * newheader(t,fp) start new information header identified by string t * headidval(r,s) copy header identifier value in s to r @@ -15,6 +15,9 @@ static const char RCSid[] = "$Id: header.c,v 2.33 2019 * printargs(ac,av,fp) print an argument list to fp, followed by '\n' * formatval(r,s) copy the format value in s to r * fputformat(s,fp) write "FORMAT=%s" to fp + * nativebigendian() are we native on big-endian machine? + * isbigendian(s) header line matches "BigEndian=1" (-1 if irrelevant) + * fputendian(fp) write native endianness in BigEndian= line * getheader(fp,f,p) read header from fp, calling f(s,p) on each line * globmatch(pat, str) check for glob match of str against pat * checkheader(i,p,o) check header format from i against p and copy to o @@ -26,6 +29,7 @@ static const char RCSid[] = "$Id: header.c,v 2.33 2019 #include +#include "tiff.h" /* for int32 */ #include "rtio.h" #include "resolu.h" @@ -40,6 +44,8 @@ const char FMTSTR[] = "FORMAT="; /* format identifier const char TMSTR[] = "CAPDATE="; /* capture date identifier */ const char GMTSTR[] = "GMT="; /* GMT identifier */ +const char BIGEND[] = "BigEndian="; /* big-endian variable */ + static gethfunc mycheck; @@ -202,6 +208,51 @@ fputformat( /* put out a format value */ int +nativebigendian() /* are we native on a big-endian machine? */ +{ + union { int32 i; char c[4]; } u; + + u.i = 1; + + return(u.c[0] == 0); +} + + +int +isbigendian( /* header line says "BigEndian=1" (-1 if irrelevant) */ + const char *s +) +{ + const char *be = BIGEND; + + while ((*s != '\0') & (*be != '=') && *s++ == *be) + ++be; + if (*be != '=') + return(-1); /* irrelevant */ + while (isspace(*s)) + s++; + if (*s++ != '=') + return(-1); + while (isspace(*s)) + s++; + return(*s == '1'); +} + + +void +fputendian( /* write native endianness in BigEndian= line */ + FILE *fp +) +{ + fputs(BIGEND, fp); + if (nativebigendian()) + fputs("1\n", fp); + else + fputs("0\n", fp); +} + + +int getheader( /* get header from file */ FILE *fp, gethfunc *f, @@ -210,13 +261,17 @@ getheader( /* get header from file */ { int rtotal = 0; char buf[MAXLINE]; + int firstc = fgetc(fp); + if (!isprint(firstc)) + return(-1); /* messed up */ + ungetc(firstc, fp); for ( ; ; ) { int rval = 0; buf[MAXLINE-2] = '\n'; if (fgets(buf, MAXLINE, fp) == NULL) return(-1); - if (buf[buf[0]=='\r'] == '\n') + if (buf[buf[0]=='\r'] == '\n') /* end of header? */ return(rtotal); if (buf[MAXLINE-2] != '\n') { ungetc(buf[MAXLINE-2], fp); /* prevent false end */