about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/readdir64.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-04-27 13:06:39 +0000
committerUlrich Drepper <drepper@redhat.com>1999-04-27 13:06:39 +0000
commit980e58323af243dd0a87f6a6eeec6f97308b46e5 (patch)
tree553907bc56fa9387a688da4efb5e9d710abefb22 /sysdeps/unix/sysv/linux/readdir64.c
parentb6a7609d56147398e6fa412fd7c7210960300505 (diff)
downloadglibc-980e58323af243dd0a87f6a6eeec6f97308b46e5.tar.gz
glibc-980e58323af243dd0a87f6a6eeec6f97308b46e5.tar.xz
glibc-980e58323af243dd0a87f6a6eeec6f97308b46e5.zip
Update.
	* include/dirent.h: Remove __getdirentries declaration, add __getdents
	and __getdents64.
	* sysdeps/unix/readdir.c: Use __getdents, not __getdirentries.
	* sysdeps/unix/readdir_r.c: Likewise.
	* sysdeps/unix/sysv/linux/readdir64.c: Likewise.
	* sysdeps/unix/sysv/linux/readdir64_r.c: Likewise.
	* sysdeps/unix/sysv/linux/getdents.c: Define __getdents, not
	__getdirentries.  Remove fourth argument.
	* sysdeps/unix/sysv/linux/getdirentries.c: New file.
	* sysdeps/unix/sysv/linux/getdirentries64.c: New file.
	* sysdeps/unix/sysv/linux/Makefile [subdir=dirent] (sysdep_routines):
	Add getdirentries and getdirentries64.
	* sysdeps/unix/sysv/linux/Dist: Add getdirentries and getdirentries64.
Diffstat (limited to 'sysdeps/unix/sysv/linux/readdir64.c')
-rw-r--r--sysdeps/unix/sysv/linux/readdir64.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c
index 710f934ebb..5a19e220aa 100644
--- a/sysdeps/unix/sysv/linux/readdir64.c
+++ b/sysdeps/unix/sysv/linux/readdir64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999 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
@@ -27,9 +27,6 @@
 
 #include <dirstream.h>
 
-extern ssize_t __getdirentries64 (int, char *, size_t, off_t *);
-
-
 /* Read a directory entry from DIRP.  */
 struct dirent64 *
 __readdir64 (DIR *dirp)
@@ -47,7 +44,6 @@ __readdir64 (DIR *dirp)
 	  /* We've emptied out our buffer.  Refill it.  */
 
 	  size_t maxread;
-	  off_t base;
 	  ssize_t bytes;
 
 #ifndef _DIRENT_HAVE_D_RECLEN
@@ -57,8 +53,7 @@ __readdir64 (DIR *dirp)
 	  maxread = dirp->allocation;
 #endif
 
-	  base = dirp->filepos;
-	  bytes = __getdirentries64 (dirp->fd, dirp->data, maxread, &base);
+	  bytes = __getdents64 (dirp->fd, dirp->data, maxread);
 	  if (bytes <= 0)
 	    {
 	      dp = NULL;