X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.c;h=f61b66d1ae4d950fe27a48ed5ec69664f6de056d;hb=c73bb82c00a639630ef310b1ac1d896f5afcedab;hp=eb51151cb50aedd77e10b60c6a063e0a692ebafe;hpb=84486fc677f94d602e0c12e9f6669da65cedcb13;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/util.c b/util.c
index eb51151..f61b66d 100644
--- a/util.c
+++ b/util.c
@@ -1289,12 +1289,12 @@ die(const char* pat, ...)
 		msg = ERRSV;
 	    }
 
-	    PUSHSTACK(SI_DIEHOOK);
+	    PUSHSTACKi(SI_DIEHOOK);
 	    PUSHMARK(SP);
 	    XPUSHs(msg);
 	    PUTBACK;
 	    perl_call_sv((SV*)cv, G_DISCARD);
-	    POPSTACK();
+	    POPSTACK;
 	    LEAVE;
 	}
     }
@@ -1343,12 +1343,12 @@ croak(const char* pat, ...)
 	    SvREADONLY_on(msg);
 	    SAVEFREESV(msg);
 
-	    PUSHSTACK(SI_DIEHOOK);
+	    PUSHSTACKi(SI_DIEHOOK);
 	    PUSHMARK(SP);
 	    XPUSHs(msg);
 	    PUTBACK;
 	    perl_call_sv((SV*)cv, G_DISCARD);
-	    POPSTACK();
+	    POPSTACK;
 	    LEAVE;
 	}
     }
@@ -1392,12 +1392,12 @@ warn(const char* pat,...)
 	    SvREADONLY_on(msg);
 	    SAVEFREESV(msg);
 
-	    PUSHSTACK(SI_WARNHOOK);
+	    PUSHSTACKi(SI_WARNHOOK);
 	    PUSHMARK(SP);
 	    XPUSHs(msg);
 	    PUTBACK;
 	    perl_call_sv((SV*)cv, G_DISCARD);
-	    POPSTACK();
+	    POPSTACK;
 	    LEAVE;
 	    return;
 	}
@@ -2562,18 +2562,21 @@ find_script(char *scriptname, bool dosearch, char **search_ext, I32 flags)
 	if (!xfound && !seen_dot && !xfailed && (PerlLIO_stat(scriptname,&statbuf) < 0))
 #endif
 	    seen_dot = 1;			/* Disable message. */
-	if (!xfound) 
-	    scriptname = NULL;
-/*	    croak("Can't %s %s%s%s",
-		  (xfailed ? "execute" : "find"),
-		  (xfailed ? xfailed : scriptname),
-		  (xfailed ? "" : " on PATH"),
-		  (xfailed || seen_dot) ? "" : ", '.' not in PATH"); */
+	if (!xfound) {
+	    if (flags & 1) {			/* do or die? */
+	        croak("Can't %s %s%s%s",
+		      (xfailed ? "execute" : "find"),
+		      (xfailed ? xfailed : scriptname),
+		      (xfailed ? "" : " on PATH"),
+		      (xfailed || seen_dot) ? "" : ", '.' not in PATH");
+	    }
+	    scriptname = Nullch;
+	}
 	if (xfailed)
 	    Safefree(xfailed);
 	scriptname = xfound;
     }
-    return scriptname;
+    return (scriptname ? savepv(scriptname) : Nullch);
 }