Fix for ithreads/stdio build

[p5sagit/p5-mst-13.2.git] / util.c

diff --git a/util.c b/util.c
index 5c5da23..29935d2 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1234,7 +1234,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 +1327,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 +1442,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 +1479,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]=='!'
@@ -3052,8 +3052,7 @@ Perl_new_struct_thread(pTHX_ struct perl_thread *t)
 
     PL_tainted = t->Ttainted;
     PL_curpm = t->Tcurpm;         /* XXX No PMOP ref count */
-    PL_nrs = newSVsv(t->Tnrs);
-    PL_rs = t->Tnrs ? SvREFCNT_inc(PL_nrs) : Nullsv;
+    PL_rs = newSVsv(t->Trs);
     PL_last_in_gv = Nullgv;
     PL_ofs_sv = t->Tofs_sv ? SvREFCNT_inc(PL_ofs_sv) : Nullsv;
     PL_defoutgv = (GV*)SvREFCNT_inc(t->Tdefoutgv);
@@ -3719,6 +3718,10 @@ Perl_getcwd_sv(pTHX_ register SV *sv)
 {
 #ifndef PERL_MICRO
 
+#ifndef INCOMPLETE_TAINTS
+    SvTAINTED_on(sv);
+#endif
+
 #ifdef HAS_GETCWD
     {
        char buf[MAXPATHLEN];