linux: Add __readdir_unlocked

And use it on readdir_r implementation.

Checked on i686-linux-gnu.

diff --git a/include/dirent.h b/include/dirent.h
index fdf4c4a2f15cbfc6aaa1fee2a711e5cfb46da392..8325a19e5fb09049a631993a2cdd060240f49154 100644 (file)
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -20,6 +20,7 @@ extern DIR *__opendirat (int dfd, const char *__name) attribute_hidden;
 extern DIR *__fdopendir (int __fd) attribute_hidden;
 extern int __closedir (DIR *__dirp) attribute_hidden;
 extern struct dirent *__readdir (DIR *__dirp) attribute_hidden;
+extern struct dirent *__readdir_unlocked (DIR *__dirp) attribute_hidden;
 extern struct dirent64 *__readdir64 (DIR *__dirp);
 libc_hidden_proto (__readdir64)
 extern int __readdir_r (DIR *__dirp, struct dirent *__entry,

diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c
index 2e03e66e6967cd94a756ee02c61a585f120198eb..ca2a8964e989ccf7bb9ac7ff8394fb34a897c011 100644 (file)
--- a/sysdeps/unix/sysv/linux/readdir.c
+++ b/sysdeps/unix/sysv/linux/readdir.c
@@ -23,15 +23,11 @@
 
 /* Read a directory entry from DIRP.  */
 struct dirent *
-__readdir (DIR *dirp)
+__readdir_unlocked (DIR *dirp)
 {
   struct dirent *dp;
   int saved_errno = errno;
 
-#if IS_IN (libc)
-  __libc_lock_lock (dirp->lock);
-#endif
-
   do
     {
       size_t reclen;
@@ -75,6 +71,18 @@ __readdir (DIR *dirp)
       /* Skip deleted files.  */
     } while (dp->d_ino == 0);
 
+  return dp;
+}
+
+struct dirent *
+__readdir (DIR *dirp)
+{
+  struct dirent *dp;
+
+#if IS_IN (libc)
+  __libc_lock_lock (dirp->lock);
+#endif
+  dp = __readdir_unlocked (dirp);
 #if IS_IN (libc)
   __libc_lock_unlock (dirp->lock);
 #endif

diff --git a/sysdeps/unix/sysv/linux/readdir_r.c b/sysdeps/unix/sysv/linux/readdir_r.c
index 0069041394624e9de031d17acccca0e282ca1a7c..28cbe9b038565dd009fd1b34cc06abdbdbcc8917 100644 (file)
--- a/sysdeps/unix/sysv/linux/readdir_r.c
+++ b/sysdeps/unix/sysv/linux/readdir_r.c
@@ -25,89 +25,43 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
 {
   struct dirent *dp;
   size_t reclen;
-  const int saved_errno = errno;
-  int ret;
 
   __libc_lock_lock (dirp->lock);
 
-  do
+  while (1)
     {
-      if (dirp->offset >= dirp->size)
-       {
-         /* We've emptied out our buffer.  Refill it.  */
-
-         size_t maxread = dirp->allocation;
-         ssize_t bytes;
-
-         maxread = dirp->allocation;
-
-         bytes = __getdents (dirp->fd, dirp->data, maxread);
-         if (bytes <= 0)
-           {
-             /* On some systems getdents fails with ENOENT when the
-                open directory has been rmdir'd already.  POSIX.1
-                requires that we treat this condition like normal EOF.  */
-             if (bytes < 0 && errno == ENOENT)
-               {
-                 bytes = 0;
-                 __set_errno (saved_errno);
-               }
-             if (bytes < 0)
-               dirp->errcode = errno;
-
-             dp = NULL;
-             break;
-           }
-         dirp->size = (size_t) bytes;
-
-         /* Reset the offset into the buffer.  */
-         dirp->offset = 0;
-       }
-
-      dp = (struct dirent *) &dirp->data[dirp->offset];
+      dp = __readdir_unlocked (dirp);
+      if (dp == NULL)
+       break;
 
       reclen = dp->d_reclen;
+      if (reclen <= offsetof (struct dirent, d_name) + NAME_MAX + 1)
+       break;
 
-      dirp->offset += reclen;
-
-      dirp->filepos = dp->d_off;
-
-      if (reclen > offsetof (struct dirent, d_name) + NAME_MAX + 1)
+      /* The record is very long.  It could still fit into the caller-supplied
+        buffer if we can skip padding at the end.  */
+      size_t namelen = _D_EXACT_NAMLEN (dp);
+      if (namelen <= NAME_MAX)
        {
-         /* The record is very long.  It could still fit into the
-            caller-supplied buffer if we can skip padding at the
-            end.  */
-         size_t namelen = _D_EXACT_NAMLEN (dp);
-         if (namelen <= NAME_MAX)
-           reclen = offsetof (struct dirent, d_name) + namelen + 1;
-         else
-           {
-             /* The name is too long.  Ignore this file.  */
-             dirp->errcode = ENAMETOOLONG;
-             dp->d_ino = 0;
-             continue;
-           }
+         reclen = offsetof (struct dirent, d_name) + namelen + 1;
+         break;
        }
 
-      /* Skip deleted and ignored files.  */
+      /* The name is too long.  Ignore this file.  */
+      dirp->errcode = ENAMETOOLONG;
     }
-  while (dp->d_ino == 0);
 
   if (dp != NULL)
     {
       *result = memcpy (entry, dp, reclen);
       entry->d_reclen = reclen;
-      ret = 0;
     }
   else
-    {
-      *result = NULL;
-      ret = dirp->errcode;
-    }
+    *result = NULL;
 
   __libc_lock_unlock (dirp->lock);
 
-  return ret;
+  return dp != NULL ? 0 : dirp->errcode;
 }
 
 weak_alias (__readdir_r, readdir_r)