--- ray/src/common/header.c	2003/02/25 02:47:21	2.12
+++ ray/src/common/header.c	2003/07/27 22:12:01	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: header.c,v 2.12 2003/02/25 02:47:21 greg Exp $";
+static const char	RCSid[] = "$Id: header.c,v 2.20 2003/07/27 22:12:01 schorsch Exp $";
 #endif
 /*
  *  header.c - routines for reading and writing information headers.
@@ -26,19 +26,14 @@ static const char	RCSid[] = "$Id: header.c,v 2.12 2003
 
 #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 */
@@ -144,8 +139,6 @@ int  ac;
 char  **av;
 FILE  *fp;
 {
-	int  quote;
-
 	while (ac-- > 0) {
 		fputword(*av++, fp);
 		fputc(ac ? ' ' : '\n', fp);
@@ -313,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 */
 }