summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2012-01-08 19:30:47 (GMT)
committerCharles-François Natali <neologix@free.fr>2012-01-08 19:30:47 (GMT)
commitf2840a88904e8e8e1060a686882be41362808657 (patch)
tree3d9f4aab8a88410d4efdd062d569735c230bfc42
parent38f425e4756142ea03267ad0790bee7417461db9 (diff)
downloadcpython-f2840a88904e8e8e1060a686882be41362808657.zip
cpython-f2840a88904e8e8e1060a686882be41362808657.tar.gz
cpython-f2840a88904e8e8e1060a686882be41362808657.tar.bz2
Backed out changeset 36f2e236c601: For some reason, rewinddir() doesn't work as
it should on OpenIndiana.
-rw-r--r--Modules/posixmodule.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 602c422..3c723cf 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