avoid nonportable example code

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

diff --git a/pp_hot.c b/pp_hot.c
index 6f0fd7c..7d39514 100644 (file)
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -163,6 +163,10 @@ PP(pp_concat)
                /* Take a copy since we're about to overwrite TARG */
                olds = s = (U8*)savepvn((char*)s, len);
            }
+           if (SvGMAGICAL(left))
+               mg_get(left);
+           else if (!SvOK(left) && SvTYPE(left) <= SVt_PVMG)
+               sv_setpv(left, "");     /* Suppress warning. */
             l = (U8*)SvPV(left, targlen);
             if (TARG != left)
                 sv_setpvn(TARG, (char*)l, targlen);
@@ -373,6 +377,7 @@ PP(pp_print)
     else
        gv = PL_defoutgv;
     if ((mg = SvTIED_mg((SV*)gv, 'q'))) {
+      had_magic:
        if (MARK == ORIGMARK) {
            /* If using default handle then we need to make space to
             * pass object as 1st arg, so move other args up ...
@@ -396,6 +401,8 @@ PP(pp_print)
     }
     if (!(io = GvIO(gv))) {
         dTHR;
+        if ((GvEGV(gv)) && (mg = SvTIED_mg((SV*)GvEGV(gv),'q')))
+            goto had_magic;
        if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
            report_evil_fh(gv, io, PL_op->op_type);
        SETERRNO(EBADF,RMS$_IFI);
@@ -1785,6 +1792,8 @@ PP(pp_subst)
        TARG = DEFSV;
        EXTEND(SP,1);
     }
+    if (SvFAKE(TARG) && SvREADONLY(TARG))
+       sv_force_normal(TARG);
     if (SvREADONLY(TARG)
        || (SvTYPE(TARG) > SVt_PVLV
            && !(SvTYPE(TARG) == SVt_PVGV && SvFAKE(TARG))))