X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.c;h=b9310650e066b7d9e52441f350c2c003c0b33820;hb=809a5acc2df9d5b3c0528c9c63a1f59bbe24b2cf;hp=d58b0cf494d9d5099f5a42afe33232cc4541a8dc;hpb=4633a7c4bad06b471d9310620b7fe8ddd158cccd;p=p5sagit%2Fp5-mst-13.2.git diff --git a/mg.c b/mg.c index d58b0cf..b931065 100644 --- a/mg.c +++ b/mg.c @@ -1,6 +1,6 @@ /* mg.c * - * Copyright (c) 1991-1994, Larry Wall + * Copyright (c) 1991-1997, 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. @@ -15,11 +15,62 @@ #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 #endif -*/ + +#if defined(HAS_GETGROUPS) || defined(HAS_SETGROUPS) +# 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 @@ -44,30 +95,34 @@ 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; + save_magic(&mgs, 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; } @@ -75,33 +130,25 @@ int mg_set(sv) SV* sv; { + MGS mgs; MAGIC* mg; MAGIC* nextmg; - U32 savemagic = SvMAGICAL(sv); - SvMAGICAL_off(sv); - SvFLAGS(sv) |= (SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT; + 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 */ - 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; } @@ -116,18 +163,13 @@ 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; + MGS mgs; + ENTER; + save_magic(&mgs, 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; } } @@ -140,11 +182,11 @@ int mg_clear(sv) SV* sv; { + MGS mgs; MAGIC* mg; - U32 savemagic = SvMAGICAL(sv); - SvMAGICAL_off(sv); - SvFLAGS(sv) |= (SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT; + ENTER; + save_magic(&mgs, sv); for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) { MGVTBL* vtbl = mg->mg_virtual; @@ -154,10 +196,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; } @@ -179,7 +218,7 @@ mg_copy(sv, nsv, key, klen) SV* sv; SV* nsv; char *key; -STRLEN klen; +I32 klen; { int count = 0; MAGIC* mg; @@ -204,7 +243,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); @@ -225,49 +267,47 @@ 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]) && - (t = curpm->op_pmregexp->endp[paren]) ) { + if (paren <= rx->nparens && + (s = rx->startp[paren]) && + (t = rx->endp[paren])) + { i = t - s; if (i >= 0) return i; } } return 0; - break; case '+': - if (curpm) { - paren = curpm->op_pmregexp->lastparen; - if (!paren) - return 0; - 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; } } 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 i; } } return 0; @@ -292,6 +332,7 @@ MAGIC *mg; register I32 paren; register char *s; register I32 i; + register REGEXP *rx; char *t; switch (*mg->mg_ptr) { @@ -299,44 +340,80 @@ MAGIC *mg; 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 +# include + 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)); + 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]) && - (t = curpm->op_pmregexp->endp[paren]) ) { + if (paren <= rx->nparens && + (s = rx->startp[paren]) && + (t = rx->endp[paren])) + { i = t - s; + getrx: if (i >= 0) { - MAGIC *tmg; + bool was_tainted; + if (tainting) { + was_tainted = tainted; + tainted = FALSE; + } sv_setpvn(sv,s,i); - if (tainting && (tmg = mg_find(sv,'t'))) - tmg->mg_len = 0; /* guarantee $1 untainted */ + if (tainting) + tainted = was_tainted || rx->exec_tainted; break; } } @@ -344,32 +421,27 @@ MAGIC *mg; sv_setsv(sv,&sv_undef); break; case '+': - if (curpm) { - paren = curpm->op_pmregexp->lastparen; + 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); - break; - } + if (curpm && (rx = curpm->op_pmregexp)) { + if ((s = rx->subbeg) && rx->startp[0]) { + i = rx->startp[0] - s; + goto getrx; } } 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; + if (curpm && (rx = curpm->op_pmregexp)) { + if (rx->subend && (s = rx->endp[0])) { + i = rx->subend - s; + goto getrx; } } sv_setsv(sv,&sv_undef); @@ -377,12 +449,19 @@ MAGIC *mg; 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); + { + dTHR; + sv_setiv(sv, (IV)STATUS_CURRENT); +#ifdef COMPLEX_STATUS + LvTARGOFF(sv) = statusvalue; + LvTARGLEN(sv) = statusvalue_vms; +#endif + } break; case '^': s = IoTOP_NAME(GvIOp(defoutgv)); @@ -401,13 +480,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 +494,10 @@ MAGIC *mg; case '/': break; case '[': - sv_setiv(sv,(I32)curcop->cop_arybase); + WITH_THR(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 +509,46 @@ 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 '(': - s = buf; - (void)sprintf(s,"%d",(int)gid); + sv_setiv(sv, (IV)gid); + sv_setpvf(sv, "%Vd", (IV)gid); goto add_groups; case ')': - s = buf; - (void)sprintf(s,"%d",(int)egid); + sv_setiv(sv, (IV)egid); + sv_setpvf(sv, "%Vd", (IV)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]); - while (*s) s++; - } + while (--i >= 0) + sv_catpvf(sv, " %Vd", (IV)gary[i]); } #endif - sv_setpv(sv,buf); + SvIOK_on(sv); /* what a wonderful hack! */ break; case '*': break; @@ -491,34 +576,74 @@ SV* sv; MAGIC* mg; { register char *s; - STRLEN len; + char *ptr; + STRLEN len, klen; I32 i; + s = SvPV(sv,len); - my_setenv(mg->mg_ptr,s); + ptr = MgPV(mg,klen); + 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); + SV **valp; + if ((valp = hv_fetch(GvHVn(envgv), ptr, klen, FALSE))) + s = SvPV(*valp, len); } #endif + +#if !defined(OS2) && !defined(AMIGAOS) && !defined(_WIN32) /* And you'll never guess what the dog had */ /* in its mouth... */ if (tainting) { - if (s && strEQ(mg->mg_ptr,"PATH")) { + MgTAINTEDDIR_off(mg); +#ifdef VMS + if (s && klen == 8 && strEQ(ptr, "DCL$PATH")) { + char pathbuf[256], eltbuf[256], *cp, *elt = s; + struct stat sbuf; + int i = 0, j = 0; + + do { /* DCL$PATH may be a search list */ + while (1) { /* as may dev portion of any element */ + if ( ((cp = strchr(elt,'[')) || (cp = strchr(elt,'<'))) ) { + if ( *(cp+1) == '.' || *(cp+1) == '-' || + cando_by_name(S_IWUSR,0,elt) ) { + MgTAINTEDDIR_on(mg); + return 0; + } + } + if ((cp = strchr(elt, ':')) != Nullch) + *cp = '\0'; + if (my_trnlnm(elt, eltbuf, j++)) + elt = eltbuf; + else + break; + } + j = 0; + } while (my_trnlnm(s, pathbuf, i++) && (elt = pathbuf)); + } +#endif /* VMS */ + if (s && klen == 4 && strEQ(ptr,"PATH")) { char *strend = s + len; while (s < strend) { - s = cpytill(tokenbuf,s,strend,':',&i); + struct stat st; + s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, + s, strend, ':', &i); s++; - if (*tokenbuf != '/' - || (Stat(tokenbuf,&statbuf) && (statbuf.st_mode & 2)) ) + if (i >= sizeof tokenbuf /* too long -- assume the worst */ + || *tokenbuf != '/' + || (Stat(tokenbuf, &st) == 0 && (st.st_mode & 2)) ) { MgTAINTEDDIR_on(mg); + return 0; + } } } } +#endif /* neither OS2 nor AMIGAOS nor _WIN32 */ + return 0; } @@ -527,7 +652,54 @@ magic_clearenv(sv,mg) SV* sv; MAGIC* mg; { - my_setenv(mg->mg_ptr,Nullch); + my_setenv(MgPV(mg,na),Nullch); + return 0; +} + +int +magic_getsig(sv,mg) +SV* sv; +MAGIC* mg; +{ + I32 i; + /* Are we fetching a signal entry? */ + i = whichsig(MgPV(mg,na)); + if (i) { + if(psig_ptr[i]) + sv_setsv(sv,psig_ptr[i]); + else { + dTHR; /* just for SvREFCNT_inc */ + 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,na)); + 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; } @@ -536,11 +708,12 @@ magic_setsig(sv,mg) SV* sv; MAGIC* mg; { + dTHR; register char *s; I32 i; SV** svp; - s = mg->mg_ptr; + s = MgPV(mg,na); if (*s == '_') { if (strEQ(s,"__DIE__")) svp = &diehook; @@ -563,10 +736,16 @@ MAGIC* mg; 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)signal(i,sighandler); + (void)rsignal(i, sighandler); else *svp = SvREFCNT_inc(sv); return 0; @@ -574,23 +753,26 @@ 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; } else { - if (!strchr(s,':') && !strchr(s,'\'')) { - sprintf(tokenbuf, "main::%s",s); - sv_setpv(sv,tokenbuf); - } + /* + * We should warn if HINT_STRICT_REFS, but without + * access to a known hint bit in a known OP, we can't + * tell whether HINT_STRICT_REFS is in force or not. + */ + if (!strchr(s,':') && !strchr(s,'\'')) + sv_setpv(sv, form("main::%s", s)); if (i) - (void)signal(i,sighandler); + (void)rsignal(i, sighandler); else *svp = SvREFCNT_inc(sv); } @@ -620,12 +802,25 @@ 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; MAGIC* mg; char *meth; { + dTHR; dSP; ENTER; @@ -633,8 +828,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; @@ -663,13 +862,18 @@ magic_setpack(sv,mg) SV* sv; MAGIC* mg; { + dTHR; dSP; 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); @@ -692,6 +896,7 @@ int magic_wipepack(sv,mg) SV* sv; MAGIC* mg; { + dTHR; dSP; PUSHMARK(sp); @@ -709,6 +914,7 @@ SV* sv; MAGIC* mg; SV* key; { + dTHR; dSP; char *meth = SvOK(key) ? "NEXTKEY" : "FIRSTKEY"; @@ -742,6 +948,7 @@ magic_setdbline(sv,mg) SV* sv; MAGIC* mg; { + dTHR; OP *o; I32 i; GV* gv; @@ -749,7 +956,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,na)), FALSE); if (svp && SvIOKp(*svp) && (o = (OP*)SvSTASH(*svp))) o->op_private = i; else @@ -762,6 +970,7 @@ magic_getarylen(sv,mg) SV* sv; MAGIC* mg; { + dTHR; sv_setiv(sv, AvFILL((AV*)mg->mg_obj) + curcop->cop_arybase); return 0; } @@ -771,6 +980,7 @@ magic_setarylen(sv,mg) SV* sv; MAGIC* mg; { + dTHR; av_fill((AV*)mg->mg_obj, SvIV(sv) - curcop->cop_arybase); return 0; } @@ -785,6 +995,7 @@ MAGIC* mg; if (SvTYPE(lsv) >= SVt_PVMG && SvMAGIC(lsv)) { mg = mg_find(lsv, 'g'); if (mg && mg->mg_len >= 0) { + dTHR; sv_setiv(sv, mg->mg_len + curcop->cop_arybase); return 0; } @@ -818,7 +1029,7 @@ MAGIC* mg; } len = SvPOK(lsv) ? SvCUR(lsv) : sv_len(lsv); - pos = SvIV(sv) - curcop->cop_arybase; + WITH_THR(pos = SvIV(sv) - curcop->cop_arybase); if (pos < 0) { pos += len; if (pos < 0) @@ -827,6 +1038,7 @@ MAGIC* mg; else if (pos > len) pos = len; mg->mg_len = pos; + mg->mg_flags &= ~MGf_MINMATCH; return 0; } @@ -836,7 +1048,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; } @@ -857,14 +1075,8 @@ 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); - if (!GvHV(gv)) - gv_HVadd(gv); - if (!GvIOp(gv)) - GvIOp(gv) = newIO(); return 0; } @@ -884,10 +1096,8 @@ magic_gettaint(sv,mg) SV* sv; MAGIC* mg; { - if (mg->mg_len & 1) - tainted = TRUE; - else if (mg->mg_len & 2 && mg->mg_obj == sv) /* kludge */ - tainted = TRUE; + TAINT_IF((mg->mg_len & 1) || + (mg->mg_len & 2) && mg->mg_obj == sv); /* kludge */ return 0; } @@ -896,6 +1106,7 @@ magic_settaint(sv,mg) SV* sv; MAGIC* mg; { + dTHR; if (localizing) { if (localizing == 1) mg->mg_len <<= 1; @@ -919,11 +1130,105 @@ MAGIC* mg; } int +magic_getdefelem(sv,mg) +SV* sv; +MAGIC* mg; +{ + SV *targ = Nullsv; + if (LvTARGLEN(sv)) { + if (mg->mg_obj) { + HV* hv = (HV*)LvTARG(sv); + HE* he = hv_fetch_ent(hv, mg->mg_obj, FALSE, 0); + if (he) + targ = HeVAL(he); + } + else { + AV* av = (AV*)LvTARG(sv); + if ((I32)LvTARGOFF(sv) <= AvFILL(av)) + targ = AvARRAY(av)[LvTARGOFF(sv)]; + } + if (targ && targ != &sv_undef) { + dTHR; /* just for SvREFCNT_dec */ + /* somebody else defined it for us */ + SvREFCNT_dec(LvTARG(sv)); + LvTARG(sv) = SvREFCNT_inc(targ); + LvTARGLEN(sv) = 0; + SvREFCNT_dec(mg->mg_obj); + mg->mg_obj = Nullsv; + mg->mg_flags &= ~MGf_REFCOUNTED; + } + } + else + targ = LvTARG(sv); + sv_setsv(sv, targ ? targ : &sv_undef); + return 0; +} + +int +magic_setdefelem(sv,mg) +SV* sv; +MAGIC* mg; +{ + if (LvTARGLEN(sv)) + vivify_defelem(sv); + if (LvTARG(sv)) { + sv_setsv(LvTARG(sv), sv); + SvSETMAGIC(LvTARG(sv)); + } + return 0; +} + +int +magic_freedefelem(sv,mg) +SV* sv; +MAGIC* mg; +{ + SvREFCNT_dec(LvTARG(sv)); + return 0; +} + +void +vivify_defelem(sv) +SV* sv; +{ + dTHR; /* just for SvREFCNT_inc and SvREFCNT_dec*/ + MAGIC* mg; + SV* value; + + if (!LvTARGLEN(sv) || !(mg = mg_find(sv, 'y'))) + return; + if (mg->mg_obj) { + HV* hv = (HV*)LvTARG(sv); + HE* he = hv_fetch_ent(hv, mg->mg_obj, TRUE, 0); + if (!he || (value = HeVAL(he)) == &sv_undef) + croak(no_helem, SvPV(mg->mg_obj, na)); + } + else { + AV* av = (AV*)LvTARG(sv); + if ((I32)LvTARGLEN(sv) < 0 && (I32)LvTARGOFF(sv) > AvFILL(av)) + LvTARG(sv) = Nullsv; /* array can't be extended */ + else { + SV** svp = av_fetch(av, LvTARGOFF(sv), TRUE); + if (!svp || (value = *svp) == &sv_undef) + croak(no_aelem, (I32)LvTARGOFF(sv)); + } + } + SvREFCNT_inc(value); + SvREFCNT_dec(LvTARG(sv)); + LvTARG(sv) = value; + LvTARGLEN(sv) = 0; + SvREFCNT_dec(mg->mg_obj); + mg->mg_obj = Nullsv; + mg->mg_flags &= ~MGf_REFCOUNTED; +} + +int magic_setmglob(sv,mg) SV* sv; MAGIC* mg; { mg->mg_len = -1; + SvSCREAM_off(sv); return 0; } @@ -938,6 +1243,16 @@ MAGIC* mg; } 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; @@ -949,11 +1264,31 @@ 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; MAGIC* mg; { + dTHR; register char *s; I32 i; STRLEN len; @@ -965,6 +1300,14 @@ 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 + /* will anyone ever use this? */ + SETERRNO(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv), 4); +#endif + break; case '\006': /* ^F */ maxsysfd = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv); break; @@ -979,6 +1322,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) { @@ -990,7 +1341,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)); @@ -1000,7 +1355,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 '^': @@ -1025,9 +1380,18 @@ MAGIC* mg; IoPAGE(GvIOp(defoutgv)) = (long)(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv)); break; case '|': - IoFLAGS(GvIOp(defoutgv)) &= ~IOf_FLUSH; - if ((SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv)) != 0) { - IoFLAGS(GvIOp(defoutgv)) |= IOf_FLUSH; + { + IO *io = GvIOp(defoutgv); + if ((SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv)) == 0) + IoFLAGS(io) &= ~IOf_FLUSH; + else { + if (!(IoFLAGS(io) & IOf_FLUSH)) { + PerlIO *ofp = IoOFP(io); + if (ofp) + (void)PerlIO_flush(ofp); + IoFLAGS(io) |= IOf_FLUSH; + } + } } break; case '*': @@ -1035,24 +1399,20 @@ 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) Safefree(ors); - ors = savepv(SvPV(sv,orslen)); + if (SvOK(sv) || SvGMAGICAL(sv)) + ors = savepv(SvPV(sv,orslen)); + else { + ors = Nullch; + orslen = 0; + } break; case ',': if (ofs) @@ -1068,10 +1428,23 @@ MAGIC* mg; compiling.cop_arybase = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv); break; case '?': - statusvalue = FIXSTATUS(SvIOK(sv) ? SvIVX(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 '!': - 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); break; case '<': uid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv); @@ -1155,7 +1528,30 @@ MAGIC* mg; tainting |= (uid && (euid != uid || egid != gid)); break; case ')': +#ifdef HAS_SETGROUPS + { + char *p = SvPV(sv, na); + Groups_t gary[NGROUPS]; + + SET_NUMERIC_STANDARD(); + while (isSPACE(*p)) + ++p; + egid = I_V(atof(p)); + for (i = 0; i < NGROUPS; ++i) { + while (*p && !isSPACE(*p)) + ++p; + while (isSPACE(*p)) + ++p; + if (!*p) + break; + gary[i] = I_V(atof(p)); + } + if (i) + (void)setgroups(i, gary); + } +#else /* HAS_SETGROUPS */ egid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv); +#endif /* HAS_SETGROUPS */ if (delaymagic) { delaymagic |= DM_EGID; break; /* don't do magic till later */ @@ -1193,7 +1589,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++) @@ -1225,6 +1622,23 @@ MAGIC* mg; return 0; } +#ifdef USE_THREADS +int +magic_mutexfree(sv, mg) +SV *sv; +MAGIC *mg; +{ + dTHR; + DEBUG_L(PerlIO_printf(PerlIO_stderr(), "0x%lx: magic_mutexfree 0x%lx\n", + (unsigned long)thr, (unsigned long)sv);) + if (MgOWNER(mg)) + croak("panic: magic_mutexfree"); + MUTEX_DESTROY(MgMUTEXP(mg)); + COND_DESTROY(MgCONDP(mg)); + return 0; +} +#endif /* USE_THREADS */ + I32 whichsig(sig) char *sig; @@ -1249,47 +1663,37 @@ Signal_t sighandler(sig) int sig; { + dTHR; dSP; GV *gv; HV *st; SV *sv; CV *cv; AV *oldstack; - char *signame; -#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]); - signame = sig_name[sig]; - cv = sv_2cv(*hv_fetch(GvHVn(siggv),signame,strlen(signame), - TRUE), - &st, &gv, TRUE); - if (!cv || !CvROOT(cv) && - *signame == 'C' && instr(signame,"LD")) { - - if (signame[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", - signame, GvENAME(gv) ); + sig_name[sig], GvENAME(gv) ); 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,signame); + 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;