Changeset 10 for python/trunk/Modules/getpath.c

Timestamp:

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

Author:

Yuri Dario

Message:

python: merged offline changes.

File:

• python/trunk/Modules/getpath.c (modified) (11 diffs)

python/trunk/Modules/getpath.c

@@ -117 +117 @@
 #endif
 
+#ifndef __EMX__
 #ifndef PYTHONPATH
 #define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
               EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+#endif
+#else
+//#define PYTHONPATH    "./Lib;./Lib/plat-" PLATFORM \
+//                      ";./Lib/lib-dynload;./Lib/site-packages"
+// force unixroot
+#define PYTHONPATH PREFIX "/lib/python" VERSION ";" \
+              EXEC_PREFIX "/lib/python" VERSION "/lib-" PLATFORM ";" \
+              EXEC_PREFIX "/lib/python" VERSION "/site-packages" ";" \
+              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ";" \
+/* now local (for building) */ \
+              "./lib" ";" \
+              "./lib/plat-" PLATFORM ";" \
+              "./lib/site-packages" ";" \
+              "./lib/lib-dynload"
 #endif
 
@@ -136 +151 @@
 {
     size_t i = strlen(dir);
-    while (i > 0 && dir[i] != SEP)
+    while (i > 0 && !IS_SEP(dir[i]))
         --i;
     dir[i] = '\0';
@@ -209 +224 @@
 {
     size_t n, k;
-    if (stuff[0] == SEP)
+    if (IS_ABSPATH(stuff))
         n = 0;
     else {
         n = strlen(buffer);
-        if (n > 0 && buffer[n-1] != SEP && n < MAXPATHLEN)
+        if (n > 0 && !IS_SEP(buffer[n-1]) && n < MAXPATHLEN)
             buffer[n++] = SEP;
     }
@@ -230 +245 @@
 copy_absolute(char *path, char *p)
 {
-    if (p[0] == SEP)
+    if (IS_ABSPATH(p)) {
         strcpy(path, p);
+#ifdef ALTSEP
+        p = path;
+        while ((p = strchr(p, ALTSEP)))
+            *p++ = SEP;
+#endif
+    }
     else {
         getcwd(path, MAXPATHLEN);
-        if (p[0] == '.' && p[1] == SEP)
+        if (p[0] == '.' && IS_SEP(p[1]))
             p += 2;
         joinpath(path, p);
@@ -246 +267 @@
     char buffer[MAXPATHLEN + 1];
 
-    if (path[0] == SEP)
+    if (IS_ABSPATH(path)) {
+#ifdef ALTSEP
+        while ((path = strchr(path, ALTSEP)))
+            *path++ = SEP;
+#endif
         return;
+    }
     copy_absolute(buffer, path);
     strcpy(path, buffer);
@@ -399 +425 @@
          * $PATH isn't exported, you lose.
          */
-        if (strchr(prog, SEP))
+        if (HAS_ANYSEP(prog))
                 strncpy(progpath, prog, MAXPATHLEN);
 #ifdef __APPLE__
@@ -442 +468 @@
         else
                 progpath[0] = '\0';
-        if (progpath[0] != SEP)
+#ifndef ALTSEP
+        if (!IS_ABSPATH(progpath))
+#endif
                 absolutize(progpath);
         strncpy(argv0_path, progpath, MAXPATHLEN);
@@ -488 +516 @@
             /* It's not null terminated! */
             tmpbuffer[linklen] = '\0';
-            if (tmpbuffer[0] == SEP)
+            if (IS_ABSPATH(tmpbuffer))
                 /* tmpbuffer should never be longer than MAXPATHLEN,
                    but extra check does not hurt */
@@ -553 +581 @@
 
     while (1) {
-        char *delim = strchr(defpath, DELIM);
-
-        if (defpath[0] != SEP)
+        char *delim = strchr(defpath, ':'); /* bird: hardcoded DELIM in default path. */
+
+        if (!IS_ABSPATH(defpath))
             /* Paths are relative to prefix */
             bufsz += prefixsz;
@@ -598 +626 @@
         defpath = pythonpath;
         while (1) {
-            char *delim = strchr(defpath, DELIM);
-
-            if (defpath[0] != SEP) {
+            char *delim = strchr(defpath, ':'); /* bird: hardcoded DELIM in default path. */
+
+            if (!IS_ABSPATH(defpath)) {
                 strcat(buf, prefix);
                 strcat(buf, separator);
@@ -606 +634 @@
 
             if (delim) {
-                size_t len = delim - defpath + 1;
+                size_t len = delim - defpath;
                 size_t end = strlen(buf) + len;
                 strncat(buf, defpath, len);
-                *(buf + end) = '\0';
+                *(buf + end) = DELIM;   /* bird: correct the DELIM char. */
+                *(buf + end + 1) = '\0';
             }
             else {