--- ray/src/common/header.c	1992/02/20 11:40:36	2.2
+++ ray/src/common/header.c	1995/10/15 14:07:58	2.5
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1994 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
+ *  copymatch(pat, str)	copy str into pat if glob match
  *  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  <stdio.h>
 #include  <ctype.h>
 
-#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) *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;
@@ -58,26 +95,33 @@ register FILE  *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 +132,7 @@ FILE  *fp;
 }
 
 
+int
 getheader(fp, f, p)		/* get header from file */
 FILE  *fp;
 int  (*f)();
@@ -97,10 +142,14 @@ 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';
@@ -122,9 +171,7 @@ 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);
 }
 
@@ -134,7 +181,7 @@ register struct check  *cp;
  * copies str into pat if there is a match (returning true).
  */
 
-#ifdef COPYMATCH
+int
 copymatch(pat, str)
 char	*pat, *str;
 {
@@ -172,9 +219,6 @@ char	*pat, *str;
 		strcpy(pat, str);
 	return(1);
 }
-#else
-#define copymatch(pat, s)	(!strcmp(pat, s))
-#endif
 
 
 /*
@@ -190,6 +234,7 @@ char	*pat, *str;
  * if fout is not NULL.
  */
 
+int
 checkheader(fin, fmt, fout)
 FILE  *fin;
 char  *fmt;