--- ray/src/common/header.c 2003/02/22 02:07:22 2.11 +++ ray/src/common/header.c 2004/01/02 11:35:17 2.22 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: header.c,v 2.11 2003/02/22 02:07:22 greg Exp $"; +static const char RCSid[] = "$Id: header.c,v 2.22 2004/01/02 11:35:17 schorsch Exp $"; #endif /* * header.c - routines for reading and writing information headers. @@ -24,89 +24,30 @@ static const char RCSid[] = "$Id: header.c,v 2.11 2003 * To copy header from input to output, use getheader(fin, fputs, fout) */ -/* ==================================================================== - * The Radiance Software License, Version 1.0 - * - * Copyright (c) 1990 - 2002 The Regents of the University of California, - * through Lawrence Berkeley National Laboratory. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes Radiance software - * (http://radsite.lbl.gov/) - * developed by the Lawrence Berkeley National Laboratory - * (http://www.lbl.gov/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Radiance," "Lawrence Berkeley National Laboratory" - * and "The Regents of the University of California" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact radiance@radsite.lbl.gov. - * - * 5. Products derived from this software may not be called "Radiance", - * nor may "Radiance" appear in their name, without prior written - * permission of Lawrence Berkeley National Laboratory. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of Lawrence Berkeley National Laboratory. For more - * information on Lawrence Berkeley National Laboratory, please see - * . - */ +#include "copyright.h" -#include -#include #include #include +#include "rtio.h" +#include "resolu.h" + #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 */ -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, + register FILE *fp +) { fputs(HDRSTR, fp); fputs(s, fp); @@ -114,9 +55,11 @@ 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) */ + register char *r, + register char *s +) { register char *cp = HDRSTR; @@ -128,18 +71,20 @@ register char *r, *s; } -int -isheadid(s) /* check to see if line is header id */ -char *s; +extern int +isheadid( /* check to see if line is header id */ + char *s +) { return(headidval(NULL, s)); } -int -dateval(tloc, s) /* get capture date value */ -time_t *tloc; -char *s; +extern int +dateval( /* get capture date value */ + time_t *tloc, + char *s +) { struct tm tms; register char *cp = TMSTR; @@ -161,18 +106,20 @@ char *s; } -int -isdate(s) /* is the given line a capture date? */ -char *s; +extern int +isdate( /* 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; +extern void +fputdate( /* write out the given time value */ + time_t tv, + FILE *fp +) { struct tm *tm = localtime(&tv); if (tm == NULL) @@ -183,9 +130,10 @@ FILE *fp; } -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); @@ -193,14 +141,13 @@ 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 +) { - int quote; - while (ac-- > 0) { fputword(*av++, fp); fputc(ac ? ' ' : '\n', fp); @@ -208,10 +155,11 @@ 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) */ + register char *r, + register char *s +) { register char *cp = FMTSTR; @@ -227,18 +175,20 @@ register char *s; } -int -isformat(s) /* is line a format line? */ -char *s; +extern int +isformat( /* is line a format line? */ + char *s +) { return(formatval(NULL, s)); } -void -fputformat(s, fp) /* put out a format value */ -char *s; -FILE *fp; +extern void +fputformat( /* put out a format value */ + char *s, + FILE *fp +) { fputs(FMTSTR, fp); fputs(s, fp); @@ -246,11 +196,12 @@ FILE *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]; @@ -281,19 +232,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 */ + register char *p, + register char *s +) { int setmatch; @@ -357,11 +313,12 @@ 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; @@ -373,11 +330,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 */ }