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.4 by greg, Fri Jun 27 06:53:21 2003 UTC vs.
Revision 2.7 by greg, Tue Sep 14 02:53:50 2004 UTC

# Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11  
12   #include  "rtio.h"
13  
14 + #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
15 + #undef getc
16 + #define getc    getc_unlocked
17 + #endif
18  
19 +
20   char *
21   fgetline(s, n, fp)      /* read in line with escapes, elide final newline */
22   char  *s;
# Line 22 | Line 27 | register FILE  *fp;
27          register int  c = EOF;
28  
29          while (--n > 0 && (c = getc(fp)) != EOF) {
30 <                if (c == '\r')
31 <                        continue;
30 >                if (c == '\r' && (c = getc(fp)) != '\n') {
31 >                        ungetc(c, fp);          /* must be Apple file */
32 >                        c = '\n';
33 >                }
34                  if (c == '\n' && (cp == s || cp[-1] != '\\'))
35                          break;
36                  *cp++ = c;

Diff Legend

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