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 /lib/libpthread | |
| 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 'lib/libpthread')
| -rw-r--r-- | lib/libpthread/shlib_version | 4 | ||||
| -rw-r--r-- | lib/libpthread/uthread/pthread_private.h | 4 | ||||
| -rw-r--r-- | lib/libpthread/uthread/uthread_getdirentries.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/libpthread/shlib_version b/lib/libpthread/shlib_version index eb2c603aec0..262f3bc13b6 100644 --- a/lib/libpthread/shlib_version +++ b/lib/libpthread/shlib_version @@ -1,2 +1,2 @@ -major=12 -minor=1 +major=13 +minor=0 diff --git a/lib/libpthread/uthread/pthread_private.h b/lib/libpthread/uthread/pthread_private.h index 4a7a1243b74..7e79622073f 100644 --- a/lib/libpthread/uthread/pthread_private.h +++ b/lib/libpthread/uthread/pthread_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread_private.h,v 1.75 2010/07/13 03:10:29 guenther Exp $ */ +/* $OpenBSD: pthread_private.h,v 1.76 2010/10/28 15:02:41 millert Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -1352,7 +1352,7 @@ int _thread_sys_alphasort(const void *, const void *); int _thread_sys_scandir(const char *, struct dirent ***, int (*)(struct dirent *), int (*)(const void *, const void *)); int _thread_sys_closedir(DIR *); -int _thread_sys_getdirentries(int, char *, int, long *); +int _thread_sys_getdirentries(int, char *, int, off_t *); long _thread_sys_telldir(const DIR *); struct dirent *_thread_sys_readdir(DIR *); void _thread_sys_rewinddir(DIR *); diff --git a/lib/libpthread/uthread/uthread_getdirentries.c b/lib/libpthread/uthread/uthread_getdirentries.c index 1dd8d30e651..23ae786ad27 100644 --- a/lib/libpthread/uthread/uthread_getdirentries.c +++ b/lib/libpthread/uthread/uthread_getdirentries.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_getdirentries.c,v 1.3 1999/11/25 07:01:36 d Exp $ */ +/* $OpenBSD: uthread_getdirentries.c,v 1.4 2010/10/28 15:02:41 millert Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au> * All rights reserved. @@ -39,7 +39,7 @@ #include "pthread_private.h" int -getdirentries(int fd, char *buf, int nbytes, long *basep) +getdirentries(int fd, char *buf, int nbytes, off_t *basep) { int ret; |