Changeset 391 for python/trunk/Python/dynload_shlib.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Python/dynload_shlib.c (modified) (3 diffs)

python/trunk/Python/dynload_shlib.c

@@ -28 +28 @@
 #endif
 
-#if ((defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)) \
-    || (defined(__OS2__) && defined(__KLIBC__))
+#if ((defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)) || defined(PYOS_OS2)
 #define LEAD_UNDERSCORE "_"
 #else
@@ -38 +37 @@
 const struct filedescr _PyImport_DynLoadFiletab[] = {
 #ifdef __CYGWIN__
-        {".dll", "rb", C_EXTENSION},
-        {"module.dll", "rb", C_EXTENSION},
+    {".dll", "rb", C_EXTENSION},
+    {"module.dll", "rb", C_EXTENSION},
 #else
-#if (defined(PYOS_OS2) && defined(PYCC_GCC)) || (defined(__OS2__) && defined(__KLIBC__))
-        {".pyd", "rb", C_EXTENSION},
-        {".dll", "rb", C_EXTENSION},
+#if defined(PYOS_OS2) && defined(PYCC_GCC)
+    {".pyd", "rb", C_EXTENSION},
+    {".dll", "rb", C_EXTENSION},
 #else
 #ifdef __VMS
-        {".exe", "rb", C_EXTENSION},
-        {".EXE", "rb", C_EXTENSION},
-        {"module.exe", "rb", C_EXTENSION},
-        {"MODULE.EXE", "rb", C_EXTENSION},
+    {".exe", "rb", C_EXTENSION},
+    {".EXE", "rb", C_EXTENSION},
+    {"module.exe", "rb", C_EXTENSION},
+    {"MODULE.EXE", "rb", C_EXTENSION},
 #else
-        {".so", "rb", C_EXTENSION},
-        {"module.so", "rb", C_EXTENSION},
+    {".so", "rb", C_EXTENSION},
+    {"module.so", "rb", C_EXTENSION},
 #endif
 #endif
 #endif
-        {0, 0}
+    {0, 0}
 };
 
 static struct {
-        dev_t dev;
+    dev_t dev;
 #ifdef __VMS
-        ino_t ino[3];
+    ino_t ino[3];
 #else
-        ino_t ino;
+    ino_t ino;
 #endif
-        void *handle;
+    void *handle;
 } handles[128];
 static int nhandles = 0;
@@ -72 +71 @@
 
 dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
-                                    const char *pathname, FILE *fp)
+                                    const char *pathname, FILE *fp)
 {
-        dl_funcptr p;
-        void *handle;
-        char funcname[258];
-        char pathbuf[260];
-        int dlopenflags=0;
+    dl_funcptr p;
+    void *handle;
+    char funcname[258];
+    char pathbuf[260];
+    int dlopenflags=0;
 
-        if (strchr(pathname, '/') == NULL) {
-                /* Prefix bare filename with "./" */
-                PyOS_snprintf(pathbuf, sizeof(pathbuf), "./%-.255s", pathname);
-                pathname = pathbuf;
-        }
+    if (strchr(pathname, '/') == NULL) {
+        /* Prefix bare filename with "./" */
+        PyOS_snprintf(pathbuf, sizeof(pathbuf), "./%-.255s", pathname);
+        pathname = pathbuf;
+    }
 
-        PyOS_snprintf(funcname, sizeof(funcname), 
-                      LEAD_UNDERSCORE "init%.200s", shortname);
+    PyOS_snprintf(funcname, sizeof(funcname),
+                  LEAD_UNDERSCORE "init%.200s", shortname);
 
-        if (fp != NULL) {
-                int i;
-                struct stat statb;
-                fstat(fileno(fp), &statb);
-                for (i = 0; i < nhandles; i++) {
-                        if (statb.st_dev == handles[i].dev &&
-                            statb.st_ino == handles[i].ino) {
-                                p = (dl_funcptr) dlsym(handles[i].handle,
-                                                       funcname);
-                                return p;
-                        }
-                }
-                if (nhandles < 128) {
-                        handles[nhandles].dev = statb.st_dev;
+    if (fp != NULL) {
+        int i;
+        struct stat statb;
+        fstat(fileno(fp), &statb);
+        for (i = 0; i < nhandles; i++) {
+            if (statb.st_dev == handles[i].dev &&
+                statb.st_ino == handles[i].ino) {
+                p = (dl_funcptr) dlsym(handles[i].handle,
+                                       funcname);
+                return p;
+            }
+        }
+        if (nhandles < 128) {
+            handles[nhandles].dev = statb.st_dev;
 #ifdef __VMS
-                        handles[nhandles].ino[0] = statb.st_ino[0];
-                        handles[nhandles].ino[1] = statb.st_ino[1];
-                        handles[nhandles].ino[2] = statb.st_ino[2];
+            handles[nhandles].ino[0] = statb.st_ino[0];
+            handles[nhandles].ino[1] = statb.st_ino[1];
+            handles[nhandles].ino[2] = statb.st_ino[2];
 #else
-                        handles[nhandles].ino = statb.st_ino;
+            handles[nhandles].ino = statb.st_ino;
 #endif
-                }
-        }
+        }
+    }
 
 #if !(defined(PYOS_OS2) && defined(PYCC_GCC))
-        dlopenflags = PyThreadState_GET()->interp->dlopenflags;
+    dlopenflags = PyThreadState_GET()->interp->dlopenflags;
 #endif
 
-        if (Py_VerboseFlag)
-                PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname, 
-                                  dlopenflags);
+    if (Py_VerboseFlag)
+        PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname,
+                          dlopenflags);
 
 #ifdef __VMS
-        /* VMS currently don't allow a pathname, use a logical name instead */
-        /* Concatenate 'python_module_' and shortname */
-        /* so "import vms.bar" will use the logical python_module_bar */
-        /* As C module use only one name space this is probably not a */
-        /* important limitation */
-        PyOS_snprintf(pathbuf, sizeof(pathbuf), "python_module_%-.200s", 
-                      shortname);
-        pathname = pathbuf;
+    /* VMS currently don't allow a pathname, use a logical name instead */
+    /* Concatenate 'python_module_' and shortname */
+    /* so "import vms.bar" will use the logical python_module_bar */
+    /* As C module use only one name space this is probably not a */
+    /* important limitation */
+    PyOS_snprintf(pathbuf, sizeof(pathbuf), "python_module_%-.200s",
+                  shortname);
+    pathname = pathbuf;
 #endif
 
 #if (defined(PYOS_OS2) && defined(PYCC_GCC))
-        // resolve unixroot
-        if (_realrealpath( pathname, pathbuf, sizeof(pathbuf))!=0)
-                pathname = pathbuf;
+    // resolve unixroot
+    if (_realrealpath( pathname, pathbuf, sizeof(pathbuf))!=0)
+        pathname = pathbuf;
 #endif
 
-        handle = dlopen(pathname, dlopenflags);
+    handle = dlopen(pathname, dlopenflags);
 
-        if (handle == NULL) {
-                const char *error = dlerror();
-                if (error == NULL)
-                        error = "unknown dlopen() error";
-                PyErr_SetString(PyExc_ImportError, error);
-                return NULL;
-        }
-        if (fp != NULL && nhandles < 128)
-                handles[nhandles++].handle = handle;
-        p = (dl_funcptr) dlsym(handle, funcname);
-        return p;
+    if (handle == NULL) {
+        const char *error = dlerror();
+        if (error == NULL)
+            error = "unknown dlopen() error";
+        PyErr_SetString(PyExc_ImportError, error);
+        return NULL;
+    }
+    if (fp != NULL && nhandles < 128)
+        handles[nhandles++].handle = handle;
+    p = (dl_funcptr) dlsym(handle, funcname);
+    return p;
 }