--- ray/src/common/header.c	2003/02/22 02:07:22	2.11
+++ ray/src/common/header.c	2003/07/21 22:30:17	2.19
@@ -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.19 2003/07/21 22:30:17 schorsch Exp $";
 #endif
 /*
  *  header.c - routines for reading and writing information headers.
@@ -24,76 +24,16 @@ 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
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
-#include  <stdio.h>
-#include  <string.h>
 #include  <time.h>
 #include  <ctype.h>
 
+#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 */
@@ -199,8 +139,6 @@ int  ac;
 char  **av;
 FILE  *fp;
 {
-	int  quote;
-
 	while (ac-- > 0) {
 		fputword(*av++, fp);
 		fputc(ac ? ' ' : '\n', fp);
@@ -368,16 +306,17 @@ FILE  *fout;
 
 	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])
 		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 */
 }