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.4 by greg, Fri Jun 27 06:53:21 2003 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;
18 > int  n;
19 > register FILE  *fp;
20   {
21 <        register char  *cp;
22 <        register int  c;
21 >        register char  *cp = s;
22 >        register int  c = EOF;
23  
24 <        cp = s;
25 <        while (--n > 0 && (c = getc(fp)) != EOF && c != '\n') {
26 <                if (c == '\\') {
27 <                        if ((c = getc(fp)) == EOF)
28 <                                break;
30 <                }
24 >        while (--n > 0 && (c = getc(fp)) != EOF) {
25 >                if (c == '\r')
26 >                        continue;
27 >                if (c == '\n' && (cp == s || cp[-1] != '\\'))
28 >                        break;
29                  *cp++ = c;
30          }
31 <        if (cp == s)
31 >        if (cp == s && c == EOF)
32                  return(NULL);
33 <        *cp++ = '\0';
33 >        *cp = '\0';
34          return(s);
35   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines