Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

munmap() mmap()ed regions.

Browse Source
This commit is contained in:
jtc 1994-11-23 07:11:00 +00:00
parent 66aea4d8d2
commit 48851c7a0b
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/tail/forward.c
View File

@ -36,7 +36,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)forward.c 5.4 (Berkeley) 2/12/92";*/
static char rcsid[] = "$Id: forward.c,v 1.4 1994/04/24 20:19:17 deraadt Exp $";
static char rcsid[] = "$Id: forward.c,v 1.5 1994/11/23 07:11:00 jtc Exp $";
#endif /* not lint */
#include <sys/types.h>
@ -180,16 +180,17 @@ rlines(fp, off, sbp)
{
register int size;
register char *p;
char *start;
if (!(size = sbp->st_size))
return;
if ((p = mmap(NULL,
if ((start = mmap(NULL,
size, PROT_READ, 0, fileno(fp), (off_t)0)) == (caddr_t)-1)
err("%s", strerror(errno));
/* Last char is special, ignore whether newline or not. */
for (p += size - 1; --size;)
for (p = start + size - 1; --size;)
if (*--p == '\n' && !--off) {
++p;
break;
@ -200,4 +201,8 @@ rlines(fp, off, sbp)
WR(p, size);
if (fseek(fp, sbp->st_size, SEEK_SET) == -1)
ierr();
if (munmap(start, (size_t)sbp->st_size)) {
err("%s", strerror(errno));
}
}

13
usr.bin/tail/reverse.c
View File

@ -36,7 +36,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)reverse.c 5.3 (Berkeley) 2/12/92";*/
static char rcsid[] = "$Id: reverse.c,v 1.4 1994/04/24 20:19:18 deraadt Exp $";
static char rcsid[] = "$Id: reverse.c,v 1.5 1994/11/23 07:11:03 jtc Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -109,16 +109,15 @@ r_reg(fp, style, off, sbp)
register int size;
register int llen;
register char *p;
int fd;
char *start;
if (!(size = sbp->st_size))
return;
fd = fileno(fp);
if ((p =
mmap(NULL, size, PROT_READ, 0, fd, (off_t)0)) == (caddr_t)-1)
if ((start = mmap(NULL, (size_t)size,
PROT_READ, 0, fileno(fp), (off_t)0)) == (caddr_t)-1)
err("%s", strerror(errno));
p += size - 1;
p = start + size - 1;
if (style == RBYTES && off < size)
size = off;
@ -135,6 +134,8 @@ r_reg(fp, style, off, sbp)
}
if (llen)
WR(p, llen);
if (munmap(start, (size_t)sbp->st_size))
err("%s", strerror(errno));
}
typedef struct bf {