Commit d4efbf90 authored by Benjamin Peterson's avatar Benjamin Peterson

use pep 383 decoding for mknod and mkfifo #9570

Patch by David Watson.
parent f0f45142
......@@ -30,6 +30,8 @@ Core and Builtins
Extensions
----------
- Issue #9570: Use PEP 383 decoding in os.mknod and os.mkfifo.
- Issue #6915: Under Windows, os.listdir() didn't release the Global
Interpreter Lock around all system calls. Original patch by Ryan Kelly.
......
......@@ -5702,14 +5702,18 @@ Create a FIFO (a POSIX named pipe).");
static PyObject *
posix_mkfifo(PyObject *self, PyObject *args)
{
PyObject *opath;
char *filename;
int mode = 0666;
int res;
if (!PyArg_ParseTuple(args, "s|i:mkfifo", &filename, &mode))
if (!PyArg_ParseTuple(args, "O&|i:mkfifo", PyUnicode_FSConverter, &opath,
&mode))
return NULL;
filename = PyBytes_AS_STRING(opath);
Py_BEGIN_ALLOW_THREADS
res = mkfifo(filename, mode);
Py_END_ALLOW_THREADS
Py_DECREF(opath);
if (res < 0)
return posix_error();
Py_INCREF(Py_None);
......@@ -5732,15 +5736,19 @@ os.makedev()), otherwise it is ignored.");
static PyObject *
posix_mknod(PyObject *self, PyObject *args)
{
PyObject *opath;
char *filename;
int mode = 0600;
int device = 0;
int res;
if (!PyArg_ParseTuple(args, "s|ii:mknod", &filename, &mode, &device))
if (!PyArg_ParseTuple(args, "O&|ii:mknod", PyUnicode_FSConverter, &opath,
&mode, &device))
return NULL;
filename = PyBytes_AS_STRING(opath);
Py_BEGIN_ALLOW_THREADS
res = mknod(filename, mode, device);
Py_END_ALLOW_THREADS
Py_DECREF(opath);
if (res < 0)
return posix_error();
Py_INCREF(Py_None);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment