summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff/diffdir.c
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2010-10-28 15:02:41 +0000
committermillert <millert@openbsd.org>2010-10-28 15:02:41 +0000
commit3f3251d07e727cddd979d347f8fb323a4143d3ec (patch)
tree4d084e5596687dc0bfc7f2d91bed4379075213f6 /usr.bin/diff/diffdir.c
parentA function that only returns NULL should return void. (diff)
downloadwireguard-openbsd-3f3251d07e727cddd979d347f8fb323a4143d3ec.tar.xz
wireguard-openbsd-3f3251d07e727cddd979d347f8fb323a4143d3ec.zip
Change basep parameter of getdirentries() to be off_t *, not long *
so it works correctly with large offsets (and matches other systems). This requires adding a new getdirentries syscall, with the old one renamed to ogetdirentries. All in-tree consumers of getdirentries() have been updated. Bump libc and libpthread major numbers. OK and with deraadt@
Diffstat (limited to 'usr.bin/diff/diffdir.c')
-rw-r--r--usr.bin/diff/diffdir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c
index 5105fbad96a..d9ed703ae7e 100644
--- a/usr.bin/diff/diffdir.c
+++ b/usr.bin/diff/diffdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diffdir.c,v 1.37 2010/07/17 00:00:32 ray Exp $ */
+/* $OpenBSD: diffdir.c,v 1.38 2010/10/28 15:02:41 millert Exp $ */
/*
* Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -167,7 +167,7 @@ slurpdir(char *path, char **bufp, int enoentok)
{
char *buf, *ebuf, *cp;
size_t bufsize, have, need;
- long base;
+ off_t base;
int fd, nbytes, entries;
struct stat sb;
struct dirent **dirlist, *dp;