system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-14 20:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

complete err() changes, actually use warn() in most instances

Browse source
This commit is contained in:
Adam David 1996-08-26 20:37:48 +00:00
parent 30959c76e0
commit 44cf272f78
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=17833
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr.bin/tail/forward.c
View file

@ -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;
}
}

3
usr.bin/tail/misc.c
View file

@ -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

9
usr.bin/tail/reverse.c
View file

@ -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;
}