From: Charles-François Natali <neologix@free.fr>
Date: Sun, 8 Jan 2012 19:30:47 +0000 (+0100)
Subject: Backed out changeset 36f2e236c601: For some reason, rewinddir() doesn't work as
X-Git-Tag: v3.3.0a1~455
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2840a88904e8e8e1060a686882be41362808657;p=thirdparty%2FPython%2Fcpython.git

Backed out changeset 36f2e236c601: For some reason, rewinddir() doesn't work as
it should on OpenIndiana.
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 602c4222dd1e..3c723cf28837 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -2890,7 +2890,6 @@ posix_fdlistdir(PyObject *self, PyObject *args)
         close(fd);
         return posix_error();
     }
-    rewinddir(dirp);
     if ((d = PyList_New(0)) == NULL) {
         Py_BEGIN_ALLOW_THREADS
         closedir(dirp);
@@ -2907,6 +2906,7 @@ posix_fdlistdir(PyObject *self, PyObject *args)
                 break;
             } else {
                 Py_BEGIN_ALLOW_THREADS
+                rewinddir(dirp);
                 closedir(dirp);
                 Py_END_ALLOW_THREADS
                 Py_DECREF(d);
@@ -2930,6 +2930,7 @@ posix_fdlistdir(PyObject *self, PyObject *args)
         Py_DECREF(v);
     }
     Py_BEGIN_ALLOW_THREADS
+    rewinddir(dirp);
     closedir(dirp);
     Py_END_ALLOW_THREADS