5 |
|
#endif |
6 |
|
|
7 |
|
/* |
8 |
< |
* fgetline.c - read line with escaped newlines |
8 |
> |
* fgetline.c - read line with escaped newlines. |
9 |
|
* |
10 |
|
* 10/4/89 |
11 |
|
*/ |
16 |
|
char * |
17 |
|
fgetline(s, n, fp) /* read in line with escapes, elide final newline */ |
18 |
|
char *s; |
19 |
< |
register int n; |
20 |
< |
FILE *fp; |
19 |
> |
int n; |
20 |
> |
register FILE *fp; |
21 |
|
{ |
22 |
< |
register char *cp; |
23 |
< |
register int c; |
22 |
> |
register char *cp = s; |
23 |
> |
register int c = EOF; |
24 |
|
|
25 |
< |
cp = s; |
26 |
< |
while (--n > 0 && (c = getc(fp)) != EOF && c != '\n') { |
27 |
< |
if (c == '\\') { |
28 |
< |
if ((c = getc(fp)) == EOF) |
29 |
< |
break; |
30 |
< |
} |
25 |
> |
while (--n > 0 && (c = getc(fp)) != EOF) { |
26 |
> |
if (c == '\n' && (cp == s || cp[-1] != '\\')) |
27 |
> |
break; |
28 |
|
*cp++ = c; |
29 |
|
} |
30 |
< |
if (cp == s) |
30 |
> |
if (cp == s && c == EOF) |
31 |
|
return(NULL); |
32 |
< |
*cp++ = '\0'; |
32 |
> |
*cp = '\0'; |
33 |
|
return(s); |
34 |
|
} |