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

diff --git a/mg.c b/mg.c
index 98da315..9461515 100644
--- a/mg.c
+++ b/mg.c
@@ -21,6 +21,7 @@
 #endif
 */
 
+
 void
 mg_magical(sv)
 SV* sv;
@@ -79,6 +80,7 @@ SV* sv;
     U32 savemagic = SvMAGICAL(sv);
 
     SvMAGICAL_off(sv);
+    SvFLAGS(sv) |= (SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
 
     for (mg = SvMAGIC(sv); mg; mg = nextmg) {
 	MGVTBL* vtbl = mg->mg_virtual;
@@ -108,7 +110,7 @@ mg_len(sv)
 SV* sv;
 {
     MAGIC* mg;
-    char *s;
+    char *junk;
     STRLEN len;
 
     for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
@@ -130,7 +132,7 @@ SV* sv;
 	}
     }
 
-    s = SvPV(sv, len);
+    junk = SvPV(sv, len);
     return len;
 }
 
@@ -223,6 +225,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 +235,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 +251,7 @@ MAGIC *mg;
 		return 0;
 	    goto getparen;
 	}
+	return 0;
 	break;
     case '`':
 	if (curpm) {
@@ -258,23 +260,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,8 +292,12 @@ 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));
 	break;
@@ -330,49 +330,49 @@ MAGIC *mg;
 	    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
@@ -531,6 +531,49 @@ MAGIC* mg;
     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 SIGALRM    
+    if (signo == SIGALRM) {
+#else
+    if (0) {
+#endif        
+#ifdef SA_INTERRUPT
+	act.sa_flags |= SA_INTERRUPT;	/* SunOS */
+#endif	
+    } else {
+#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
+
+
 int
 magic_setsig(sv,mg)
 SV* sv;
@@ -538,29 +581,61 @@ 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 = mg->mg_ptr;
+    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 (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 (!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;
 }
@@ -852,7 +927,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 +939,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;
 }
 
@@ -918,6 +1001,9 @@ 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());
@@ -953,8 +1039,10 @@ MAGIC* mg;
 	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))
 	    IoLINES(GvIOp(last_in_gv)) = (long)SvIV(sv);
 	break;
@@ -1023,10 +1111,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),SS$_ABORT);		/* will anyone ever use this? */
 	break;
     case '<':
 	uid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
@@ -1039,6 +1127,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 +1140,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 +1168,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 +1187,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 +1214,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 +1276,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,18 +1298,20 @@ int sig;
     SV *sv;
     CV *cv;
     AV *oldstack;
+    char *signame; 
 
 #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]),
+    signame = sig_name[sig];
+    cv = sv_2cv(*hv_fetch(GvHVn(siggv),signame,strlen(signame),
 			  TRUE),
 		&st, &gv, TRUE);
     if (!cv || !CvROOT(cv) &&
-	*sig_name[sig] == 'C' && instr(sig_name[sig],"LD")) {
+	*signame == 'C' && instr(signame,"LD")) {
 	
-	if (sig_name[sig][1] == 'H')
+	if (signame[1] == 'H')
 	    cv = sv_2cv(*hv_fetch(GvHVn(siggv),"CLD",3,TRUE),
 			&st, &gv, TRUE);
 	else
@@ -1227,7 +1322,7 @@ int sig;
     if (!cv || !CvROOT(cv)) {
 	if (dowarn)
 	    warn("SIG%s handler \"%s\" not defined.\n",
-		sig_name[sig], GvENAME(gv) );
+		signame, GvENAME(gv) );
 	return;
     }
 
@@ -1237,7 +1332,7 @@ int sig;
     SWITCHSTACK(stack, signalstack);
 
     sv = sv_newmortal();
-    sv_setpv(sv,sig_name[sig]);
+    sv_setpv(sv,signame);
     PUSHMARK(sp);
     PUSHs(sv);
     PUTBACK;