--- ray/src/common/header.c	1996/07/27 07:21:38	2.8
+++ ray/src/common/header.c	2003/02/25 02:47:21	2.12
@@ -1,17 +1,18 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: header.c,v 2.12 2003/02/25 02:47:21 greg Exp $";
 #endif
-
 /*
  *  header.c - routines for reading and writing information headers.
  *
- *	8/19/88
+ *  Externals declared in resolu.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
+ *  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
@@ -23,7 +24,11 @@ static char SCCSid[] = "$SunId$ LBL";
  *  To copy header from input to output, use getheader(fin, fputs, fout)
  */
 
+#include "copyright.h"
+
 #include  <stdio.h>
+#include  <string.h>
+#include  <time.h>
 #include  <ctype.h>
 
 #define	 MAXLINE	512
@@ -38,7 +43,12 @@ char  HDRSTR[] = "#?";		/* information header magic nu
 
 char  FMTSTR[] = "FORMAT=";	/* format identifier */
 
+char  TMSTR[] = "CAPDATE=";	/* capture date identifier */
 
+static int mycheck();
+
+
+void
 newheader(s, fp)		/* identifying line of information header */
 char  *s;
 register FILE  *fp;
@@ -57,7 +67,7 @@ register char  *r, *s;
 
 	while (*cp) if (*cp++ != *s++) return(0);
 	if (r == NULL) return(1);
-	while (*s) *r++ = *s++;
+	while (*s && !isspace(*s)) *r++ = *s++;
 	*r = '\0';
 	return(1);
 }
@@ -71,25 +81,74 @@ char  *s;
 }
 
 
+int
+dateval(tloc, s)		/* get capture date value */
+time_t	*tloc;
+char	*s;
+{
+	struct tm	tms;
+	register char  *cp = TMSTR;
+
+	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;
+	tms.tm_isdst = -1;	/* ask mktime() to figure out DST */
+	*tloc = mktime(&tms);
+	return(1);
+}
+
+
+int
+isdate(s)			/* 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;
+{
+	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);
+}
+
+
+void
+fputnow(fp)			/* write out the current time */
+FILE	*fp;
+{
+	time_t	tv;
+	time(&tv);
+	fputdate(tv, fp);
+}
+
+
+void
 printargs(ac, av, fp)		/* print arguments to a file */
 int  ac;
 char  **av;
-register FILE  *fp;
+FILE  *fp;
 {
 	int  quote;
 
 	while (ac-- > 0) {
-		if (index(*av, ' ') != NULL) {		/* quote it */
-			if (index(*av, '\'') != NULL)
-				quote = '"';
-			else
-				quote = '\'';
-			putc(quote, fp);
-			fputs(*av++, fp);
-			putc(quote, fp);
-		} else
-			fputs(*av++, fp);
-		putc(ac ? ' ' : '\n', fp);
+		fputword(*av++, fp);
+		fputc(ac ? ' ' : '\n', fp);
 	}
 }
 
@@ -121,6 +180,7 @@ char  *s;
 }
 
 
+void
 fputformat(s, fp)		/* put out a format value */
 char  *s;
 FILE  *fp;
@@ -153,8 +213,8 @@ char  *p;
 			ungetc(buf[MAXLINE-2], fp);	/* prevent false end */
 			buf[MAXLINE-2] = '\0';
 		}
-		if (f != NULL)
-			(*f)(buf, p);
+		if (f != NULL && (*f)(buf, p) < 0)
+			return(-1);
 	}
 }
 
@@ -165,21 +225,22 @@ struct check {
 };
 
 
-static
+static int
 mycheck(s, cp)			/* check a header line for format info. */
 char  *s;
 register struct check  *cp;
 {
 	if (!formatval(cp->fs, s) && cp->fp != NULL)
 		fputs(s, cp->fp);
+	return(0);
 }
 
 
 int
-globmatch(pat, str)		/* check for glob match of str against pat */
-char	*pat, *str;
+globmatch(p, s)			/* check for match of s against pattern p */
+register char	*p, *s;
 {
-	register char	*p = pat, *s = str;
+	int	setmatch;
 
 	do {
 		switch (*p) {
@@ -195,6 +256,24 @@ char	*pat, *str;
 					return(1);
 			while (*s++);
 			return(0);
+		case '[':			/* character set */
+			setmatch = *s == *++p;
+			if (!*p)
+				return(0);
+			while (*++p != ']') {
+				if (!*p)
+					return(0);
+				if (*p == '-') {
+					setmatch += p[-1] <= *s && *s <= p[1];
+					if (!*++p)
+						break;
+				} else
+					setmatch += *p == *s;
+			}
+			if (!setmatch)
+				return(0);
+			s++;
+			break;
 		case '\\':			/* literal next */
 			p++;
 		/* fall through */