diff options
| author | Adam David <adam@FreeBSD.org> | 1996-08-26 20:37:48 +0000 |
|---|---|---|
| committer | Adam David <adam@FreeBSD.org> | 1996-08-26 20:37:48 +0000 |
| commit | 44cf272f781c1703c921e2a0baacb048481e7cb9 (patch) | |
| tree | 7144acd331ef8f32f7c6403d7f6b73e1b84774fc /usr.bin/tail | |
| parent | 30959c76e0721f71049213a09de9ce130aa07df8 (diff) | |
| download | src-44cf272f781c1703c921e2a0baacb048481e7cb9.tar.gz src-44cf272f781c1703c921e2a0baacb048481e7cb9.zip | |
complete err() changes, actually use warn() in most instances
Notes
Notes:
svn path=/head/; revision=17833
Diffstat (limited to 'usr.bin/tail')
| -rw-r--r-- | usr.bin/tail/forward.c | 6 | ||||
| -rw-r--r-- | usr.bin/tail/misc.c | 3 | ||||
| -rw-r--r-- | usr.bin/tail/reverse.c | 9 |
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c index 1d5f710a06c0..4b22eefddf08 100644 --- a/usr.bin/tail/forward.c +++ b/usr.bin/tail/forward.c @@ -205,13 +205,13 @@ rlines(fp, off, sbp) if (size > SIZE_T_MAX) { errno = EFBIG; - err(0, "%s", fname); + ierr(); return; } if ((start = mmap(NULL, (size_t)size, PROT_READ, 0, fileno(fp), (off_t)0)) == (caddr_t)-1) { - err(0, "%s", fname); + ierr(); return; } @@ -230,7 +230,7 @@ rlines(fp, off, sbp) return; } if (munmap(start, (size_t)sbp->st_size)) { - err(0, "%s", fname); + ierr(); return; } } diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c index a396fc30eea2..8891819e7391 100644 --- a/usr.bin/tail/misc.c +++ b/usr.bin/tail/misc.c @@ -51,7 +51,8 @@ static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; void ierr() { - err(0, "%s", fname); + warn("%s", fname); + rval = 1; } void diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c index 3573ec63b794..2653add72cd3 100644 --- a/usr.bin/tail/reverse.c +++ b/usr.bin/tail/reverse.c @@ -120,13 +120,13 @@ r_reg(fp, style, off, sbp) if (size > SIZE_T_MAX) { errno = EFBIG; - err(0, "%s", fname); + ierr(); return; } if ((start = mmap(NULL, (size_t)size, PROT_READ, 0, fileno(fp), (off_t)0)) == (caddr_t)-1) { - err(0, "%s", fname); + ierr(); return; } p = start + size - 1; @@ -147,7 +147,7 @@ r_reg(fp, style, off, sbp) if (llen) WR(p, llen); if (munmap(start, (size_t)sbp->st_size)) - err(0, "%s", fname); + ierr(); } typedef struct bf { @@ -224,8 +224,7 @@ r_buf(fp) } if (enomem) { - (void)fprintf(stderr, - "tail: warning: %ld bytes discarded\n", enomem); + warnx("warning: %ld bytes discarded\n", enomem); rval = 1; } |