X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=os2%2Fos2.c;h=830d90016369eada8a290a39d0224e447d2a9bf1;hb=7d824d8e6f7cacfafe95d58fa9ab3d99bd41e854;hp=740f403d0bd972e261a3fab81a2fc80c698b7489;hpb=4d1ff10ffec86208b0da135b87c76b89e61c866e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/os2/os2.c b/os2/os2.c
index 740f403..830d900 100644
--- a/os2/os2.c
+++ b/os2/os2.c
@@ -618,14 +618,14 @@ do_spawn_ve(pTHX_ SV *really, U32 flag, U32 execf, char *inicmd, U32 addflag)
 	if (strEQ(PL_Argv[0],"/bin/sh")) 
 	    PL_Argv[0] = PL_sh_path;
 
-	if (PL_Argv[0][0] != '/' && PL_Argv[0][0] != '\\'
-	    && !(PL_Argv[0][0] && PL_Argv[0][1] == ':' 
-		 && (PL_Argv[0][2] == '/' || PL_Argv[0][2] != '\\'))
-	    ) /* will spawnvp use PATH? */
-	    TAINT_ENV();	/* testing IFS here is overkill, probably */
 	/* We should check PERL_SH* and PERLLIB_* as well? */
 	if (!really || !*(tmps = SvPV(really, n_a)))
 	    tmps = PL_Argv[0];
+	if (tmps[0] != '/' && tmps[0] != '\\'
+	    && !(tmps[0] && tmps[1] == ':' 
+		 && (tmps[2] == '/' || tmps[2] != '\\'))
+	    ) /* will spawnvp use PATH? */
+	    TAINT_ENV();	/* testing IFS here is overkill, probably */
 
       reread:
 	force_shell = 0;
@@ -1977,6 +1977,9 @@ XS(XS_Cwd_sys_cwd)
 	RETVAL = _getcwd2(p, MAXPATHLEN);
 	ST(0) = sv_newmortal();
 	sv_setpv((SV*)ST(0), RETVAL);
+#ifndef INCOMPLETE_TAINTS
+	SvTAINTED_on(ST(0));
+#endif
     }
     XSRETURN(1);
 }
@@ -2571,7 +2574,7 @@ check_emx_runtime(char **env, EXCEPTIONREGISTRATIONRECORD *preg)
     /* if (flags & FORCE_EMX_INIT_INSTALL_ATEXIT) */
     atexit(jmp_out_of_atexit);		/* Allow run of atexit() w/o exit()  */
 
-    if (!env) {				/* Fetch from the process info block */
+    if (env == NULL) {			/* Fetch from the process info block */
 	int c = 0;
 	PPIB pib;
 	PTIB tib;
@@ -2583,11 +2586,6 @@ check_emx_runtime(char **env, EXCEPTIONREGISTRATIONRECORD *preg)
 	    c++;
 	    e = e + strlen(e) + 1;
 	}
-	e = pib->pib_pchenv;
-	while (*e) {			/* Get count */
-	    c++;
-	    e = e + strlen(e) + 1;
-	}
 	New(1307, env, c + 1, char*);
 	ep = env;
 	e = pib->pib_pchenv;
@@ -2746,21 +2744,21 @@ my_flock(int handle, int o)
   if (!(_emx_env & 0x200) || !use_my) 
     return flock(handle, o);	/* Delegate to EMX. */
   
-                                        // is this a file?
+                                        /* is this a file? */
   if ((DosQueryHType(handle, &handle_type, &flag_word) != 0) ||
       (handle_type & 0xFF))
   {
     errno = EBADF;
     return -1;
   }
-                                        // set lock/unlock ranges
+                                        /* set lock/unlock ranges */
   rNull.lOffset = rNull.lRange = rFull.lOffset = 0;
   rFull.lRange = 0x7FFFFFFF;
-                                        // set timeout for blocking
+                                        /* set timeout for blocking */
   timeout = ((blocking = !(o & LOCK_NB))) ? 100 : 1;
-                                        // shared or exclusive?
+                                        /* shared or exclusive? */
   shared = (o & LOCK_SH) ? 1 : 0;
-                                        // do not block the unlock
+                                        /* do not block the unlock */
   if (o & (LOCK_UN | LOCK_SH | LOCK_EX)) {
     rc = DosSetFileLocks(handle, &rFull, &rNull, timeout, shared);
     switch (rc) {
@@ -2774,7 +2772,7 @@ my_flock(int handle, int o)
         errno = ENOLCK;
         return -1;
       case ERROR_LOCK_VIOLATION:
-        break;                          // not an error
+        break;                          /* not an error */
       case ERROR_INVALID_PARAMETER:
       case ERROR_ATOMIC_LOCK_NOT_SUPPORTED:
       case ERROR_READ_LOCKS_NOT_SUPPORTED:
@@ -2788,9 +2786,9 @@ my_flock(int handle, int o)
         return -1;
     }
   }
-                                        // lock may block
+                                        /* lock may block */
   if (o & (LOCK_SH | LOCK_EX)) {
-                                        // for blocking operations
+                                        /* for blocking operations */
     for (;;) {
       rc =
         DosSetFileLocks(
@@ -2828,7 +2826,7 @@ my_flock(int handle, int o)
           errno = EINVAL;
           return -1;
       }
-                                        // give away timeslice
+                                        /* give away timeslice */
       DosSleep(1);
     }
   }
@@ -2882,7 +2880,7 @@ my_getpwent (void)
   if (!use_my_pwent())
     return getpwent();			/* Delegate to EMX. */
   if (pwent_cnt++)
-    return 0;				// Return one entry only
+    return 0;				/* Return one entry only */
   return getpwuid(0);
 }
 
@@ -2903,7 +2901,7 @@ struct group *
 getgrent (void)
 {
   if (grent_cnt++)
-    return 0;				// Return one entry only
+    return 0;				/* Return one entry only */
   return getgrgid(0);
 }