--- ray/src/common/header.c	1996/07/27 07:21:38	2.8
+++ ray/src/common/header.c	1998/10/27 08:44:28	2.10
@@ -57,7 +57,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);
 }
@@ -153,8 +153,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);
 	}
 }