Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / sysdeps / mach / hurd / readdir64_r.c

diff --git a/sysdeps/mach/hurd/readdir64_r.c b/sysdeps/mach/hurd/readdir64_r.c
index 7cb40bc0cc8edf2b0e25efcd8cdf3f02b9141f4b..e98ada1cd151a409778c857f54cb4b880d05e65d 100644 (file)
--- 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-2016 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
@@ -12,41 +12,100 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #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)
+weak_alias (__readdir64_r, readdir64_r)