Even more Todo.

[perl5.git] / taint.c

diff --git a/taint.c b/taint.c
index cdf9a7e..0f0ce98 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -5,16 +5,19 @@
  */
 
 #include "EXTERN.h"
+#define PERL_IN_TAINT_C
 #include "perl.h"
 
 void
-taint_proper(const char *f, char *s)
+Perl_taint_proper(pTHX_ const char *f, const char *s)
 {
     dTHR;      /* just for taint */
     char *ug;
 
+#ifdef HAS_SETEUID
     DEBUG_u(PerlIO_printf(Perl_debug_log,
-            "%s %d %d %d\n", s, PL_tainted, PL_uid, PL_euid));
+            "%s %d %"Uid_t_f" %"Uid_t_f"\n", s, PL_tainted, PL_uid, PL_euid));
+#endif
 
     if (PL_tainted) {
        if (!f)
@@ -26,14 +29,14 @@ taint_proper(const char *f, char *s)
        else
            ug = " while running with -T switch";
        if (!PL_unsafe)
-           croak(f, s, ug);
+           Perl_croak(aTHX_ f, s, ug);
        else if (ckWARN(WARN_TAINT))
-           warner(WARN_TAINT, f, s, ug);
+           Perl_warner(aTHX_ WARN_TAINT, f, s, ug);
     }
 }
 
 void
-taint_env(void)
+Perl_taint_env(pTHX)
 {
     SV** svp;
     MAGIC* mg;
@@ -50,6 +53,7 @@ taint_env(void)
        return;
 
 #ifdef VMS
+    {
     int i = 0;
     char name[10 + TYPE_DIGITS(int)] = "DCL$PATH";
 
@@ -71,6 +75,7 @@ taint_env(void)
        }
        i++;
     }
+  }
 #endif /* VMS */
 
     svp = hv_fetch(GvHVn(PL_envgv),"PATH",4,FALSE);