X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.c;h=934c7764751908b1b277c0e4627f88448e4c0f1a;hb=69969c6f8dad38fedd2ed2c653a7948030e5ecf8;hp=98da315cd8265af6544d4d9afb67a905df0002aa;hpb=ecfc54246c2a6f42dc95b17a964a6048192067d2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.c b/mg.c
index 98da315..934c776 100644
--- a/mg.c
+++ b/mg.c
@@ -15,11 +15,69 @@
 #include "EXTERN.h"
 #include "perl.h"
 
-/* Omit -- it causes too much grief on mixed systems.
+/* XXX If this causes problems, set i_unistd=undef in the hint file.  */
 #ifdef I_UNISTD
 # include <unistd.h>
 #endif
-*/
+
+#ifdef HAS_GETGROUPS
+#  ifndef NGROUPS
+#    define NGROUPS 32
+#  endif
+#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(mgs);
+}
+
 
 void
 mg_magical(sv)
@@ -43,30 +101,33 @@ int
 mg_get(sv)
 SV* sv;
 {
+    MGS* mgs;
     MAGIC* mg;
-    U32 savemagic = SvMAGICAL(sv) | SvREADONLY(sv);
+    MAGIC** mgp;
+    int mgp_valid = 0;
 
-    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 ((mg == (mgp_valid ? *mgp : SvMAGIC(sv))) && (mg->mg_flags & MGf_GSKIP))
+		mgs->mgs_flags = 0;
 	}
+	/* Advance to next magic (complicated by possible deletion) */
+	if (mg == (mgp_valid ? *mgp : SvMAGIC(sv))) {
+	    mgp = &mg->mg_moremagic;
+	    mgp_valid = 1;
+	}
+	else
+	    mgp = &SvMAGIC(sv);	/* Re-establish pointer after sv_upgrade */
     }
 
-    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 +135,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;
 }
 
@@ -108,29 +162,22 @@ mg_len(sv)
 SV* sv;
 {
     MAGIC* mg;
-    char *s;
+    char *junk;
     STRLEN len;
 
     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;
 	}
     }
 
-    s = SvPV(sv, len);
+    junk = SvPV(sv, len);
     return len;
 }
 
@@ -139,10 +186,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 +198,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 +220,7 @@ mg_copy(sv, nsv, key, klen)
 SV* sv;
 SV* nsv;
 char *key;
-STRLEN klen;
+I32 klen;
 {
     int count = 0;
     MAGIC* mg;
@@ -202,7 +245,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);
@@ -223,6 +269,7 @@ MAGIC *mg;
     register I32 paren;
     register char *s;
     register I32 i;
+    char *t;
 
     switch (*mg->mg_ptr) {
     case '1': case '2': case '3': case '4':
@@ -232,16 +279,14 @@ MAGIC *mg;
 	  getparen:
 	    if (curpm->op_pmregexp &&
 	      paren <= curpm->op_pmregexp->nparens &&
-	      (s = curpm->op_pmregexp->startp[paren]) ) {
-		i = curpm->op_pmregexp->endp[paren] - s;
+	      (s = curpm->op_pmregexp->startp[paren]) &&
+	      (t = curpm->op_pmregexp->endp[paren]) ) {
+		i = t - s;
 		if (i >= 0)
 		    return i;
-		else
-		    return 0;
 	    }
-	    else
-		return 0;
 	}
+	return 0;
 	break;
     case '+':
 	if (curpm) {
@@ -250,6 +295,7 @@ MAGIC *mg;
 		return 0;
 	    goto getparen;
 	}
+	return 0;
 	break;
     case '`':
 	if (curpm) {
@@ -258,23 +304,17 @@ MAGIC *mg;
 		i = curpm->op_pmregexp->startp[0] - s;
 		if (i >= 0)
 		    return i;
-		else
-		    return 0;
 	    }
-	    else
-		return 0;
 	}
-	break;
+	return 0;
     case '\'':
 	if (curpm) {
 	    if (curpm->op_pmregexp &&
 	      (s = curpm->op_pmregexp->endp[0]) ) {
 		return (STRLEN) (curpm->op_pmregexp->subend - s);
 	    }
-	    else
-		return 0;
 	}
-	break;
+	return 0;
     case ',':
 	return (STRLEN)ofslen;
     case '\\':
@@ -296,93 +336,128 @@ MAGIC *mg;
     register I32 paren;
     register char *s;
     register I32 i;
+    char *t;
 
     switch (*mg->mg_ptr) {
+    case '\001':		/* ^A */
+	sv_setsv(sv, bodytarget);
+	break;
     case '\004':		/* ^D */
-	sv_setiv(sv,(I32)(debug & 32767));
+	sv_setiv(sv, (IV)(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);
+	sv_setiv(sv, (IV)maxsysfd);
 	break;
     case '\010':		/* ^H */
-	sv_setiv(sv,(I32)hints);
+	sv_setiv(sv, (IV)hints);
 	break;
     case '\t':			/* ^I */
 	if (inplace)
 	    sv_setpv(sv, inplace);
 	else
-	    sv_setsv(sv,&sv_undef);
+	    sv_setsv(sv, &sv_undef);
+	break;
+    case '\017':		/* ^O */
+	sv_setpv(sv, osname);
 	break;
     case '\020':		/* ^P */
-	sv_setiv(sv,(I32)perldb);
+	sv_setiv(sv, (IV)perldb);
 	break;
     case '\024':		/* ^T */
-	sv_setiv(sv,(I32)basetime);
+#ifdef BIG_TIME
+ 	sv_setnv(sv, basetime);
+#else
+	sv_setiv(sv, (IV)basetime);
+#endif
 	break;
     case '\027':		/* ^W */
-	sv_setiv(sv,(I32)dowarn);
+	sv_setiv(sv, (IV)dowarn);
 	break;
     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 &&
 	      (s = curpm->op_pmregexp->startp[paren]) &&
-	      curpm->op_pmregexp->endp[paren] ) {
-		i = curpm->op_pmregexp->endp[paren] - s;
-		if (i >= 0)
+	      (t = curpm->op_pmregexp->endp[paren]) ) {
+		i = t - s;
+		if (i >= 0) {
+		    MAGIC *tmg;
 		    sv_setpvn(sv,s,i);
-		else
-		    sv_setsv(sv,&sv_undef);
+		    if (tainting && (tmg = mg_find(sv,'t')))
+			tmg->mg_len = 0;	/* guarantee $1 untainted */
+		    break;
+		}
 	    }
-	    else
-		sv_setsv(sv,&sv_undef);
 	}
+	sv_setsv(sv,&sv_undef);
 	break;
     case '+':
 	if (curpm) {
 	    paren = curpm->op_pmregexp->lastparen;
 	    if (paren)
 		goto getparen;
-	    else
-		sv_setsv(sv,&sv_undef);
 	}
+	sv_setsv(sv,&sv_undef);
 	break;
     case '`':
 	if (curpm) {
 	    if (curpm->op_pmregexp &&
 	      (s = curpm->op_pmregexp->subbeg) ) {
 		i = curpm->op_pmregexp->startp[0] - s;
-		if (i >= 0)
+		if (i >= 0) {
 		    sv_setpvn(sv,s,i);
-		else
-		    sv_setpvn(sv,"",0);
+		    break;
+		}
 	    }
-	    else
-		sv_setpvn(sv,"",0);
 	}
+	sv_setsv(sv,&sv_undef);
 	break;
     case '\'':
 	if (curpm) {
 	    if (curpm->op_pmregexp &&
 	      (s = curpm->op_pmregexp->endp[0]) ) {
 		sv_setpvn(sv,s, curpm->op_pmregexp->subend - s);
+		break;
 	    }
-	    else
-		sv_setpvn(sv,"",0);
 	}
+	sv_setsv(sv,&sv_undef);
 	break;
     case '.':
 #ifndef lint
 	if (GvIO(last_in_gv)) {
-	    sv_setiv(sv,(I32)IoLINES(GvIO(last_in_gv)));
+	    sv_setiv(sv, (IV)IoLINES(GvIO(last_in_gv)));
 	}
 #endif
 	break;
     case '?':
-	sv_setiv(sv,(I32)statusvalue);
+	sv_setiv(sv, (IV)statusvalue);
 	break;
     case '^':
 	s = IoTOP_NAME(GvIOp(defoutgv));
@@ -401,13 +476,13 @@ MAGIC *mg;
 	break;
 #ifndef lint
     case '=':
-	sv_setiv(sv,(I32)IoPAGE_LEN(GvIOp(defoutgv)));
+	sv_setiv(sv, (IV)IoPAGE_LEN(GvIOp(defoutgv)));
 	break;
     case '-':
-	sv_setiv(sv,(I32)IoLINES_LEFT(GvIOp(defoutgv)));
+	sv_setiv(sv, (IV)IoLINES_LEFT(GvIOp(defoutgv)));
 	break;
     case '%':
-	sv_setiv(sv,(I32)IoPAGE(GvIOp(defoutgv)));
+	sv_setiv(sv, (IV)IoPAGE(GvIOp(defoutgv)));
 	break;
 #endif
     case ':':
@@ -415,10 +490,10 @@ MAGIC *mg;
     case '/':
 	break;
     case '[':
-	sv_setiv(sv,(I32)curcop->cop_arybase);
+	sv_setiv(sv, (IV)curcop->cop_arybase);
 	break;
     case '|':
-	sv_setiv(sv, (IoFLAGS(GvIOp(defoutgv)) & IOf_FLUSH) != 0 );
+	sv_setiv(sv, (IV)(IoFLAGS(GvIOp(defoutgv)) & IOf_FLUSH) != 0 );
 	break;
     case ',':
 	sv_setpvn(sv,ofs,ofslen);
@@ -430,40 +505,53 @@ MAGIC *mg;
 	sv_setpv(sv,ofmt);
 	break;
     case '!':
-	sv_setnv(sv,(double)errno);
+#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 '<':
-	sv_setiv(sv,(I32)uid);
+	sv_setiv(sv, (IV)uid);
 	break;
     case '>':
-	sv_setiv(sv,(I32)euid);
+	sv_setiv(sv, (IV)euid);
 	break;
     case '(':
+	sv_setiv(sv, (IV)gid);
 	s = buf;
 	(void)sprintf(s,"%d",(int)gid);
 	goto add_groups;
     case ')':
+	sv_setiv(sv, (IV)egid);
 	s = buf;
 	(void)sprintf(s,"%d",(int)egid);
       add_groups:
 	while (*s) s++;
 #ifdef HAS_GETGROUPS
-#ifndef NGROUPS
-#define NGROUPS 32
-#endif
 	{
 	    Groups_t gary[NGROUPS];
 
 	    i = getgroups(NGROUPS,gary);
 	    while (--i >= 0) {
-		(void)sprintf(s," %ld", (long)gary[i]);
+		(void)sprintf(s," %d", (int)gary[i]);
 		while (*s) s++;
 	    }
 	}
 #endif
 	sv_setpv(sv,buf);
+	SvNOK_on(sv);	/* what a wonderful hack! */
 	break;
     case '*':
 	break;
@@ -491,23 +579,29 @@ SV* sv;
 MAGIC* mg;
 {
     register char *s;
+    char *ptr;
     STRLEN len;
     I32 i;
     s = SvPV(sv,len);
-    my_setenv(mg->mg_ptr,s);
+    ptr = MgPV(mg);
+    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;
+	SV *keysv;
+	if (mg->mg_len == HEf_SVKEY) keysv = (SV *)mg->mg_ptr;
+	else keysv = newSVpv(mg->mg_ptr,mg->mg_len);
+	if (envhe = hv_fetch_ent(GvHVn(envgv),keysv,FALSE,0))
+	    s = SvPV(HeVAL(envhe),len);
+	if (mg->mg_len != HEf_SVKEY) SvREFCNT_dec(keysv);
     }
 #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) {
@@ -527,7 +621,98 @@ magic_clearenv(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    my_setenv(mg->mg_ptr,Nullch);
+    my_setenv(MgPV(mg),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(MgPV(mg));
+    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(MgPV(mg));
+    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,29 +723,71 @@ MAGIC* mg;
 {
     register char *s;
     I32 i;
+    SV** svp;
 
-    i = whichsig(mg->mg_ptr);	/* ...no, a brick */
-    if (!i && (dowarn || strEQ(mg->mg_ptr,"ALARM")))
-	warn("No such signal: SIG%s", mg->mg_ptr);
+    s = MgPV(mg);
+    if (*s == '_') {
+	if (strEQ(s,"__DIE__"))
+	    svp = &diehook;
+	else if (strEQ(s,"__WARN__"))
+	    svp = &warnhook;
+	else if (strEQ(s,"__PARSE__"))
+	    svp = &parsehook;
+	else
+	    croak("No such hook: %s", s);
+	i = 0;
+	if (*svp) {
+	    SvREFCNT_dec(*svp);
+	    *svp = 0;
+	}
+    }
+    else {
+	i = whichsig(s);	/* ...no, a brick */
+	if (!i) {
+	    if (dowarn || strEQ(s,"ALARM"))
+		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(s,strlen(s));
+	SvTEMP_off(sv); /* Make sure it doesn't go away on us */
+	SvREADONLY_on(psig_name[i]);
+    }
     if (SvTYPE(sv) == SVt_PVGV || SvROK(sv)) {
-	(void)signal(i,sighandler);
+	if (i)
+	    (void)rsignal(i,sighandler);
+	else
+	    *svp = SvREFCNT_inc(sv);
 	return 0;
     }
     s = SvPV_force(sv,na);
-    if (strEQ(s,"IGNORE"))
-#ifndef lint
-	(void)signal(i,SIG_IGN);
-#else
-	;
-#endif
-    else if (strEQ(s,"DEFAULT") || !*s)
-	(void)signal(i,SIG_DFL);
+    if (strEQ(s,"IGNORE")) {
+	if (i)
+	    (void)rsignal(i,SIG_IGN);
+	else
+	    *svp = 0;
+    }
+    else if (strEQ(s,"DEFAULT") || !*s) {
+	if (i)
+	    (void)rsignal(i,SIG_DFL);
+	else
+	    *svp = 0;
+    }
     else {
-	(void)signal(i,sighandler);
+    	if(hints & HINT_STRICT_REFS)
+    		die(no_symref,s,"a subroutine");
 	if (!strchr(s,':') && !strchr(s,'\'')) {
 	    sprintf(tokenbuf, "main::%s",s);
 	    sv_setpv(sv,tokenbuf);
 	}
+	if (i)
+	    (void)rsignal(i,sighandler);
+	else
+	    *svp = SvREFCNT_inc(sv);
     }
     return 0;
 }
@@ -588,6 +815,18 @@ MAGIC* mg;
 }
 #endif /* OVERLOAD */
 
+int
+magic_setnkeys(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    if (LvTARG(sv)) {
+	hv_ksplit((HV*)LvTARG(sv), SvIV(sv));
+	LvTARG(sv) = Nullsv;	/* Don't allow a ref to reassign this. */
+    }
+    return 0;
+}
+
 static int
 magic_methpack(sv,mg,meth)
 SV* sv;
@@ -601,8 +840,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;
@@ -636,8 +879,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);
@@ -717,7 +964,8 @@ MAGIC* mg;
 
     gv = DBline;
     i = SvTRUE(sv);
-    svp = av_fetch(GvAV(gv),atoi(mg->mg_ptr), FALSE);
+    svp = av_fetch(GvAV(gv),
+		     atoi(MgPV(mg)), FALSE);
     if (svp && SvIOKp(*svp) && (o = (OP*)SvSTASH(*svp)))
 	o->op_private = i;
     else
@@ -804,7 +1052,13 @@ magic_getglob(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    gv_efullname(sv,((GV*)sv));/* a gv value, be nice */
+    if (SvFAKE(sv)) {			/* FAKE globs can get coerced */
+	SvFAKE_off(sv);
+	gv_efullname3(sv,((GV*)sv), "*");
+	SvFAKE_on(sv);
+    }
+    else
+	gv_efullname3(sv,((GV*)sv), "*");	/* a gv value, be nice */
     return 0;
 }
 
@@ -825,7 +1079,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);
@@ -852,7 +1106,10 @@ magic_gettaint(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    tainted = TRUE;
+    if (mg->mg_len & 1)
+	tainted = TRUE;
+    else if (mg->mg_len & 2 && mg->mg_obj == sv)	/* kludge */
+	tainted = TRUE;
     return 0;
 }
 
@@ -861,11 +1118,16 @@ magic_settaint(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    if (!tainted) {
-	if (!SvMAGICAL(sv))
-	    SvMAGICAL_on(sv);
-	sv_unmagic(sv, 't');
+    if (localizing) {
+	if (localizing == 1)
+	    mg->mg_len <<= 1;
+	else
+	    mg->mg_len >>= 1;
     }
+    else if (tainted)
+	mg->mg_len |= 1;
+    else
+	mg->mg_len &= ~1;
     return 0;
 }
 
@@ -884,6 +1146,7 @@ SV* sv;
 MAGIC* mg;
 {
     mg->mg_len = -1;
+    SvSCREAM_off(sv);
     return 0;
 }
 
@@ -918,10 +1181,20 @@ MAGIC* mg;
     I32 i;
     STRLEN len;
     switch (*mg->mg_ptr) {
+    case '\001':	/* ^A */
+	sv_setsv(bodytarget, sv);
+	break;
     case '\004':	/* ^D */
 	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;
@@ -936,6 +1209,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) {
@@ -947,15 +1228,21 @@ 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));
 	break;
     case '.':
-	if (localizing)
-	    save_sptr((SV**)&last_in_gv);
-	else if (SvOK(sv))
+	if (localizing) {
+	    if (localizing == 1)
+		save_sptr((SV**)&last_in_gv);
+	}
+	else if (SvOK(sv) && GvIO(last_in_gv))
 	    IoLINES(GvIOp(last_in_gv)) = (long)SvIV(sv);
 	break;
     case '^':
@@ -990,19 +1277,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)
@@ -1023,10 +1301,10 @@ MAGIC* mg;
 	compiling.cop_arybase = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	break;
     case '?':
-	statusvalue = U_S(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
+	statusvalue = FIXSTATUS(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
 	break;
     case '!':
-	errno = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);		/* 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);
@@ -1039,6 +1317,7 @@ MAGIC* mg;
 #else
 #ifdef HAS_SETREUID
 	(void)setreuid((Uid_t)uid, (Uid_t)-1);
+#else
 #ifdef HAS_SETRESUID
       (void)setresuid((Uid_t)uid, (Uid_t)-1, (Uid_t)-1);
 #else
@@ -1051,8 +1330,8 @@ MAGIC* mg;
 #endif
 #endif
 #endif
-	uid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
-	tainting |= (euid != uid || egid != gid);
+	uid = (I32)getuid();
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case '>':
 	euid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
@@ -1079,7 +1358,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);
@@ -1098,13 +1377,15 @@ MAGIC* mg;
 #else
 	if (gid == egid)			/* special case $( = $) */
 	    (void)setgid(gid);
-	else
+	else {
+	    gid = (I32)getgid();
 	    croak("setrgid() not implemented");
+	}
 #endif
 #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);
@@ -1123,13 +1404,15 @@ MAGIC* mg;
 #else
 	if (egid == gid)			/* special case $) = $( */
 	    (void)setgid(egid);
-	else
+	else {
+	    egid = (I32)getegid();
 	    croak("setegid() not implemented");
+	}
 #endif
 #endif
 #endif
 	egid = (I32)getegid();
-	tainting |= (euid != uid || egid != gid);
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case ':':
 	chopset = SvPV_force(sv,na);
@@ -1183,7 +1466,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;
@@ -1205,25 +1488,12 @@ int sig;
     SV *sv;
     CV *cv;
     AV *oldstack;
+    
+    if(!psig_ptr[sig])
+    	die("Signal SIG%s received, but no signal handler set.\n",
+    	sig_name[sig]);
 
-#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",
@@ -1231,13 +1501,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;