Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Two robustness patches: 

(1) In opendir(), don't call the lock-release macros; we're
manipulating list objects and that shouldn't be done in unlocked
state.

(2) Don't use posix_strint() for chmod() -- the mode_t arg might be a
64 bit int (reported by Nick Maclaren).
This commit is contained in:
Guido van Rossum 2000-03-31 00:47:28 +00:00
parent fb2789f387
commit ffd15f5255
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Modules/posixmodule.c
View File

@ -692,7 +692,18 @@ posix_chmod(self, args)
PyObject *self;
PyObject *args;
{
return posix_strint(args, "si:chmod", chmod);
char *path;
int i;
int res;
if (!PyArg_ParseTuple(args, format, &path, &i))
return NULL;
Py_BEGIN_ALLOW_THREADS
res = chmod(path, i);
Py_END_ALLOW_THREADS
if (res < 0)
return posix_error_with_filename(path);
Py_INCREF(Py_None);
return Py_None;
}
@ -998,14 +1009,11 @@ posix_listdir(self, args)
struct dirent *ep;
if (!PyArg_ParseTuple(args, "s:listdir", &name))
return NULL;
Py_BEGIN_ALLOW_THREADS
if ((dirp = opendir(name)) == NULL) {
Py_BLOCK_THREADS
return posix_error_with_filename(name);
}
if ((d = PyList_New(0)) == NULL) {
closedir(dirp);
Py_BLOCK_THREADS
return NULL;
}
while ((ep = readdir(dirp)) != NULL) {
@ -1028,7 +1036,6 @@ posix_listdir(self, args)
Py_DECREF(v);
}
closedir(dirp);
Py_END_ALLOW_THREADS
return d;