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

Comparing src/common/fgetline.c (file contents):
Revision 2.3 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.5 by greg, Wed Feb 11 22:11:33 2004 UTC

# Line 4 | Line 4 | static const char      RCSid[] = "$Id$";
4   /*
5   * fgetline.c - read line with escaped newlines.
6   *
7 < *  External symbols declared in standard.h
7 > *  External symbols declared in rtio.h
8   */
9  
10   #include "copyright.h"
11  
12 < #include  <stdio.h>
12 > #include  "rtio.h"
13  
14  
15   char *
# Line 22 | Line 22 | register FILE  *fp;
22          register int  c = EOF;
23  
24          while (--n > 0 && (c = getc(fp)) != EOF) {
25 <                if (c == '\r')
26 <                        continue;
25 >                if (c == '\r' && (c = getc(fp)) != '\n') {
26 >                        ungetc(c, fp);          /* must be Apple file */
27 >                        c = '\n';
28 >                }
29                  if (c == '\n' && (cp == s || cp[-1] != '\\'))
30                          break;
31                  *cp++ = c;

Diff Legend

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