| 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 | 
– | 
 *  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 | 
+ | 
 *  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 | 
| 27 | 
  | 
 | 
| 28 | 
  | 
#include "copyright.h" | 
| 29 | 
  | 
 | 
| 29 | 
– | 
#include  <time.h> | 
| 30 | 
  | 
#include  <ctype.h> | 
| 31 | 
  | 
 | 
| 32 | 
+ | 
#include  "tiff.h"      /* for int32 */ | 
| 33 | 
  | 
#include  "rtio.h" | 
| 34 | 
  | 
#include  "resolu.h" | 
| 35 | 
  | 
 | 
| 36 | 
< | 
#define  MAXLINE        512 | 
| 36 | 
> | 
#define  MAXLINE        2048 | 
| 37 | 
  | 
 | 
| 38 | 
< | 
char  HDRSTR[] = "#?";          /* information header magic number */ | 
| 38 | 
> | 
extern time_t           timegm(struct tm *tm); | 
| 39 | 
  | 
 | 
| 40 | 
< | 
char  FMTSTR[] = "FORMAT=";     /* format identifier */ | 
| 40 | 
> | 
const char  HDRSTR[] = "#?";            /* information header magic number */ | 
| 41 | 
  | 
 | 
| 42 | 
< | 
char  TMSTR[] = "CAPDATE=";     /* capture date identifier */ | 
| 42 | 
> | 
const char  FMTSTR[] = "FORMAT=";       /* format identifier */ | 
| 43 | 
  | 
 | 
| 44 | 
< | 
static int mycheck(); | 
| 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 | 
+ | 
 | 
| 52 | 
  | 
void | 
| 53 | 
< | 
newheader(s, fp)                /* identifying line of information header */ | 
| 54 | 
< | 
char  *s; | 
| 55 | 
< | 
register FILE  *fp; | 
| 53 | 
> | 
newheader(              /* identifying line of information header */ | 
| 54 | 
> | 
        const char  *s, | 
| 55 | 
> | 
        FILE  *fp | 
| 56 | 
> | 
) | 
| 57 | 
  | 
{ | 
| 58 | 
  | 
        fputs(HDRSTR, fp); | 
| 59 | 
  | 
        fputs(s, fp); | 
| 60 | 
< | 
        putc('\n', fp); | 
| 60 | 
> | 
        fputc('\n', fp); | 
| 61 | 
  | 
} | 
| 62 | 
  | 
 | 
| 63 | 
  | 
 | 
| 64 | 
  | 
int | 
| 65 | 
< | 
headidval(r,s)                  /* get header id (return true if is id) */ | 
| 66 | 
< | 
register char  *r, *s; | 
| 65 | 
> | 
headidval(                      /* get header id (return true if is id) */ | 
| 66 | 
> | 
        char  *r, | 
| 67 | 
> | 
        const char      *s | 
| 68 | 
> | 
) | 
| 69 | 
  | 
{ | 
| 70 | 
< | 
        register char  *cp = HDRSTR; | 
| 70 | 
> | 
        const char  *cp = HDRSTR; | 
| 71 | 
  | 
 | 
| 72 | 
  | 
        while (*cp) if (*cp++ != *s++) return(0); | 
| 73 | 
  | 
        if (r == NULL) return(1); | 
| 78 | 
  | 
 | 
| 79 | 
  | 
 | 
| 80 | 
  | 
int | 
| 81 | 
< | 
isheadid(s)                     /* check to see if line is header id */ | 
| 82 | 
< | 
char  *s; | 
| 81 | 
> | 
dateval(                /* convert capture date line to UTC */ | 
| 82 | 
> | 
        time_t  *tloc, | 
| 83 | 
> | 
        const char      *s | 
| 84 | 
> | 
) | 
| 85 | 
  | 
{ | 
| 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 | 
– | 
{ | 
| 86 | 
  | 
        struct tm       tms; | 
| 87 | 
< | 
        register char  *cp = TMSTR; | 
| 87 | 
> | 
        const char      *cp = TMSTR; | 
| 88 | 
  | 
 | 
| 89 | 
  | 
        while (*cp) if (*cp++ != *s++) return(0); | 
| 90 | 
  | 
        while (isspace(*s)) s++; | 
| 104 | 
  | 
 | 
| 105 | 
  | 
 | 
| 106 | 
  | 
int | 
| 107 | 
< | 
isdate(s)                       /* is the given line a capture date? */ | 
| 108 | 
< | 
char *s; | 
| 107 | 
> | 
gmtval(                 /* convert GMT date line to UTC */ | 
| 108 | 
> | 
        time_t  *tloc, | 
| 109 | 
> | 
        const char      *s | 
| 110 | 
> | 
) | 
| 111 | 
  | 
{ | 
| 112 | 
< | 
        return(dateval(NULL, s)); | 
| 112 | 
> | 
        struct tm       tms; | 
| 113 | 
> | 
        const char      *cp = GMTSTR; | 
| 114 | 
> | 
 | 
| 115 | 
> | 
        while (*cp) if (*cp++ != *s++) return(0); | 
| 116 | 
> | 
        while (isspace(*s)) s++; | 
| 117 | 
> | 
        if (!*s) return(0); | 
| 118 | 
> | 
        if (sscanf(s, "%d:%d:%d %d:%d:%d", | 
| 119 | 
> | 
                        &tms.tm_year, &tms.tm_mon, &tms.tm_mday, | 
| 120 | 
> | 
                        &tms.tm_hour, &tms.tm_min, &tms.tm_sec) != 6) | 
| 121 | 
> | 
                return(0); | 
| 122 | 
> | 
        if (tloc == NULL) | 
| 123 | 
> | 
                return(1); | 
| 124 | 
> | 
        tms.tm_mon--; | 
| 125 | 
> | 
        tms.tm_year -= 1900; | 
| 126 | 
> | 
        *tloc = timegm(&tms); | 
| 127 | 
> | 
        return(1); | 
| 128 | 
  | 
} | 
| 129 | 
  | 
 | 
| 130 | 
  | 
 | 
| 131 | 
  | 
void | 
| 132 | 
< | 
fputdate(tv, fp)                /* write out the given time value */ | 
| 133 | 
< | 
time_t  tv; | 
| 134 | 
< | 
FILE    *fp; | 
| 132 | 
> | 
fputdate(               /* write out the given time value (local & GMT) */ | 
| 133 | 
> | 
        time_t  tv, | 
| 134 | 
> | 
        FILE    *fp | 
| 135 | 
> | 
) | 
| 136 | 
  | 
{ | 
| 137 | 
< | 
        struct tm       *tm = localtime(&tv); | 
| 138 | 
< | 
        if (tm == NULL) | 
| 139 | 
< | 
                return; | 
| 140 | 
< | 
        fprintf(fp, "%s %04d:%02d:%02d %02d:%02d:%02d\n", TMSTR, | 
| 141 | 
< | 
                        tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, | 
| 142 | 
< | 
                        tm->tm_hour, tm->tm_min, tm->tm_sec); | 
| 137 | 
> | 
        struct tm       *tms; | 
| 138 | 
> | 
 | 
| 139 | 
> | 
        tms = localtime(&tv); | 
| 140 | 
> | 
        if (tms != NULL) | 
| 141 | 
> | 
                fprintf(fp, "%s %04d:%02d:%02d %02d:%02d:%02d\n", TMSTR, | 
| 142 | 
> | 
                                tms->tm_year+1900, tms->tm_mon+1, tms->tm_mday, | 
| 143 | 
> | 
                                tms->tm_hour, tms->tm_min, tms->tm_sec); | 
| 144 | 
> | 
        tms = gmtime(&tv); | 
| 145 | 
> | 
        if (tms != NULL) | 
| 146 | 
> | 
                fprintf(fp, "%s %04d:%02d:%02d %02d:%02d:%02d\n", GMTSTR, | 
| 147 | 
> | 
                                tms->tm_year+1900, tms->tm_mon+1, tms->tm_mday, | 
| 148 | 
> | 
                                tms->tm_hour, tms->tm_min, tms->tm_sec); | 
| 149 | 
  | 
} | 
| 150 | 
  | 
 | 
| 151 | 
  | 
 | 
| 152 | 
  | 
void | 
| 153 | 
< | 
fputnow(fp)                     /* write out the current time */ | 
| 154 | 
< | 
FILE    *fp; | 
| 153 | 
> | 
fputnow(                        /* write out the current time */ | 
| 154 | 
> | 
        FILE    *fp | 
| 155 | 
> | 
) | 
| 156 | 
  | 
{ | 
| 157 | 
  | 
        time_t  tv; | 
| 158 | 
  | 
        time(&tv); | 
| 161 | 
  | 
 | 
| 162 | 
  | 
 | 
| 163 | 
  | 
void | 
| 164 | 
< | 
printargs(ac, av, fp)           /* print arguments to a file */ | 
| 165 | 
< | 
int  ac; | 
| 166 | 
< | 
char  **av; | 
| 167 | 
< | 
FILE  *fp; | 
| 164 | 
> | 
printargs(              /* print arguments to a file */ | 
| 165 | 
> | 
        int  ac, | 
| 166 | 
> | 
        char  **av, | 
| 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); | 
| 183 | 
  | 
 | 
| 184 | 
  | 
 | 
| 185 | 
  | 
int | 
| 186 | 
< | 
formatval(r, s)                 /* get format value (return true if format) */ | 
| 187 | 
< | 
register char  *r; | 
| 188 | 
< | 
register char  *s; | 
| 186 | 
> | 
formatval(                      /* get format value (return true if format) */ | 
| 187 | 
> | 
        char  fmt[MAXFMTLEN], | 
| 188 | 
> | 
        const char  *s | 
| 189 | 
> | 
) | 
| 190 | 
  | 
{ | 
| 191 | 
< | 
        register char  *cp = FMTSTR; | 
| 191 | 
> | 
        const char  *cp = FMTSTR; | 
| 192 | 
> | 
        char  *r = fmt; | 
| 193 | 
  | 
 | 
| 194 | 
  | 
        while (*cp) if (*cp++ != *s++) return(0); | 
| 195 | 
  | 
        while (isspace(*s)) s++; | 
| 197 | 
  | 
        if (r == NULL) return(1); | 
| 198 | 
  | 
        do | 
| 199 | 
  | 
                *r++ = *s++; | 
| 200 | 
< | 
        while(*s && !isspace(*s)); | 
| 200 | 
> | 
        while (*s && !isspace(*s) && r-fmt < MAXFMTLEN-1); | 
| 201 | 
  | 
        *r = '\0'; | 
| 202 | 
  | 
        return(1); | 
| 203 | 
  | 
} | 
| 204 | 
  | 
 | 
| 205 | 
  | 
 | 
| 206 | 
+ | 
void | 
| 207 | 
+ | 
fputformat(             /* put out a format value */ | 
| 208 | 
+ | 
        const char  *s, | 
| 209 | 
+ | 
        FILE  *fp | 
| 210 | 
+ | 
) | 
| 211 | 
+ | 
{ | 
| 212 | 
+ | 
        int     align = 0; | 
| 213 | 
+ | 
 | 
| 214 | 
+ | 
        fputs(FMTSTR, fp); | 
| 215 | 
+ | 
        fputs(s, fp); | 
| 216 | 
+ | 
                        /* pad to align binary type for mmap() */ | 
| 217 | 
+ | 
        if (!strcmp(s, "float")) | 
| 218 | 
+ | 
                align = 4; | 
| 219 | 
+ | 
        else if (!strcmp(s, "double")) | 
| 220 | 
+ | 
                align = 8; | 
| 221 | 
+ | 
        if (align) { | 
| 222 | 
+ | 
                long    pos = ftell(fp); | 
| 223 | 
+ | 
                if (pos >= 0) { | 
| 224 | 
+ | 
                        pos = (pos + 2) % align; | 
| 225 | 
+ | 
                        if (pos) align -= pos; | 
| 226 | 
+ | 
                        else align = 0; | 
| 227 | 
+ | 
                } else | 
| 228 | 
+ | 
                        align = 0; | 
| 229 | 
+ | 
        } | 
| 230 | 
+ | 
        while (align-- > 0) | 
| 231 | 
+ | 
                putc(' ', fp); | 
| 232 | 
+ | 
        fputc('\n', fp); | 
| 233 | 
+ | 
} | 
| 234 | 
+ | 
 | 
| 235 | 
+ | 
 | 
| 236 | 
  | 
int | 
| 237 | 
< | 
isformat(s)                     /* is line a format line? */ | 
| 170 | 
< | 
char  *s; | 
| 237 | 
> | 
nativebigendian()       /* are we native on a big-endian machine? */ | 
| 238 | 
  | 
{ | 
| 239 | 
< | 
        return(formatval(NULL, s)); | 
| 239 | 
> | 
        union { int32 i; char c[4]; } u; | 
| 240 | 
> | 
 | 
| 241 | 
> | 
        u.i = 1; | 
| 242 | 
> | 
 | 
| 243 | 
> | 
        return(u.c[0] == 0); | 
| 244 | 
  | 
} | 
| 245 | 
  | 
 | 
| 246 | 
  | 
 | 
| 247 | 
+ | 
int | 
| 248 | 
+ | 
isbigendian(            /* header line says "BigEndian=1" (-1 if irrelevant) */ | 
| 249 | 
+ | 
        const char *s | 
| 250 | 
+ | 
) | 
| 251 | 
+ | 
{ | 
| 252 | 
+ | 
        const char      *be = BIGEND; | 
| 253 | 
+ | 
 | 
| 254 | 
+ | 
        while ((*s != '\0') & (*be != '=') && *s++ == *be) | 
| 255 | 
+ | 
                ++be; | 
| 256 | 
+ | 
        if (*be != '=') | 
| 257 | 
+ | 
                return(-1);     /* irrelevant */ | 
| 258 | 
+ | 
        while (isspace(*s)) | 
| 259 | 
+ | 
                s++; | 
| 260 | 
+ | 
        if (*s++ != '=') | 
| 261 | 
+ | 
                return(-1); | 
| 262 | 
+ | 
        while (isspace(*s)) | 
| 263 | 
+ | 
                s++; | 
| 264 | 
+ | 
        return(*s == '1'); | 
| 265 | 
+ | 
} | 
| 266 | 
+ | 
 | 
| 267 | 
+ | 
 | 
| 268 | 
  | 
void | 
| 269 | 
< | 
fputformat(s, fp)               /* put out a format value */ | 
| 270 | 
< | 
char  *s; | 
| 271 | 
< | 
FILE  *fp; | 
| 269 | 
> | 
fputendian(             /* write native endianness in BigEndian= line */ | 
| 270 | 
> | 
        FILE *fp | 
| 271 | 
> | 
) | 
| 272 | 
  | 
{ | 
| 273 | 
< | 
        fputs(FMTSTR, fp); | 
| 274 | 
< | 
        fputs(s, fp); | 
| 275 | 
< | 
        putc('\n', fp); | 
| 273 | 
> | 
        fputs(BIGEND, fp); | 
| 274 | 
> | 
        if (nativebigendian()) | 
| 275 | 
> | 
                fputs("1\n", fp); | 
| 276 | 
> | 
        else | 
| 277 | 
> | 
                fputs("0\n", fp); | 
| 278 | 
  | 
} | 
| 279 | 
  | 
 | 
| 280 | 
  | 
 | 
| 281 | 
  | 
int | 
| 282 | 
< | 
getheader(fp, f, p)             /* get header from file */ | 
| 283 | 
< | 
FILE  *fp; | 
| 284 | 
< | 
int  (*f)(); | 
| 285 | 
< | 
char  *p; | 
| 282 | 
> | 
getheader(              /* get header from file */ | 
| 283 | 
> | 
        FILE  *fp, | 
| 284 | 
> | 
        gethfunc *f, | 
| 285 | 
> | 
        void  *p | 
| 286 | 
> | 
) | 
| 287 | 
  | 
{ | 
| 288 | 
+ | 
        int   rtotal = 0; | 
| 289 | 
  | 
        char  buf[MAXLINE]; | 
| 290 | 
+ | 
        int   firstc = fgetc(fp); | 
| 291 | 
  | 
 | 
| 292 | 
+ | 
        if (!isprint(firstc)) | 
| 293 | 
+ | 
                return(-1);                             /* messed up */ | 
| 294 | 
+ | 
        ungetc(firstc, fp); | 
| 295 | 
  | 
        for ( ; ; ) { | 
| 296 | 
+ | 
                int     rval = 0; | 
| 297 | 
  | 
                buf[MAXLINE-2] = '\n'; | 
| 298 | 
  | 
                if (fgets(buf, MAXLINE, fp) == NULL) | 
| 299 | 
  | 
                        return(-1); | 
| 300 | 
< | 
                if (buf[0] == '\n') | 
| 301 | 
< | 
                        return(0); | 
| 201 | 
< | 
#ifdef MSDOS | 
| 202 | 
< | 
                if (buf[0] == '\r' && buf[1] == '\n') | 
| 203 | 
< | 
                        return(0); | 
| 204 | 
< | 
#endif | 
| 300 | 
> | 
                if (buf[buf[0]=='\r'] == '\n')          /* end of header? */ | 
| 301 | 
> | 
                        return(rtotal); | 
| 302 | 
  | 
                if (buf[MAXLINE-2] != '\n') { | 
| 303 | 
  | 
                        ungetc(buf[MAXLINE-2], fp);     /* prevent false end */ | 
| 304 | 
  | 
                        buf[MAXLINE-2] = '\0'; | 
| 305 | 
  | 
                } | 
| 306 | 
< | 
                if (f != NULL && (*f)(buf, p) < 0) | 
| 306 | 
> | 
                if (f != NULL && (rval = (*f)(buf, p)) < 0) | 
| 307 | 
  | 
                        return(-1); | 
| 308 | 
+ | 
                rtotal += rval; | 
| 309 | 
  | 
        } | 
| 310 | 
  | 
} | 
| 311 | 
  | 
 | 
| 312 | 
  | 
 | 
| 313 | 
  | 
struct check { | 
| 314 | 
  | 
        FILE    *fp; | 
| 315 | 
< | 
        char    fs[64]; | 
| 315 | 
> | 
        char    fs[MAXFMTLEN]; | 
| 316 | 
  | 
}; | 
| 317 | 
  | 
 | 
| 318 | 
  | 
 | 
| 319 | 
  | 
static int | 
| 320 | 
< | 
mycheck(s, cp)                  /* check a header line for format info. */ | 
| 321 | 
< | 
char  *s; | 
| 322 | 
< | 
register struct check  *cp; | 
| 320 | 
> | 
mycheck(                        /* check a header line for format info. */ | 
| 321 | 
> | 
        char  *s, | 
| 322 | 
> | 
        void  *cp | 
| 323 | 
> | 
) | 
| 324 | 
  | 
{ | 
| 325 | 
< | 
        if (!formatval(cp->fs, s) && cp->fp != NULL) | 
| 326 | 
< | 
                fputs(s, cp->fp); | 
| 325 | 
> | 
        struct check    *scp = (struct check *)cp; | 
| 326 | 
> | 
 | 
| 327 | 
> | 
        if (!formatval(scp->fs, s) && scp->fp != NULL) | 
| 328 | 
> | 
                return(fputs(s, scp->fp)); | 
| 329 | 
> | 
 | 
| 330 | 
  | 
        return(0); | 
| 331 | 
  | 
} | 
| 332 | 
  | 
 | 
| 333 | 
  | 
 | 
| 334 | 
  | 
int | 
| 335 | 
< | 
globmatch(p, s)                 /* check for match of s against pattern p */ | 
| 336 | 
< | 
register char   *p, *s; | 
| 335 | 
> | 
globmatch(                      /* check for match of s against pattern p */ | 
| 336 | 
> | 
        const char      *p, | 
| 337 | 
> | 
        const char      *s | 
| 338 | 
> | 
) | 
| 339 | 
  | 
{ | 
| 340 | 
  | 
        int     setmatch; | 
| 341 | 
  | 
 | 
| 348 | 
  | 
                case '*':                       /* match any string */ | 
| 349 | 
  | 
                        while (p[1] == '*') p++; | 
| 350 | 
  | 
                        do | 
| 351 | 
< | 
                                if ( (p[1]=='?' || p[1]==*s) && | 
| 351 | 
> | 
                                if ( (p[1]=='?') | (p[1]==*s) && | 
| 352 | 
  | 
                                                globmatch(p+1,s) ) | 
| 353 | 
  | 
                                        return(1); | 
| 354 | 
  | 
                        while (*s++); | 
| 361 | 
  | 
                                if (!*p) | 
| 362 | 
  | 
                                        return(0); | 
| 363 | 
  | 
                                if (*p == '-') { | 
| 364 | 
< | 
                                        setmatch += p[-1] <= *s && *s <= p[1]; | 
| 364 | 
> | 
                                        setmatch += (p[-1] <= *s && *s <= p[1]); | 
| 365 | 
  | 
                                        if (!*++p) | 
| 366 | 
  | 
                                                break; | 
| 367 | 
  | 
                                } else | 
| 368 | 
< | 
                                        setmatch += *p == *s; | 
| 368 | 
> | 
                                        setmatch += (*p == *s); | 
| 369 | 
  | 
                        } | 
| 370 | 
  | 
                        if (!setmatch) | 
| 371 | 
  | 
                                return(0); | 
| 400 | 
  | 
 */ | 
| 401 | 
  | 
 | 
| 402 | 
  | 
int | 
| 403 | 
< | 
checkheader(fin, fmt, fout) | 
| 404 | 
< | 
FILE  *fin; | 
| 405 | 
< | 
char  *fmt; | 
| 406 | 
< | 
FILE  *fout; | 
| 403 | 
> | 
checkheader( | 
| 404 | 
> | 
        FILE  *fin, | 
| 405 | 
> | 
        char  fmt[MAXFMTLEN], | 
| 406 | 
> | 
        FILE  *fout | 
| 407 | 
> | 
) | 
| 408 | 
  | 
{ | 
| 409 | 
  | 
        struct check    cdat; | 
| 410 | 
< | 
        register char   *cp; | 
| 410 | 
> | 
        char    *cp; | 
| 411 | 
  | 
 | 
| 412 | 
  | 
        cdat.fp = fout; | 
| 413 | 
  | 
        cdat.fs[0] = '\0'; | 
| 414 | 
< | 
        if (getheader(fin, mycheck, (char *)&cdat) < 0) | 
| 414 | 
> | 
        if (getheader(fin, mycheck, &cdat) < 0) | 
| 415 | 
  | 
                return(-1); | 
| 416 | 
  | 
        if (!cdat.fs[0]) | 
| 417 | 
  | 
                return(0); |