Changeset 10 for python/trunk/Python/import.c

Timestamp:

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

Author:

Yuri Dario

Message:

python: merged offline changes.

File:

• python/trunk/Python/import.c (modified) (2 diffs)

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;