diff options
Diffstat (limited to 'sysdeps/mach/hurd/readdir64.c')
| -rw-r--r-- | sysdeps/mach/hurd/readdir64.c | 85 |
1 files changed, 73 insertions, 12 deletions
diff --git a/sysdeps/mach/hurd/readdir64.c b/sysdeps/mach/hurd/readdir64.c index 2d03ec381b..1953e81b31 100644 --- a/sysdeps/mach/hurd/readdir64.c +++ b/sysdeps/mach/hurd/readdir64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001 Free Software Foundation, Inc. +/* Copyright (C) 2001,02 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,25 +17,86 @@ 02111-1307 USA. */ #include <dirent.h> -#include <limits.h> #include <stddef.h> -#include <string.h> +#include <hurd.h> +#include <hurd/fs.h> +#include <hurd/fd.h> +#include "dirstream.h" /* Read a directory entry from DIRP. */ struct dirent64 * __readdir64 (DIR *dirp) { - struct dirent64 *result; - static union - { - struct dirent64 d; - char b[offsetof (struct dirent64, d_name) + UCHAR_MAX + 1]; - } u; - int err; + struct dirent64 *dp; - err = __readdir64_r (dirp, &u.d, &result); + if (dirp == NULL) + { + errno = EINVAL; + return NULL; + } - return err ? NULL : result; + __libc_lock_lock (dirp->__lock); + + do + { + if (dirp->__ptr - dirp->__data >= dirp->__size) + { + /* We've emptied out our buffer. Refill it. */ + + char *data = dirp->__data; + int nentries; + error_t err; + + if (err = HURD_FD_PORT_USE (dirp->__fd, + __dir_readdir (port, + &data, &dirp->__size, + dirp->__entry_ptr, + -1, 0, &nentries))) + { + __hurd_fail (err); + dp = NULL; + break; + } + + /* DATA now corresponds to entry index DIRP->__entry_ptr. */ + dirp->__entry_data = dirp->__entry_ptr; + + if (data != dirp->__data) + { + /* The data was passed out of line, so our old buffer is no + longer useful. Deallocate the old buffer and reset our + information for the new buffer. */ + __vm_deallocate (__mach_task_self (), + (vm_address_t) dirp->__data, + dirp->__allocation); + dirp->__data = data; + dirp->__allocation = round_page (dirp->__size); + } + + /* Reset the pointer into the buffer. */ + dirp->__ptr = dirp->__data; + + if (nentries == 0) + { + /* End of file. */ + dp = NULL; + break; + } + + /* We trust the filesystem to return correct data and so we + ignore NENTRIES. */ + } + + dp = (struct dirent64 *) dirp->__ptr; + dirp->__ptr += dp->d_reclen; + ++dirp->__entry_ptr; + + /* Loop to ignore deleted files. */ + } while (dp->d_fileno == 0); + + __libc_lock_unlock (dirp->__lock); + + return dp; } weak_alias (__readdir64, readdir64) |