X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.c;h=8ef13a328872aa0fd76bb939faee75114232ce53;hb=64f14228217abb04a437553319642d6e7a82a3e8;hp=8af7172d16dee5321b3db246a9fede5662ed1d5c;hpb=fc36a67e8855d031b2a6921819d899eb149eee2d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perl.c b/perl.c
index 8af7172..8ef13a3 100644
--- a/perl.c
+++ b/perl.c
@@ -1706,7 +1706,12 @@ SV *sv;
 	    if (retval < 0)
 		continue;
 	    if (S_ISREG(statbuf.st_mode)
-	     && cando(S_IRUSR,TRUE,&statbuf) && cando(S_IXUSR,TRUE,&statbuf)) {
+		&& cando(S_IRUSR,TRUE,&statbuf)
+#ifndef DOSISH
+		&& cando(S_IXUSR,TRUE,&statbuf)
+#endif
+		)
+	    {
 		xfound = tokenbuf;              /* bingo! */
 		break;
 	    }
@@ -2351,6 +2356,10 @@ register char **env;
 	    sv = newSVpv(s--,0);
 	    (void)hv_store(hv, *env, s - *env, sv, 0);
 	    *s = '=';
+#if defined(__BORLANDC__) && defined(USE_WIN32_RTL_ENV)
+	    /* Sins of the RTL. See note in my_setenv(). */
+	    (void)putenv(savepv(*env));
+#endif
 	}
 #endif
 #ifdef DYNAMIC_ENV_FETCH
@@ -2387,7 +2396,7 @@ init_perllib()
 #endif /* VMS */
     }
 
-/* Use the ~-expanded versions of APPLIB (undocumented),
+/* Use the ~-expanded versions of APPLLIB (undocumented),
     ARCHLIB PRIVLIB SITEARCH SITELIB and OLDARCHLIB
 */
 #ifdef APPLLIB_EXP