Add PL_ to merged file

[perl5.git] / taint.c

diff --git a/taint.c b/taint.c
index cd9e4ec..88ca8a5 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -8,31 +8,30 @@
 #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(),
-            "%s %d %d %d\n", s, tainted, uid, euid));
+    DEBUG_u(PerlIO_printf(Perl_debug_log,
+            "%s %d %d %d\n", s, PL_tainted, PL_uid, PL_euid));
 
-    if (tainted) {
-       if (euid != uid)
+    if (PL_tainted) {
+       if (PL_euid != PL_uid)
            ug = " while running setuid";
-       else if (egid != gid)
+       else if (PL_egid != PL_gid)
            ug = " while running setgid";
        else
            ug = " while running with -T switch";
-       if (!unsafe)
+       if (!PL_unsafe)
            croak(f, s, ug);
-       else if (dowarn)
+       else if (PL_dowarn)
            warn(f, s, ug);
     }
 }
 
 void
-taint_env()
+taint_env(void)
 {
     SV** svp;
     MAGIC* mg;
@@ -56,10 +55,12 @@ taint_env()
        if (!svp || *svp == &sv_undef)
            break;
        if (SvTAINTED(*svp)) {
+           dTHR;
            TAINT;
            taint_proper("Insecure %s%s", "$ENV{DCL$PATH}");
        }
        if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+           dTHR;
            TAINT;
            taint_proper("Insecure directory in %s%s", "$ENV{DCL$PATH}");
        }
@@ -67,13 +68,15 @@ taint_env()
     }
 #endif /* VMS */
 
-    svp = hv_fetch(GvHVn(envgv),"PATH",4,FALSE);
+    svp = hv_fetch(GvHVn(PL_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}");
        }
@@ -81,12 +84,13 @@ taint_env()
 
 #ifndef VMS
     /* tainted $TERM is okay if it contains no metachars */
-    svp = hv_fetch(GvHVn(envgv),"TERM",4,FALSE);
+    svp = hv_fetch(GvHVn(PL_envgv),"TERM",4,FALSE);
     if (svp && *svp && SvTAINTED(*svp)) {
-       bool was_tainted = tainted;
-       char *t = SvPV(*svp, na);
-       char *e = t + na;
-       tainted = was_tainted;
+       dTHR;   /* just for taint */
+       bool was_tainted = PL_tainted;
+       char *t = SvPV(*svp, PL_na);
+       char *e = t + PL_na;
+       PL_tainted = was_tainted;
        if (t < e && isALNUM(*t))
            t++;
        while (t < e && (isALNUM(*t) || *t == '-' || *t == ':'))
@@ -99,8 +103,9 @@ taint_env()
 #endif /* !VMS */
 
     for (e = misc_env; *e; e++) {
-       svp = hv_fetch(GvHVn(envgv), *e, strlen(*e), FALSE);
-       if (svp && *svp != &sv_undef && SvTAINTED(*svp)) {
+       svp = hv_fetch(GvHVn(PL_envgv), *e, strlen(*e), FALSE);
+       if (svp && *svp != &PL_sv_undef && SvTAINTED(*svp)) {
+           dTHR;       /* just for taint */
            TAINT;
            taint_proper("Insecure $ENV{%s}%s", *e);
        }