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

Timestamp:

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

Author:

bird

Message:

In progress...

Location:

trunk/essentials/dev-lang/python/Modules

Files:

• getpath.c (modified) (10 diffs)
• posixmodule.c (modified) (1 diff)

trunk/essentials/dev-lang/python/Modules/getpath.c

@@ -136 +136 @@
 {
     size_t i = strlen(dir);
-    while (i > 0 && dir[i] != SEP)
+    while (i > 0 && )
         --i;
     dir[i] = '\0';
@@ -209 +209 @@
 {
     size_t n, k;
-    if (stuff[0] == SEP)
+    if ()
         n = 0;
     else {
         n = strlen(buffer);
-        if (n > 0 && buffer[n-1] != SEP && n < MAXPATHLEN)
+        if (n > 0 &&  && n < MAXPATHLEN)
             buffer[n++] = SEP;
     }
@@ -230 +230 @@
 copy_absolute(char *path, char *p)
 {
-    if (p[0] == SEP)
+    if (
         strcpy(path, p);
+
+
+
+
+
+
     else {
         getcwd(path, MAXPATHLEN);
-        if (p[0] == '.' && p[1] == SEP)
+        if (p[0] == '.' && )
             p += 2;
         joinpath(path, p);
@@ -246 +252 @@
     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 +410 @@
          * $PATH isn't exported, you lose.
          */
-        if (strchr(prog, SEP))
+        if ())
                 strncpy(progpath, prog, MAXPATHLEN);
 #ifdef __APPLE__
@@ -442 +453 @@
         else
                 progpath[0] = '\0';
-        if (progpath[0] != SEP)
+#ifndef ALTSEP
+        if (!IS_ABSPATH(progpath))
+#endif
                 absolutize(progpath);
         strncpy(argv0_path, progpath, MAXPATHLEN);
@@ -488 +501 @@
             /* It's not null terminated! */
             tmpbuffer[linklen] = '\0';
-            if (tmpbuffer[0] == SEP)
+            if ()
                 /* tmpbuffer should never be longer than MAXPATHLEN,
                    but extra check does not hurt */
@@ -553 +566 @@
 
     while (1) {
-        char *delim = strchr(defpath, DELIM);
-
-        if (defpath[0] != SEP)
+        char *delim = strchr(defpath, 
+
+        if (