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.2 by greg, Wed Oct 4 16:36:55 1989 UTC vs.
Revision 2.3 by greg, Tue Feb 25 02:47: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.
6   *
7 < *      10/4/89
7 > *  External symbols declared in standard.h
8   */
9  
10 + #include "copyright.h"
11 +
12   #include  <stdio.h>
13  
14  
# Line 19 | Line 18 | char  *s;
18   int  n;
19   register FILE  *fp;
20   {
22        int  escape = 0;
21          register char  *cp = s;
22          register int  c = EOF;
23  
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;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines