Page MenuHomeFreeBSD
Differential D2637 Diff 6664 lang/python27/files/patch-Modules__fcntlmodule.c

Changeset View

Standalone View

View Options

lang/python27/files/patch-Modules__fcntlmodule.c

--- ./Modules/fcntlmodule.c.orig 2014-07-03 21:57:10.429953240 +1000 --- ./Modules/fcntlmodule.c.orig 2014-07-03 21:57:10.429953240 +1000
+++ ./Modules/fcntlmodule.c 2014-07-03 21:59:36.517210444 +1000 +++ ./Modules/fcntlmodule.c 2014-07-03 21:59:36.517210444 +1000
@@ -98,20 +98,15 @@ @@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *ar
{ {
#define IOCTL_BUFSZ 1024 #define IOCTL_BUFSZ 1024
mvaUnsubmitted
Done
Inline Actions

Avoid timestamp changes

mva: Avoid timestamp changes
int fd; int fd;
- /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I' - /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
+ /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k' + /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
format for the 'code' parameter because Python turns 0x8000000 format for the 'code' parameter because Python turns 0x8000000
into either a large positive number (PyLong or PyInt on 64-bit into either a large positive number (PyLong or PyInt on 64-bit
platforms) or a negative number on others (32-bit PyInt) platforms) or a negative number on others (32-bit PyInt)
whereas the system expects it to be a 32bit bit field value whereas the system expects it to be a 32bit bit field value
regardless of it being passed as an int or unsigned long on regardless of it being passed as an int or unsigned long on
- various platforms. See the termios.TIOCSWINSZ constant across - various platforms. See the termios.TIOCSWINSZ constant across
- platforms for an example of this. - platforms for an example of this.
- -
- If any of the 64bit platforms ever decide to use more than 32bits - If any of the 64bit platforms ever decide to use more than 32bits
- in their unsigned long ioctl codes this will break and need - in their unsigned long ioctl codes this will break and need
- special casing based on the platform being built on. - special casing based on the platform being built on.
+ various platforms. + various platforms.
*/ */
- unsigned int code; - unsigned int code;
+ unsigned long code; + unsigned long code;
int arg; int arg;
int ret; int ret;
char *str; char *str;
@@ -119,7 +114,7 @@ @@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
int mutate_arg = 1; int mutate_arg = 1;
char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */ char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */
- if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl", - if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
+ if (PyArg_ParseTuple(args, "O&kw#|i:ioctl", + if (PyArg_ParseTuple(args, "O&kw#|i:ioctl",
conv_descriptor, &fd, &code, conv_descriptor, &fd, &code,
&str, &len, &mutate_arg)) { &str, &len, &mutate_arg)) {
char *arg; char *arg;
@@ -170,7 +165,7 @@ @@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
} }
PyErr_Clear(); PyErr_Clear();
- if (PyArg_ParseTuple(args, "O&Is#:ioctl", - if (PyArg_ParseTuple(args, "O&Is#:ioctl",
+ if (PyArg_ParseTuple(args, "O&ks#:ioctl", + if (PyArg_ParseTuple(args, "O&ks#:ioctl",
conv_descriptor, &fd, &code, &str, &len)) { conv_descriptor, &fd, &code, &str, &len)) {
if (len > IOCTL_BUFSZ) { if (len > IOCTL_BUFSZ) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
@@ -192,7 +187,7 @@ @@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
PyErr_Clear(); PyErr_Clear();
arg = 0; arg = 0;
if (!PyArg_ParseTuple(args, if (!PyArg_ParseTuple(args,
- "O&I|i;ioctl requires a file or file descriptor," - "O&I|i;ioctl requires a file or file descriptor,"
+ "O&k|i;ioctl requires a file or file descriptor," + "O&k|i;ioctl requires a file or file descriptor,"
" an integer and optionally an integer or buffer argument", " an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) { conv_descriptor, &fd, &code, &arg)) {
return NULL; return NULL;