X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.c;h=318b7fef2decbf581ce56f483e0f46b2fab67d4a;hb=3f4fc4634a226330cf98eab6871f26f45d52e425;hp=a0c12e6a2b668c71ad237374e6676c2dddd78273;hpb=93a17b20b6d176db3f04f51a63b0a781e5ffd11c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.c b/mg.c
index a0c12e6..318b7fe 100644
--- a/mg.c
+++ b/mg.c
@@ -1,26 +1,128 @@
-/* $RCSfile: hash.c,v $$Revision: 4.1 $$Date: 92/08/07 18:21:48 $
+/*    mg.c
  *
- *    Copyright (c) 1993, Larry Wall
+ *    Copyright (c) 1991-1994, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
- * $Log:        hash.c,v $
+ */
+
+/*
+ * "Sam sat on the ground and put his head in his hands.  'I wish I had never
+ * come here, and I don't want to see no more magic,' he said, and fell silent."
  */
 
 #include "EXTERN.h"
 #include "perl.h"
 
+/* 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 void
+save_magic(mgs, sv)
+MGS* mgs;
+SV* sv;
+{
+    assert(SvMAGICAL(sv));
+
+    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;
+}
+
+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);
+    }
+}
+
+
+void
+mg_magical(sv)
+SV* sv;
+{
+    MAGIC* mg;
+    for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
+	MGVTBL* vtbl = mg->mg_virtual;
+	if (vtbl) {
+	    if (vtbl->svt_get && !(mg->mg_flags & MGf_GSKIP))
+		SvGMAGICAL_on(sv);
+	    if (vtbl->svt_set)
+		SvSMAGICAL_on(sv);
+	    if (!(SvFLAGS(sv) & (SVs_GMG|SVs_SMG)) || vtbl->svt_clear)
+		SvRMAGICAL_on(sv);
+	}
+    }
+}
+
 int
 mg_get(sv)
 SV* sv;
 {
+    MGS mgs;
     MAGIC* mg;
-    for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
+    MAGIC** mgp;
+    int mgp_valid = 0;
+
+    ENTER;
+    save_magic(&mgs, sv);
+
+    mgp = &SvMAGIC(sv);
+    while ((mg = *mgp) != 0) {
 	MGVTBL* vtbl = mg->mg_virtual;
-	if (vtbl && vtbl->svt_get)
+	if (!(mg->mg_flags & MGf_GSKIP) && vtbl && vtbl->svt_get) {
 	    (*vtbl->svt_get)(sv, mg);
+	    /* 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 */
     }
+
+    LEAVE;
     return 0;
 }
 
@@ -28,12 +130,25 @@ int
 mg_set(sv)
 SV* sv;
 {
+    MGS mgs;
     MAGIC* mg;
-    for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
+    MAGIC* nextmg;
+
+    ENTER;
+    save_magic(&mgs, 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 */
+	    mgs.mgs_flags = 0;
+	}
 	if (vtbl && vtbl->svt_set)
 	    (*vtbl->svt_set)(sv, mg);
     }
+
+    LEAVE;
     return 0;
 }
 
@@ -42,39 +157,55 @@ mg_len(sv)
 SV* sv;
 {
     MAGIC* mg;
+    char *junk;
+    STRLEN len;
+
     for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
 	MGVTBL* vtbl = mg->mg_virtual;
-	if (vtbl && vtbl->svt_len)
-	    return (*vtbl->svt_len)(sv, mg);
+	if (vtbl && vtbl->svt_len) {
+	    MGS mgs;
+
+	    ENTER;
+	    save_magic(&mgs, sv);
+	    /* omit MGf_GSKIP -- not changed here */
+	    len = (*vtbl->svt_len)(sv, mg);
+	    LEAVE;
+	    return len;
+	}
     }
-    mg_get(sv);
-    if (!SvPOK(sv) && SvNIOK(sv))
-	sv_2pv(sv);
-    if (SvPOK(sv))
-	return SvCUR(sv);
-    return 0;
+
+    junk = SvPV(sv, len);
+    return len;
 }
 
 int
 mg_clear(sv)
 SV* sv;
 {
+    MGS mgs;
     MAGIC* mg;
+
+    ENTER;
+    save_magic(&mgs, sv);
+
     for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
 	MGVTBL* vtbl = mg->mg_virtual;
+	/* omit GSKIP -- never set here */
+	
 	if (vtbl && vtbl->svt_clear)
 	    (*vtbl->svt_clear)(sv, mg);
     }
+
+    LEAVE;
     return 0;
 }
 
 MAGIC*
 mg_find(sv, type)
 SV* sv;
-char type;
+int type;
 {
     MAGIC* mg;
-    MAGIC** mgp = &SvMAGIC(sv);
     for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
 	if (mg->mg_type == type)
 	    return mg;
@@ -83,30 +214,25 @@ char type;
 }
 
 int
-mg_free(sv, type)
+mg_copy(sv, nsv, key, klen)
 SV* sv;
-char type;
+SV* nsv;
+char *key;
+I32 klen;
 {
+    int count = 0;
     MAGIC* mg;
-    MAGIC** mgp = &SvMAGIC(sv);
-    for (mg = *mgp; mg; mg = *mgp) {
-	if (mg->mg_type == type) {
-	    MGVTBL* vtbl = mg->mg_virtual;
-	    *mgp = mg->mg_moremagic;
-	    if (vtbl && vtbl->svt_free)
-		(*vtbl->svt_free)(sv, mg);
-	    if (mg->mg_ptr && mg->mg_type != 'g')
-		Safefree(mg->mg_ptr);
-	    Safefree(mg);
+    for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
+	if (isUPPER(mg->mg_type)) {
+	    sv_magic(nsv, mg->mg_obj, toLOWER(mg->mg_type), key, klen);
+	    count++;
 	}
-	else
-	    mgp = &mg->mg_moremagic;
     }
-    return 0;
+    return count;
 }
 
 int
-mg_freeall(sv)
+mg_free(sv)
 SV* sv;
 {
     MAGIC* mg;
@@ -117,7 +243,12 @@ 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);
     }
     SvMAGIC(sv) = 0;
@@ -128,14 +259,6 @@ SV* sv;
 #include <signal.h>
 #endif
 
-#ifdef VOIDSIG
-#define handlertype void
-#else
-#define handlertype int
-#endif
-
-static handlertype sighandler();
-
 U32
 magic_len(sv, mg)
 SV *sv;
@@ -144,56 +267,52 @@ MAGIC *mg;
     register I32 paren;
     register char *s;
     register I32 i;
+    register REGEXP *rx;
+    char *t;
 
     switch (*mg->mg_ptr) {
     case '1': case '2': case '3': case '4':
     case '5': case '6': case '7': case '8': case '9': case '&':
-	if (curpm) {
+	if (curpm && (rx = curpm->op_pmregexp)) {
 	    paren = atoi(mg->mg_ptr);
 	  getparen:
-	    if (curpm->op_pmregexp &&
-	      paren <= curpm->op_pmregexp->nparens &&
-	      (s = curpm->op_pmregexp->startp[paren]) ) {
-		i = curpm->op_pmregexp->endp[paren] - s;
+	    if (paren <= rx->nparens &&
+		(s = rx->startp[paren]) &&
+		(t = rx->endp[paren]))
+	    {
+		i = t - s;
 		if (i >= 0)
 		    return i;
-		else
-		    return 0;
 	    }
-	    else
-		return 0;
 	}
+	return 0;
 	break;
     case '+':
-	if (curpm) {
-	    paren = curpm->op_pmregexp->lastparen;
-	    goto getparen;
+	if (curpm && (rx = curpm->op_pmregexp)) {
+	    paren = rx->lastparen;
+	    if (paren)
+		goto getparen;
 	}
+	return 0;
 	break;
     case '`':
-	if (curpm) {
-	    if (curpm->op_pmregexp &&
-	      (s = curpm->op_pmregexp->subbeg) ) {
-		i = curpm->op_pmregexp->startp[0] - s;
+	if (curpm && (rx = curpm->op_pmregexp)) {
+	    if ((s = rx->subbeg) && rx->startp[0]) {
+		i = rx->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);
+	if (curpm && (rx = curpm->op_pmregexp)) {
+	    if (rx->subend && (s = rx->endp[0])) {
+		i = rx->subend - s;
+		if (i >= 0)
+		    return 0;
 	    }
-	    else
-		return 0;
 	}
-	break;
+	return 0;
     case ',':
 	return (STRLEN)ofslen;
     case '\\':
@@ -201,7 +320,7 @@ MAGIC *mg;
     }
     magic_get(sv,mg);
     if (!SvPOK(sv) && SvNIOK(sv))
-	sv_2pv(sv);
+	sv_2pv(sv, &na);
     if (SvPOK(sv))
 	return SvCUR(sv);
     return 0;
@@ -215,89 +334,136 @@ MAGIC *mg;
     register I32 paren;
     register char *s;
     register I32 i;
+    register REGEXP *rx;
+    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, (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));
+	if (curpm && (rx = curpm->op_pmregexp)) {
+	    paren = atoi(GvENAME((GV*)mg->mg_obj));
 	  getparen:
-	    if (curpm->op_pmregexp &&
-	      paren <= curpm->op_pmregexp->nparens &&
-	      (s = curpm->op_pmregexp->startp[paren]) ) {
-		i = curpm->op_pmregexp->endp[paren] - s;
-		if (i >= 0)
+	    if (paren <= rx->nparens &&
+		(s = rx->startp[paren]) &&
+		(t = rx->endp[paren]))
+	    {
+		i = t - s;
+	      getrx:
+		if (i >= 0) {
+		    bool was_tainted;
+		    if (tainting) {
+			was_tainted = tainted;
+			tainted = FALSE;
+		    }
 		    sv_setpvn(sv,s,i);
-		else
-		    sv_setsv(sv,&sv_undef);
+		    if (tainting)
+			tainted = was_tainted || rx->exec_tainted;
+		    break;
+		}
 	    }
-	    else
-		sv_setsv(sv,&sv_undef);
 	}
+	sv_setsv(sv,&sv_undef);
 	break;
     case '+':
-	if (curpm) {
-	    paren = curpm->op_pmregexp->lastparen;
-	    goto getparen;
+	if (curpm && (rx = curpm->op_pmregexp)) {
+	    paren = rx->lastparen;
+	    if (paren)
+		goto getparen;
 	}
+	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)
-		    sv_setpvn(sv,s,i);
-		else
-		    sv_setpvn(sv,"",0);
+	if (curpm && (rx = curpm->op_pmregexp)) {
+	    if ((s = rx->subbeg) && rx->startp[0]) {
+		i = rx->startp[0] - s;
+		goto getrx;
 	    }
-	    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);
+	if (curpm && (rx = curpm->op_pmregexp)) {
+	    if (rx->subend && (s = rx->endp[0])) {
+		i = rx->subend - s;
+		goto getrx;
 	    }
-	    else
-		sv_setpvn(sv,"",0);
 	}
+	sv_setsv(sv,&sv_undef);
 	break;
     case '.':
 #ifndef lint
-	if (last_in_gv && GvIO(last_in_gv)) {
-	    sv_setiv(sv,(I32)GvIO(last_in_gv)->lines);
+	if (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)STATUS_CURRENT);
+#ifdef COMPLEX_STATUS
+	LvTARGOFF(sv) = statusvalue;
+	LvTARGLEN(sv) = statusvalue_vms;
+#endif
 	break;
     case '^':
-	s = GvIO(defoutgv)->top_name;
+	s = IoTOP_NAME(GvIOp(defoutgv));
 	if (s)
 	    sv_setpv(sv,s);
 	else {
@@ -306,20 +472,20 @@ MAGIC *mg;
 	}
 	break;
     case '~':
-	s = GvIO(defoutgv)->fmt_name;
+	s = IoFMT_NAME(GvIOp(defoutgv));
 	if (!s)
 	    s = GvENAME(defoutgv);
 	sv_setpv(sv,s);
 	break;
 #ifndef lint
     case '=':
-	sv_setiv(sv,(I32)GvIO(defoutgv)->page_len);
+	sv_setiv(sv, (IV)IoPAGE_LEN(GvIOp(defoutgv)));
 	break;
     case '-':
-	sv_setiv(sv,(I32)GvIO(defoutgv)->lines_left);
+	sv_setiv(sv, (IV)IoLINES_LEFT(GvIOp(defoutgv)));
 	break;
     case '%':
-	sv_setiv(sv,(I32)GvIO(defoutgv)->page);
+	sv_setiv(sv, (IV)IoPAGE(GvIOp(defoutgv)));
 	break;
 #endif
     case ':':
@@ -327,12 +493,10 @@ MAGIC *mg;
     case '/':
 	break;
     case '[':
-	sv_setiv(sv,(I32)arybase);
+	sv_setiv(sv, (IV)curcop->cop_arybase);
 	break;
     case '|':
-	if (!GvIO(defoutgv))
-	    GvIO(defoutgv) = newIO();
-	sv_setiv(sv, (GvIO(defoutgv)->flags & IOf_FLUSH) != 0 );
+	sv_setiv(sv, (IV)(IoFLAGS(GvIOp(defoutgv)) & IOf_FLUSH) != 0 );
 	break;
     case ',':
 	sv_setpvn(sv,ofs,ofslen);
@@ -344,46 +508,60 @@ MAGIC *mg;
 	sv_setpv(sv,ofmt);
 	break;
     case '!':
-	sv_setnv(sv,(double)errno);
-	sv_setpv(sv, errno ? strerror(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
 	{
-	    GROUPSTYPE gary[NGROUPS];
+	    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);
+	SvIOK_on(sv);	/* what a wonderful hack! */
 	break;
     case '*':
 	break;
     case '0':
 	break;
     }
+    return 0;
 }
 
 int
@@ -404,24 +582,95 @@ SV* sv;
 MAGIC* mg;
 {
     register char *s;
+    char *ptr;
+    STRLEN len;
     I32 i;
-    s = SvPV(sv);
-    my_setenv(mg->mg_ptr,s);
+    s = SvPV(sv,len);
+    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) {
+	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... */
-#ifdef TAINT
-    if (s && strEQ(mg->mg_ptr,"PATH")) {
-	char *strend = SvEND(sv);
+    if (tainting) {
+	if (s && strEQ(ptr,"PATH")) {
+	    char *strend = s + len;
 
-	while (s < strend) {
-	    s = cpytill(tokenbuf,s,strend,':',&i);
-	    s++;
-	    if (*tokenbuf != '/'
-	      || (stat(tokenbuf,&statbuf) && (statbuf.st_mode & 2)) )
-		sv->sv_tainted = 2;
+	    while (s < strend) {
+		s = cpytill(tokenbuf,s,strend,':',&i);
+		s++;
+		if (*tokenbuf != '/'
+		  || (Stat(tokenbuf,&statbuf) && (statbuf.st_mode & 2)) )
+		    MgTAINTEDDIR_on(mg);
+	    }
 	}
     }
-#endif
+    return 0;
+}
+
+int
+magic_clearenv(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    my_setenv(MgPV(mg),Nullch);
+    return 0;
+}
+
+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 {
+    	    Sighandler_t sigstate = rsignal_state(i);
+
+    	    /* cache state so we don't fetch it again */
+    	    if(sigstate == 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;
 }
 
@@ -432,39 +681,234 @@ MAGIC* mg;
 {
     register char *s;
     I32 i;
-    s = SvPV(sv);
-    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);
-    if (strEQ(s,"IGNORE"))
-#ifndef lint
-	(void)signal(i,SIG_IGN);
-#else
-	;
-#endif
-    else if (strEQ(s,"DEFAULT") || !*s)
-	(void)signal(i,SIG_DFL);
+    SV** svp;
+
+    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;
+	}
+	SvREFCNT_dec(psig_name[i]);
+	SvREFCNT_dec(psig_ptr[i]);
+	psig_ptr[i] = SvREFCNT_inc(sv);
+	SvTEMP_off(sv); /* Make sure it doesn't go away on us */
+	psig_name[i] = newSVpv(s, strlen(s));
+	SvREADONLY_on(psig_name[i]);
+    }
+    if (SvTYPE(sv) == SVt_PVGV || SvROK(sv)) {
+	if (i)
+	    (void)rsignal(i, sighandler);
+	else
+	    *svp = SvREFCNT_inc(sv);
+	return 0;
+    }
+    s = SvPV_force(sv,na);
+    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 (!strchr(s,'\'')) {
-	    sprintf(tokenbuf, "main'%s",s);
+    	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;
 }
 
 int
-magic_setdbm(sv,mg)
+magic_setisa(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    sub_generation++;
+    return 0;
+}
+
+#ifdef OVERLOAD
+
+int
+magic_setamagic(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    /* HV_badAMAGIC_on(Sv_STASH(sv)); */
+    amagic_generation++;
+
+    return 0;
+}
+#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;
 MAGIC* mg;
+char *meth;
 {
-    HV* hv = (HV*)mg->mg_obj;
-    hv_dbmstore(hv,mg->mg_ptr,mg->mg_len,sv);	/* XXX slurp? */
+    dSP;
+
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(sp);
+    EXTEND(sp, 2);
+    PUSHs(mg->mg_obj);
+    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;
+
+    if (perl_call_method(meth, G_SCALAR))
+	sv_setsv(sv, *stack_sp--);
+
+    FREETMPS;
+    LEAVE;
     return 0;
 }
 
 int
+magic_getpack(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    magic_methpack(sv,mg,"FETCH");
+    if (mg->mg_ptr)
+	mg->mg_flags |= MGf_GSKIP;
+    return 0;
+}
+
+int
+magic_setpack(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    dSP;
+
+    PUSHMARK(sp);
+    EXTEND(sp, 3);
+    PUSHs(mg->mg_obj);
+    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);
+    PUTBACK;
+
+    perl_call_method("STORE", G_SCALAR|G_DISCARD);
+
+    return 0;
+}
+
+int
+magic_clearpack(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    return magic_methpack(sv,mg,"DELETE");
+}
+
+int magic_wipepack(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    dSP;
+
+    PUSHMARK(sp);
+    XPUSHs(mg->mg_obj);
+    PUTBACK;
+
+    perl_call_method("CLEAR", G_SCALAR|G_DISCARD);
+
+    return 0;
+}
+
+int
+magic_nextpack(sv,mg,key)
+SV* sv;
+MAGIC* mg;
+SV* key;
+{
+    dSP;
+    char *meth = SvOK(key) ? "NEXTKEY" : "FIRSTKEY";
+
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(sp);
+    EXTEND(sp, 2);
+    PUSHs(mg->mg_obj);
+    if (SvOK(key))
+	PUSHs(key);
+    PUTBACK;
+
+    if (perl_call_method(meth, G_SCALAR))
+	sv_setsv(key, *stack_sp--);
+
+    FREETMPS;
+    LEAVE;
+    return 0;
+}
+
+int
+magic_existspack(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    return magic_methpack(sv,mg,"EXISTS");
+} 
+
+int
 magic_setdbline(sv,mg)
 SV* sv;
 MAGIC* mg;
@@ -476,8 +920,9 @@ MAGIC* mg;
 
     gv = DBline;
     i = SvTRUE(sv);
-    svp = av_fetch(GvAV(gv),atoi(mg->mg_ptr), FALSE);
-    if (svp && SvIOK(*svp) && (o = (OP*)SvSTASH(*svp)))
+    svp = av_fetch(GvAV(gv),
+		     atoi(MgPV(mg)), FALSE);
+    if (svp && SvIOKp(*svp) && (o = (OP*)SvSTASH(*svp)))
 	o->op_private = i;
     else
 	warn("Can't break at that line\n");
@@ -489,7 +934,7 @@ magic_getarylen(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    sv_setiv(sv, AvFILL((AV*)mg->mg_obj) + arybase);
+    sv_setiv(sv, AvFILL((AV*)mg->mg_obj) + curcop->cop_arybase);
     return 0;
 }
 
@@ -498,7 +943,64 @@ magic_setarylen(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    av_fill((AV*)mg->mg_obj, (SvIOK(sv) ? SvIV(sv) : sv_2iv(sv)) - arybase);
+    av_fill((AV*)mg->mg_obj, SvIV(sv) - curcop->cop_arybase);
+    return 0;
+}
+
+int
+magic_getpos(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    SV* lsv = LvTARG(sv);
+    
+    if (SvTYPE(lsv) >= SVt_PVMG && SvMAGIC(lsv)) {
+	mg = mg_find(lsv, 'g');
+	if (mg && mg->mg_len >= 0) {
+	    sv_setiv(sv, mg->mg_len + curcop->cop_arybase);
+	    return 0;
+	}
+    }
+    (void)SvOK_off(sv);
+    return 0;
+}
+
+int
+magic_setpos(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    SV* lsv = LvTARG(sv);
+    SSize_t pos;
+    STRLEN len;
+
+    mg = 0;
+    
+    if (SvTYPE(lsv) >= SVt_PVMG && SvMAGIC(lsv))
+	mg = mg_find(lsv, 'g');
+    if (!mg) {
+	if (!SvOK(sv))
+	    return 0;
+	sv_magic(lsv, (SV*)0, 'g', Nullch, 0);
+	mg = mg_find(lsv, 'g');
+    }
+    else if (!SvOK(sv)) {
+	mg->mg_len = -1;
+	return 0;
+    }
+    len = SvPOK(lsv) ? SvCUR(lsv) : sv_len(lsv);
+
+    pos = SvIV(sv) - curcop->cop_arybase;
+    if (pos < 0) {
+	pos += len;
+	if (pos < 0)
+	    pos = 0;
+    }
+    else if (pos > len)
+	pos = len;
+    mg->mg_len = pos;
+    mg->mg_flags &= ~MGf_MINMATCH;
+
     return 0;
 }
 
@@ -507,7 +1009,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;
 }
 
@@ -521,21 +1029,15 @@ MAGIC* mg;
 
     if (!SvOK(sv))
 	return 0;
-    s = SvPOK(sv) ? SvPV(sv) : sv_2pv(sv);
+    s = SvPV(sv, na);
     if (*s == '*' && s[1])
 	s++;
-    gv = gv_fetchpv(s,TRUE);
+    gv = gv_fetchpv(s,TRUE, SVt_PVGV);
     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);
-    if (!GvHV(gv))
-	gv_HVadd(gv);
-    if (!GvIO(gv))
-	GvIO(gv) = newIO();
     return 0;
 }
 
@@ -544,10 +1046,37 @@ magic_setsubstr(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    char *tmps = SvPV(sv);
-    if (!tmps)
-	tmps = "";
-    sv_insert(LvTARG(sv),LvTARGOFF(sv),LvTARGLEN(sv), tmps,SvCUR(sv));
+    STRLEN len;
+    char *tmps = SvPV(sv,len);
+    sv_insert(LvTARG(sv),LvTARGOFF(sv),LvTARGLEN(sv), tmps, len);
+    return 0;
+}
+
+int
+magic_gettaint(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    TAINT_IF((mg->mg_len & 1) ||
+	     (mg->mg_len & 2) && mg->mg_obj == sv);	/* kludge */
+    return 0;
+}
+
+int
+magic_settaint(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    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;
 }
 
@@ -561,12 +1090,71 @@ MAGIC* mg;
 }
 
 int
+magic_getitervar(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    SV *targ = Nullsv;
+    if (LvTARGLEN(sv)) {
+	AV* av = (AV*)LvTARG(sv);
+	if (LvTARGOFF(sv) <= AvFILL(av))
+	    targ = AvARRAY(av)[LvTARGOFF(sv)];
+    }
+    else
+	targ = LvTARG(sv);
+    sv_setsv(sv, targ ? targ : &sv_undef);
+    return 0;
+}
+
+int
+magic_setitervar(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    if (LvTARGLEN(sv))
+	vivify_itervar(sv);
+    if (LvTARG(sv))
+	sv_setsv(LvTARG(sv), sv);
+    return 0;
+}
+
+int
+magic_freeitervar(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    SvREFCNT_dec(LvTARG(sv));
+    return 0;
+}
+
+void
+vivify_itervar(sv)
+SV* sv;
+{
+    AV* av;
+
+    if (!LvTARGLEN(sv))
+	return;
+    av = (AV*)LvTARG(sv);
+    if (LvTARGOFF(sv) <= AvFILL(av)) {
+	SV** svp = AvARRAY(av) + LvTARGOFF(sv);
+	LvTARG(sv) = newSVsv(*svp);
+	SvREFCNT_dec(*svp);
+	*svp = SvREFCNT_inc(LvTARG(sv));
+    }
+    else
+	LvTARG(sv) = Nullsv;
+    SvREFCNT_dec(av);
+    LvTARGLEN(sv) = 0;
+}
+
+int
 magic_setmglob(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    mg->mg_ptr = 0;
-    mg->mg_len = 0;
+    mg->mg_len = -1;
+    SvSCREAM_off(sv);
     return 0;
 }
 
@@ -575,12 +1163,22 @@ magic_setbm(sv,mg)
 SV* sv;
 MAGIC* mg;
 {
-    mg_free(sv, 'B');
+    sv_unmagic(sv, 'B');
     SvVALID_off(sv);
     return 0;
 }
 
 int
+magic_setfm(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    sv_unmagic(sv, 'f');
+    SvCOMPILED_off(sv);
+    return 0;
+}
+
+int
 magic_setuvar(sv,mg)
 SV* sv;
 MAGIC* mg;
@@ -592,6 +1190,25 @@ MAGIC* mg;
     return 0;
 }
 
+#ifdef USE_LOCALE_COLLATE
+int
+magic_setcollxfrm(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+    /*
+     * René Descartes said "I think not."
+     * and vanished with a faint plop.
+     */
+    if (mg->mg_ptr) {
+	Safefree(mg->mg_ptr);
+	mg->mg_ptr = NULL;
+	mg->mg_len = -1;
+    }
+    return 0;
+}
+#endif /* USE_LOCALE_COLLATE */
+
 int
 magic_set(sv,mg)
 SV* sv;
@@ -599,24 +1216,47 @@ MAGIC* mg;
 {
     register char *s;
     I32 i;
+    STRLEN len;
     switch (*mg->mg_ptr) {
+    case '\001':	/* ^A */
+	sv_setsv(bodytarget, sv);
+	break;
     case '\004':	/* ^D */
-	debug = (SvIOK(sv) ? SvIV(sv) : sv_2iv(sv)) | 32768;
+	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
+	/* will anyone ever use this? */
+	SETERRNO(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv), 4);
+#endif
+	break;
     case '\006':	/* ^F */
-	maxsysfd = SvIOK(sv) ? SvIV(sv) : sv_2iv(sv);
+	maxsysfd = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
+	break;
+    case '\010':	/* ^H */
+	hints = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	break;
     case '\t':	/* ^I */
 	if (inplace)
 	    Safefree(inplace);
 	if (SvOK(sv))
-	    inplace = savestr(SvPV(sv));
+	    inplace = savepv(SvPV(sv,na));
 	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) ? SvIV(sv) : sv_2iv(sv);
+	i = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	if (i != perldb) {
 	    if (perldb)
 		oldlastpm = curpm;
@@ -626,171 +1266,212 @@ MAGIC* mg;
 	perldb = i;
 	break;
     case '\024':	/* ^T */
-	basetime = (time_t)(SvIOK(sv) ? SvIV(sv) : sv_2iv(sv));
+#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) ? SvIV(sv) : sv_2iv(sv));
+	dowarn = (bool)(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
 	break;
     case '.':
-	if (localizing)
-	    save_sptr((SV**)&last_in_gv);
+	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 '^':
-	Safefree(GvIO(defoutgv)->top_name);
-	GvIO(defoutgv)->top_name = s = savestr(SvPV(sv));
-	GvIO(defoutgv)->top_gv = gv_fetchpv(s,TRUE);
+	Safefree(IoTOP_NAME(GvIOp(defoutgv)));
+	IoTOP_NAME(GvIOp(defoutgv)) = s = savepv(SvPV(sv,na));
+	IoTOP_GV(GvIOp(defoutgv)) = gv_fetchpv(s,TRUE, SVt_PVIO);
 	break;
     case '~':
-	Safefree(GvIO(defoutgv)->fmt_name);
-	GvIO(defoutgv)->fmt_name = s = savestr(SvPV(sv));
-	GvIO(defoutgv)->fmt_gv = gv_fetchpv(s,TRUE);
+	Safefree(IoFMT_NAME(GvIOp(defoutgv)));
+	IoFMT_NAME(GvIOp(defoutgv)) = s = savepv(SvPV(sv,na));
+	IoFMT_GV(GvIOp(defoutgv)) = gv_fetchpv(s,TRUE, SVt_PVIO);
 	break;
     case '=':
-	GvIO(defoutgv)->page_len = (long)(SvIOK(sv) ? SvIV(sv) : sv_2iv(sv));
+	IoPAGE_LEN(GvIOp(defoutgv)) = (long)(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
 	break;
     case '-':
-	GvIO(defoutgv)->lines_left = (long)(SvIOK(sv) ? SvIV(sv) : sv_2iv(sv));
-	if (GvIO(defoutgv)->lines_left < 0L)
-	    GvIO(defoutgv)->lines_left = 0L;
+	IoLINES_LEFT(GvIOp(defoutgv)) = (long)(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
+	if (IoLINES_LEFT(GvIOp(defoutgv)) < 0L)
+	    IoLINES_LEFT(GvIOp(defoutgv)) = 0L;
 	break;
     case '%':
-	GvIO(defoutgv)->page = (long)(SvIOK(sv) ? SvIV(sv) : sv_2iv(sv));
+	IoPAGE(GvIOp(defoutgv)) = (long)(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
 	break;
     case '|':
-	if (!GvIO(defoutgv))
-	    GvIO(defoutgv) = newIO();
-	GvIO(defoutgv)->flags &= ~IOf_FLUSH;
-	if ((SvIOK(sv) ? SvIV(sv) : sv_2iv(sv)) != 0) {
-	    GvIO(defoutgv)->flags |= IOf_FLUSH;
+	IoFLAGS(GvIOp(defoutgv)) &= ~IOf_FLUSH;
+	if ((SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv)) != 0) {
+	    IoFLAGS(GvIOp(defoutgv)) |= IOf_FLUSH;
 	}
 	break;
     case '*':
-	i = SvIOK(sv) ? SvIV(sv) : sv_2iv(sv);
+	i = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	multiline = (i != 0);
 	break;
     case '/':
-	if (SvPOK(sv)) {
-	    nrs = rs = SvPV(sv);
-	    nrslen = rslen = SvCUR(sv);
-	    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)
 	    Safefree(ors);
-	ors = savestr(SvPV(sv));
-	orslen = SvCUR(sv);
+	if (SvOK(sv) || SvGMAGICAL(sv))
+	    ors = savepv(SvPV(sv,orslen));
+	else {
+	    ors = Nullch;
+	    orslen = 0;
+	}
 	break;
     case ',':
 	if (ofs)
 	    Safefree(ofs);
-	ofs = savestr(SvPV(sv));
-	ofslen = SvCUR(sv);
+	ofs = savepv(SvPV(sv, ofslen));
 	break;
     case '#':
 	if (ofmt)
 	    Safefree(ofmt);
-	ofmt = savestr(SvPV(sv));
+	ofmt = savepv(SvPV(sv,na));
 	break;
     case '[':
-	arybase = SvIOK(sv) ? SvIV(sv) : sv_2iv(sv);
+	compiling.cop_arybase = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	break;
     case '?':
-	statusvalue = U_S(SvIOK(sv) ? SvIV(sv) : sv_2iv(sv));
+#ifdef COMPLEX_STATUS
+	if (localizing == 2) {
+	    statusvalue = LvTARGOFF(sv);
+	    statusvalue_vms = LvTARGLEN(sv);
+	}
+	else
+#endif
+#ifdef VMSISH_STATUS
+	if (VMSISH_STATUS)
+	    STATUS_NATIVE_SET((U32)(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv)));
+	else
+#endif
+	    STATUS_POSIX_SET(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
 	break;
     case '!':
-	errno = SvIOK(sv) ? SvIV(sv) : sv_2iv(sv);		/* will anyone ever use this? */
+	SETERRNO(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv),
+		 (SvIV(sv) == EVMSERR) ? 4 : vaxc$errno);
 	break;
     case '<':
-	uid = SvIOK(sv) ? SvIV(sv) : sv_2iv(sv);
+	uid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	if (delaymagic) {
 	    delaymagic |= DM_RUID;
 	    break;				/* don't do magic till later */
 	}
 #ifdef HAS_SETRUID
-	(void)setruid((UIDTYPE)uid);
+	(void)setruid((Uid_t)uid);
 #else
 #ifdef HAS_SETREUID
-	(void)setreuid((UIDTYPE)uid, (UIDTYPE)-1);
+	(void)setreuid((Uid_t)uid, (Uid_t)-1);
+#else
+#ifdef HAS_SETRESUID
+      (void)setresuid((Uid_t)uid, (Uid_t)-1, (Uid_t)-1);
 #else
 	if (uid == euid)		/* special case $< = $> */
 	    (void)setuid(uid);
-	else
-	    fatal("setruid() not implemented");
+	else {
+	    uid = (I32)getuid();
+	    croak("setruid() not implemented");
+	}
 #endif
 #endif
-	uid = SvIOK(sv) ? SvIV(sv) : sv_2iv(sv);
+#endif
+	uid = (I32)getuid();
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case '>':
-	euid = SvIOK(sv) ? SvIV(sv) : sv_2iv(sv);
+	euid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	if (delaymagic) {
 	    delaymagic |= DM_EUID;
 	    break;				/* don't do magic till later */
 	}
 #ifdef HAS_SETEUID
-	(void)seteuid((UIDTYPE)euid);
+	(void)seteuid((Uid_t)euid);
 #else
 #ifdef HAS_SETREUID
-	(void)setreuid((UIDTYPE)-1, (UIDTYPE)euid);
+	(void)setreuid((Uid_t)-1, (Uid_t)euid);
+#else
+#ifdef HAS_SETRESUID
+	(void)setresuid((Uid_t)-1, (Uid_t)euid, (Uid_t)-1);
 #else
 	if (euid == uid)		/* special case $> = $< */
 	    setuid(euid);
-	else
-	    fatal("seteuid() not implemented");
+	else {
+	    euid = (I32)geteuid();
+	    croak("seteuid() not implemented");
+	}
+#endif
 #endif
 #endif
 	euid = (I32)geteuid();
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case '(':
-	gid = SvIOK(sv) ? SvIV(sv) : sv_2iv(sv);
+	gid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	if (delaymagic) {
 	    delaymagic |= DM_RGID;
 	    break;				/* don't do magic till later */
 	}
 #ifdef HAS_SETRGID
-	(void)setrgid((GIDTYPE)gid);
+	(void)setrgid((Gid_t)gid);
 #else
 #ifdef HAS_SETREGID
-	(void)setregid((GIDTYPE)gid, (GIDTYPE)-1);
+	(void)setregid((Gid_t)gid, (Gid_t)-1);
+#else
+#ifdef HAS_SETRESGID
+      (void)setresgid((Gid_t)gid, (Gid_t)-1, (Gid_t) 1);
 #else
 	if (gid == egid)			/* special case $( = $) */
 	    (void)setgid(gid);
-	else
-	    fatal("setrgid() not implemented");
+	else {
+	    gid = (I32)getgid();
+	    croak("setrgid() not implemented");
+	}
+#endif
 #endif
 #endif
 	gid = (I32)getgid();
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case ')':
-	egid = SvIOK(sv) ? SvIV(sv) : sv_2iv(sv);
+	egid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
 	if (delaymagic) {
 	    delaymagic |= DM_EGID;
 	    break;				/* don't do magic till later */
 	}
 #ifdef HAS_SETEGID
-	(void)setegid((GIDTYPE)egid);
+	(void)setegid((Gid_t)egid);
 #else
 #ifdef HAS_SETREGID
-	(void)setregid((GIDTYPE)-1, (GIDTYPE)egid);
+	(void)setregid((Gid_t)-1, (Gid_t)egid);
+#else
+#ifdef HAS_SETRESGID
+	(void)setresgid((Gid_t)-1, (Gid_t)egid, (Gid_t)-1);
 #else
 	if (egid == gid)			/* special case $) = $( */
 	    (void)setgid(egid);
-	else
-	    fatal("setegid() not implemented");
+	else {
+	    egid = (I32)getegid();
+	    croak("setegid() not implemented");
+	}
+#endif
 #endif
 #endif
 	egid = (I32)getegid();
+	tainting |= (uid && (euid != uid || egid != gid));
 	break;
     case ':':
-	chopset = SvPV(sv);
+	chopset = SvPV_force(sv,na);
 	break;
     case '0':
 	if (!origalen) {
@@ -801,7 +1482,8 @@ MAGIC* mg;
 		if (origargv[i] == s + 1)
 		    s += strlen(++s);	/* this one is ok too */
 	    }
-	    if (origenviron[0] == s + 1) {	/* can grab env area too? */
+	    /* can grab env area too? */
+	    if (origenviron && origenviron[0] == s + 1) {
 		my_setenv("NoNeSuCh", Nullch);
 					    /* force copy of environment */
 		for (i = 0; origenviron[i]; i++)
@@ -810,8 +1492,8 @@ MAGIC* mg;
 	    }
 	    origalen = s - origargv[0];
 	}
-	s = SvPV(sv);
-	i = SvCUR(sv);
+	s = SvPV_force(sv,len);
+	i = len;
 	if (i >= origalen) {
 	    i = origalen;
 	    SvCUR_set(sv, i);
@@ -824,6 +1506,9 @@ MAGIC* mg;
 	    *s++ = '\0';
 	    while (++i < origalen)
 		*s++ = ' ';
+	    s = origargv[0]+i;
+	    for (i = 1; i < origargc; i++)
+		origargv[i] = Nullch;
 	}
 	break;
     }
@@ -838,7 +1523,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;
@@ -850,72 +1535,47 @@ char *sig;
     return 0;
 }
 
-static handlertype
+Signal_t
 sighandler(sig)
-I32 sig;
+int sig;
 {
     dSP;
     GV *gv;
+    HV *st;
     SV *sv;
     CV *cv;
-    CONTEXT *cx;
     AV *oldstack;
-    I32 hasargs = 1;
-    I32 items = 1;
-    I32 gimme = G_SCALAR;
 
-#ifdef OS2		/* or anybody else who requires SIG_ACK */
-    signal(sig, SIG_ACK);
-#endif
+    if (!psig_ptr[sig])
+	die("Signal SIG%s received, but no signal handler set.\n",
+	    sig_name[sig]);
 
-    gv = gv_fetchpv(
-	SvPVnx(*hv_fetch(GvHVn(siggv),sig_name[sig],strlen(sig_name[sig]),
-	  TRUE)), TRUE);
-    cv = GvCV(gv);
-    if (!cv && *sig_name[sig] == 'C' && instr(sig_name[sig],"LD")) {
-	if (sig_name[sig][1] == 'H')
-	    gv = gv_fetchpv(SvPVnx(*hv_fetch(GvHVn(siggv),"CLD",3,TRUE)),
-	      TRUE);
-	else
-	    gv = gv_fetchpv(SvPVnx(*hv_fetch(GvHVn(siggv),"CHLD",4,TRUE)),
-	      TRUE);
-	cv = GvCV(gv);	/* gag */
-    }
-    if (!cv) {
+    cv = sv_2cv(psig_ptr[sig],&st,&gv,TRUE);
+    if (!cv || !CvROOT(cv)) {
 	if (dowarn)
 	    warn("SIG%s handler \"%s\" not defined.\n",
 		sig_name[sig], GvENAME(gv) );
 	return;
     }
 
-    oldstack = stack;
-    SWITCHSTACK(stack, signalstack);
+    oldstack = curstack;
+    if (curstack != signalstack)
+	AvFILL(signalstack) = 0;
+    SWITCHSTACK(curstack, signalstack);
 
-    sv = sv_mortalcopy(&sv_undef);
-    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);
-
-    ENTER;
-    SAVETMPS;
-
-    push_return(op);
-    push_return(0);
-    PUSHBLOCK(cx, CXt_SUB, sp);
-    PUSHSUB(cx);
-    cx->blk_sub.savearray = GvAV(defgv);
-    cx->blk_sub.argarray = av_fake(items, sp);
-    GvAV(defgv) = cx->blk_sub.argarray;
-    CvDEPTH(cv)++;
-    if (CvDEPTH(cv) >= 2) {
-	if (CvDEPTH(cv) == 100 && dowarn)
-	    warn("Deep recursion on subroutine \"%s\"",GvENAME(gv));
-    }
-    op = CvSTART(cv);
     PUTBACK;
-    run();		/* Does the LEAVE for us. */
+
+    perl_call_sv((SV*)cv, G_DISCARD);
 
     SWITCHSTACK(signalstack, oldstack);
-    op = pop_return();
 
     return;
 }