summaryrefslogtreecommitdiff
path: root/sysdeps/mach/hurd/readdir64_r.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-06-11 23:04:51 +0000
committerRoland McGrath <roland@gnu.org>2002-06-11 23:04:51 +0000
commit337738b77123cbfed07d53c9408eb74109856d0a (patch)
treeb5eba5547489c0efef99967e7f427f4ae4b4e727 /sysdeps/mach/hurd/readdir64_r.c
parent522c33f6bb802f6bf7840c78a5805b6929fd3ccd (diff)
downloadglibc-337738b77123cbfed07d53c9408eb74109856d0a.tar.gz
* sysdeps/mach/hurd/xstat64.c: Conditionalize entire contents of the
file on [!RTLD_STAT64]. * sysdeps/mach/hurd/fxstat64.c: Likewise. * sysdeps/mach/hurd/tmpfile.c (tmpfile64): Define as alias of tmpfile. (__fdopen): Use INTUSE. * sysdeps/mach/hurd/tmpfile64.c: New file, empty placeholder. * stdio-common/tmpfile64.c: File removed. * sysdeps/generic/tmpfile64.c: New file. * sysdeps/generic/tmpfile.c (GEN_THIS): New macro, define to __GT_FILE if not already defined. (tmpfile): Use it in place of __GT_FILE. * include/unistd.h: Declare __chown_internal. * sysdeps/mach/hurd/sendfile64.c (sendfile64): Do real work here. * sysdeps/mach/hurd/sendfile.c (sendfile): Call that. 2002-06-09 Roland McGrath <roland@frob.com> Update to new Hurd RPC interfaces supporting 64-bit file sizes. * sysdeps/mach/hurd/configure.in: Check for <hurd/version.h> with value of HURD_INTERFACE_VERSION >= 20020609. * sysdeps/mach/hurd/configure: Regenerated. * shlib-versions (.*-.*-gnu-gnu.*): Set libhurduser=0.3. * sysdeps/mach/hurd/xstatconv.c (xstat64_conv): Rewritten to convert a struct stat64 into a struct stat and return 0 or -1 with errno set to EOVERFLOW. * sysdeps/mach/hurd/statfsconv.c (statfs64_conv): Likewise for struct statfs64 to struct statfs. * sysdeps/mach/hurd/xstat.c (__xstat): Use converter and call ... * sysdeps/mach/hurd/xstat64.c (__xstat64): ... this, real work here. * sysdeps/mach/hurd/fxstat.c (__fxstat): Likewise. * sysdeps/mach/hurd/fxstat64.c (__fxstat64): Likewise. * sysdeps/mach/hurd/lxstat.c (__lxstat): Likewise. * sysdeps/mach/hurd/lxstat64.c (__lxstat64): Likewise. * sysdeps/mach/hurd/statfs.c (__statfs): Likewise. * sysdeps/mach/hurd/statfs64.c (__statfs64): Likewise. * sysdeps/mach/hurd/fstatfs.c (__fstatfs): Likewise. * sysdeps/mach/hurd/fstatfs64.c (__fstatfs64): Likewise. * sysdeps/mach/hurd/pwrite64.c (__libc_pwrite64): Do real work here. * sysdeps/mach/hurd/pwrite.c (__libc_pwrite): Call that. * sysdeps/mach/hurd/pread64.c (__libc_pread64): Do real work here. * sysdeps/mach/hurd/pread.c (__libc_pread): Call that. * sysdeps/mach/hurd/lseek64.c (__libc_lseek64): Do real work here. * sysdeps/mach/hurd/lseek.c (__libc_lseek): Call that. * sysdeps/mach/hurd/readdir64.c (__readdir64): Do real work here. * sysdeps/mach/hurd/readdir.c (__readdir): Call that. * sysdeps/mach/hurd/readdir64_r.c (__readdir64_r): Do real work here. * sysdeps/mach/hurd/readdir_r.c (__readdir64_r): Call that. * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Use struct stat64 for io_stat argument. * sysdeps/mach/hurd/readlink.c (__readlink): Likewise. * hurd/fopenport.c (seekio): Remove EOVERFLOW check, pass POS directly to io_seek. * hurd/fd-read.c (_hurd_fd_read): Use loff_t for OFFSET argument. * hurd/fd-write.c (_hurd_fd_write): Likewise. * hurd/hurd/fd.h: Update decls. * sysdeps/mach/hurd/getcwd.c (_hurd_canonicalize_directory_name_internal): Use ino64_t and struct dirent64. * sysdeps/mach/hurd/dl-sysdep.c (open_file): Use struct stat64. (__xstat): Renamed to __xstat64, use struct stat64 for argument. (__fxstat): Renamed to __fxstat64, use struct stat64 for argument. (__lseek): Renamed to __libc_lseek64, use off64_t for argument. 2002-06-08 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/dirstream.h (struct __dirstream): Use size_t instead of unsigned long int for __allocation and __size members. 2002-05-19 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'sysdeps/mach/hurd/readdir64_r.c')
-rw-r--r--sysdeps/mach/hurd/readdir64_r.c98
1 files changed, 79 insertions, 19 deletions
diff --git a/sysdeps/mach/hurd/readdir64_r.c b/sysdeps/mach/hurd/readdir64_r.c
index 7cb40bc0cc..c26b35bb70 100644
--- a/sysdeps/mach/hurd/readdir64_r.c
+++ b/sysdeps/mach/hurd/readdir64_r.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,36 +17,96 @@
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. */
int
__readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result)
{
- struct dirent *result32;
- union
- {
- struct dirent d;
- char b[offsetof (struct dirent, d_name) + UCHAR_MAX + 1];
- } u;
- int err;
-
- err = __readdir_r (dirp, &u.d, &result32);
- if (result32)
+ struct dirent64 *dp;
+ error_t err = 0;
+
+ if (dirp == NULL)
+ {
+ errno = EINVAL;
+ return errno;
+ }
+
+ __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;
+
+ 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);
+
+ if (dp)
{
- entry->d_fileno = result32->d_fileno;
- entry->d_reclen = result32->d_reclen;
- entry->d_type = result32->d_type;
- entry->d_namlen = result32->d_namlen;
- memcpy (entry->d_name, result32->d_name, result32->d_namlen + 1);
+ *entry = *dp;
+ memcpy (entry->d_name, dp->d_name, dp->d_namlen + 1);
*result = entry;
}
else
*result = NULL;
-
- return err;
+
+ __libc_lock_unlock (dirp->__lock);
+
+ return dp ? 0 : err ? errno : 0;
}
weak_alias(__readdir64_r, readdir64_r)