--- ray/src/common/header.c 1992/02/20 11:40:36 2.2 +++ ray/src/common/header.c 1998/10/27 08:44:28 2.10 @@ -1,4 +1,4 @@ -/* Copyright (c) 1991 Regents of the University of California */ +/* Copyright (c) 1996 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -9,11 +9,15 @@ static char SCCSid[] = "$SunId$ LBL"; * * 8/19/88 * - * printargs(ac,av,fp) print an argument list to fp, followed by '\n' + * 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 + * 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) @@ -22,18 +26,51 @@ static char SCCSid[] = "$SunId$ LBL"; #include #include -#define MAXLINE 512 +#define MAXLINE 512 #ifndef BSD -#define index strchr +#define index strchr #endif extern char *index(); -char FMTSTR[] = "FORMAT="; -int FMTSTRL = 7; +char HDRSTR[] = "#?"; /* information header magic number */ +char FMTSTR[] = "FORMAT="; /* format identifier */ + +newheader(s, fp) /* identifying line of information header */ +char *s; +register FILE *fp; +{ + fputs(HDRSTR, fp); + fputs(s, fp); + putc('\n', fp); +} + + +int +headidval(r,s) /* get header id (return true if is id) */ +register char *r, *s; +{ + register char *cp = HDRSTR; + + while (*cp) if (*cp++ != *s++) return(0); + if (r == NULL) return(1); + while (*s && !isspace(*s)) *r++ = *s++; + *r = '\0'; + return(1); +} + + +int +isheadid(s) /* check to see if line is header id */ +char *s; +{ + return(headidval(NULL, s)); +} + + printargs(ac, av, fp) /* print arguments to a file */ int ac; char **av; @@ -52,32 +89,38 @@ register FILE *fp; putc(quote, fp); } else fputs(*av++, fp); - putc(' ', fp); + putc(ac ? ' ' : '\n', fp); } - putc('\n', fp); } -isformat(s) /* is line a format line? */ -char *s; -{ - return(!strncmp(s,FMTSTR,FMTSTRL)); -} - - -formatval(r, s) /* return format value */ +int +formatval(r, s) /* get format value (return true if format) */ register char *r; register char *s; { - s += FMTSTRL; + register char *cp = FMTSTR; + + while (*cp) if (*cp++ != *s++) return(0); while (isspace(*s)) s++; - if (!*s) { *r = '\0'; return; } - while(*s) *r++ = *s++; - while (isspace(r[-1])) r--; + if (!*s) return(0); + if (r == NULL) return(1); + do + *r++ = *s++; + while(*s && !isspace(*s)); *r = '\0'; + return(1); } +int +isformat(s) /* is line a format line? */ +char *s; +{ + return(formatval(NULL, s)); +} + + fputformat(s, fp) /* put out a format value */ char *s; FILE *fp; @@ -88,6 +131,7 @@ FILE *fp; } +int getheader(fp, f, p) /* get header from file */ FILE *fp; int (*f)(); @@ -97,16 +141,20 @@ char *p; for ( ; ; ) { buf[MAXLINE-2] = '\n'; - if (fgets(buf, sizeof(buf), fp) == NULL) + if (fgets(buf, MAXLINE, fp) == NULL) return(-1); if (buf[0] == '\n') return(0); +#ifdef MSDOS + if (buf[0] == '\r' && buf[1] == '\n') + return(0); +#endif if (buf[MAXLINE-2] != '\n') { 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); } } @@ -122,23 +170,15 @@ mycheck(s, cp) /* check a header line for format inf char *s; register struct check *cp; { - if (!strncmp(s,FMTSTR,FMTSTRL)) - formatval(cp->fs, s); - else if (cp->fp != NULL) /* don't copy format info. */ + if (!formatval(cp->fs, s) && cp->fp != NULL) fputs(s, cp->fp); } -/* - * Copymatch(pat,str) checks pat for wildcards, and - * copies str into pat if there is a match (returning true). - */ - -#ifdef COPYMATCH -copymatch(pat, str) +int +globmatch(pat, str) /* check for glob match of str against pat */ char *pat, *str; { - int docopy = 0; register char *p = pat, *s = str; do { @@ -146,16 +186,13 @@ char *pat, *str; 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 '\\': /* literal next */ @@ -168,13 +205,8 @@ char *pat, *str; break; } } while (*p++); - if (docopy) - strcpy(pat, str); return(1); } -#else -#define copymatch(pat, s) (!strcmp(pat, s)) -#endif /* @@ -185,23 +217,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) 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 */ }