--- ray/src/common/header.c 1994/02/27 10:16:45 2.4 +++ ray/src/common/header.c 2003/06/27 06:53:21 2.16 @@ -1,43 +1,51 @@ -/* Copyright (c) 1994 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: header.c,v 2.16 2003/06/27 06:53:21 greg Exp $"; #endif - /* * header.c - routines for reading and writing information headers. * - * 8/19/88 + * 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 + * 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 + * 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 * * To copy header from input to output, use getheader(fin, fputs, fout) */ +#include "copyright.h" +#include "resolu.h" + #include +#include +#include #include #define MAXLINE 512 -#ifndef BSD -#define index strchr -#endif - -extern char *index(); - char HDRSTR[] = "#?"; /* information header magic number */ char FMTSTR[] = "FORMAT="; /* format identifier */ +char TMSTR[] = "CAPDATE="; /* capture date identifier */ +extern void fputword(char *s, FILE *fp); + +static int mycheck(); + + +void newheader(s, fp) /* identifying line of information header */ char *s; register FILE *fp; @@ -48,6 +56,7 @@ register FILE *fp; } +int headidval(r,s) /* get header id (return true if is id) */ register char *r, *s; { @@ -55,12 +64,13 @@ register char *r, *s; while (*cp) if (*cp++ != *s++) return(0); if (r == NULL) return(1); - while (*s) *r++ = *s++; + while (*s && !isspace(*s)) *r++ = *s++; *r = '\0'; return(1); } +int isheadid(s) /* check to see if line is header id */ char *s; { @@ -68,30 +78,77 @@ char *s; } +int +dateval(tloc, s) /* get capture date value */ +time_t *tloc; +char *s; +{ + struct tm tms; + register char *cp = TMSTR; + + 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; + tms.tm_isdst = -1; /* ask mktime() to figure out DST */ + *tloc = mktime(&tms); + return(1); +} + + +int +isdate(s) /* is the given line a capture date? */ +char *s; +{ + return(dateval(NULL, s)); +} + + +void +fputdate(tv, fp) /* write out the given time value */ +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); +} + + +void +fputnow(fp) /* write out the current time */ +FILE *fp; +{ + time_t tv; + time(&tv); + fputdate(tv, fp); +} + + +void printargs(ac, av, fp) /* print arguments to a file */ int ac; char **av; -register FILE *fp; +FILE *fp; { - int quote; - while (ac-- > 0) { - if (index(*av, ' ') != NULL) { /* quote it */ - if (index(*av, '\'') != NULL) - quote = '"'; - else - quote = '\''; - putc(quote, fp); - fputs(*av++, fp); - putc(quote, fp); - } else - fputs(*av++, fp); - putc(' ', fp); + fputword(*av++, fp); + fputc(ac ? ' ' : '\n', fp); } - putc('\n', fp); } +int formatval(r, s) /* get format value (return true if format) */ register char *r; register char *s; @@ -102,13 +159,15 @@ register char *s; while (isspace(*s)) s++; if (!*s) return(0); if (r == NULL) return(1); - while(*s) *r++ = *s++; - while (isspace(r[-1])) r--; + do + *r++ = *s++; + while(*s && !isspace(*s)); *r = '\0'; return(1); } +int isformat(s) /* is line a format line? */ char *s; { @@ -116,6 +175,7 @@ char *s; } +void fputformat(s, fp) /* put out a format value */ char *s; FILE *fp; @@ -126,6 +186,7 @@ FILE *fp; } +int getheader(fp, f, p) /* get header from file */ FILE *fp; int (*f)(); @@ -147,8 +208,8 @@ char *p; ungetc(buf[MAXLINE-2], fp); /* prevent false end */ buf[MAXLINE-2] = '\0'; } - if (f != NULL) - (*f)(buf, p); + if (f != NULL && (*f)(buf, p) < 0) + return(-1); } } @@ -159,45 +220,55 @@ struct check { }; -static +static int mycheck(s, cp) /* check a header line for format info. */ char *s; register struct check *cp; { if (!formatval(cp->fs, s) && cp->fp != NULL) fputs(s, cp->fp); + return(0); } -/* - * Copymatch(pat,str) checks pat for wildcards, and - * copies str into pat if there is a match (returning true). - */ - -#ifdef COPYMATCH -copymatch(pat, str) -char *pat, *str; +int +globmatch(p, s) /* check for match of s against pattern p */ +register char *p, *s; { - int docopy = 0; - register char *p = pat, *s = str; + int setmatch; do { switch (*p) { case '?': /* match any character */ if (!*s++) return(0); - docopy++; break; case '*': /* match any string */ while (p[1] == '*') p++; do - if ( (p[1]=='?' || p[1]==*s) - && copymatch(p+1,s) ) { - strcpy(pat, str); + if ( (p[1]=='?' || p[1]==*s) && + globmatch(p+1,s) ) return(1); - } while (*s++); return(0); + case '[': /* character set */ + setmatch = *s == *++p; + if (!*p) + return(0); + while (*++p != ']') { + if (!*p) + return(0); + if (*p == '-') { + setmatch += p[-1] <= *s && *s <= p[1]; + if (!*++p) + break; + } else + setmatch += *p == *s; + } + if (!setmatch) + return(0); + s++; + break; case '\\': /* literal next */ p++; /* fall through */ @@ -208,13 +279,8 @@ char *pat, *str; break; } } while (*p++); - if (docopy) - strcpy(pat, str); return(1); } -#else -#define copymatch(pat, s) (!strcmp(pat, s)) -#endif /* @@ -225,23 +291,33 @@ char *pat, *str; * if any input format is found (or there is an error), and 0 otherwise. * If fmt contains any '*' or '?' characters, then checkheader * does wildcard expansion and copies a matching result into fmt. - * Be sure that fmt is big enough to hold the match in such cases! + * Be sure that fmt is big enough to hold the match in such cases, + * and that it is not a static, read-only string! * The input header (minus any format lines) is copied to fout * if fout is not NULL. */ +int checkheader(fin, fmt, fout) FILE *fin; char *fmt; FILE *fout; { struct check cdat; + register char *cp; cdat.fp = fout; cdat.fs[0] = '\0'; - if (getheader(fin, mycheck, &cdat) < 0) + if (getheader(fin, mycheck, (char *)&cdat) < 0) return(-1); - if (cdat.fs[0] != '\0') - return(copymatch(fmt, cdat.fs) ? 1 : -1); - return(0); + if (!cdat.fs[0]) + return(0); + for (cp = fmt; *cp; cp++) /* check for globbing */ + 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 */ }