components/python/python27/patches/10-closerange.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 578 4f51372decaf
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
578
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     1
--- Python-2.7.1/Modules/posixmodule.c	Fri Nov 26 09:35:50 2010
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
+++ Python-2.7.1/Modules/posixmodule.c	Fri Nov  4 09:41:24 2011
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
@@ -6442,16 +6442,34 @@
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
 "closerange(fd_low, fd_high)\n\n\
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
 Closes all file descriptors in [fd_low, fd_high), ignoring errors.");
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
 
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
+static int
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
+close_func(void *lohi, int fd)
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
+{
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
+    int lo = ((int *)lohi)[0];
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
+    int hi = ((int *)lohi)[1];
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
+
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
+    if (fd >= hi)
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
+        return (1);
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
+    else if (fd >= lo)
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    16
+        close(fd);
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    17
+
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    18
+    return (0);
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    19
+}
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    20
+
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    21
 static PyObject *
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    22
 posix_closerange(PyObject *self, PyObject *args)
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    23
 {
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    24
     int fd_from, fd_to, i;
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    25
+    int lohi[2];
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    26
+
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    27
     if (!PyArg_ParseTuple(args, "ii:closerange", &fd_from, &fd_to))
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    28
         return NULL;
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    29
     Py_BEGIN_ALLOW_THREADS
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    30
-    for (i = fd_from; i < fd_to; i++)
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    31
-        if (_PyVerify_fd(i))
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    32
-            close(i);
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    33
+
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    34
+    lohi[0] = fd_from;
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    35
+    lohi[1] = fd_to;
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    36
+    fdwalk(close_func, lohi);
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    37
+
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    38
     Py_END_ALLOW_THREADS
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    39
     Py_RETURN_NONE;
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    40
 }