Mingw32 PERL_OBJECT tweaks

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

diff --git a/pp_hot.c b/pp_hot.c
index 62a4ef7..823da44 100644 (file)
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -284,7 +284,7 @@ PP(pp_pushre)
     Copy(&PL_op, &LvTARGOFF(sv), 1, OP*);
     XPUSHs(sv);
 #else
-    XPUSHs((SV*)op);
+    XPUSHs((SV*)PL_op);
 #endif
     RETURN;
 }
@@ -700,27 +700,27 @@ PP(pp_aassign)
     if (PL_delaymagic & ~DM_DELAY) {
        if (PL_delaymagic & DM_UID) {
 #ifdef HAS_SETRESUID
-           (void)setresuid(uid,euid,(Uid_t)-1);
+           (void)setresuid(PL_uid,PL_euid,(Uid_t)-1);
 #else
 #  ifdef HAS_SETREUID
            (void)setreuid(PL_uid,PL_euid);
 #  else
 #    ifdef HAS_SETRUID
-           if ((delaymagic & DM_UID) == DM_RUID) {
-               (void)setruid(uid);
-               delaymagic &= ~DM_RUID;
+           if ((PL_delaymagic & DM_UID) == DM_RUID) {
+               (void)setruid(PL_uid);
+               PL_delaymagic &= ~DM_RUID;
            }
 #    endif /* HAS_SETRUID */
 #    ifdef HAS_SETEUID
-           if ((delaymagic & DM_UID) == DM_EUID) {
-               (void)seteuid(uid);
-               delaymagic &= ~DM_EUID;
+           if ((PL_delaymagic & DM_UID) == DM_EUID) {
+               (void)seteuid(PL_uid);
+               PL_delaymagic &= ~DM_EUID;
            }
 #    endif /* HAS_SETEUID */
-           if (delaymagic & DM_UID) {
-               if (uid != euid)
+           if (PL_delaymagic & DM_UID) {
+               if (PL_uid != PL_euid)
                    DIE("No setreuid available");
-               (void)PerlProc_setuid(uid);
+               (void)PerlProc_setuid(PL_uid);
            }
 #  endif /* HAS_SETREUID */
 #endif /* HAS_SETRESUID */
@@ -729,27 +729,27 @@ PP(pp_aassign)
        }
        if (PL_delaymagic & DM_GID) {
 #ifdef HAS_SETRESGID
-           (void)setresgid(gid,egid,(Gid_t)-1);
+           (void)setresgid(PL_gid,PL_egid,(Gid_t)-1);
 #else
 #  ifdef HAS_SETREGID
            (void)setregid(PL_gid,PL_egid);
 #  else
 #    ifdef HAS_SETRGID
-           if ((delaymagic & DM_GID) == DM_RGID) {
-               (void)setrgid(gid);
-               delaymagic &= ~DM_RGID;
+           if ((PL_delaymagic & DM_GID) == DM_RGID) {
+               (void)setrgid(PL_gid);
+               PL_delaymagic &= ~DM_RGID;
            }
 #    endif /* HAS_SETRGID */
 #    ifdef HAS_SETEGID
-           if ((delaymagic & DM_GID) == DM_EGID) {
-               (void)setegid(gid);
-               delaymagic &= ~DM_EGID;
+           if ((PL_delaymagic & DM_GID) == DM_EGID) {
+               (void)setegid(PL_gid);
+               PL_delaymagic &= ~DM_EGID;
            }
 #    endif /* HAS_SETEGID */
-           if (delaymagic & DM_GID) {
-               if (gid != egid)
+           if (PL_delaymagic & DM_GID) {
+               if (PL_gid != PL_egid)
                    DIE("No setregid available");
-               (void)PerlProc_setgid(gid);
+               (void)PerlProc_setgid(PL_gid);
            }
 #  endif /* HAS_SETREGID */
 #endif /* HAS_SETRESGID */
@@ -853,8 +853,6 @@ PP(pp_match)
            }
        }
     }
-    if (!rx->nparens && !global)
-       gimme = G_SCALAR;                       /* accidental array context? */
     safebase = (((gimme == G_ARRAY) || global || !rx->nparens)
                && !PL_sawampersand);
     safebase = safebase ? 0  : REXEC_COPY_STR ;
@@ -958,6 +956,8 @@ play_it_again:
            PUTBACK;                    /* EVAL blocks may use stack */
            goto play_it_again;
        }
+       else if (!iters)
+           XPUSHs(&PL_sv_yes);
        LEAVE_SCOPE(oldsave);
        RETURN;
     }
@@ -1590,7 +1590,9 @@ PP(pp_subst)
        DIE("panic: do_subst");
 
     strend = s + len;
-    maxiters = (strend - s) + 10;
+    maxiters = 2*(strend - s) + 10;    /* We can match twice at each 
+                                          position, once with zero-length,
+                                          second time with non-zero. */
 
     if (!rx->prelen && PL_curpm) {
        pm = PL_curpm;