--- ray/src/common/header.c 2003/06/07 12:50:20 2.14 +++ ray/src/common/header.c 2009/05/21 18:08:43 2.25 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: header.c,v 2.14 2003/06/07 12:50:20 schorsch Exp $"; +static const char RCSid[] = "$Id: header.c,v 2.25 2009/05/21 18:08:43 greg Exp $"; #endif /* * header.c - routines for reading and writing information headers. @@ -7,14 +7,12 @@ static const char RCSid[] = "$Id: header.c,v 2.14 2003 * Externals declared in resolu.h * * newheader(t,fp) start new information header identified by string t - * isheadid(s) returns true if s is a header id line * headidval(r,s) copy header identifier value in s to r - * dateval(t,s) get capture date value - * isdate(s) returns true if s is a date line - * fputdate(t,fp) put out the given capture date and time + * dateval(t,s) get capture date value as UTC + * gmtval(t,s) get GMT as UTC + * fputdate(t,fp) put out the given UTC * fputnow(fp) put out the current date and time * printargs(ac,av,fp) print an argument list to fp, followed by '\n' - * isformat(s) returns true if s is of the form "FORMAT=*" * formatval(r,s) copy the format value in s to r * fputformat(s,fp) write "FORMAT=%s" to fp * getheader(fp,f,p) read header from fp, calling f(s,p) on each line @@ -26,28 +24,28 @@ static const char RCSid[] = "$Id: header.c,v 2.14 2003 #include "copyright.h" -#include -#include -#include #include -#include "standard.h" +#include "rtio.h" +#include "resolu.h" -#define MAXLINE 512 +#define MAXLINE 2048 -char HDRSTR[] = "#?"; /* information header magic number */ +const char HDRSTR[] = "#?"; /* information header magic number */ -char FMTSTR[] = "FORMAT="; /* format identifier */ +const char FMTSTR[] = "FORMAT="; /* format identifier */ -char TMSTR[] = "CAPDATE="; /* capture date identifier */ +const char TMSTR[] = "CAPDATE="; /* capture date identifier */ +const char GMTSTR[] = "GMT="; /* GMT identifier */ -static int mycheck(); +static gethfunc mycheck; -void -newheader(s, fp) /* identifying line of information header */ -char *s; -register FILE *fp; +extern void +newheader( /* identifying line of information header */ + char *s, + FILE *fp +) { fputs(HDRSTR, fp); fputs(s, fp); @@ -55,11 +53,13 @@ register FILE *fp; } -int -headidval(r,s) /* get header id (return true if is id) */ -register char *r, *s; +extern int +headidval( /* get header id (return true if is id) */ + char *r, + char *s +) { - register char *cp = HDRSTR; + const char *cp = HDRSTR; while (*cp) if (*cp++ != *s++) return(0); if (r == NULL) return(1); @@ -69,21 +69,14 @@ register char *r, *s; } -int -isheadid(s) /* check to see if line is header id */ -char *s; +extern int +dateval( /* convert capture date line to UTC */ + time_t *tloc, + char *s +) { - return(headidval(NULL, s)); -} - - -int -dateval(tloc, s) /* get capture date value */ -time_t *tloc; -char *s; -{ struct tm tms; - register char *cp = TMSTR; + const char *cp = TMSTR; while (*cp) if (*cp++ != *s++) return(0); while (isspace(*s)) s++; @@ -102,31 +95,56 @@ char *s; } -int -isdate(s) /* is the given line a capture date? */ -char *s; +extern int +gmtval( /* convert GMT date line to UTC */ + time_t *tloc, + char *s +) { - return(dateval(NULL, s)); + struct tm tms; + const char *cp = GMTSTR; + + while (*cp) if (*cp++ != *s++) return(0); + while (isspace(*s)) s++; + if (!*s) return(0); + if (sscanf(s, "%d:%d:%d %d:%d:%d", + &tms.tm_year, &tms.tm_mon, &tms.tm_mday, + &tms.tm_hour, &tms.tm_min, &tms.tm_sec) != 6) + return(0); + if (tloc == NULL) + return(1); + tms.tm_mon--; + tms.tm_year -= 1900; + *tloc = timegm(&tms); + return(1); } -void -fputdate(tv, fp) /* write out the given time value */ -time_t tv; -FILE *fp; +extern void +fputdate( /* write out the given time value (local & GMT) */ + time_t tv, + FILE *fp +) { - struct tm *tm = localtime(&tv); - if (tm == NULL) - return; - fprintf(fp, "%s %04d:%02d:%02d %02d:%02d:%02d\n", TMSTR, - tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); + struct tm *tms; + + tms = localtime(&tv); + if (tms != NULL) + fprintf(fp, "%s %04d:%02d:%02d %02d:%02d:%02d\n", TMSTR, + tms->tm_year+1900, tms->tm_mon+1, tms->tm_mday, + tms->tm_hour, tms->tm_min, tms->tm_sec); + tms = gmtime(&tv); + if (tms != NULL) + fprintf(fp, "%s %04d:%02d:%02d %02d:%02d:%02d\n", GMTSTR, + tms->tm_year+1900, tms->tm_mon+1, tms->tm_mday, + tms->tm_hour, tms->tm_min, tms->tm_sec); } -void -fputnow(fp) /* write out the current time */ -FILE *fp; +extern void +fputnow( /* write out the current time */ + FILE *fp +) { time_t tv; time(&tv); @@ -134,11 +152,12 @@ FILE *fp; } -void -printargs(ac, av, fp) /* print arguments to a file */ -int ac; -char **av; -FILE *fp; +extern void +printargs( /* print arguments to a file */ + int ac, + char **av, + FILE *fp +) { while (ac-- > 0) { fputword(*av++, fp); @@ -147,12 +166,13 @@ FILE *fp; } -int -formatval(r, s) /* get format value (return true if format) */ -register char *r; -register char *s; +extern int +formatval( /* get format value (return true if format) */ + char *r, + char *s +) { - register char *cp = FMTSTR; + const char *cp = FMTSTR; while (*cp) if (*cp++ != *s++) return(0); while (isspace(*s)) s++; @@ -166,30 +186,24 @@ register char *s; } -int -isformat(s) /* is line a format line? */ -char *s; +extern void +fputformat( /* put out a format value */ + char *s, + FILE *fp +) { - return(formatval(NULL, s)); -} - - -void -fputformat(s, fp) /* put out a format value */ -char *s; -FILE *fp; -{ fputs(FMTSTR, fp); fputs(s, fp); putc('\n', fp); } -int -getheader(fp, f, p) /* get header from file */ -FILE *fp; -int (*f)(); -char *p; +extern int +getheader( /* get header from file */ + FILE *fp, + gethfunc *f, + void *p +) { char buf[MAXLINE]; @@ -220,19 +234,24 @@ struct check { static int -mycheck(s, cp) /* check a header line for format info. */ -char *s; -register struct check *cp; +mycheck( /* check a header line for format info. */ + char *s, + void *cp +) { - if (!formatval(cp->fs, s) && cp->fp != NULL) - fputs(s, cp->fp); + if (!formatval(((struct check*)cp)->fs, s) + && ((struct check*)cp)->fp != NULL) { + fputs(s, ((struct check*)cp)->fp); + } return(0); } -int -globmatch(p, s) /* check for match of s against pattern p */ -register char *p, *s; +extern int +globmatch( /* check for match of s against pattern p */ + char *p, + char *s +) { int setmatch; @@ -296,14 +315,15 @@ register char *p, *s; * if fout is not NULL. */ -int -checkheader(fin, fmt, fout) -FILE *fin; -char *fmt; -FILE *fout; +extern int +checkheader( + FILE *fin, + char *fmt, + FILE *fout +) { struct check cdat; - register char *cp; + char *cp; cdat.fp = fout; cdat.fs[0] = '\0'; @@ -312,11 +332,12 @@ FILE *fout; if (!cdat.fs[0]) return(0); for (cp = fmt; *cp; cp++) /* check for globbing */ - if (*cp == '?' | *cp == '*') + if ((*cp == '?') | (*cp == '*')) { if (globmatch(fmt, cdat.fs)) { strcpy(fmt, cdat.fs); return(1); } else return(-1); + } return(strcmp(fmt, cdat.fs) ? -1 : 1); /* literal match */ }