diff options
| author | peter <peter@FreeBSD.org> | 1997-06-22 10:59:24 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-06-22 10:59:24 +0000 |
| commit | e00aed2084aea5f9880023debf362de96dd10ad2 (patch) | |
| tree | 5f844f9e367fdc809c7ac2e00e2c104f128879c3 /contrib/cvs/src/rcs.c | |
| parent | 891d25f8be548bdcb7be081005a66c22b10145d5 (diff) | |
| download | FreeBSD-src-e00aed2084aea5f9880023debf362de96dd10ad2.zip FreeBSD-src-e00aed2084aea5f9880023debf362de96dd10ad2.tar.gz | |
merge conflicts
Diffstat (limited to 'contrib/cvs/src/rcs.c')
| -rw-r--r-- | contrib/cvs/src/rcs.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/contrib/cvs/src/rcs.c b/contrib/cvs/src/rcs.c index ce4f410..834acd9 100644 --- a/contrib/cvs/src/rcs.c +++ b/contrib/cvs/src/rcs.c @@ -1050,8 +1050,13 @@ getrcsrev (fp, revp) do { c = getc (fp); if (c == EOF) + { /* FIXME: should be including filename in error message. */ - error (1, errno, "cannot read rcs file"); + if (ferror (fp)) + error (1, errno, "cannot read rcs file"); + else + error (1, 0, "unexpected end of file reading rcs file"); + } } while (whitespace (c)); if (!(isdigit (c) || c == '.')) @@ -1075,7 +1080,10 @@ getrcsrev (fp, revp) if (c == EOF) { /* FIXME: should be including filename in error message. */ - error (1, errno, "cannot read rcs file"); + if (ferror (fp)) + error (1, errno, "cannot read rcs file"); + else + error (1, 0, "unexpected end of file reading rcs file"); } } |
