Changeset 3215

Timestamp:

Apr 25, 2007, 3:27:40 AM (18 years ago)

Author:

bird

Message:

make the standard abs_path call deal with symlinks and stopped it from shaving off the root slash when a drive letter is present.

File:

• trunk/essentials/dev-lang/perl/os2/os2.c (modified) (2 diffs)

trunk/essentials/dev-lang/perl/os2/os2.c ¶

@@ -3472 +3472 @@
         }
         if (dir == NULL) {
+#ifdef __KLIBC__
+        assert(MAXPATHLEN >= PATH_MAX);
+            if (realpath(path, p) != 0) {
+            RETVAL = p;
+        } else 
+#endif 
             if (_abspath(p, path, MAXPATHLEN) == 0) {
                 RETVAL = p;
@@ -3556 +3562 @@
         /* Remove trailing slashes */
         l = strlen(RETVAL);
-        while (l > 0 && RETVAL[l-1] == '/')
+        while (l > 0 && RETVAL[l-1] == '/' && (l > 3 || RETVAL[1] != ':'))
             l--;
         ST(0) = sv_newmortal();