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 1.1 by greg, Wed Oct 4 15:48:15 1989 UTC vs.
Revision 2.10 by greg, Wed Jul 29 18:19:31 2020 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1989 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5 < * fgetline.c - read line with escaped newlines
5 > * fgetline.c - read line with escaped newlines.
6   *
7 < *      10/4/89
7 > *  External symbols declared in rtio.h
8   */
9  
10 < #include  <stdio.h>
10 > #include "copyright.h"
11  
12 + #include  "rtio.h"
13  
14 +
15   char *
16 < fgetline(s, n, fp)      /* read in line with escapes, elide final newline */
17 < char  *s;
18 < register int  n;
19 < 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;
23 <        register int  c;
22 >        char  *cp = s;
23 >        int  c = EOF;
24  
25 <        cp = s;
26 <        while (--n > 0 && (c = getc(fp)) != EOF && c != '\n') {
27 <                if (c == '\\') {
28 <                        if ((c = getc(fp)) == EOF)
29 <                                break;
25 >        while (--n > 0 && (c = getc(fp)) != EOF) {
26 >                if (c == '\r' && (c = getc(fp)) != '\n') {
27 >                        ungetc(c, fp);          /* must be Apple file */
28 >                        c = '\n';
29                  }
30 +                if (c == '\n' && (cp == s || cp[-1] != '\\'))
31 +                        break;
32                  *cp++ = c;
33          }
34 <        if (cp == s)
34 >        if ((cp == s) & (c == EOF))
35                  return(NULL);
36 <        *cp++ = '\0';
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