XSLoader revisted

[p5sagit/p5-mst-13.2.git] / ext / Cwd / Cwd.xs

diff --git a/ext/Cwd/Cwd.xs b/ext/Cwd/Cwd.xs
index 6935155..3f7b93b 100644 (file)
--- a/ext/Cwd/Cwd.xs
+++ b/ext/Cwd/Cwd.xs
@@ -2,6 +2,10 @@
 #include "perl.h"
 #include "XSUB.h"
 
+#ifdef I_UNISTD
+#   include <unistd.h>
+#endif
+
 /* The realpath() implementation from OpenBSD 2.9 (realpath.c 1.4)
  * Renamed here to bsd_realpath() to avoid library conflicts.
  * --jhi 2000-06-20 */
@@ -66,15 +70,17 @@ bsd_realpath(path, resolved)
        char *resolved;
 {
 #ifdef VMS
-       return Perl_rmsexpand((char*)path, resolved, NULL, 0);
+       dTHX;
+       return Perl_rmsexpand(aTHX_ (char*)path, resolved, NULL, 0);
 #else
-       struct stat sb;
-       int fd, n, rootd, serrno;
+       int rootd, serrno;
        char *p, *q, wbuf[MAXPATHLEN];
        int symlinks = 0;
 
        /* Save the starting point. */
 #ifdef HAS_FCHDIR
+       int fd;
+
        if ((fd = open(".", O_RDONLY)) < 0) {
                (void)strcpy(resolved, ".");
                return (NULL);
@@ -116,10 +122,13 @@ loop:
        } else
                p = resolved;
 
-#ifdef HAS_LSTAT
+#if defined(HAS_LSTAT) && defined(HAS_READLINK) && defined(HAS_SYMLINK)
+    {
+       struct stat sb;
        /* Deal with the last component. */
        if (lstat(p, &sb) == 0) {
                if (S_ISLNK(sb.st_mode)) {
+                       int n;
                        if (++symlinks > MAXSYMLINKS) {
                                errno = ELOOP;
                                goto err1;
@@ -136,6 +145,7 @@ loop:
                        p = "";
                }
        }
+    }
 #endif
 
        /*
@@ -179,12 +189,22 @@ loop:
 #endif
 
        /* It's okay if the close fails, what's an fd more or less? */
+#ifdef HAS_FCHDIR
        (void)close(fd);
+#endif
        return (resolved);
 
 err1:  serrno = errno;
+#ifdef HAS_FCHDIR
        (void)fchdir(fd);
-err2:  (void)close(fd);
+#else
+       (void)chdir(wd);
+#endif
+
+err2:
+#ifdef HAS_FCHDIR
+       (void)close(fd);
+#endif
        errno = serrno;
        return (NULL);
 #endif
@@ -196,11 +216,15 @@ PROTOTYPES: ENABLE
 
 void
 fastcwd()
+PROTOTYPE: DISABLE
 PPCODE:
 {
     dXSTARG;
-    sv_getcwd(TARG);
+    getcwd_sv(TARG);
     XSprePUSH; PUSHTARG;
+#ifndef INCOMPLETE_TAINTS
+    SvTAINTED_on(TARG);
+#endif
 }
 
 void
@@ -210,30 +234,20 @@ PPCODE:
 {
     dXSTARG;
     char *path;
-    STRLEN len;
-    char *buf;
-
-    New(0, buf, MAXPATHLEN, char);
-    if (buf) {
-        buf[MAXPATHLEN] = 0;
-        if (pathsv)
-           path = SvPV(pathsv, len);
-       else {
-           path = ".";
-           len  = 1;
-       }
+    char buf[MAXPATHLEN];
 
-       if (bsd_realpath(path, buf)) {
-           sv_setpvn(TARG, buf, strlen(buf));
-           SvPOK_only(TARG);
-       }
-       else
-           sv_setsv(TARG, &PL_sv_undef);
+    path = pathsv ? SvPV_nolen(pathsv) : ".";
 
-       Safefree(buf);
+    if (bsd_realpath(path, buf)) {
+        sv_setpvn(TARG, buf, strlen(buf));
+        SvPOK_only(TARG);
+       SvTAINTED_on(TARG);
     }
     else
         sv_setsv(TARG, &PL_sv_undef);
 
     XSprePUSH; PUSHTARG;
+#ifndef INCOMPLETE_TAINTS
+    SvTAINTED_on(TARG);
+#endif
 }