X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.c;h=c5b32e342c5ade9968ef145cb7dea9a34c3c0672;hb=3de3f243803f0137ba3b3c90aff49200f1481a3d;hp=e1bf5719f7aa73b24630018b36536f2dac3c6dbf;hpb=8bfdd7d95bcb290ba639e2c88c5d4370ab8fcfc0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/util.c b/util.c
index e1bf571..c5b32e3 100644
--- a/util.c
+++ b/util.c
@@ -1227,6 +1227,9 @@ Perl_vcroak(pTHX_ const char* pat, va_list *args)
 	PL_restartop = die_where(message, msglen);
 	JMPENV_JUMP(3);
     }
+    else if (!message)
+	message = SvPVx(ERRSV, msglen);
+
     {
 #ifdef USE_SFIO
 	/* SFIO can really mess with your errno */
@@ -1234,7 +1237,7 @@ Perl_vcroak(pTHX_ const char* pat, va_list *args)
 #endif
 	PerlIO *serr = Perl_error_log;
 
-	PerlIO_write(serr, message, msglen);
+	PERL_WRITE_MSG_TO_CONSOLE(serr, message, msglen);
 	(void)PerlIO_flush(serr);
 #ifdef USE_SFIO
 	errno = e;
@@ -1327,7 +1330,7 @@ Perl_vwarn(pTHX_ const char* pat, va_list *args)
     {
 	PerlIO *serr = Perl_error_log;
 
-	PerlIO_write(serr, message, msglen);
+	PERL_WRITE_MSG_TO_CONSOLE(serr, message, msglen);
 #ifdef LEAKTEST
 	DEBUG_L(*message == '!'
 		? (xstat(message[1]=='!'
@@ -1442,7 +1445,7 @@ Perl_vwarner(pTHX_ U32  err, const char* pat, va_list* args)
         }
 	{
 	    PerlIO *serr = Perl_error_log;
-	    PerlIO_write(serr, message, msglen);
+	    PERL_WRITE_MSG_TO_CONSOLE(serr, message, msglen);
 	    (void)PerlIO_flush(serr);
 	}
         my_failure_exit();
@@ -1479,7 +1482,7 @@ Perl_vwarner(pTHX_ U32  err, const char* pat, va_list* args)
         }
 	{
 	    PerlIO *serr = Perl_error_log;
-	    PerlIO_write(serr, message, msglen);
+	    PERL_WRITE_MSG_TO_CONSOLE(serr, message, msglen);
 #ifdef LEAKTEST
 	    DEBUG_L(*message == '!'
 		? (xstat(message[1]=='!'
@@ -2285,7 +2288,8 @@ Perl_rsignal(pTHX_ int signo, Sighandler_t handler)
     return PerlProc_signal(signo, handler);
 }
 
-static int sig_trapped;
+static int sig_trapped;	/* XXX signals are process-wide anyway, so we
+			   ignore the implications of this for threading */
 
 static
 Signal_t