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

Comparing ray/src/common/fgetline.c (file contents):
Revision 2.5 by greg, Wed Feb 11 22:11:33 2004 UTC vs.
Revision 2.10 by greg, Wed Jul 29 18:19:31 2020 UTC

# Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13  
14  
15   char *
16 < fgetline(s, n, fp)      /* read in line with escapes, elide final newline */
17 < char  *s;
18 < int  n;
19 < register FILE  *fp;
16 > fgetline(               /* read in line with escapes, elide final newline */
17 >        char  *s,
18 >        int  n,
19 >        FILE  *fp
20 > )
21   {
22 <        register char  *cp = s;
23 <        register int  c = EOF;
22 >        char  *cp = s;
23 >        int  c = EOF;
24  
25          while (--n > 0 && (c = getc(fp)) != EOF) {
26                  if (c == '\r' && (c = getc(fp)) != '\n') {
# Line 30 | Line 31 | register FILE  *fp;
31                          break;
32                  *cp++ = c;
33          }
34 <        if (cp == s && c == EOF)
34 >        if ((cp == s) & (c == EOF))
35                  return(NULL);
36          *cp = '\0';
37 + #if defined(_WIN32) || defined(_WIN64)
38 +                                                /* remove escaped newlines */
39 +        for (cp = s; (cp = strchr(cp, '\\')) != NULL && cp[1] == '\n'; )
40 +                memmove(cp, cp+2, strlen(cp+2)+1);
41 + #endif
42          return(s);
43   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines