cleanup installation of utilities on win32

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

diff --git a/doop.c b/doop.c
index 4b10dde..e527cde 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -106,7 +106,7 @@ do_join(register SV *sv, SV *del, register SV **mark, register SV **sp)
        sv_upgrade(sv, SVt_PV);
     if (SvLEN(sv) < len + items) {     /* current length is way too short */
        while (items-- > 0) {
-           if (*mark) {
+           if (*mark && !SvGMAGICAL(*mark) && SvOK(*mark)) {
                SvPV(*mark, tmplen);
                len += tmplen;
            }
@@ -474,7 +474,7 @@ do_kv(ARGSproto)
        RETURN;
 
     if (gimme == G_SCALAR) {
-       I32 i;
+       IV i;
        dTARGET;
 
        if (op->op_flags & OPf_MOD) {   /* lvalue */
@@ -483,7 +483,11 @@ do_kv(ARGSproto)
                sv_magic(TARG, Nullsv, 'k', Nullch, 0);
            }
            LvTYPE(TARG) = 'k';
-           LvTARG(TARG) = (SV*)hv;
+           if (LvTARG(TARG) != (SV*)hv) {
+               if (LvTARG(TARG))
+                   SvREFCNT_dec(LvTARG(TARG));
+               LvTARG(TARG) = SvREFCNT_inc(hv);
+           }
            PUSHs(TARG);
            RETURN;
        }
@@ -502,7 +506,7 @@ do_kv(ARGSproto)
     }
 
     /* Guess how much room we need.  hv_max may be a few too many.  Oh well. */
-    EXTEND(sp, HvMAX(hv) * (dokeys + dovalues));
+    EXTEND(SP, HvMAX(hv) * (dokeys + dovalues));
 
     PUTBACK;   /* hv_iternext and hv_iterval might clobber stack_sp */
     while (entry = realhv ? hv_iternext(hv) : avhv_iternext((AV*)hv)) {