--- ray/src/common/header.c 2014/05/30 23:43:48 2.29 +++ ray/src/common/header.c 2017/05/07 16:14:19 2.30 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: header.c,v 2.29 2014/05/30 23:43:48 greg Exp $"; +static const char RCSid[] = "$Id: header.c,v 2.30 2017/05/07 16:14:19 greg Exp $"; #endif /* * header.c - routines for reading and writing information headers. @@ -207,20 +207,23 @@ getheader( /* get header from file */ void *p ) { + int rtotal = 0; char buf[MAXLINE]; for ( ; ; ) { + int rval = 0; buf[MAXLINE-2] = '\n'; if (fgets(buf, MAXLINE, fp) == NULL) return(-1); if (buf[buf[0]=='\r'] == '\n') - return(0); + return(rtotal); if (buf[MAXLINE-2] != '\n') { ungetc(buf[MAXLINE-2], fp); /* prevent false end */ buf[MAXLINE-2] = '\0'; } - if (f != NULL && (*f)(buf, p) < 0) + if (f != NULL && (rval = (*f)(buf, p)) < 0) return(-1); + rtotal += rval; } }