207 |
|
void *p |
208 |
|
) |
209 |
|
{ |
210 |
+ |
int rtotal = 0; |
211 |
|
char buf[MAXLINE]; |
212 |
|
|
213 |
|
for ( ; ; ) { |
214 |
+ |
int rval = 0; |
215 |
|
buf[MAXLINE-2] = '\n'; |
216 |
|
if (fgets(buf, MAXLINE, fp) == NULL) |
217 |
|
return(-1); |
218 |
|
if (buf[buf[0]=='\r'] == '\n') |
219 |
< |
return(0); |
219 |
> |
return(rtotal); |
220 |
|
if (buf[MAXLINE-2] != '\n') { |
221 |
|
ungetc(buf[MAXLINE-2], fp); /* prevent false end */ |
222 |
|
buf[MAXLINE-2] = '\0'; |
223 |
|
} |
224 |
< |
if (f != NULL && (*f)(buf, p) < 0) |
224 |
> |
if (f != NULL && (rval = (*f)(buf, p)) < 0) |
225 |
|
return(-1); |
226 |
+ |
rtotal += rval; |
227 |
|
} |
228 |
|
} |
229 |
|
|