Changeset 10 for python/trunk/Python

Timestamp:

Sep 3, 2010, 5:33:06 PM (15 years ago)

Author:

Yuri Dario

Message:

python: merged offline changes.

Location:

python/trunk/Python

Files:

• dynload_shlib.c (modified) (3 diffs)
• import.c (modified) (2 diffs)
• pystrtod.c (modified) (3 diffs)
• sysmodule.c (modified) (3 diffs)
• traceback.c (modified) (1 diff)

python/trunk/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},
@@ -128 +132 @@
 #endif
 
+#if (defined(PYOS_OS2) && defined(PYCC_GCC))
+        // resolve unixroot
+        if (_realrealpath( pathname, pathbuf, sizeof(pathbuf))!=0)
+                pathname = pathbuf;
+#endif
+
         handle = dlopen(pathname, dlopenflags);
 

python/trunk/Python/import.c

@@ -1564 +1564 @@
 #include <dirent.h>
 
+#elif defined(__KLIBC__)
+#include <stdlib.h>
+
 #elif defined(PYOS_OS2)
 #define INCL_DOS
@@ -1683 +1686 @@
 
 /* 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;

python/trunk/Python/pystrtod.c

@@ -3 +3 @@
 #include <Python.h>
 #include <locale.h>
+#ifdef __EMX__
+#include <float.h>
+#endif
+
 
 /* ascii character tests (as opposed to locale tests) */
@@ -41 +45 @@
 PyOS_ascii_strtod(const char *nptr, char **endptr)
 {
+#ifdef __EMX__
+_control87(MCW_EM, MCW_EM);
+#endif
         char *fail_pos;
         double val = -1.0;
@@ -173 +180 @@
         }
         else {
+//sigfpe here
                 val = strtod(digits_pos, &fail_pos);
         }

python/trunk/Python/sysmodule.c

@@ -1556 +1556 @@
                         /* 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 */
@@ -1568 +1578 @@
                                         /* Must make a copy */
                                         strcpy(argv0copy, argv0);
-                                        q = strrchr(argv0copy, SEP);
+                                        q = &argv0copy[q - argv0];
                                         strcpy(q+1, link);
                                         argv0 = argv0copy;
@@ -1609 +1619 @@
 #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) {

python/trunk/Python/traceback.c

@@ -158 +158 @@
                                         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);