Changes to allow compiler with gcc-2.8.1 in C++ mode,

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

diff --git a/mg.c b/mg.c
index 289dd3b..492e351 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -684,7 +684,7 @@ magic_setenv(SV *sv, MAGIC *mg)
                s++;
                if (i >= sizeof tmpbuf   /* too long -- assume the worst */
                      || *tmpbuf != '/'
-                     || (Stat(tmpbuf, &st) == 0 && (st.st_mode & 2)) ) {
+                     || (PerlLIO_stat(tmpbuf, &st) == 0 && (st.st_mode & 2)) ) {
                    MgTAINTEDDIR_on(mg);
                    return 0;
                }
@@ -954,13 +954,14 @@ magic_setnkeys(SV *sv, MAGIC *mg)
     return 0;
 }          
 
+/* caller is responsible for stack switching/cleanup */
 static int
 magic_methcall(MAGIC *mg, char *meth, I32 flags, int n, SV *val)
 {
     dSP;
 
-    PUSHMARK(sp);
-    EXTEND(sp, n);
+    PUSHMARK(SP);
+    EXTEND(SP, n);
     PUSHs(mg->mg_obj);
     if (n > 1) { 
        if (mg->mg_ptr) {
@@ -988,11 +989,13 @@ magic_methpack(SV *sv, MAGIC *mg, char *meth)
 
     ENTER;
     SAVETMPS;
+    PUSHSTACK(SI_MAGIC);
 
     if (magic_methcall(mg, meth, G_SCALAR, 2, NULL)) {
        sv_setsv(sv, *stack_sp--);
     }
 
+    POPSTACK();
     FREETMPS;
     LEAVE;
     return 0;
@@ -1010,7 +1013,12 @@ magic_getpack(SV *sv, MAGIC *mg)
 int
 magic_setpack(SV *sv, MAGIC *mg)
 {
+    dSP;
+    ENTER;
+    PUSHSTACK(SI_MAGIC);
     magic_methcall(mg, "STORE", G_SCALAR|G_DISCARD, 3, sv);
+    POPSTACK();
+    LEAVE;
     return 0;
 }
 
@@ -1024,15 +1032,17 @@ magic_clearpack(SV *sv, MAGIC *mg)
 U32
 magic_sizepack(SV *sv, MAGIC *mg)
 {         
-    dTHR;
+    dSP;
     U32 retval = 0;
 
     ENTER;
     SAVETMPS;
+    PUSHSTACK(SI_MAGIC);
     if (magic_methcall(mg, "FETCHSIZE", G_SCALAR, 2, NULL)) {
        sv = *stack_sp--;
-       retval = (U32) SvIV(sv);
+       retval = (U32) SvIV(sv)-1;
     }
+    POPSTACK();
     FREETMPS;
     LEAVE;
     return retval;
@@ -1042,12 +1052,14 @@ int magic_wipepack(SV *sv, MAGIC *mg)
 {
     dSP;
 
-    PUSHMARK(sp);
+    ENTER;
+    PUSHSTACK(SI_MAGIC);
+    PUSHMARK(SP);
     XPUSHs(mg->mg_obj);
     PUTBACK;
-
     perl_call_method("CLEAR", G_SCALAR|G_DISCARD);
-
+    POPSTACK();
+    LEAVE;
     return 0;
 }
 
@@ -1059,8 +1071,9 @@ magic_nextpack(SV *sv, MAGIC *mg, SV *key)
 
     ENTER;
     SAVETMPS;
-    PUSHMARK(sp);
-    EXTEND(sp, 2);
+    PUSHSTACK(SI_MAGIC);
+    PUSHMARK(SP);
+    EXTEND(SP, 2);
     PUSHs(mg->mg_obj);
     if (SvOK(key))
        PUSHs(key);
@@ -1069,6 +1082,7 @@ magic_nextpack(SV *sv, MAGIC *mg, SV *key)
     if (perl_call_method(meth, G_SCALAR))
        sv_setsv(key, *stack_sp--);
 
+    POPSTACK();
     FREETMPS;
     LEAVE;
     return 0;
@@ -1545,7 +1559,7 @@ magic_set(SV *sv, MAGIC *mg)
            STATUS_POSIX_SET(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
        break;
     case '!':
-       SETERRNO(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv),
+       SETERRNO(SvIOK(sv) ? SvIVX(sv) : SvOK(sv) ? sv_2iv(sv) : 0,
                 (SvIV(sv) == EVMSERR) ? 4 : vaxc$errno);
        break;
     case '<':
@@ -1801,17 +1815,13 @@ sighandler(int sig)
     HV *st;
     SV *sv, *tSv = Sv;
     CV *cv = Nullcv;
-    AV *oldstack;
     OP *myop = op;
     U32 flags = 0;
     I32 o_save_i = savestack_ix, type;
-    PERL_CONTEXT *cx;
     XPV *tXpv = Xpv;
     
     if (savestack_ix + 15 <= savestack_max)
        flags |= 1;
-    if (cxstack_ix < cxstack_max - 2)
-       flags |= 2;
     if (markstack_ptr < markstack_max - 2)
        flags |= 4;
     if (retstack_ix < retstack_max - 2)
@@ -1819,12 +1829,6 @@ sighandler(int sig)
     if (scopestack_ix < scopestack_max - 3)
        flags |= 16;
 
-    if (flags & 2) {           /* POPBLOCK may decrease cxstack too early. */
-       cxstack_ix++;           /* Protect from overwrite. */
-       cx = &cxstack[cxstack_ix];
-       type = cx->cx_type;             /* Can be during partial write. */
-       cx->cx_type = CXt_NULL;         /* Make it safe for unwind. */
-    }
     if (!psig_ptr[sig])
        die("Signal SIG%s received, but no signal handler set.\n",
            sig_name[sig]);
@@ -1859,11 +1863,6 @@ sighandler(int sig)
        goto cleanup;
     }
 
-    oldstack = curstack;
-    if (curstack != signalstack)
-       AvFILLp(signalstack) = 0;
-    SWITCHSTACK(curstack, signalstack);
-
     if(psig_name[sig]) {
        sv = SvREFCNT_inc(psig_name[sig]);
        flags |= 64;
@@ -1872,20 +1871,18 @@ sighandler(int sig)
        sv = sv_newmortal();
        sv_setpv(sv,sig_name[sig]);
     }
-    PUSHMARK(sp);
+
+    PUSHSTACK(SI_SIGNAL);
+    PUSHMARK(SP);
     PUSHs(sv);
     PUTBACK;
 
     perl_call_sv((SV*)cv, G_DISCARD);
 
-    SWITCHSTACK(signalstack, oldstack);
+    POPSTACK();
 cleanup:
     if (flags & 1)
        savestack_ix -= 8; /* Unprotect save in progress. */
-    if (flags & 2) {
-       cxstack[cxstack_ix].cx_type = type;
-       cxstack_ix -= 1;
-    }
     if (flags & 4) 
        markstack_ptr--;
     if (flags & 8)