From: Gurusamy Sarathy <gsar@cpan.org>
Date: Sun, 27 Feb 2000 18:09:04 +0000 (+0000)
Subject: tweak change#5286 (we don't ever get to pp_glob() if we're using
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=71686f127f234c5d198d286d1c5f3e9e7a3ad450;p=p5sagit%2Fp5-mst-13.2.git

tweak change#5286 (we don't ever get to pp_glob() if we're using
the internal glob())

p4raw-link: @5286 on //depot/perl: 3a4b19e44cf4e74b7a6a58fed36ba3ca9cafc864

p4raw-id: //depot/perl@5289
---

diff --git a/pp_sys.c b/pp_sys.c
index 3429c45..ee8605c 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -356,12 +356,13 @@ PP(pp_glob)
     OP *result;
     tryAMAGICunTARGET(iter, -1);
 
+    /* Note that we only ever get here if File::Glob fails to load
+     * without at the same time croaking, for some reason, or if
+     * perl was built with PERL_EXTERNAL_GLOB */
+
     ENTER;
 
 #ifndef VMS
-    /* If we're not using an external glob, just let readdir() tainting
-     * do its thing.  Otherwise, engage paranoia mode. */
-#if defined(PERL_EXTERNAL_GLOB)
     if (PL_tainting) {
 	/*
 	 * The external globbing program may use things we can't control,
@@ -370,7 +371,6 @@ PP(pp_glob)
 	TAINT;
 	taint_proper(PL_no_security, "glob");
     }
-#endif /* PERL_EXTERNAL_GLOB */
 #endif /* !VMS */
 
     SAVESPTR(PL_last_in_gv);	/* We don't want this to be permanent. */