ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/header.c

Comparing ray/src/common/header.c (file contents):
Revision 2.33 by greg, Sat May 25 04:00:54 2019 UTC vs.
Revision 2.35 by greg, Fri Jul 19 17:37:56 2019 UTC

#	Line 4 | Line 4 | static const char      RCSid[] = "$Id$";
4		/*
5		*  header.c - routines for reading and writing information headers.
6		*
7	<	*  Externals declared in resolu.h
7	>	*  Externals declared in rtio.h
8		*
9		*  newheader(t,fp)     start new information header identified by string t
10		*  headidval(r,s)      copy header identifier value in s to r
#	Line 210 | Line 210 | getheader(             /* get header from file */
210		{
211		int   rtotal = 0;
212		char  buf[MAXLINE];
213	+	int   firstc = fgetc(fp);
214
215	+	if (!isprint(firstc))
216	+	return(-1);                             /* messed up */
217	+	ungetc(firstc, fp);
218		for ( ; ; ) {
219		int     rval = 0;
220		buf[MAXLINE-2] = '\n';
221		if (fgets(buf, MAXLINE, fp) == NULL)
222		return(-1);
223	<	if (buf[buf[0]=='\r'] == '\n')
223	>	if (buf[buf[0]=='\r'] == '\n')          /* end of header? */
224		return(rtotal);
225		if (buf[MAXLINE-2] != '\n') {
226		ungetc(buf[MAXLINE-2], fp);     /* prevent false end */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)