diff options
| author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2003-11-22 13:40:29 +0000 |
|---|---|---|
| committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2003-11-22 13:40:29 +0000 |
| commit | 8c803e509bda74af2ccc5e8a1bde09c1279b26b1 (patch) | |
| tree | 3cdbe3256f9bde313e022e20feb5f731802cc1c9 | |
| parent | 76eb0de1658d05508fad67f17c71bd6c9e3fb249 (diff) | |
Revert the last change since it's broke make release.
| -rw-r--r-- | usr.bin/xinstall/xinstall.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 6c258cd622b..efd558c3804 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xinstall.c,v 1.37 2003/11/21 20:53:42 mickey Exp $ */ +/* $OpenBSD: xinstall.c,v 1.38 2003/11/22 13:40:28 grange Exp $ */ /* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif -static char rcsid[] = "$OpenBSD: xinstall.c,v 1.37 2003/11/21 20:53:42 mickey Exp $"; +static char rcsid[] = "$OpenBSD: xinstall.c,v 1.38 2003/11/22 13:40:28 grange Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -433,8 +433,7 @@ copy(int from_fd, char *from_name, int to_fd, char *to_name, off_t size, volatile size_t siz; if ((p = mmap(NULL, (size_t)size, PROT_READ, MAP_PRIVATE, - from_fd, (off_t)0)) == MAP_FAILED || - madvise(p, size, MADV_SEQUENTIAL)) { + from_fd, (off_t)0)) == MAP_FAILED) { serrno = errno; (void)unlink(to_name); errx(EX_OSERR, "%s: %s", from_name, strerror(serrno)); @@ -510,12 +509,10 @@ compare(int from_fd, const char *from_name, size_t from_len, int to_fd, remainder -= length; if ((p1 = mmap(NULL, length, PROT_READ, MAP_PRIVATE, - from_fd, from_off)) == MAP_FAILED || - madvise(p1, length, MADV_SEQUENTIAL)) + from_fd, from_off)) == MAP_FAILED) err(EX_OSERR, "%s", from_name); if ((p2 = mmap(NULL, length, PROT_READ, MAP_PRIVATE, - to_fd, to_off)) == MAP_FAILED || - madvise(p2, length, MADV_SEQUENTIAL)) + to_fd, to_off)) == MAP_FAILED) err(EX_OSERR, "%s", to_name); dfound = memcmp(p1, p2, length); |