mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

This is barry-scott's patch:

Browse source 
[ 1231069 ] ioctl has problem with -ive request codes

by using the 'I' not the 'i' format code to PyArg_ParseTuple().

Backport candidate?  Maybe...
This commit is contained in:
Michael W. Hudson 2005-07-27 20:24:40 +00:00
parent e452c7af77
commit 8137bea4ca
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -117,6 +117,10 @@ Core and builtins
Extension Modules
-----------------
- Patch #1231069: The fcntl.ioctl function now uses the 'I' code for
the request code argument, which results in more C-like behaviour
for large or negative values.
- Bug #1234979: For the argument of thread.Lock.acquire, the Windows
implemented treated all integer values except 1 as false.

6
Modules/fcntlmodule.c
View file

@ -102,7 +102,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
int mutate_arg = 1;
char buf[1024];
if (PyArg_ParseTuple(args, "O&iw#|i:ioctl",
if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
conv_descriptor, &fd, &code,
&str, &len, &mutate_arg)) {
char *arg;
@ -151,7 +151,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
}
PyErr_Clear();
if (PyArg_ParseTuple(args, "O&is#:ioctl",
if (PyArg_ParseTuple(args, "O&Is#:ioctl",
conv_descriptor, &fd, &code, &str, &len)) {
if (len > sizeof buf) {
PyErr_SetString(PyExc_ValueError,
@ -172,7 +172,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
PyErr_Clear();
arg = 0;
if (!PyArg_ParseTuple(args,
"O&i|i;ioctl requires a file or file descriptor,"
"O&I|i;ioctl requires a file or file descriptor,"
" an integer and optionally a integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) {
return NULL;