Solaris is a bit strange, if there are no more entries in the

directory, it returns EINVAL.  Since this is against POSIX, we
hack around the problem here.  EINVAL is possible from other
readdir implementations, but only if the result buffer is too small.
since we control the size of that buffer, we should never have
that problem.

With this change Solaris passes all directory tests.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64174 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 0 deletions

diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c
index c38e303b9..a802717a1 100644
--- a/file_io/unix/dir.c
+++ b/file_io/unix/dir.c
@@ -183,6 +183,17 @@ apr_status_t apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
      */
     if(!ret && thedir->entry != retent)
         ret = APR_ENOENT;
+
+    /* Solaris is a bit strange, if there are no more entries in the
+     * directory, it returns EINVAL.  Since this is against POSIX, we
+     * hack around the problem here.  EINVAL is possible from other
+     * readdir implementations, but only if the result buffer is too small.
+     * since we control the size of that buffer, we should never have
+     * that problem.
+     */
+    if (ret == EINVAL) {
+        ret = ENOENT;
+    }
 #else
     /* We're about to call a non-thread-safe readdir() that may
        possibly set `errno', and the logic below actually cares about