X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.c;h=4b46ec45731b98fe63b3de2ca5d188c8bc583506;hb=43cc1d52f97c5f21f3207f045444707e7be33927;hp=555c7a121ae63859d5fc4089e9e0e6ff0e4a4a73;hpb=748a93069b3d16374a9859d1456065dd3ae11394;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.c b/mg.c
index 555c7a1..4b46ec4 100644
--- a/mg.c
+++ b/mg.c
@@ -21,6 +21,59 @@
 #endif
 */
 
+/*
+ * Use the "DESTRUCTOR" scope cleanup to reinstate magic.
+ */
+
+struct magic_state {
+    SV* mgs_sv;
+    U32 mgs_flags;
+};
+typedef struct magic_state MGS;
+
+static void restore_magic _((void *p));
+
+static MGS *
+save_magic(sv)
+SV* sv;
+{
+    MGS* mgs;
+
+    assert(SvMAGICAL(sv));
+
+    mgs = (MGS*)safemalloc(sizeof(MGS));
+    mgs->mgs_sv = sv;
+    mgs->mgs_flags = SvMAGICAL(sv) | SvREADONLY(sv);
+    SAVEDESTRUCTOR(restore_magic, mgs);
+
+    SvMAGICAL_off(sv);
+    SvREADONLY_off(sv);
+    SvFLAGS(sv) |= (SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
+
+    return mgs;
+}
+
+static void
+restore_magic(p)
+void* p;
+{
+    MGS *mgs = (MGS*)p;
+    SV* sv = mgs->mgs_sv;
+
+    if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv))
+    {
+	if (mgs->mgs_flags)
+	    SvFLAGS(sv) |= mgs->mgs_flags;
+	else
+	    mg_magical(sv);
+	if (SvGMAGICAL(sv))
+	    SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK);
+    }
+
+    safefree((void *)mgs);
+}
+
+
 void
 mg_magical(sv)
 SV* sv;
@@ -43,30 +96,28 @@ int
 mg_get(sv)
 SV* sv;
 {
+    MGS* mgs;
     MAGIC* mg;
-    U32 savemagic = SvMAGICAL(sv) | SvREADONLY(sv);
+    MAGIC** mgp;
 
-    assert(SvGMAGICAL(sv));
-    SvMAGICAL_off(sv);
-    SvREADONLY_off(sv);
-    SvFLAGS(sv) |= (SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
+    ENTER;
+    mgs = save_magic(sv);
 
-    for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
+    mgp = &SvMAGIC(sv);
+    while ((mg = *mgp) != 0) {
 	MGVTBL* vtbl = mg->mg_virtual;
 	if (!(mg->mg_flags & MGf_GSKIP) && vtbl && vtbl->svt_get) {
 	    (*vtbl->svt_get)(sv, mg);
-	    if (mg->mg_flags & MGf_GSKIP)
-		savemagic = 0;
+	    /* Ignore this magic if it's been deleted */
+	    if (*mgp == mg && (mg->mg_flags & MGf_GSKIP))
+		mgs->mgs_flags = 0;
 	}
+	/* Advance to next magic (complicated by possible deletion) */
+	if (*mgp == mg)
+	    mgp = &mg->mg_moremagic;
     }
 
-    if (savemagic)
-	SvFLAGS(sv) |= savemagic;
-    else
-	mg_magical(sv);
-    if (SvGMAGICAL(sv))
-	SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK);
-
+    LEAVE;
     return 0;
 }
 
@@ -74,32 +125,25 @@ int
 mg_set(sv)
 SV* sv;
 {
+    MGS* mgs;
     MAGIC* mg;
     MAGIC* nextmg;
-    U32 savemagic = SvMAGICAL(sv);
 
-    SvMAGICAL_off(sv);
+    ENTER;
+    mgs = save_magic(sv);
 
     for (mg = SvMAGIC(sv); mg; mg = nextmg) {
 	MGVTBL* vtbl = mg->mg_virtual;
 	nextmg = mg->mg_moremagic;	/* it may delete itself */
 	if (mg->mg_flags & MGf_GSKIP) {
 	    mg->mg_flags &= ~MGf_GSKIP;	/* setting requires another read */
-	    savemagic = 0;
+	    mgs->mgs_flags = 0;
 	}
 	if (vtbl && vtbl->svt_set)
 	    (*vtbl->svt_set)(sv, mg);
     }
 
-    if (SvMAGIC(sv)) {
-	if (savemagic)
-	    SvFLAGS(sv) |= savemagic;
-	else
-	    mg_magical(sv);
-	if (SvGMAGICAL(sv))
-	    SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK);
-    }
-
+    LEAVE;
     return 0;
 }
 
@@ -114,18 +158,11 @@ SV* sv;
     for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
 	MGVTBL* vtbl = mg->mg_virtual;
 	if (vtbl && vtbl->svt_len) {
-	    U32 savemagic = SvMAGICAL(sv);
-
-	    SvMAGICAL_off(sv);
-	    SvFLAGS(sv) |= (SvFLAGS(sv)&(SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
-
+	    ENTER;
+	    save_magic(sv);
 	    /* omit MGf_GSKIP -- not changed here */
 	    len = (*vtbl->svt_len)(sv, mg);
-
-	    SvFLAGS(sv) |= savemagic;
-	    if (SvGMAGICAL(sv))
-		SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK);
-
+	    LEAVE;
 	    return len;
 	}
     }
@@ -139,10 +176,9 @@ mg_clear(sv)
 SV* sv;
 {
     MAGIC* mg;
-    U32 savemagic = SvMAGICAL(sv);
 
-    SvMAGICAL_off(sv);
-    SvFLAGS(sv) |= (SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
+    ENTER;
+    save_magic(sv);
 
     for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
 	MGVTBL* vtbl = mg->mg_virtual;
@@ -152,10 +188,7 @@ SV* sv;
 	    (*vtbl->svt_clear)(sv, mg);
     }
 
-    SvFLAGS(sv) |= savemagic;
-    if (SvGMAGICAL(sv))
-	SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK);
-
+    LEAVE;
     return 0;
 }
 
@@ -177,7 +210,7 @@ mg_copy(sv, nsv, key, klen)
 SV* sv;
 SV* nsv;
 char *key;
-STRLEN klen;
+I32 klen;
 {
     int count = 0;
     MAGIC* mg;
@@ -202,7 +235,10 @@ SV* sv;
 	if (vtbl && vtbl->svt_free)
 	    (*vtbl->svt_free)(sv, mg);
 	if (mg->mg_ptr && mg->mg_type != 'g')
-	    Safefree(mg->mg_ptr);
+	    if (mg->mg_len >= 0)
+		Safefree(mg->mg_ptr);
+	    else if (mg->mg_len == HEf_SVKEY)
+		SvREFCNT_dec((SV*)mg->mg_ptr);
 	if (mg->mg_flags & MGf_REFCOUNTED)
 	    SvREFCNT_dec(mg->mg_obj);
 	Safefree(mg);
@@ -299,6 +335,30 @@ MAGIC *mg;
     case '\004':		/* ^D */
 	sv_setiv(sv,(I32)(debug & 32767));
 	break;
+    case '\005':  /* ^E */
+#ifdef VMS
+	{
+#	    include <descrip.h>
+#	    include <starlet.h>
+	    char msg[255];
+	    $DESCRIPTOR(msgdsc,msg);
+	    sv_setnv(sv,(double)vaxc$errno);
+	    if (sys$getmsg(vaxc$errno,&msgdsc.dsc$w_length,&msgdsc,0,0) & 1)
+		sv_setpvn(sv,msgdsc.dsc$a_pointer,msgdsc.dsc$w_length);
+	    else
+		sv_setpv(sv,"");
+	}
+#else
+#ifdef OS2
+	sv_setnv(sv,(double)Perl_rc);
+	sv_setpv(sv, os2error(Perl_rc));
+#else
+	sv_setnv(sv,(double)errno);
+	sv_setpv(sv, errno ? Strerror(errno) : "");
+#endif
+#endif
+	SvNOK_on(sv);	/* what a wonderful hack! */
+	break;
     case '\006':		/* ^F */
 	sv_setiv(sv,(I32)maxsysfd);
 	break;
@@ -311,11 +371,18 @@ MAGIC *mg;
 	else
 	    sv_setsv(sv,&sv_undef);
 	break;
+    case '\017':		/* ^O */
+	sv_setpv(sv,osname);
+	break;
     case '\020':		/* ^P */
 	sv_setiv(sv,(I32)perldb);
 	break;
     case '\024':		/* ^T */
+#ifdef BIG_TIME
+ 	sv_setnv(sv,basetime);
+#else
 	sv_setiv(sv,(I32)basetime);
+#endif
 	break;
     case '\027':		/* ^W */
 	sv_setiv(sv,(I32)dowarn);
@@ -323,7 +390,7 @@ MAGIC *mg;
     case '1': case '2': case '3': case '4':
     case '5': case '6': case '7': case '8': case '9': case '&':
 	if (curpm) {
-	    paren = atoi(GvENAME(mg->mg_obj));
+	    paren = atoi(GvENAME((GV*)mg->mg_obj));
 	  getparen:
 	    if (curpm->op_pmregexp &&
 	      paren <= curpm->op_pmregexp->nparens &&
@@ -428,8 +495,21 @@ MAGIC *mg;
 	sv_setpv(sv,ofmt);
 	break;
     case '!':
+#ifdef VMS
+	sv_setnv(sv,(double)((errno == EVMSERR) ? vaxc$errno : errno));
+	sv_setpv(sv, errno ? Strerror(errno) : "");
+#else
+	{
+	int saveerrno = errno;
 	sv_setnv(sv,(double)errno);
+#ifdef OS2
+	if (errno == errno_isOS2) sv_setpv(sv, os2error(Perl_rc));
+	else
+#endif
 	sv_setpv(sv, errno ? Strerror(errno) : "");
+	errno = saveerrno;
+	}
+#endif
 	SvNOK_on(sv);	/* what a wonderful hack! */
 	break;
     case '<':
@@ -489,23 +569,25 @@ SV* sv;
 MAGIC* mg;
 {
     register char *s;
+    char *ptr;
     STRLEN len;
     I32 i;
     s = SvPV(sv,len);
-    my_setenv(mg->mg_ptr,s);
+    ptr = (mg->mg_len == HEf_SVKEY) ? SvPV((SV*)mg->mg_ptr, na) : mg->mg_ptr;
+    my_setenv(ptr, s);
 #ifdef DYNAMIC_ENV_FETCH
      /* We just undefd an environment var.  Is a replacement */
      /* waiting in the wings? */
     if (!len) {
-	SV **envsvp;
-	if (envsvp = hv_fetch(GvHVn(envgv),mg->mg_ptr,mg->mg_len,FALSE))
-	    s = SvPV(*envsvp,len);
+	HE *envhe;
+	if (envhe = hv_fetch_ent(GvHVn(envgv),HeSVKEY((HE*)(mg->mg_ptr)),FALSE,0))
+	    s = SvPV(HeVAL(envhe),len);
     }
 #endif
 			    /* And you'll never guess what the dog had */
 			    /*   in its mouth... */
     if (tainting) {
-	if (s && strEQ(mg->mg_ptr,"PATH")) {
+	if (s && strEQ(ptr,"PATH")) {
 	    char *strend = s + len;
 
 	    while (s < strend) {
@@ -525,7 +607,99 @@ magic_clearenv(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    my_setenv(mg->mg_ptr,Nullch);
+    my_setenv(((mg->mg_len == HEf_SVKEY) ?
+	       SvPV((SV*)mg->mg_ptr, na) : mg->mg_ptr),Nullch);
+    return 0;
+}
+
+#ifdef HAS_SIGACTION
+/* set up reliable signal() clone */
+
+typedef void (*Sigfunc) _((int));
+
+static
+Sigfunc rsignal(signo,handler)
+int signo;
+Sigfunc handler;
+{
+    struct sigaction act,oact;
+    
+    act.sa_handler = handler;
+    sigemptyset(&act.sa_mask);
+    act.sa_flags = 0;
+#ifdef SA_RESTART
+    act.sa_flags |= SA_RESTART;	/* SVR4, 4.3+BSD */
+#endif
+    if (sigaction(signo, &act, &oact) < 0)
+    	return(SIG_ERR);
+    else
+    	return(oact.sa_handler);
+}
+
+#else
+
+/* ah well, so much for reliability */
+
+#define rsignal(x,y) signal(x,y)
+
+#endif
+
+static sig_trapped;
+static
+Signal_t
+sig_trap(signo)
+int signo;
+{
+    sig_trapped++;
+}
+int
+magic_getsig(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    I32 i;
+    /* Are we fetching a signal entry? */
+    i = whichsig(mg->mg_ptr);
+    if (i) {
+    	if(psig_ptr[i])
+    	    sv_setsv(sv,psig_ptr[i]);
+    	else {
+    	    void (*origsig)(int);
+    	    /* get signal state without losing signals */
+    	    sig_trapped=0;
+    	    origsig = rsignal(i,sig_trap);
+    	    rsignal(i,origsig);
+    	    if(sig_trapped)
+    	    	kill(getpid(),i);
+    	    /* cache state so we don't fetch it again */
+    	    if(origsig == SIG_IGN)
+    	    	sv_setpv(sv,"IGNORE");
+    	    else
+    	    	sv_setsv(sv,&sv_undef);
+    	    psig_ptr[i] = SvREFCNT_inc(sv);
+    	    SvTEMP_off(sv);
+    	}
+    }
+    return 0;
+}
+int
+magic_clearsig(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    I32 i;
+    /* Are we clearing a signal entry? */
+    i = whichsig(mg->mg_ptr);
+    if (i) {
+    	if(psig_ptr[i]) {
+    	    SvREFCNT_dec(psig_ptr[i]);
+    	    psig_ptr[i]=0;
+    	}
+    	if(psig_name[i]) {
+    	    SvREFCNT_dec(psig_name[i]);
+    	    psig_name[i]=0;
+    	}
+    }
     return 0;
 }
 
@@ -538,7 +712,7 @@ MAGIC* mg;
     I32 i;
     SV** svp;
 
-    s = mg->mg_ptr;
+    s = (mg->mg_len == HEf_SVKEY) ? SvPV((SV*)mg->mg_ptr, na) : mg->mg_ptr;
     if (*s == '_') {
 	if (strEQ(s,"__DIE__"))
 	    svp = &diehook;
@@ -549,6 +723,10 @@ MAGIC* mg;
 	else
 	    croak("No such hook: %s", s);
 	i = 0;
+	if (*svp) {
+	    SvREFCNT_dec(*svp);
+	    *svp = 0;
+	}
     }
     else {
 	i = whichsig(s);	/* ...no, a brick */
@@ -557,10 +735,18 @@ MAGIC* mg;
 		warn("No such signal: SIG%s", s);
 	    return 0;
 	}
+        if(psig_ptr[i])
+   	    SvREFCNT_dec(psig_ptr[i]);
+	psig_ptr[i] = SvREFCNT_inc(sv);
+	if(psig_name[i])
+	    SvREFCNT_dec(psig_name[i]);
+	psig_name[i] = newSVpv(mg->mg_ptr,strlen(mg->mg_ptr));
+	SvTEMP_off(sv); /* Make sure it doesn't go away on us */
+	SvREADONLY_on(psig_name[i]);
     }
     if (SvTYPE(sv) == SVt_PVGV || SvROK(sv)) {
 	if (i)
-	    (void)signal(i,sighandler);
+	    (void)rsignal(i,sighandler);
 	else
 	    *svp = SvREFCNT_inc(sv);
 	return 0;
@@ -568,13 +754,13 @@ MAGIC* mg;
     s = SvPV_force(sv,na);
     if (strEQ(s,"IGNORE")) {
 	if (i)
-	    (void)signal(i,SIG_IGN);
+	    (void)rsignal(i,SIG_IGN);
 	else
 	    *svp = 0;
     }
     else if (strEQ(s,"DEFAULT") || !*s) {
 	if (i)
-	    (void)signal(i,SIG_DFL);
+	    (void)rsignal(i,SIG_DFL);
 	else
 	    *svp = 0;
     }
@@ -584,7 +770,7 @@ MAGIC* mg;
 	    sv_setpv(sv,tokenbuf);
 	}
 	if (i)
-	    (void)signal(i,sighandler);
+	    (void)rsignal(i,sighandler);
 	else
 	    *svp = SvREFCNT_inc(sv);
     }
@@ -627,8 +813,12 @@ char *meth;
     PUSHMARK(sp);
     EXTEND(sp, 2);
     PUSHs(mg->mg_obj);
-    if (mg->mg_ptr)
-	PUSHs(sv_2mortal(newSVpv(mg->mg_ptr, mg->mg_len)));
+    if (mg->mg_ptr) {
+	if (mg->mg_len >= 0)
+	    PUSHs(sv_2mortal(newSVpv(mg->mg_ptr, mg->mg_len)));
+	else if (mg->mg_len == HEf_SVKEY)
+	    PUSHs((SV*)mg->mg_ptr);
+    }
     else if (mg->mg_type == 'p')
 	PUSHs(sv_2mortal(newSViv(mg->mg_len)));
     PUTBACK;
@@ -662,8 +852,12 @@ MAGIC* mg;
     PUSHMARK(sp);
     EXTEND(sp, 3);
     PUSHs(mg->mg_obj);
-    if (mg->mg_ptr)
-	PUSHs(sv_2mortal(newSVpv(mg->mg_ptr, mg->mg_len)));
+    if (mg->mg_ptr) {
+	if (mg->mg_len >= 0)
+	    PUSHs(sv_2mortal(newSVpv(mg->mg_ptr, mg->mg_len)));
+	else if (mg->mg_len == HEf_SVKEY)
+	    PUSHs((SV*)mg->mg_ptr);
+    }
     else if (mg->mg_type == 'p')
 	PUSHs(sv_2mortal(newSViv(mg->mg_len)));
     PUSHs(sv);
@@ -851,7 +1045,7 @@ MAGIC* mg;
     if (sv == (SV*)gv)
 	return 0;
     if (GvGP(sv))
-	gp_free(sv);
+	gp_free((GV*)sv);
     GvGP(sv) = gp_ref(GvGP(gv));
     if (!GvAV(gv))
 	gv_AVadd(gv);
@@ -918,6 +1112,7 @@ SV* sv;
 MAGIC* mg;
 {
     mg->mg_len = -1;
+    SvSCREAM_off(sv);
     return 0;
 }
 
@@ -959,6 +1154,13 @@ MAGIC* mg;
 	debug = (SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv)) | 0x80000000;
 	DEBUG_x(dump_all());
 	break;
+    case '\005':  /* ^E */
+#ifdef VMS
+	set_vaxc_errno(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
+#else
+	SETERRNO(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv),4);		/* will anyone ever use this? */
+#endif
+	break;
     case '\006':	/* ^F */
 	maxsysfd = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	break;
@@ -973,6 +1175,14 @@ MAGIC* mg;
 	else
 	    inplace = Nullch;
 	break;
+    case '\017':	/* ^O */
+	if (osname)
+	    Safefree(osname);
+	if (SvOK(sv))
+	    osname = savepv(SvPV(sv,na));
+	else
+	    osname = Nullch;
+	break;
     case '\020':	/* ^P */
 	i = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	if (i != perldb) {
@@ -984,7 +1194,11 @@ MAGIC* mg;
 	perldb = i;
 	break;
     case '\024':	/* ^T */
+#ifdef BIG_TIME
+	basetime = (Time_t)(SvNOK(sv) ? SvNVX(sv) : sv_2nv(sv));
+#else
 	basetime = (Time_t)(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
+#endif
 	break;
     case '\027':	/* ^W */
 	dowarn = (bool)(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
@@ -994,7 +1208,7 @@ MAGIC* mg;
 	    if (localizing == 1)
 		save_sptr((SV**)&last_in_gv);
 	}
-	else if (SvOK(sv))
+	else if (SvOK(sv) && GvIO(last_in_gv))
 	    IoLINES(GvIOp(last_in_gv)) = (long)SvIV(sv);
 	break;
     case '^':
@@ -1029,19 +1243,10 @@ MAGIC* mg;
 	multiline = (i != 0);
 	break;
     case '/':
-	if (SvOK(sv)) {
-	    nrs = rs = SvPV_force(sv,rslen);
-	    nrslen = rslen;
-	    if (rspara = !rslen) {
-		nrs = rs = "\n\n";
-		nrslen = rslen = 2;
-	    }
-	    nrschar = rschar = rs[rslen - 1];
-	}
-	else {
-	    nrschar = rschar = 0777;	/* fake a non-existent char */
-	    nrslen = rslen = 1;
-	}
+	SvREFCNT_dec(nrs);
+	nrs = newSVsv(sv);
+	SvREFCNT_dec(rs);
+	rs = SvREFCNT_inc(nrs);
 	break;
     case '\\':
 	if (ors)
@@ -1065,7 +1270,7 @@ MAGIC* mg;
 	statusvalue = FIXSTATUS(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
 	break;
     case '!':
-	SETERRNO(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv),SS$_ABORT);		/* will anyone ever use this? */
+	SETERRNO(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv),SvIV(sv) == EVMSERR ? 4 : vaxc$errno);		/* will anyone ever use this? */
 	break;
     case '<':
 	uid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
@@ -1092,7 +1297,7 @@ MAGIC* mg;
 #endif
 #endif
 	uid = (I32)getuid();
-	tainting |= (euid != uid || egid != gid);
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case '>':
 	euid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
@@ -1119,7 +1324,7 @@ MAGIC* mg;
 #endif
 #endif
 	euid = (I32)geteuid();
-	tainting |= (euid != uid || egid != gid);
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case '(':
 	gid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
@@ -1146,7 +1351,7 @@ MAGIC* mg;
 #endif
 #endif
 	gid = (I32)getgid();
-	tainting |= (euid != uid || egid != gid);
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case ')':
 	egid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
@@ -1173,7 +1378,7 @@ MAGIC* mg;
 #endif
 #endif
 	egid = (I32)getegid();
-	tainting |= (euid != uid || egid != gid);
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case ':':
 	chopset = SvPV_force(sv,na);
@@ -1227,7 +1432,7 @@ char *sig;
 
     for (sigv = sig_name+1; *sigv; sigv++)
 	if (strEQ(sig,*sigv))
-	    return sigv - sig_name;
+	    return sig_num[sigv - sig_name];
 #ifdef SIGCLD
     if (strEQ(sig,"CHLD"))
 	return SIGCLD;
@@ -1250,24 +1455,7 @@ int sig;
     CV *cv;
     AV *oldstack;
 
-#ifdef OS2		/* or anybody else who requires SIG_ACK */
-    signal(sig, SIG_ACK);
-#endif
-
-    cv = sv_2cv(*hv_fetch(GvHVn(siggv),sig_name[sig],strlen(sig_name[sig]),
-			  TRUE),
-		&st, &gv, TRUE);
-    if (!cv || !CvROOT(cv) &&
-	*sig_name[sig] == 'C' && instr(sig_name[sig],"LD")) {
-	
-	if (sig_name[sig][1] == 'H')
-	    cv = sv_2cv(*hv_fetch(GvHVn(siggv),"CLD",3,TRUE),
-			&st, &gv, TRUE);
-	else
-	    cv = sv_2cv(*hv_fetch(GvHVn(siggv),"CHLD",4,TRUE),
-			&st, &gv, TRUE);
-	/* gag */
-    }
+    cv = sv_2cv(psig_ptr[sig],&st,&gv,TRUE);
     if (!cv || !CvROOT(cv)) {
 	if (dowarn)
 	    warn("SIG%s handler \"%s\" not defined.\n",
@@ -1275,13 +1463,17 @@ int sig;
 	return;
     }
 
-    oldstack = stack;
-    if (stack != signalstack)
+    oldstack = curstack;
+    if (curstack != signalstack)
 	AvFILL(signalstack) = 0;
-    SWITCHSTACK(stack, signalstack);
+    SWITCHSTACK(curstack, signalstack);
 
-    sv = sv_newmortal();
-    sv_setpv(sv,sig_name[sig]);
+    if(psig_name[sig])
+    	sv = SvREFCNT_inc(psig_name[sig]);
+    else {
+        sv = sv_newmortal();
+        sv_setpv(sv,sig_name[sig]);
+    }
     PUSHMARK(sp);
     PUSHs(sv);
     PUTBACK;