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.6 by greg, Thu Apr 29 14:36:49 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
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 + #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
15 + #define getc    getc_unlocked
16 + #endif
17 +
18 +
19   char *
20   fgetline(s, n, fp)      /* read in line with escapes, elide final newline */
21   char  *s;
22 < register int  n;
23 < FILE  *fp;
22 > int  n;
23 > register FILE  *fp;
24   {
25 <        register char  *cp;
26 <        register int  c;
25 >        register char  *cp = s;
26 >        register int  c = EOF;
27  
28 <        cp = s;
29 <        while (--n > 0 && (c = getc(fp)) != EOF && c != '\n') {
30 <                if (c == '\\') {
31 <                        if ((c = getc(fp)) == EOF)
29 <                                break;
28 >        while (--n > 0 && (c = getc(fp)) != EOF) {
29 >                if (c == '\r' && (c = getc(fp)) != '\n') {
30 >                        ungetc(c, fp);          /* must be Apple file */
31 >                        c = '\n';
32                  }
33 +                if (c == '\n' && (cp == s || cp[-1] != '\\'))
34 +                        break;
35                  *cp++ = c;
36          }
37 <        if (cp == s)
37 >        if (cp == s && c == EOF)
38                  return(NULL);
39 <        *cp++ = '\0';
39 >        *cp = '\0';
40          return(s);
41   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines