Allow an @INC hook to set %INC

Message-ID: <20010928221813.A16889@rafael>

p4raw-id: //depot/perl@12260

diff --git a/pp_ctl.c b/pp_ctl.c
index 4b81fe5771cbbf0a1509530671235ea7ce5b84e3..8b320bf92a6de0f1ef1a469808db70b86994cc1e 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3323,10 +3323,14 @@ trylocal: {
        SETERRNO(0, SS$_NORMAL);
 
     /* Assume success here to prevent recursive requirement. */
-    (void)hv_store(GvHVn(PL_incgv), name, strlen(name),
-                  (hook_sv ? SvREFCNT_inc(hook_sv)
-                           : newSVpv(CopFILE(&PL_compiling), 0)),
-                  0 );
+    len = strlen(name);
+    /* Check whether a hook in @INC has already filled %INC */
+    if (!hook_sv || !(svp = hv_fetch(GvHVn(PL_incgv), name, len, 0))) {
+       (void)hv_store(GvHVn(PL_incgv), name, len,
+                      (hook_sv ? SvREFCNT_inc(hook_sv)
+                               : newSVpv(CopFILE(&PL_compiling), 0)),
+                      0 );
+    }
 
     ENTER;
     SAVETMPS;