Support crypt_r(const char*,const char*, CRYPTD*).

[perl5.git] / taint.c

diff --git a/taint.c b/taint.c
index 9bf00bc..7914e64 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -1,3 +1,12 @@
+/*    taint.c
+ *
+ *    Copyright (c) 1997-2002, Larry Wall
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ */
+
 /*
  * "...we will have peace, when you and all your works have perished--and
  * the works of your dark master to whom you would deliver us.  You are a
@@ -13,9 +22,26 @@ Perl_taint_proper(pTHX_ const char *f, const char *s)
 {
     char *ug;
 
-#ifdef HAS_SETEUID
-    DEBUG_u(PerlIO_printf(Perl_debug_log,
-            "%s %d %"Uid_t_f" %"Uid_t_f"\n", s, PL_tainted, (Uid_t)PL_uid, (Uid_t)PL_euid));
+#if defined(HAS_SETEUID) && defined(DEBUGGING)
+#   if Uid_t_size == 1
+    {
+        UV  uid = PL_uid;
+        UV euid = PL_euid;
+
+        DEBUG_u(PerlIO_printf(Perl_debug_log,
+                              "%s %d %"UVuf" %"UVuf"\n",
+                              s, PL_tainted, uid, euid));
+    }
+#   else
+    {
+        IV  uid = PL_uid;
+        IV euid = PL_euid;
+
+        DEBUG_u(PerlIO_printf(Perl_debug_log,
+                              "%s %d %"IVdf" %"IVdf"\n",
+                              s, PL_tainted, uid, euid));
+    }
+#   endif
 #endif
 
     if (PL_tainted) {
@@ -31,7 +57,7 @@ Perl_taint_proper(pTHX_ const char *f, const char *s)
            ug = " while running with -T switch";
        if (PL_unsafe || PL_taint_warn) {
             if(ckWARN(WARN_TAINT))
-                Perl_warner(aTHX_ WARN_TAINT, f, s, ug);
+                Perl_warner(aTHX_ packWARN(WARN_TAINT), f, s, ug);
         }
         else {
             Perl_croak(aTHX_ f, s, ug);