ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/header.c
(Generate patch)

Comparing ray/src/common/header.c (file contents):
Revision 2.32 by greg, Thu Aug 2 18:33:42 2018 UTC vs.
Revision 2.34 by greg, Sun Jun 9 18:22:20 2019 UTC

# 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 */
# Line 241 | Line 245 | mycheck(                       /* check a header line for format info. */
245          void  *cp
246   )
247   {
248 <        if (!formatval(((struct check*)cp)->fs, s)
249 <                        && ((struct check*)cp)->fp != NULL) {
250 <                fputs(s, ((struct check*)cp)->fp);
251 <        }
248 >        struct check    *scp = (struct check *)cp;
249 >
250 >        if (!formatval(scp->fs, s) && scp->fp != NULL)
251 >                fputs(s, scp->fp);
252 >
253          return(0);
254   }
255  

Diff Legend

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