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

Timestamp:

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

Author:

Yuri Dario

Message:

python: merged offline changes.

File:

• python/trunk/Python/sysmodule.c (modified) (3 diffs)

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) {