Cleanup MakeMaker 'not in config' noise

[perl5.git] / taint.c

diff --git a/taint.c b/taint.c
index cd9e4ec..2dc43a4 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -8,13 +8,12 @@
 #include "perl.h"
 
 void
-taint_proper(f, s)
-const char *f;
-char *s;
+taint_proper(const char *f, char *s)
 {
+    dTHR;      /* just for taint */
     char *ug;
 
-    DEBUG_u(PerlIO_printf(PerlIO_stderr(),
+    DEBUG_u(PerlIO_printf(Perl_debug_log,
             "%s %d %d %d\n", s, tainted, uid, euid));
 
     if (tainted) {
@@ -32,7 +31,7 @@ char *s;
 }
 
 void
-taint_env()
+taint_env(void)
 {
     SV** svp;
     MAGIC* mg;
@@ -70,10 +69,12 @@ taint_env()
     svp = hv_fetch(GvHVn(envgv),"PATH",4,FALSE);
     if (svp && *svp) {
        if (SvTAINTED(*svp)) {
+           dTHR;
            TAINT;
            taint_proper("Insecure %s%s", "$ENV{PATH}");
        }
        if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+           dTHR;
            TAINT;
            taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
        }
@@ -83,6 +84,7 @@ taint_env()
     /* tainted $TERM is okay if it contains no metachars */
     svp = hv_fetch(GvHVn(envgv),"TERM",4,FALSE);
     if (svp && *svp && SvTAINTED(*svp)) {
+       dTHR;   /* just for taint */
        bool was_tainted = tainted;
        char *t = SvPV(*svp, na);
        char *e = t + na;
@@ -101,6 +103,7 @@ taint_env()
     for (e = misc_env; *e; e++) {
        svp = hv_fetch(GvHVn(envgv), *e, strlen(*e), FALSE);
        if (svp && *svp != &sv_undef && SvTAINTED(*svp)) {
+           dTHR;       /* just for taint */
            TAINT;
            taint_proper("Insecure $ENV{%s}%s", *e);
        }