--- ray/src/common/header.c 2003/02/22 02:07:22 2.11
+++ ray/src/common/header.c 2019/07/19 17:37:56 2.35
@@ -1,20 +1,18 @@
#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.35 2019/07/19 17:37:56 greg Exp $";
#endif
/*
* header.c - routines for reading and writing information headers.
*
- * Externals declared in resolu.h
+ * Externals declared in rtio.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
@@ -24,89 +22,32 @@ 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
-#define MAXLINE 512
+#include "rtio.h"
+#include "resolu.h"
-#ifndef BSD
-#define index strchr
-#endif
+#define MAXLINE 2048
-extern char *index();
+extern time_t timegm(struct tm *tm);
-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;
+newheader( /* identifying line of information header */
+ const char *s,
+ FILE *fp
+)
{
fputs(HDRSTR, fp);
fputs(s, fp);
@@ -115,10 +56,12 @@ register FILE *fp;
int
-headidval(r,s) /* get header id (return true if is id) */
-register char *r, *s;
+headidval( /* get header id (return true if is id) */
+ char *r,
+ const char *s
+)
{
- register char *cp = HDRSTR;
+ const char *cp = HDRSTR;
while (*cp) if (*cp++ != *s++) return(0);
if (r == NULL) return(1);
@@ -129,20 +72,13 @@ register char *r, *s;
int
-isheadid(s) /* check to see if line is header id */
-char *s;
+dateval( /* convert capture date line to UTC */
+ time_t *tloc,
+ const 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++;
@@ -162,30 +98,55 @@ char *s;
int
-isdate(s) /* is the given line a capture date? */
-char *s;
+gmtval( /* convert GMT date line to UTC */
+ time_t *tloc,
+ const 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;
+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;
+fputnow( /* write out the current time */
+ FILE *fp
+)
{
time_t tv;
time(&tv);
@@ -194,13 +155,12 @@ FILE *fp;
void
-printargs(ac, av, fp) /* print arguments to a file */
-int ac;
-char **av;
-FILE *fp;
+printargs( /* print arguments to a file */
+ int ac,
+ char **av,
+ FILE *fp
+)
{
- int quote;
-
while (ac-- > 0) {
fputword(*av++, fp);
fputc(ac ? ' ' : '\n', fp);
@@ -209,11 +169,13 @@ FILE *fp;
int
-formatval(r, s) /* get format value (return true if format) */
-register char *r;
-register char *s;
+formatval( /* get format value (return true if format) */
+ char fmt[MAXFMTLEN],
+ const char *s
+)
{
- register char *cp = FMTSTR;
+ const char *cp = FMTSTR;
+ char *r = fmt;
while (*cp) if (*cp++ != *s++) return(0);
while (isspace(*s)) s++;
@@ -221,24 +183,17 @@ register char *s;
if (r == NULL) return(1);
do
*r++ = *s++;
- while(*s && !isspace(*s));
+ while (*s && !isspace(*s) && r-fmt < MAXFMTLEN-1);
*r = '\0';
return(1);
}
-int
-isformat(s) /* is line a format line? */
-char *s;
-{
- return(formatval(NULL, s));
-}
-
-
void
-fputformat(s, fp) /* put out a format value */
-char *s;
-FILE *fp;
+fputformat( /* put out a format value */
+ const char *s,
+ FILE *fp
+)
{
fputs(FMTSTR, fp);
fputs(s, fp);
@@ -247,53 +202,63 @@ FILE *fp;
int
-getheader(fp, f, p) /* get header from file */
-FILE *fp;
-int (*f)();
-char *p;
+getheader( /* get header from file */
+ FILE *fp,
+ gethfunc *f,
+ void *p
+)
{
+ int rtotal = 0;
char buf[MAXLINE];
+ int firstc = fgetc(fp);
+ if (!isprint(firstc))
+ return(-1); /* messed up */
+ ungetc(firstc, fp);
for ( ; ; ) {
+ int rval = 0;
buf[MAXLINE-2] = '\n';
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[buf[0]=='\r'] == '\n') /* end of header? */
+ return(rtotal);
if (buf[MAXLINE-2] != '\n') {
ungetc(buf[MAXLINE-2], fp); /* prevent false end */
buf[MAXLINE-2] = '\0';
}
- if (f != NULL && (*f)(buf, p) < 0)
+ if (f != NULL && (rval = (*f)(buf, p)) < 0)
return(-1);
+ rtotal += rval;
}
}
struct check {
FILE *fp;
- char fs[64];
+ char fs[MAXFMTLEN];
};
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);
+ struct check *scp = (struct check *)cp;
+
+ if (!formatval(scp->fs, s) && scp->fp != NULL)
+ fputs(s, scp->fp);
+
return(0);
}
int
-globmatch(p, s) /* check for match of s against pattern p */
-register char *p, *s;
+globmatch( /* check for match of s against pattern p */
+ const char *p,
+ const char *s
+)
{
int setmatch;
@@ -306,7 +271,7 @@ register char *p, *s;
case '*': /* match any string */
while (p[1] == '*') p++;
do
- if ( (p[1]=='?' || p[1]==*s) &&
+ if ( (p[1]=='?') | (p[1]==*s) &&
globmatch(p+1,s) )
return(1);
while (*s++);
@@ -319,11 +284,11 @@ register char *p, *s;
if (!*p)
return(0);
if (*p == '-') {
- setmatch += p[-1] <= *s && *s <= p[1];
+ setmatch += (p[-1] <= *s && *s <= p[1]);
if (!*++p)
break;
} else
- setmatch += *p == *s;
+ setmatch += (*p == *s);
}
if (!setmatch)
return(0);
@@ -358,13 +323,14 @@ register char *p, *s;
*/
int
-checkheader(fin, fmt, fout)
-FILE *fin;
-char *fmt;
-FILE *fout;
+checkheader(
+ FILE *fin,
+ char fmt[MAXFMTLEN],
+ FILE *fout
+)
{
struct check cdat;
- register char *cp;
+ char *cp;
cdat.fp = fout;
cdat.fs[0] = '\0';
@@ -373,11 +339,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 */
}