Sys::Syslog doesn't need ppport.h in core

[p5sagit/p5-mst-13.2.git] / mg.c

diff --git a/mg.c b/mg.c
index b9b2ca2..c603073 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -132,6 +132,39 @@ Perl_mg_magical(pTHX_ SV *sv)
     }
 }
 
+
+/* is this container magic (%ENV, $1 etc), or value magic (pos, taint etc)? */
+
+STATIC bool
+S_is_container_magic(const MAGIC *mg)
+{
+    switch (mg->mg_type) {
+    case PERL_MAGIC_bm:
+    case PERL_MAGIC_fm:
+    case PERL_MAGIC_regex_global:
+    case PERL_MAGIC_nkeys:
+#ifdef USE_LOCALE_COLLATE
+    case PERL_MAGIC_collxfrm:
+#endif
+    case PERL_MAGIC_qr:
+    case PERL_MAGIC_taint:
+    case PERL_MAGIC_vec:
+    case PERL_MAGIC_vstring:
+    case PERL_MAGIC_utf8:
+    case PERL_MAGIC_substr:
+    case PERL_MAGIC_defelem:
+    case PERL_MAGIC_arylen:
+    case PERL_MAGIC_pos:
+    case PERL_MAGIC_backref:
+    case PERL_MAGIC_arylen_p:
+    case PERL_MAGIC_rhash:
+    case PERL_MAGIC_symtab:
+       return 0;
+    default:
+       return 1;
+    }
+}
+
 /*
 =for apidoc mg_get
 
@@ -238,6 +271,8 @@ Perl_mg_set(pTHX_ SV *sv)
            mg->mg_flags &= ~MGf_GSKIP; /* setting requires another read */
            (SSPTR(mgs_ix, MGS*))->mgs_flags = 0;
        }
+       if (PL_localizing == 2 && !S_is_container_magic(mg))
+           continue;
        if (vtbl && vtbl->svt_set)
            CALL_FPTR(vtbl->svt_set)(aTHX_ sv, mg);
     }
@@ -414,30 +449,8 @@ Perl_mg_localize(pTHX_ SV *sv, SV *nsv)
     MAGIC *mg;
     for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
        const MGVTBL* const vtbl = mg->mg_virtual;
-       switch (mg->mg_type) {
-       /* value magic types: don't copy */
-       case PERL_MAGIC_bm:
-       case PERL_MAGIC_fm:
-       case PERL_MAGIC_regex_global:
-       case PERL_MAGIC_nkeys:
-#ifdef USE_LOCALE_COLLATE
-       case PERL_MAGIC_collxfrm:
-#endif
-       case PERL_MAGIC_qr:
-       case PERL_MAGIC_taint:
-       case PERL_MAGIC_vec:
-       case PERL_MAGIC_vstring:
-       case PERL_MAGIC_utf8:
-       case PERL_MAGIC_substr:
-       case PERL_MAGIC_defelem:
-       case PERL_MAGIC_arylen:
-       case PERL_MAGIC_pos:
-       case PERL_MAGIC_backref:
-       case PERL_MAGIC_arylen_p:
-       case PERL_MAGIC_rhash:
-       case PERL_MAGIC_symtab:
+       if (!S_is_container_magic(mg))
            continue;
-       }
                
        if ((mg->mg_flags & MGf_LOCAL) && vtbl->svt_local)
            (void)CALL_FPTR(vtbl->svt_local)(aTHX_ nsv, mg);
@@ -1989,13 +2002,11 @@ Perl_magic_settaint(pTHX_ SV *sv, MAGIC *mg)
 {
     dVAR;
     PERL_UNUSED_ARG(sv);
-    /* update taint status unless we're restoring at scope exit */
-    if (PL_localizing != 2) {
-       if (PL_tainted)
-           mg->mg_len |= 1;
-       else
-           mg->mg_len &= ~1;
-    }
+    /* update taint status */
+    if (PL_tainted)
+       mg->mg_len |= 1;
+    else
+       mg->mg_len &= ~1;
     return 0;
 }