Index: fcntlmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/fcntlmodule.c,v
retrieving revision 2.34
diff -c -r2.34 fcntlmodule.c
*** fcntlmodule.c	3 Mar 2002 02:59:15 -0000	2.34
--- fcntlmodule.c	16 May 2002 11:39:03 -0000
***************
*** 98,105 ****
--- 98,153 ----
  	int ret;
  	char *str;
  	int len;
+ 	int mutate_arg = 0;
  	char buf[1024];
  
+ 	if (PyArg_ParseTuple(args, "O&iw#|i:ioctl",
+                              conv_descriptor, &fd, &code, &str, &len, &mutate_arg)) {
+ 		char *arg;
+ 
+ 		if (PyTuple_Size(args) == 3) {
+ 			/* warning goes here in 2.4 */
+ 			mutate_arg = 0;
+ 		}
+ 	       	if (mutate_arg) {
+ 			if (len <= sizeof buf) {
+ 				memcpy(buf, str, len);
+ 				arg = buf;
+ 			} 
+ 			else {
+ 				arg = str;
+ 			}
+ 		}
+ 		else {
+ 			if (len > sizeof buf) {
+ 				PyErr_SetString(PyExc_ValueError,
+ 					"ioctl string arg too long");
+ 				return NULL;
+ 			}
+ 			else {
+ 				memcpy(buf, str, len);
+ 				arg = buf;
+ 			}
+ 		}
+ 		if (buf == arg) Py_BEGIN_ALLOW_THREADS /* think array.resize() */
+ 		ret = ioctl(fd, code, arg);
+ 		if (buf == arg) Py_END_ALLOW_THREADS
+ 		if (mutate_arg && (len < sizeof buf)) {
+ 			memcpy(str, buf, len);
+ 		}
+ 		if (ret < 0) {
+ 			PyErr_SetFromErrno(PyExc_IOError);
+ 			return NULL;
+ 		}
+ 		if (mutate_arg) {
+ 			return PyInt_FromLong(ret);
+ 		}
+ 		else {
+ 			return PyString_FromStringAndSize(buf, len);
+ 		}
+ 	}
+ 
+ 	PyErr_Clear();
  	if (PyArg_ParseTuple(args, "O&is#:ioctl",
                               conv_descriptor, &fd, &code, &str, &len)) {
  		if (len > sizeof buf) {