Better localisation of $_ in diagnostics.

[perl5.git] / taint.c

diff --git a/taint.c b/taint.c
index bf42ddf..620284c 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -1,7 +1,7 @@
 /*    taint.c
  *
  *    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, by Larry Wall and others
+ *    2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -61,7 +61,7 @@ Perl_taint_proper(pTHX_ const char *f, const char *s)
         else
            ug = " while running with -T switch";
        if (PL_unsafe || PL_taint_warn) {
-            if(ckWARN(WARN_TAINT))
+            if(ckWARN_d(WARN_TAINT))
                 Perl_warner(aTHX_ packWARN(WARN_TAINT), f, s, ug);
         }
         else {
@@ -82,6 +82,9 @@ Perl_taint_env(pTHX)
        "CDPATH",       /* ksh dain bramage #1 */
        "ENV",          /* ksh dain bramage #2 */
        "BASH_ENV",     /* bash dain bramage -- I guess it's contagious */
+#ifdef WIN32
+       "PERL5SHELL",   /* used for system() on Windows */
+#endif
        NULL
     };