Changeset 3364 for trunk/essentials/dev-lang/python/Python

Timestamp:

May 21, 2007, 2:27:53 AM (18 years ago)

Author:

bird

Message:

In progress...

Location:

trunk/essentials/dev-lang/python/Python

Files:

• dynload_shlib.c (modified) (5 diffs)
• import.c (modified) (2 diffs)
• sysmodule.c (modified) (3 diffs)
• traceback.c (modified) (2 diffs)

trunk/essentials/dev-lang/python/Python/dynload_shlib.c

@@ -21 +21 @@
 #else
 #if defined(PYOS_OS2) && defined(PYCC_GCC)
+#ifdef __KLIBC__
+#error "kLIBC has dlfcn.h and shouldn't get here!"
+#endif
 #include "dlfcn.h"
 #endif
 #endif
 
-#if (defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)
+#if ((defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)) \
+    || (defined(__OS2__) && defined(__KLIBC__))
 #define LEAD_UNDERSCORE "_"
 #else
@@ -37 +41 @@
         {"module.dll", "rb", C_EXTENSION},
 #else
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
+#if (defined(PYOS_OS2) && defined(PYCC_GCC)) || (defined(__OS2__) && defined(__KLIBC__))
         {".pyd", "rb", C_EXTENSION},
         {".dll", "rb", C_EXTENSION},
@@ -82 +86 @@
         }
 
-        PyOS_snprintf(funcname, sizeof(funcname), 
+        PyOS_snprintf(funcname, sizeof(funcname),
                       LEAD_UNDERSCORE "init%.200s", shortname);
 
@@ -114 +118 @@
 
         if (Py_VerboseFlag)
-                PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname, 
+                PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname,
                                   dlopenflags);
 
@@ -123 +127 @@
         /* As C module use only one name space this is probably not a */
         /* important limitation */
-        PyOS_snprintf(pathbuf, sizeof(pathbuf), "python_module_%-.200s", 
+        PyOS_snprintf(pathbuf, sizeof(pathbuf), "python_module_%-.200s",
                       shortname);
         pathname = pathbuf;

trunk/essentials/dev-lang/python/Python/import.c

@@ -1475 +1475 @@
 #include <dirent.h>
 
+#elif defined(__KLIBC__)
+#include <stdlib.h>
+
 #elif defined(PYOS_OS2)
 #define INCL_DOS
@@ -1594 +1597 @@
 
 /* OS/2 */
+#elif defined(__KLIBC__)
+        char canon[MAXPATHLEN+1];
+        size_t canonlen;
+        char *p, *p2;
+
+        if (Py_GETENV("PYTHONCASEOK") != NULL)
+                return 1;
+
+        /* This resolves case differences and return and native OS/2
+           path. Unfortunately, it'll also resolve symbolic links
+           while of course will screw up a bit... */
+        if (!_realrealpath(buf, canon, sizeof(canon)))
+                return 0;
+        canonlen = strlen(canon);
+        if (canonlen < namelen)
+                return 0;
+        p = strrchr(canon, SEP);
+        p2 = strrchr(p ? p : canon, ALTSEP);
+        if (p2)
+                p = p2;
+
+        return strncmp(p ? p + 1 : canon, name, namelen) == 0;
+
 #elif defined(PYOS_OS2)
         HDIR hdir = 1;

trunk/essentials/dev-lang/python/Python/sysmodule.c

@@ -1319 +1319 @@
                         /* It's a symlink */
                         link[nr] = '\0';
-                        if (link[0] == SEP)
+                        if (IS_ABSPATH(link))
                                 argv0 = link; /* Link to absolute path */
-                        else if (strchr(link, SEP) == NULL)
+                        else if (!HAS_ANYSEP(link))
                                 ; /* Link without path */
                         else {
                                 /* Must join(dirname(argv0), link) */
                                 char *q = strrchr(argv0, SEP);
+#ifdef ALTSEP
+                                char *q2 = strrchr(q ? q : argv0, ALTSEP);
+                                if (q2)
+                                        q = q2;
+#endif
+#ifdef DRVSEP
+                                if (!q && HAS_DRV(argv0))
+                                        q = strchr(argv0, DRVSEP);
+#endif
+
                                 if (q == NULL)
                                         argv0 = link; /* argv0 without path */
@@ -1331 +1341 @@
                                         /* Must make a copy */
                                         strcpy(argv0copy, argv0);
-                                        q = strrchr(argv0copy, SEP);
+                                        q = &argv0copy[q - argv0];
                                         strcpy(q+1, link);
                                         argv0 = argv0copy;
@@ -1369 +1379 @@
 #endif
                         p = strrchr(argv0, SEP);
+#ifdef ALTSEP
+                        {
+                                char *p2 = strrchr(p ? p : argv0, ALTSEP);
+                                if (p2 != NULL)
+                                        p = p2;
+                        }
+#endif
+#ifdef DRVSEP
+                        if (p == NULL && HAS_DRV(argv0))
+                                p = strchr(argv0, DRVSEP);
+#endif
                 }
                 if (p != NULL) {

trunk/essentials/dev-lang/python/Python/traceback.c

@@ -140 +140 @@
                 PyObject *path;
                 char *tail = strrchr(filename, SEP);
+#ifdef ALTSEP
+                char *tail2 = strrchr(filename, ALTSEP);
+                if (!tail || tail2 > tail)
+                        tail = tail2;
+#endif
+#ifdef DRVSEP
+                if (!tail && HAS_DRV(filename))
+                        tail = strchr(filename, DRVSEP);
+#endif
                 if (tail == NULL)
                         tail = filename;
@@ -164 +173 @@
                                         if (strlen(namebuf) != len)
                                                 continue; /* v contains '\0' */
-                                        if (len > 0 && namebuf[len-1] != SEP)
+                                        if (len > 0 && IS_SEP(namebuf[len-1]))
                                                 namebuf[len++] = SEP;
                                         strcpy(namebuf+len, tail);