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 2.1 by greg, Tue Nov 12 16:55:18 1991 UTC vs.
Revision 2.5 by greg, Wed Feb 11 22:11:33 2004 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 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;
# Line 23 | Line 22 | register FILE  *fp;
22          register int  c = EOF;
23  
24          while (--n > 0 && (c = getc(fp)) != EOF) {
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