diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2010-10-28 15:02:42 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2010-10-28 15:02:42 +0000 |
| commit | ad39b297930f7aeb9f57f3283cb31dad08c3a9ac (patch) | |
| tree | 686235f31d6eb66ef3d8180a61333f611d32602b /usr.bin | |
| parent | 24c64c90c25711433236441e0509ebae8231f426 (diff) | |
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')
| -rw-r--r-- | usr.bin/cvs/file.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/update.c | 4 | ||||
| -rw-r--r-- | usr.bin/diff/diffdir.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index 5f87cd78b5f..632f5f37c5d 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.261 2010/09/27 14:08:41 joshe Exp $ */ +/* $OpenBSD: file.c,v 1.262 2010/10/28 15:02:41 millert Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -393,7 +393,7 @@ cvs_file_walkdir(struct cvs_file *cf, struct cvs_recursion *cr) int l, type; FILE *fp; int nbytes; - long base; + off_t base; size_t bufsize; struct stat st; struct dirent *dp; diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 031783e7e47..514863d8eb5 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.165 2010/10/27 08:35:45 tobias Exp $ */ +/* $OpenBSD: update.c,v 1.166 2010/10/28 15:02:41 millert Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -235,7 +235,7 @@ cvs_update_enterdir(struct cvs_file *cf) void cvs_update_leavedir(struct cvs_file *cf) { - long base; + off_t base; int nbytes; int isempty; size_t bufsize; 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; |