X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.c;h=8af7172d16dee5321b3db246a9fede5662ed1d5c;hb=e9e069932a0db06904b29e2b09a435afd40ed35c;hp=c6991affdb01d7f4cac2504e544cda98bffb70bd;hpb=8e07c86ebc651fe92eb7e3b25f801f57cfb8dd6f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perl.c b/perl.c index c6991af..8af7172 100644 --- a/perl.c +++ b/perl.c @@ -1,6 +1,6 @@ /* perl.c * - * Copyright (c) 1987-1994 Larry Wall + * Copyright (c) 1987-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,13 +15,16 @@ #include "perl.h" #include "patchlevel.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 -*/ -char rcsid[] = "perl.c\nPatch level: ###\n"; +#if !defined(STANDARD_C) && !defined(HAS_GETENV_PROTOTYPE) +char *getenv _((char *)); /* Usually in */ +#endif + +dEXTCONST char rcsid[] = "perl.c\nPatch level: ###\n"; #ifdef IAMSUID #ifndef DOSUID @@ -35,8 +38,33 @@ char rcsid[] = "perl.c\nPatch level: ###\n"; #endif #endif +#define I_REINIT \ + STMT_START { \ + chopset = " \n-"; \ + copline = NOLINE; \ + curcop = &compiling; \ + curcopdb = NULL; \ + cxstack_ix = -1; \ + cxstack_max = 128; \ + dbargs = 0; \ + dlmax = 128; \ + laststatval = -1; \ + laststype = OP_STAT; \ + maxscream = -1; \ + maxsysfd = MAXSYSFD; \ + statname = Nullsv; \ + tmps_floor = -1; \ + tmps_ix = -1; \ + op_mask = NULL; \ + dlmax = 128; \ + laststatval = -1; \ + laststype = OP_STAT; \ + mess_sv = Nullsv; \ + } STMT_END + static void find_beginning _((void)); -static void incpush _((char *)); +static void forbid_setid _((char *)); +static void incpush _((char *, int)); static void init_ids _((void)); static void init_debugger _((void)); static void init_lexer _((void)); @@ -45,8 +73,13 @@ static void init_perllib _((void)); static void init_postdump_symbols _((int, char **, char **)); static void init_predump_symbols _((void)); static void init_stacks _((void)); +static void my_exit_jump _((void)) __attribute__((noreturn)); +static void nuke_stacks _((void)); static void open_script _((char *, bool, SV *)); -static void validate_suid _((char *)); +static void usage _((char *)); +static void validate_suid _((char *, char*)); + +static int fdscript = -1; PerlInterpreter * perl_alloc() @@ -74,15 +107,22 @@ register PerlInterpreter *sv_interp; linestr = NEWSV(65,80); sv_upgrade(linestr,SVt_PVIV); - SvREADONLY_on(&sv_undef); + if (!SvREADONLY(&sv_undef)) { + SvREADONLY_on(&sv_undef); - sv_setpv(&sv_no,No); - SvNV(&sv_no); - SvREADONLY_on(&sv_no); + sv_setpv(&sv_no,No); + SvNV(&sv_no); + SvREADONLY_on(&sv_no); - sv_setpv(&sv_yes,Yes); - SvNV(&sv_yes); - SvREADONLY_on(&sv_yes); + sv_setpv(&sv_yes,Yes); + SvNV(&sv_yes); + SvREADONLY_on(&sv_yes); + } + + nrs = newSVpv("\n", 1); + rs = SvREFCNT_inc(nrs); + + pidstatus = newHV(); #ifdef MSDOS /* @@ -96,30 +136,38 @@ register PerlInterpreter *sv_interp; } #ifdef MULTIPLICITY - chopset = " \n-"; - copline = NOLINE; - curcop = &compiling; - dlmax = 128; - laststatval = -1; - laststype = OP_STAT; - maxscream = -1; - maxsysfd = MAXSYSFD; - nrs = "\n"; - nrschar = '\n'; - nrslen = 1; - rs = "\n"; - rschar = '\n'; - rsfp = Nullfp; - rslen = 1; - statname = Nullsv; - tmps_floor = -1; + I_REINIT; + perl_destruct_level = 1; +#else + if(perl_destruct_level > 0) + I_REINIT; #endif init_ids(); - sprintf(patchlevel, "%5.3f", 5.0 + (PATCHLEVEL / 1000.0)); + + start_env.je_prev = NULL; + start_env.je_ret = -1; + start_env.je_mustcatch = TRUE; + top_env = &start_env; + STATUS_ALL_SUCCESS; + + SET_NUMERIC_STANDARD(); +#if defined(SUBVERSION) && SUBVERSION > 0 + sprintf(patchlevel, "%7.5f", (double) 5 + + ((double) PATCHLEVEL / (double) 1000) + + ((double) SUBVERSION / (double) 100000)); +#else + sprintf(patchlevel, "%5.3f", (double) 5 + + ((double) PATCHLEVEL / (double) 1000)); +#endif + +#if defined(LOCAL_PATCH_COUNT) + localpatches = local_patches; /* For possible -v */ +#endif + + PerlIO_init(); /* Hook to IO system */ fdpid = newAV(); /* for remembering popen pids by fd */ - pidstatus = newHV();/* for remembering status of dead pids */ init_stacks(); ENTER; @@ -137,17 +185,32 @@ register PerlInterpreter *sv_interp; return; destruct_level = perl_destruct_level; +#ifdef DEBUGGING + { + char *s; + if (s = getenv("PERL_DESTRUCT_LEVEL")) { + int i = atoi(s); + if (destruct_level < i) + destruct_level = i; + } + } +#endif + LEAVE; FREETMPS; - if (sv_objcount) { - /* We must account for everything. First the syntax tree. */ - if (main_root) { - curpad = AvARRAY(comppad); - op_free(main_root); - main_root = 0; - } + /* We must account for everything. */ + + /* Destroy the main CV and syntax tree */ + if (main_root) { + curpad = AvARRAY(comppad); + op_free(main_root); + main_root = Nullop; } + main_start = Nullop; + SvREFCNT_dec(main_cv); + main_cv = Nullcv; + if (sv_objcount) { /* * Try to destruct global references. We do this first so that the @@ -159,6 +222,14 @@ register PerlInterpreter *sv_interp; sv_clean_objs(); } + /* unhook hooks which will soon be, or use, destroyed data */ + SvREFCNT_dec(warnhook); + warnhook = Nullsv; + SvREFCNT_dec(diehook); + diehook = Nullsv; + SvREFCNT_dec(parsehook); + parsehook = Nullsv; + if (destruct_level == 0){ DEBUG_P(debprofdump()); @@ -166,8 +237,126 @@ register PerlInterpreter *sv_interp; /* The exit() function will do everything that needs doing. */ return; } - + + /* loosen bonds of global variables */ + + if(rsfp) { + (void)PerlIO_close(rsfp); + rsfp = Nullfp; + } + + /* Filters for program text */ + SvREFCNT_dec(rsfp_filters); + rsfp_filters = Nullav; + + /* switches */ + preprocess = FALSE; + minus_n = FALSE; + minus_p = FALSE; + minus_l = FALSE; + minus_a = FALSE; + minus_F = FALSE; + doswitches = FALSE; + dowarn = FALSE; + doextract = FALSE; + sawampersand = FALSE; /* must save all match strings */ + sawstudy = FALSE; /* do fbm_instr on all strings */ + sawvec = FALSE; + unsafe = FALSE; + + Safefree(inplace); + inplace = Nullch; + + Safefree(e_tmpname); + e_tmpname = Nullch; + + if (e_fp) { + PerlIO_close(e_fp); + e_fp = Nullfp; + } + + /* magical thingies */ + + Safefree(ofs); /* $, */ + ofs = Nullch; + + Safefree(ors); /* $\ */ + ors = Nullch; + + SvREFCNT_dec(nrs); /* $\ helper */ + nrs = Nullsv; + + multiline = 0; /* $* */ + + SvREFCNT_dec(statname); + statname = Nullsv; + statgv = Nullgv; + + /* defgv, aka *_ should be taken care of elsewhere */ + +#if 0 /* just about all regexp stuff, seems to be ok */ + + /* shortcuts to regexp stuff */ + leftgv = Nullgv; + ampergv = Nullgv; + + SAVEFREEOP(curpm); + SAVEFREEOP(oldlastpm); /* for saving regexp context during debugger */ + + regprecomp = NULL; /* uncompiled string. */ + regparse = NULL; /* Input-scan pointer. */ + regxend = NULL; /* End of input for compile */ + regnpar = 0; /* () count. */ + regcode = NULL; /* Code-emit pointer; ®dummy = don't. */ + regsize = 0; /* Code size. */ + regnaughty = 0; /* How bad is this pattern? */ + regsawback = 0; /* Did we see \1, ...? */ + + reginput = NULL; /* String-input pointer. */ + regbol = NULL; /* Beginning of input, for ^ check. */ + regeol = NULL; /* End of input, for $ check. */ + regstartp = (char **)NULL; /* Pointer to startp array. */ + regendp = (char **)NULL; /* Ditto for endp. */ + reglastparen = 0; /* Similarly for lastparen. */ + regtill = NULL; /* How far we are required to go. */ + regflags = 0; /* are we folding, multilining? */ + regprev = (char)NULL; /* char before regbol, \n if none */ + +#endif /* if 0 */ + + /* clean up after study() */ + SvREFCNT_dec(lastscream); + lastscream = Nullsv; + Safefree(screamfirst); + screamfirst = 0; + Safefree(screamnext); + screamnext = 0; + + /* startup and shutdown function lists */ + SvREFCNT_dec(beginav); + SvREFCNT_dec(endav); + beginav = Nullav; + endav = Nullav; + + /* temp stack during pp_sort() */ + SvREFCNT_dec(sortstack); + sortstack = Nullav; + + /* shortcuts just get cleared */ + envgv = Nullgv; + siggv = Nullgv; + incgv = Nullgv; + errgv = Nullgv; + argvgv = Nullgv; + argvoutgv = Nullgv; + stdingv = Nullgv; + last_in_gv = Nullgv; + + /* reset so print() ends up where we expect */ + setdefout(Nullgv); + /* Prepare to destruct main symbol table. */ + hv = defstash; defstash = 0; SvREFCNT_dec(hv); @@ -175,25 +364,84 @@ register PerlInterpreter *sv_interp; FREETMPS; if (destruct_level >= 2) { if (scopestack_ix != 0) - warn("Unbalanced scopes: %d more ENTERs than LEAVEs\n", scopestack_ix); + warn("Unbalanced scopes: %ld more ENTERs than LEAVEs\n", + (long)scopestack_ix); if (savestack_ix != 0) - warn("Unbalanced saves: %d more saves than restores\n", savestack_ix); + warn("Unbalanced saves: %ld more saves than restores\n", + (long)savestack_ix); if (tmps_floor != -1) - warn("Unbalanced tmps: %d more allocs than frees\n", tmps_floor + 1); + warn("Unbalanced tmps: %ld more allocs than frees\n", + (long)tmps_floor + 1); if (cxstack_ix != -1) - warn("Unbalanced context: %d more PUSHes than POPs\n", cxstack_ix + 1); + warn("Unbalanced context: %ld more PUSHes than POPs\n", + (long)cxstack_ix + 1); } /* Now absolutely destruct everything, somehow or other, loops or no. */ last_sv_count = 0; + SvFLAGS(strtab) |= SVTYPEMASK; /* don't clean out strtab now */ while (sv_count != 0 && sv_count != last_sv_count) { last_sv_count = sv_count; sv_clean_all(); } + SvFLAGS(strtab) &= ~SVTYPEMASK; + SvFLAGS(strtab) |= SVt_PVHV; + + /* Destruct the global string table. */ + { + /* Yell and reset the HeVAL() slots that are still holding refcounts, + * so that sv_free() won't fail on them. + */ + I32 riter; + I32 max; + HE *hent; + HE **array; + + riter = 0; + max = HvMAX(strtab); + array = HvARRAY(strtab); + hent = array[0]; + for (;;) { + if (hent) { + warn("Unbalanced string table refcount: (%d) for \"%s\"", + HeVAL(hent) - Nullsv, HeKEY(hent)); + HeVAL(hent) = Nullsv; + hent = HeNEXT(hent); + } + if (!hent) { + if (++riter > max) + break; + hent = array[riter]; + } + } + } + SvREFCNT_dec(strtab); + if (sv_count != 0) - warn("Scalars leaked: %d\n", sv_count); + warn("Scalars leaked: %ld\n", (long)sv_count); + + sv_free_arenas(); + + /* No SVs have survived, need to clean out */ + linestr = NULL; + pidstatus = Nullhv; + if (origfilename) + Safefree(origfilename); + nuke_stacks(); + hints = 0; /* Reset hints. Should hints be per-interpreter ? */ DEBUG_P(debprofdump()); + + /* As the absolutely last thing, free the non-arena SV for mess() */ + + if (mess_sv) { + /* we know that type >= SVt_PV */ + SvOOK_off(mess_sv); + Safefree(SvPVX(mess_sv)); + Safefree(SvANY(mess_sv)); + Safefree(mess_sv); + mess_sv = Nullsv; + } } void @@ -204,9 +452,6 @@ PerlInterpreter *sv_interp; return; Safefree(sv_interp); } -#if !defined(STANDARD_C) && !defined(HAS_GETENV_PROTOTYPE) -char *getenv _((char *)); /* Usually in */ -#endif int perl_parse(sv_interp, xsinit, argc, argv, env) @@ -218,10 +463,13 @@ char **env; { register SV *sv; register char *s; - char *scriptname; + char *scriptname = NULL; VOL bool dosearch = FALSE; char *validarg = ""; + I32 oldscope; AV* comppadlist; + dJMPENV; + int ret; #ifdef SETUID_SCRIPTS_ARE_SECURE_NOW #ifdef IAMSUID @@ -234,11 +482,17 @@ setuid perl scripts securely.\n"); if (!(curinterp = sv_interp)) return 255; +#if defined(NeXT) && defined(__DYNAMIC__) + _dyld_lookup_and_bind + ("__environ", (unsigned long *) &environ_pointer, NULL); +#endif /* environ */ + origargv = argv; origargc = argc; #ifndef VMS /* VMS doesn't have environ array */ origenviron = environ; #endif + e_tmpname = Nullch; if (do_undump) { @@ -252,24 +506,35 @@ setuid perl scripts securely.\n"); return 0; } - if (main_root) + if (main_root) { + curpad = AvARRAY(comppad); op_free(main_root); - main_root = 0; + main_root = Nullop; + } + main_start = Nullop; + SvREFCNT_dec(main_cv); + main_cv = Nullcv; - switch (setjmp(top_env)) { + time(&basetime); + oldscope = scopestack_ix; + + JMPENV_PUSH(ret); + switch (ret) { case 1: -#ifdef VMS - statusvalue = 255; -#else - statusvalue = 1; -#endif + STATUS_ALL_FAILURE; + /* FALL THROUGH */ case 2: + /* my_exit() was called */ + while (scopestack_ix > oldscope) + LEAVE; curstash = defstash; if (endav) - calllist(endav); - return(statusvalue); /* my_exit() was called */ + call_list(oldscope, endav); + JMPENV_POP; + return STATUS_NATIVE_EXPORT; case 3: - fprintf(stderr, "panic: top_env\n"); + JMPENV_POP; + PerlIO_printf(PerlIO_stderr(), "panic: top_env\n"); return 1; } @@ -277,6 +542,7 @@ setuid perl scripts securely.\n"); sv = newSVpv("",0); /* first used for -I flags */ SAVEFREESV(sv); init_main_stash(); + for (argc--,argv++; argc > 0; argc--,argv++) { if (argv[0][0] != '-' || !argv[0][1]) break; @@ -295,12 +561,14 @@ setuid perl scripts securely.\n"); case 'c': case 'd': case 'D': + case 'h': case 'i': case 'l': + case 'M': + case 'm': case 'n': case 'p': case 's': - case 'T': case 'u': case 'U': case 'v': @@ -309,6 +577,11 @@ setuid perl scripts securely.\n"); goto reswitch; break; + case 'T': + tainting = TRUE; + s++; + goto reswitch; + case 'e': if (euid != uid || egid != gid) croak("No -e allowed in setuid scripts"); @@ -317,41 +590,102 @@ setuid perl scripts securely.\n"); (void)mktemp(e_tmpname); if (!*e_tmpname) croak("Can't mktemp()"); - e_fp = fopen(e_tmpname,"w"); + e_fp = PerlIO_open(e_tmpname,"w"); if (!e_fp) croak("Cannot open temporary file"); } - if (argv[1]) { - fputs(argv[1],e_fp); + if (*++s) + PerlIO_puts(e_fp,s); + else if (argv[1]) { + PerlIO_puts(e_fp,argv[1]); argc--,argv++; } - (void)putc('\n', e_fp); + else + croak("No code specified for -e"); + (void)PerlIO_putc(e_fp,'\n'); break; case 'I': - taint_not("-I"); + forbid_setid("-I"); sv_catpv(sv,"-"); sv_catpv(sv,s); sv_catpv(sv," "); if (*++s) { - av_push(GvAVn(incgv),newSVpv(s,0)); + incpush(s, TRUE); } else if (argv[1]) { - av_push(GvAVn(incgv),newSVpv(argv[1],0)); + incpush(argv[1], TRUE); sv_catpv(sv,argv[1]); argc--,argv++; sv_catpv(sv," "); } break; case 'P': - taint_not("-P"); + forbid_setid("-P"); preprocess = TRUE; s++; goto reswitch; case 'S': - taint_not("-S"); + forbid_setid("-S"); dosearch = TRUE; s++; goto reswitch; + case 'V': + if (!preambleav) + preambleav = newAV(); + av_push(preambleav, newSVpv("use Config qw(myconfig config_vars)",0)); + if (*++s != ':') { + Sv = newSVpv("print myconfig();",0); +#ifdef VMS + sv_catpv(Sv,"print \"\\nCharacteristics of this PERLSHR image: \\n\","); +#else + sv_catpv(Sv,"print \"\\nCharacteristics of this binary (from libperl): \\n\","); +#endif +#if defined(DEBUGGING) || defined(NO_EMBED) || defined(MULTIPLICITY) + sv_catpv(Sv,"\" Compile-time options:"); +# ifdef DEBUGGING + sv_catpv(Sv," DEBUGGING"); +# endif +# ifdef NO_EMBED + sv_catpv(Sv," NO_EMBED"); +# endif +# ifdef MULTIPLICITY + sv_catpv(Sv," MULTIPLICITY"); +# endif + sv_catpv(Sv,"\\n\","); +#endif +#if defined(LOCAL_PATCH_COUNT) + if (LOCAL_PATCH_COUNT > 0) { + int i; + sv_catpv(Sv,"\" Locally applied patches:\\n\","); + for (i = 1; i <= LOCAL_PATCH_COUNT; i++) { + if (localpatches[i]) + sv_catpvf(Sv,"\" \\t%s\\n\",",localpatches[i]); + } + } +#endif + sv_catpvf(Sv,"\" Built under %s\\n\"",OSNAME); +#ifdef __DATE__ +# ifdef __TIME__ + sv_catpvf(Sv,",\" Compiled at %s %s\\n\"",__DATE__,__TIME__); +# else + sv_catpvf(Sv,",\" Compiled on %s\\n\"",__DATE__); +# endif +#endif + sv_catpv(Sv, "; \ +$\"=\"\\n \"; \ +@env = map { \"$_=\\\"$ENV{$_}\\\"\" } sort grep {/^PERL/} keys %ENV; \ +print \" \\%ENV:\\n @env\\n\" if @env; \ +print \" \\@INC:\\n @INC\\n\";"); + } + else { + Sv = newSVpv("config_vars(qw(",0); + sv_catpv(Sv, ++s); + sv_catpv(Sv, "))"); + s += strlen(s); + } + av_push(preambleav, Sv); + scriptname = BIT_BUCKET; /* don't look for script or read stdin */ + goto reswitch; case 'x': doextract = TRUE; s++; @@ -368,17 +702,41 @@ setuid perl scripts securely.\n"); } } switch_end: - scriptname = argv[0]; + + if (!tainting && (s = getenv("PERL5OPT"))) { + for (;;) { + while (isSPACE(*s)) + s++; + if (*s == '-') { + s++; + if (isSPACE(*s)) + continue; + } + if (!*s) + break; + if (!strchr("DIMUdmw", *s)) + croak("Illegal switch in PERL5OPT: -%c", *s); + s = moreswitches(s); + } + } + + if (!scriptname) + scriptname = argv[0]; if (e_fp) { - if (fflush(e_fp) || ferror(e_fp) || fclose(e_fp)) + if (PerlIO_flush(e_fp) || PerlIO_error(e_fp) || PerlIO_close(e_fp)) { +#ifndef MULTIPLICITY + warn("Did you forget to compile with -DMULTIPLICITY?"); +#endif croak("Can't write to temp file for -e: %s", Strerror(errno)); + } + e_fp = Nullfp; argc++,argv--; scriptname = e_tmpname; } else if (scriptname == Nullch) { #ifdef MSDOS - if ( isatty(fileno(stdin)) ) - moreswitches("v"); + if ( isatty(PerlIO_fileno(PerlIO_stdin())) ) + moreswitches("h"); #endif scriptname = "-"; } @@ -387,20 +745,19 @@ setuid perl scripts securely.\n"); open_script(scriptname,dosearch,sv); - validate_suid(validarg); + validate_suid(validarg, scriptname); if (doextract) find_beginning(); - compcv = (CV*)NEWSV(1104,0); + main_cv = compcv = (CV*)NEWSV(1104,0); sv_upgrade((SV *)compcv, SVt_PVCV); + CvUNIQUE_on(compcv); - pad = newAV(); - comppad = pad; + comppad = newAV(); av_push(comppad, Nullsv); curpad = AvARRAY(comppad); - padname = newAV(); - comppad_name = padname; + comppad_name = newAV(); comppad_name_fill = 0; min_intro_pending = 0; padix = 0; @@ -411,6 +768,7 @@ setuid perl scripts securely.\n"); av_store(comppadlist, 1, (SV*)comppad); CvPADLIST(compcv) = comppadlist; + boot_core_UNIVERSAL(); if (xsinit) (*xsinit)(); /* in case linked C routines want magical variables */ #ifdef VMS @@ -437,18 +795,16 @@ setuid perl scripts securely.\n"); curcop->cop_line = 0; curstash = defstash; preprocess = FALSE; - if (e_fp) { - e_fp = Nullfp; + if (e_tmpname) { (void)UNLINK(e_tmpname); + Safefree(e_tmpname); + e_tmpname = Nullch; } /* now that script is parsed, we can modify record separator */ - - rs = nrs; - rslen = nrslen; - rschar = nrschar; - rspara = (nrslen == 2); - sv_setpvn(GvSV(gv_fetchpv("/", TRUE, SVt_PV)), rs, rslen); + SvREFCNT_dec(rs); + rs = SvREFCNT_inc(nrs); + sv_setsv(GvSV(gv_fetchpv("/", TRUE, SVt_PV)), rs); if (do_undump) my_unexec(); @@ -458,8 +814,15 @@ setuid perl scripts securely.\n"); LEAVE; FREETMPS; + +#ifdef DEBUGGING_MSTATS + if ((s=getenv("PERL_DEBUG_MSTATS")) && atoi(s) >= 2) + dump_mstats("after compilation:"); +#endif + ENTER; restartop = 0; + JMPENV_POP; return 0; } @@ -467,37 +830,57 @@ int perl_run(sv_interp) PerlInterpreter *sv_interp; { + I32 oldscope; + dJMPENV; + int ret; + if (!(curinterp = sv_interp)) return 255; - switch (setjmp(top_env)) { + + oldscope = scopestack_ix; + + JMPENV_PUSH(ret); + switch (ret) { case 1: cxstack_ix = -1; /* start context stack again */ break; case 2: + /* my_exit() was called */ + while (scopestack_ix > oldscope) + LEAVE; curstash = defstash; if (endav) - calllist(endav); + call_list(oldscope, endav); FREETMPS; - return(statusvalue); /* my_exit() was called */ +#ifdef DEBUGGING_MSTATS + if (getenv("PERL_DEBUG_MSTATS")) + dump_mstats("after execution: "); +#endif + JMPENV_POP; + return STATUS_NATIVE_EXPORT; case 3: if (!restartop) { - fprintf(stderr, "panic: restartop\n"); + PerlIO_printf(PerlIO_stderr(), "panic: restartop\n"); FREETMPS; + JMPENV_POP; return 1; } - if (stack != mainstack) { + if (curstack != mainstack) { dSP; - SWITCHSTACK(stack, mainstack); + SWITCHSTACK(curstack, mainstack); } break; } + DEBUG_r(PerlIO_printf(PerlIO_stderr(), "%s $` $& $' support.\n", + sawampersand ? "Enabling" : "Omitting")); + if (!restartop) { DEBUG_x(dump_all()); - DEBUG(fprintf(stderr,"\nEXECUTING...\n\n")); + DEBUG(PerlIO_printf(Perl_debug_log, "\nEXECUTING...\n\n")); if (minus_c) { - fprintf(stderr,"%s syntax OK\n", origfilename); + PerlIO_printf(PerlIO_stderr(), "%s syntax OK\n", origfilename); my_exit(0); } if (perldb && DBsingle) @@ -509,35 +892,19 @@ PerlInterpreter *sv_interp; if (restartop) { op = restartop; restartop = 0; - run(); + runops(); } else if (main_start) { + CvDEPTH(main_cv) = 1; op = main_start; - run(); + runops(); } my_exit(0); + /* NOTREACHED */ return 0; } -void -my_exit(status) -U32 status; -{ - register CONTEXT *cx; - I32 gimme; - SV **newsp; - - statusvalue = FIXSTATUS(status); - if (cxstack_ix >= 0) { - if (cxstack_ix > 0) - dounwind(0); - POPBLOCK(cx,curpm); - LEAVE; - } - longjmp(top_env, 2); -} - SV* perl_get_sv(name, create) char* name; @@ -581,12 +948,13 @@ char* name; I32 create; { GV* gv = gv_fetchpv(name, create, SVt_PVCV); - if (create && !GvCV(gv)) - return newSUB(start_subparse(), + if (create && !GvCVu(gv)) + return newSUB(start_subparse(FALSE, 0), newSVOP(OP_CONST, 0, newSVpv(name,0)), + Nullop, Nullop); if (gv) - return GvCV(gv); + return GvCVu(gv); return Nullcv; } @@ -642,63 +1010,87 @@ I32 flags; /* See G_* flags in cop.h */ { LOGOP myop; /* fake syntax tree node */ SV** sp = stack_sp; - I32 oldmark = TOPMARK; + I32 oldmark; I32 retval; - jmp_buf oldtop; I32 oldscope; - + static CV *DBcv; + bool oldcatch = CATCH_GET; + dJMPENV; + int ret; + if (flags & G_DISCARD) { ENTER; SAVETMPS; } + Zero(&myop, 1, LOGOP); + myop.op_next = Nullop; + if (!(flags & G_NOARGS)) + myop.op_flags |= OPf_STACKED; + myop.op_flags |= ((flags & G_VOID) ? OPf_WANT_VOID : + (flags & G_ARRAY) ? OPf_WANT_LIST : + OPf_WANT_SCALAR); SAVESPTR(op); op = (OP*)&myop; - Zero(op, 1, LOGOP); + EXTEND(stack_sp, 1); *++stack_sp = sv; + oldmark = TOPMARK; oldscope = scopestack_ix; - if (!(flags & G_NOARGS)) - myop.op_flags = OPf_STACKED; - myop.op_next = Nullop; - myop.op_flags |= OPf_KNOW; - if (flags & G_ARRAY) - myop.op_flags |= OPf_LIST; + if (perldb && curstash != debstash + /* Handle first BEGIN of -d. */ + && (DBcv || (DBcv = GvCV(DBsub))) + /* Try harder, since this may have been a sighandler, thus + * curstash may be meaningless. */ + && (SvTYPE(sv) != SVt_PVCV || CvSTASH((CV*)sv) != debstash)) + op->op_private |= OPpENTERSUB_DB; if (flags & G_EVAL) { - Copy(top_env, oldtop, 1, jmp_buf); - cLOGOP->op_other = op; markstack_ptr--; - pp_entertry(); + /* we're trying to emulate pp_entertry() here */ + { + register CONTEXT *cx; + I32 gimme = GIMME_V; + + ENTER; + SAVETMPS; + + push_return(op->op_next); + PUSHBLOCK(cx, CXt_EVAL, stack_sp); + PUSHEVAL(cx, 0, 0); + eval_root = op; /* Only needed so that goto works right. */ + + in_eval = 1; + if (flags & G_KEEPERR) + in_eval |= 4; + else + sv_setpv(GvSV(errgv),""); + } markstack_ptr++; - restart: - switch (setjmp(top_env)) { + JMPENV_PUSH(ret); + switch (ret) { case 0: break; case 1: -#ifdef VMS - statusvalue = 255; /* XXX I don't think we use 1 anymore. */ -#else - statusvalue = 1; -#endif + STATUS_ALL_FAILURE; /* FALL THROUGH */ case 2: /* my_exit() was called */ curstash = defstash; FREETMPS; - Copy(oldtop, top_env, 1, jmp_buf); + JMPENV_POP; if (statusvalue) croak("Callback called exit"); - my_exit(statusvalue); + my_exit_jump(); /* NOTREACHED */ case 3: if (restartop) { op = restartop; restartop = 0; - goto restart; + break; } stack_sp = stack_base + oldmark; if (flags & G_ARRAY) @@ -710,14 +1102,16 @@ I32 flags; /* See G_* flags in cop.h */ goto cleanup; } } + else + CATCH_SET(TRUE); if (op == (OP*)&myop) op = pp_entersub(); if (op) - run(); + runops(); retval = stack_sp - (stack_base + oldmark); - if (flags & G_EVAL) - sv_setpv(GvSV(gv_fetchpv("@",TRUE, SVt_PV)),""); + if ((flags & G_EVAL) && !(flags & G_KEEPERR)) + sv_setpv(GvSV(errgv),""); cleanup: if (flags & G_EVAL) { @@ -734,8 +1128,11 @@ I32 flags; /* See G_* flags in cop.h */ curpm = newpm; LEAVE; } - Copy(oldtop, top_env, 1, jmp_buf); + JMPENV_POP; } + else + CATCH_SET(oldcatch); + if (flags & G_DISCARD) { stack_sp = stack_base + oldmark; retval = 0; @@ -745,78 +1142,127 @@ I32 flags; /* See G_* flags in cop.h */ return retval; } -/* Older forms, here grandfathered. */ +/* Eval a string. The G_EVAL flag is always assumed. */ -#ifdef DEPRECATED I32 -perl_callargv(subname, spix, gimme, argv) -char *subname; -register I32 spix; /* current stack pointer index */ -I32 gimme; /* See G_* flags in cop.h */ -register char **argv; /* null terminated arg list, NULL for no arglist */ +perl_eval_sv(sv, flags) +SV* sv; +I32 flags; /* See G_* flags in cop.h */ { - stack_sp = stack_base + spix; - return spix + perl_call_argv(subname, gimme, argv); -} + UNOP myop; /* fake syntax tree node */ + SV** sp = stack_sp; + I32 oldmark = sp - stack_base; + I32 retval; + I32 oldscope; + dJMPENV; + int ret; + + if (flags & G_DISCARD) { + ENTER; + SAVETMPS; + } -I32 -perl_callpv(subname, spix, gimme, hasargs, numargs) -char *subname; -I32 spix; /* stack pointer index after args are pushed */ -I32 gimme; /* See G_* flags in cop.h */ -I32 hasargs; /* whether to create a @_ array for routine */ -I32 numargs; /* how many args are pushed on the stack */ -{ - stack_sp = stack_base + spix; - PUSHMARK(stack_sp - numargs); - return spix - numargs + perl_call_sv((SV*)perl_get_cv(subname, TRUE), - gimme, hasargs, numargs); + SAVESPTR(op); + op = (OP*)&myop; + Zero(op, 1, UNOP); + EXTEND(stack_sp, 1); + *++stack_sp = sv; + oldscope = scopestack_ix; + + if (!(flags & G_NOARGS)) + myop.op_flags = OPf_STACKED; + myop.op_next = Nullop; + myop.op_type = OP_ENTEREVAL; + myop.op_flags |= ((flags & G_VOID) ? OPf_WANT_VOID : + (flags & G_ARRAY) ? OPf_WANT_LIST : + OPf_WANT_SCALAR); + if (flags & G_KEEPERR) + myop.op_flags |= OPf_SPECIAL; + + JMPENV_PUSH(ret); + switch (ret) { + case 0: + break; + case 1: + STATUS_ALL_FAILURE; + /* FALL THROUGH */ + case 2: + /* my_exit() was called */ + curstash = defstash; + FREETMPS; + JMPENV_POP; + if (statusvalue) + croak("Callback called exit"); + my_exit_jump(); + /* NOTREACHED */ + case 3: + if (restartop) { + op = restartop; + restartop = 0; + break; + } + stack_sp = stack_base + oldmark; + if (flags & G_ARRAY) + retval = 0; + else { + retval = 1; + *++stack_sp = &sv_undef; + } + goto cleanup; + } + + if (op == (OP*)&myop) + op = pp_entereval(); + if (op) + runops(); + retval = stack_sp - (stack_base + oldmark); + if (!(flags & G_KEEPERR)) + sv_setpv(GvSV(errgv),""); + + cleanup: + JMPENV_POP; + if (flags & G_DISCARD) { + stack_sp = stack_base + oldmark; + retval = 0; + FREETMPS; + LEAVE; + } + return retval; } -I32 -perl_callsv(sv, spix, gimme, hasargs, numargs) -SV* sv; -I32 spix; /* stack pointer index after args are pushed */ -I32 gimme; /* See G_* flags in cop.h */ -I32 hasargs; /* whether to create a @_ array for routine */ -I32 numargs; /* how many args are pushed on the stack */ +SV* +perl_eval_pv(p, croak_on_error) +char* p; +I32 croak_on_error; { - stack_sp = stack_base + spix; - PUSHMARK(stack_sp - numargs); - return spix - numargs + perl_call_sv(sv, gimme, hasargs, numargs); + dSP; + SV* sv = newSVpv(p, 0); + + PUSHMARK(sp); + perl_eval_sv(sv, G_SCALAR); + SvREFCNT_dec(sv); + + SPAGAIN; + sv = POPs; + PUTBACK; + + if (croak_on_error && SvTRUE(GvSV(errgv))) + croak(SvPVx(GvSV(errgv), na)); + + return sv; } -#endif /* Require a module. */ void -perl_requirepv(pv) +perl_require_pv(pv) char* pv; { - UNOP myop; /* fake syntax tree node */ - SV* sv; - dSP; - - ENTER; - SAVETMPS; - SAVESPTR(op); - sv = sv_newmortal(); - sv_setpv(sv, pv); - op = (OP*)&myop; - Zero(op, 1, UNOP); - XPUSHs(sv); - - myop.op_type = OP_REQUIRE; - myop.op_next = Nullop; - myop.op_private = 1; - myop.op_flags = OPf_KNOW; - - PUTBACK; - if (op = pp_require()) - run(); - stack_sp--; - FREETMPS; - LEAVE; + SV* sv = sv_newmortal(); + sv_setpv(sv, "require '"); + sv_catpv(sv, pv); + sv_catpv(sv, "'"); + perl_eval_sv(sv, G_DISCARD); } void @@ -831,41 +1277,36 @@ I32 namlen; sv_magic(GvSV(gv), (SV*)gv, 0, name, namlen); } -#if defined(DOSISH) -# define PERLLIB_SEP ';' -#else -# if defined(VMS) -# define PERLLIB_SEP '|' -# else -# define PERLLIB_SEP ':' -# endif -#endif - static void -incpush(p) -char *p; +usage(name) /* XXX move this out into a module ? */ +char *name; { - char *s; - - if (!p) - return; - - /* Break at all separators */ - while (*p) { - /* First, skip any consecutive separators */ - while ( *p == PERLLIB_SEP ) { - /* Uncomment the next line for PATH semantics */ - /* av_push(GvAVn(incgv), newSVpv(".", 1)); */ - p++; - } - if ( (s = strchr(p, PERLLIB_SEP)) != Nullch ) { - av_push(GvAVn(incgv), newSVpv(p, (STRLEN)(s - p))); - p = s + 1; - } else { - av_push(GvAVn(incgv), newSVpv(p, 0)); - break; - } - } + /* This message really ought to be max 23 lines. + * Removed -h because the user already knows that opton. Others? */ + printf("\nUsage: %s [switches] [--] [programfile] [arguments]", name); + printf("\n -0[octal] specify record separator (\\0, if no argument)"); + printf("\n -a autosplit mode with -n or -p (splits $_ into @F)"); + printf("\n -c check syntax only (runs BEGIN and END blocks)"); + printf("\n -d[:debugger] run scripts under debugger"); + printf("\n -D[number/list] set debugging flags (argument is a bit mask or flags)"); + printf("\n -e 'command' one line of script. Several -e's allowed. Omit [programfile]."); + printf("\n -F/pattern/ split() pattern for autosplit (-a). The //'s are optional."); + printf("\n -i[extension] edit <> files in place (make backup if extension supplied)"); + printf("\n -Idirectory specify @INC/#include directory (may be used more then once)"); + printf("\n -l[octal] enable line ending processing, specifies line teminator"); + printf("\n -[mM][-]module.. executes `use/no module...' before executing your script."); + printf("\n -n assume 'while (<>) { ... }' loop arround your script"); + printf("\n -p assume loop like -n but print line also like sed"); + printf("\n -P run script through C preprocessor before compilation"); + printf("\n -s enable some switch parsing for switches after script name"); + printf("\n -S look for the script using PATH environment variable"); + printf("\n -T turn on tainting checks"); + printf("\n -u dump core after parsing script"); + printf("\n -U allow unsafe operations"); + printf("\n -v print version number and patchlevel of perl"); + printf("\n -V[:variable] print perl configuration information"); + printf("\n -w TURN WARNINGS ON FOR COMPILATION OF YOUR SCRIPT."); + printf("\n -x[directory] strip off text before #!perl line and perhaps cd to directory\n"); } /* This routine handles any switches that can be given during run */ @@ -875,20 +1316,19 @@ moreswitches(s) char *s; { I32 numlen; + U32 rschar; switch (*s) { case '0': - nrschar = scan_oct(s, 4, &numlen); - nrs = savepvn("\n",1); - *nrs = nrschar; - if (nrschar > 0377) { - nrslen = 0; - nrs = ""; - } - else if (!nrschar && numlen >= 2) { - nrslen = 2; - nrs = "\n\n"; - nrschar = '\n'; + rschar = scan_oct(s, 4, &numlen); + SvREFCNT_dec(nrs); + if (rschar & ~((U8)~0)) + nrs = &sv_undef; + else if (!rschar && numlen >= 2) + nrs = newSVpv("", 0); + else { + char ch = rschar; + nrs = newSVpv(&ch, 1); } return s + numlen; case 'F': @@ -905,16 +1345,20 @@ char *s; s++; return s; case 'd': - taint_not("-d"); + forbid_setid("-d"); + s++; + if (*s == ':' || *s == '=') { + my_setenv("PERL5DB", form("use Devel::%s;", ++s)); + s += strlen(s); + } if (!perldb) { perldb = TRUE; init_debugger(); } - s++; return s; case 'D': #ifdef DEBUGGING - taint_not("-D"); + forbid_setid("-D"); if (isALPHA(s[1])) { static char debopts[] = "psltocPmfrxuLHXD"; char *d; @@ -933,6 +1377,9 @@ char *s; #endif /*SUPPRESS 530*/ return s; + case 'h': + usage(origargv[0]); + exit(0); case 'i': if (inplace) Safefree(inplace); @@ -942,11 +1389,13 @@ char *s; *s = '\0'; break; case 'I': - taint_not("-I"); + forbid_setid("-I"); if (*++s) { - char *e; + char *e, *p; for (e = s; *e && !isSPACE(*e); e++) ; - av_push(GvAVn(incgv),newSVpv(s,e-s)); + p = savepvn(s, e-s); + incpush(p, TRUE); + Safefree(p); if (*e) return e; } @@ -965,10 +1414,50 @@ char *s; s += numlen; } else { - ors = savepvn(nrs,nrslen); - orslen = nrslen; + if (RsPARA(nrs)) { + ors = "\n\n"; + orslen = 2; + } + else + ors = SvPV(nrs, orslen); + ors = savepvn(ors, orslen); } return s; + case 'M': + forbid_setid("-M"); /* XXX ? */ + /* FALL THROUGH */ + case 'm': + forbid_setid("-m"); /* XXX ? */ + if (*++s) { + char *start; + char *use = "use "; + /* -M-foo == 'no foo' */ + if (*s == '-') { use = "no "; ++s; } + Sv = newSVpv(use,0); + start = s; + /* We allow -M'Module qw(Foo Bar)' */ + while(isALNUM(*s) || *s==':') ++s; + if (*s != '=') { + sv_catpv(Sv, start); + if (*(start-1) == 'm') { + if (*s != '\0') + croak("Can't use '%c' after -mname", *s); + sv_catpv( Sv, " ()"); + } + } else { + sv_catpvn(Sv, start, s-start); + sv_catpv(Sv, " split(/,/,q{"); + sv_catpv(Sv, ++s); + sv_catpv(Sv, "})"); + } + s += strlen(s); + if (preambleav == NULL) + preambleav = newAV(); + av_push(preambleav, Sv); + } + else + croak("No space allowed after -%c", *(s-1)); + return s; case 'n': minus_n = TRUE; s++; @@ -978,12 +1467,13 @@ char *s; s++; return s; case 's': - taint_not("-s"); + forbid_setid("-s"); doswitches = TRUE; s++; return s; case 'T': - tainting = TRUE; + if (!tainting) + croak("Too late for \"-T\" option"); s++; return s; case 'u': @@ -995,26 +1485,29 @@ char *s; s++; return s; case 'v': - printf("\nThis is perl, version %s\n\n",patchlevel); - fputs("\tUnofficial patchlevel 1n.\n",stdout); - fputs("\nCopyright 1987-1994, Larry Wall\n",stdout); +#if defined(SUBVERSION) && SUBVERSION > 0 + printf("\nThis is perl, version 5.%03d_%02d", PATCHLEVEL, SUBVERSION); +#else + printf("\nThis is perl, version %s",patchlevel); +#endif + + printf("\n\nCopyright 1987-1997, Larry Wall\n"); #ifdef MSDOS - fputs("MS-DOS port Copyright (c) 1989, 1990, Diomidis Spinellis\n", - stdout); -#ifdef OS2 - fputs("OS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n", - stdout); + printf("\n\nMS-DOS port Copyright (c) 1989, 1990, Diomidis Spinellis\n"); +#endif +#ifdef DJGPP + printf("djgpp v2 port (jpl5003c) by Hirofumi Watanabe, 1996\n"); #endif +#ifdef OS2 + printf("\n\nOS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n" + "Version 5 port Copyright (c) 1994-1997, Andreas Kaiser, Ilya Zakharevich\n"); #endif #ifdef atarist - fputs("atariST series port, ++jrb bammi@cadence.com\n", stdout); + printf("atariST series port, ++jrb bammi@cadence.com\n"); #endif - fputs("\n\ + printf("\n\ Perl may be copied only under the terms of either the Artistic License or the\n\ -GNU General Public License, which may be found in the Perl 5.0 source kit.\n",stdout); -#ifdef MSDOS - usage(origargv[0]); -#endif +GNU General Public License, which may be found in the Perl 5.0 source kit.\n\n"); exit(0); case 'w': dowarn = TRUE; @@ -1030,6 +1523,10 @@ GNU General Public License, which may be found in the Perl 5.0 source kit.\n",st case '\n': case '\t': break; +#ifdef ALTERNATE_SHEBANG + case 'S': /* OS/2 needs -S on "extproc" line. */ + break; +#endif case 'P': if (preprocess) return s+1; @@ -1048,18 +1545,28 @@ void my_unexec() { #ifdef UNEXEC + SV* prog; + SV* file; int status; extern int etext; - sprintf (buf, "%s.perldump", origfilename); - sprintf (tokenbuf, "%s/perl", BIN); + prog = newSVpv(BIN_EXP); + sv_catpv(prog, "/perl"); + file = newSVpv(origfilename); + sv_catpv(file, ".perldump"); - status = unexec(buf, tokenbuf, &etext, sbrk(0), 0); + status = unexec(SvPVX(file), SvPVX(prog), &etext, sbrk(0), 0); if (status) - fprintf(stderr, "unexec of %s into %s failed!\n", tokenbuf, buf); + PerlIO_printf(PerlIO_stderr(), "unexec of %s into %s failed!\n", + SvPVX(prog), SvPVX(file)); exit(status); #else +# ifdef VMS +# include + lib$signal(SS$_DEBUG); /* ssdef.h #included from vmsish.h */ +# else ABORT(); /* for use with undump */ +# endif #endif } @@ -1067,6 +1574,15 @@ static void init_main_stash() { GV *gv; + + /* Note that strtab is a rather special HV. Assumptions are made + about not iterating on it, and not adding tie magic to it. + It is properly deallocated in perl_destruct() */ + strtab = newHV(); + HvSHAREKEYS_off(strtab); /* mandatory */ + Newz(506,((XPVHV*)SvANY(strtab))->xhv_array, + sizeof(HE*) * (((XPVHV*)SvANY(strtab))->xhv_max + 1), char); + curstash = defstash = newHV(); curstname = newSVpv("main",4); gv = gv_fetchpv("main::",TRUE, SVt_PVHV); @@ -1075,11 +1591,16 @@ init_main_stash() SvREADONLY_on(gv); HvNAME(defstash) = savepv("main"); incgv = gv_HVadd(gv_AVadd(gv_fetchpv("INC",TRUE, SVt_PVAV))); - SvMULTI_on(incgv); + GvMULTI_on(incgv); defgv = gv_fetchpv("_",TRUE, SVt_PVAV); + errgv = gv_HVadd(gv_fetchpv("@", TRUE, SVt_PV)); + GvMULTI_on(errgv); + sv_setpvn(GvSV(errgv), "", 0); curstash = defstash; compiling.cop_stash = defstash; debstash = GvHV(gv_fetchpv("DB::", GV_ADDMULTI, SVt_PVHV)); + /* We must init $/ before switches are processed. */ + sv_setpvn(GvSV(gv_fetchpv("/", TRUE, SVt_PV)), "\n", 1); } #ifdef CAN_PROTOTYPE @@ -1097,37 +1618,92 @@ SV *sv; char *xfailed = Nullch; register char *s; I32 len; + int retval; +#if defined(DOSISH) && !defined(OS2) && !defined(atarist) +# define SEARCH_EXTS ".bat", ".cmd", NULL +# define MAX_EXT_LEN 4 +#endif +#ifdef VMS +# define SEARCH_EXTS ".pl", ".com", NULL +# define MAX_EXT_LEN 4 +#endif + /* additional extensions to try in each dir if scriptname not found */ +#ifdef SEARCH_EXTS + char *ext[] = { SEARCH_EXTS }; + int extidx = (strchr(scriptname,'.')) ? -1 : 0; /* has ext already */ +#else +# define MAX_EXT_LEN 0 +#endif +#ifdef VMS + if (dosearch) { + int hasdir, idx = 0, deftypes = 1; + + hasdir = (strpbrk(scriptname,":[= sizeof tokenbuf) + continue; /* don't search dir with too-long name */ + strcat(tokenbuf, scriptname); +#else /* !VMS */ if (dosearch && !strchr(scriptname, '/') && (s = getenv("PATH"))) { - bufend = s + strlen(s); - while (*s) { -#ifndef DOSISH - s = cpytill(tokenbuf,s,bufend,':',&len); + while (s < bufend) { +#ifndef atarist + s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend, +#ifdef DOSISH + ';', #else -#ifdef atarist - for (len = 0; *s && *s != ',' && *s != ';'; tokenbuf[len++] = *s++); - tokenbuf[len] = '\0'; -#else - for (len = 0; *s && *s != ';'; tokenbuf[len++] = *s++); - tokenbuf[len] = '\0'; -#endif + ':', #endif - if (*s) + &len); +#else /* atarist */ + for (len = 0; *s && *s != ',' && *s != ';'; len++, s++) { + if (len < sizeof tokenbuf) + tokenbuf[len] = *s; + } + if (len < sizeof tokenbuf) + tokenbuf[len] = '\0'; +#endif /* atarist */ + if (s < bufend) s++; -#ifndef DOSISH - if (len && tokenbuf[len-1] != '/') -#else -#ifdef atarist - if (len && ((tokenbuf[len-1] != '\\') && (tokenbuf[len-1] != '/'))) -#else - if (len && tokenbuf[len-1] != '\\') + if (len + 1 + strlen(scriptname) + MAX_EXT_LEN >= sizeof tokenbuf) + continue; /* don't search dir with too-long name */ + if (len +#if defined(atarist) && !defined(DOSISH) + && tokenbuf[len - 1] != '/' +#endif +#if defined(atarist) || defined(DOSISH) + && tokenbuf[len - 1] != '\\' #endif + ) + tokenbuf[len++] = '/'; + (void)strcpy(tokenbuf + len, scriptname); +#endif /* !VMS */ + +#ifdef SEARCH_EXTS + len = strlen(tokenbuf); + if (extidx > 0) /* reset after previous loop */ + extidx = 0; + do { #endif - (void)strcat(tokenbuf+len,"/"); - (void)strcat(tokenbuf+len,scriptname); - DEBUG_p(fprintf(stderr,"Looking for %s\n",tokenbuf)); - if (Stat(tokenbuf,&statbuf) < 0) /* not there? */ + DEBUG_p(PerlIO_printf(Perl_debug_log, "Looking for %s\n",tokenbuf)); + retval = Stat(tokenbuf,&statbuf); +#ifdef SEARCH_EXTS + } while ( retval < 0 /* not there */ + && extidx>=0 && ext[extidx] /* try an extension? */ + && strcpy(tokenbuf+len, ext[extidx++]) + ); +#endif + if (retval < 0) continue; if (S_ISREG(statbuf.st_mode) && cando(S_IRUSR,TRUE,&statbuf) && cando(S_IXUSR,TRUE,&statbuf)) { @@ -1144,21 +1720,41 @@ SV *sv; scriptname = xfound; } - origfilename = savepv(e_fp ? "-e" : scriptname); + if (strnEQ(scriptname, "/dev/fd/", 8) && isDIGIT(scriptname[8]) ) { + char *s = scriptname + 8; + fdscript = atoi(s); + while (isDIGIT(*s)) + s++; + if (*s) + scriptname = s + 1; + } + else + fdscript = -1; + origfilename = savepv(e_tmpname ? "-e" : scriptname); curcop->cop_filegv = gv_fetchfile(origfilename); if (strEQ(origfilename,"-")) scriptname = ""; - if (preprocess) { - char *cpp = CPPSTDIN; + if (fdscript >= 0) { + rsfp = PerlIO_fdopen(fdscript,"r"); +#if defined(HAS_FCNTL) && defined(F_SETFD) + if (rsfp) + fcntl(PerlIO_fileno(rsfp),F_SETFD,1); /* ensure close-on-exec */ +#endif + } + else if (preprocess) { + char *cpp_cfg = CPPSTDIN; + SV *cpp = NEWSV(0,0); + SV *cmd = NEWSV(0,0); + + if (strEQ(cpp_cfg, "cppstdin")) + sv_catpvf(cpp, "%s/", BIN_EXP); + sv_catpv(cpp, cpp_cfg); - if (strEQ(cpp,"cppstdin")) - sprintf(tokenbuf, "%s/%s", SCRIPTDIR, cpp); - else - sprintf(tokenbuf, "%s", cpp); sv_catpv(sv,"-I"); sv_catpv(sv,PRIVLIB_EXP); + #ifdef MSDOS - (void)sprintf(buf, "\ + sv_setpvf(cmd, "\ sed %s -e \"/^[^#]/b\" \ -e \"/^#[ ]*include[ ]/b\" \ -e \"/^#[ ]*define[ ]/b\" \ @@ -1170,10 +1766,10 @@ sed %s -e \"/^[^#]/b\" \ -e \"/^#[ ]*undef[ ]/b\" \ -e \"/^#[ ]*endif/b\" \ -e \"s/^#.*//\" \ - %s | %s -C %s %s", + %s | %_ -C %_ %s", (doextract ? "-e \"1,/^#/d\n\"" : ""), #else - (void)sprintf(buf, "\ + sv_setpvf(cmd, "\ %s %s -e '/^[^#]/b' \ -e '/^#[ ]*include[ ]/b' \ -e '/^#[ ]*define[ ]/b' \ @@ -1185,7 +1781,7 @@ sed %s -e \"/^[^#]/b\" \ -e '/^#[ ]*undef[ ]/b' \ -e '/^#[ ]*endif/b' \ -e 's/^[ ]*#.*//' \ - %s | %s -C %s %s", + %s | %_ -C %_ %s", #ifdef LOC_SED LOC_SED, #else @@ -1193,7 +1789,7 @@ sed %s -e \"/^[^#]/b\" \ #endif (doextract ? "-e '1,/^#/d\n'" : ""), #endif - scriptname, tokenbuf, SvPV(sv, na), CPPMINUS); + scriptname, cpp, sv, CPPMINUS); doextract = FALSE; #ifdef IAMSUID /* actually, this is caught earlier */ if (euid != uid && !euid) { /* if running suidperl */ @@ -1214,21 +1810,31 @@ sed %s -e \"/^[^#]/b\" \ croak("Can't do seteuid!\n"); } #endif /* IAMSUID */ - rsfp = my_popen(buf,"r"); + rsfp = my_popen(SvPVX(cmd), "r"); + SvREFCNT_dec(cmd); + SvREFCNT_dec(cpp); } else if (!*scriptname) { - taint_not("program input from stdin"); - rsfp = stdin; + forbid_setid("program input from stdin"); + rsfp = PerlIO_stdin(); } - else - rsfp = fopen(scriptname,"r"); - if ((FILE*)rsfp == Nullfp) { + else { + rsfp = PerlIO_open(scriptname,"r"); +#if defined(HAS_FCNTL) && defined(F_SETFD) + if (rsfp) + fcntl(PerlIO_fileno(rsfp),F_SETFD,1); /* ensure close-on-exec */ +#endif + } + if (e_tmpname) { + e_fp = rsfp; + } + if (!rsfp) { #ifdef DOSUID #ifndef IAMSUID /* in case script is not readable before setuid */ if (euid && Stat(SvPVX(GvSV(curcop->cop_filegv)),&statbuf) >= 0 && statbuf.st_mode & (S_ISUID|S_ISGID)) { - (void)sprintf(buf, "%s/sperl%s", BIN, patchlevel); - execv(buf, origargv); /* try again */ + /* try again */ + execv(form("%s/sperl%s", BIN_EXP, patchlevel), origargv); croak("Can't do setuid\n"); } #endif @@ -1239,9 +1845,12 @@ sed %s -e \"/^[^#]/b\" \ } static void -validate_suid(validarg) +validate_suid(validarg, scriptname) char *validarg; +char *scriptname; { + int which; + /* do we need to emulate setuid on scripts? */ /* This code is for those BSD systems that have setuid #! scripts disabled @@ -1263,11 +1872,11 @@ char *validarg; */ #ifdef DOSUID - char *s; + char *s, *s2; - if (Fstat(fileno(rsfp),&statbuf) < 0) /* normal stat is insecure */ + if (Fstat(PerlIO_fileno(rsfp),&statbuf) < 0) /* normal stat is insecure */ croak("Can't stat script \"%s\"",origfilename); - if (statbuf.st_mode & (S_ISUID|S_ISGID)) { + if (fdscript < 0 && statbuf.st_mode & (S_ISUID|S_ISGID)) { I32 len; #ifdef IAMSUID @@ -1305,15 +1914,15 @@ char *validarg; croak("Permission denied"); /* testing full pathname here */ if (tmpstatbuf.st_dev != statbuf.st_dev || tmpstatbuf.st_ino != statbuf.st_ino) { - (void)fclose(rsfp); + (void)PerlIO_close(rsfp); if (rsfp = my_popen("/bin/mail root","w")) { /* heh, heh */ - fprintf(rsfp, -"User %d tried to run dev %d ino %d in place of dev %d ino %d!\n\ -(Filename of set-id script was %s, uid %d gid %d.)\n\nSincerely,\nperl\n", - uid,tmpstatbuf.st_dev, tmpstatbuf.st_ino, - statbuf.st_dev, statbuf.st_ino, + PerlIO_printf(rsfp, +"User %ld tried to run dev %ld ino %ld in place of dev %ld ino %ld!\n\ +(Filename of set-id script was %s, uid %ld gid %ld.)\n\nSincerely,\nperl\n", + (long)uid,(long)tmpstatbuf.st_dev, (long)tmpstatbuf.st_ino, + (long)statbuf.st_dev, (long)statbuf.st_ino, SvPVX(GvSV(curcop->cop_filegv)), - statbuf.st_uid, statbuf.st_gid); + (long)statbuf.st_uid, (long)statbuf.st_gid); (void)my_pclose(rsfp); } croak("Permission denied\n"); @@ -1340,13 +1949,15 @@ char *validarg; croak("Setuid/gid script is writable by world"); doswitches = FALSE; /* -s is insecure in suid */ curcop->cop_line++; - if (fgets(tokenbuf,sizeof tokenbuf, rsfp) == Nullch || - strnNE(tokenbuf,"#!",2) ) /* required even on Sys V */ + if (sv_gets(linestr, rsfp, 0) == Nullch || + strnNE(SvPV(linestr,na),"#!",2) ) /* required even on Sys V */ croak("No #! line"); - s = tokenbuf+2; + s = SvPV(linestr,na)+2; if (*s == ' ') s++; while (!isSPACE(*s)) s++; - if (strnNE(s-4,"perl",4) && strnNE(s-9,"perl",4)) /* sanity check */ + for (s2 = s; (s2 > SvPV(linestr,na)+2 && + (isDIGIT(s2[-1]) || strchr("._-", s2[-1]))); s2--) ; + if (strnNE(s2-4,"perl",4) && strnNE(s-9,"perl",4)) /* sanity check */ croak("Not a perl script"); while (*s == ' ' || *s == '\t') s++; /* @@ -1368,10 +1979,10 @@ FIX YOUR KERNEL, PUT A C WRAPPER AROUND THIS SCRIPT, OR USE -u AND UNDUMP!\n"); #endif /* IAMSUID */ if (euid) { /* oops, we're not the setuid root perl */ - (void)fclose(rsfp); + (void)PerlIO_close(rsfp); #ifndef IAMSUID - (void)sprintf(buf, "%s/sperl%s", BIN, patchlevel); - execv(buf, origargv); /* try again */ + /* try again */ + execv(form("%s/sperl%s", BIN_EXP, patchlevel), origargv); #endif croak("Can't do setuid\n"); } @@ -1435,13 +2046,31 @@ FIX YOUR KERNEL, PUT A C WRAPPER AROUND THIS SCRIPT, OR USE -u AND UNDUMP!\n"); #ifdef IAMSUID else if (preprocess) croak("-P not allowed for setuid/setgid script\n"); + else if (fdscript >= 0) + croak("fd script not allowed in suidperl\n"); else croak("Script is not setuid/setgid in suidperl\n"); + + /* We absolutely must clear out any saved ids here, so we */ + /* exec the real perl, substituting fd script for scriptname. */ + /* (We pass script name as "subdir" of fd, which perl will grok.) */ + PerlIO_rewind(rsfp); + lseek(PerlIO_fileno(rsfp),(Off_t)0,0); /* just in case rewind didn't */ + for (which = 1; origargv[which] && origargv[which] != scriptname; which++) ; + if (!origargv[which]) + croak("Permission denied"); + origargv[which] = savepv(form("/dev/fd/%d/%s", + PerlIO_fileno(rsfp), origargv[which])); +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(PerlIO_fileno(rsfp),F_SETFD,0); /* ensure no close-on-exec */ +#endif + execv(form("%s/perl%s", BIN_EXP, patchlevel), origargv); /* try again */ + croak("Can't do setuid\n"); #endif /* IAMSUID */ #else /* !DOSUID */ if (euid != uid || egid != gid) { /* (suidperl doesn't exist, in fact) */ #ifndef SETUID_SCRIPTS_ARE_SECURE_NOW - Fstat(fileno(rsfp),&statbuf); /* may be either wrapped or real suid */ + Fstat(PerlIO_fileno(rsfp),&statbuf); /* may be either wrapped or real suid */ if ((euid != uid && euid == statbuf.st_uid && statbuf.st_mode & S_ISUID) || (egid != gid && egid == statbuf.st_gid && statbuf.st_mode & S_ISGID) @@ -1458,21 +2087,25 @@ FIX YOUR KERNEL, PUT A C WRAPPER AROUND THIS SCRIPT, OR USE -u AND UNDUMP!\n"); static void find_beginning() { - register char *s; + register char *s, *s2; /* skip forward in input to the real script? */ - taint_not("-x"); + forbid_setid("-x"); while (doextract) { if ((s = sv_gets(linestr, rsfp, 0)) == Nullch) croak("No Perl script found in input\n"); - if (*s == '#' && s[1] == '!' && instr(s,"perl")) { - ungetc('\n',rsfp); /* to keep line count right */ + if (*s == '#' && s[1] == '!' && (s = instr(s,"perl"))) { + PerlIO_ungetc(rsfp, '\n'); /* to keep line count right */ doextract = FALSE; - if (s = instr(s,"perl -")) { - s += 6; - /*SUPPRESS 530*/ - while (s = moreswitches(s)) ; + while (*s && !(isSPACE (*s) || *s == '#')) s++; + s2 = s; + while (*s == ' ' || *s == '\t') s++; + if (*s++ == '-') { + while (isDIGIT(s2[-1]) || strchr("-._", s2[-1])) s2--; + if (strnEQ(s2-4,"perl",4)) + /*SUPPRESS 530*/ + while (s = moreswitches(s)) ; } if (cddir && chdir(cddir) < 0) croak("Can't chdir to %s",cddir); @@ -1491,7 +2124,17 @@ init_ids() uid |= gid << 16; euid |= egid << 16; #endif - tainting |= (euid != uid || egid != gid); + tainting |= (uid && (euid != uid || egid != gid)); +} + +static void +forbid_setid(s) +char *s; +{ + if (euid != uid) + croak("No %s allowed while running setuid", s); + if (egid != gid) + croak("No %s allowed while running setgid", s); } static void @@ -1504,42 +2147,29 @@ init_debugger() DBline = gv_fetchpv("dbline", GV_ADDMULTI, SVt_PVAV); DBsub = gv_HVadd(gv_fetchpv("sub", GV_ADDMULTI, SVt_PVHV)); DBsingle = GvSV((gv_fetchpv("single", GV_ADDMULTI, SVt_PV))); + sv_setiv(DBsingle, 0); DBtrace = GvSV((gv_fetchpv("trace", GV_ADDMULTI, SVt_PV))); + sv_setiv(DBtrace, 0); DBsignal = GvSV((gv_fetchpv("signal", GV_ADDMULTI, SVt_PV))); + sv_setiv(DBsignal, 0); curstash = defstash; } static void init_stacks() { - stack = newAV(); - mainstack = stack; /* remember in case we switch stacks */ - AvREAL_off(stack); /* not a real array */ - av_extend(stack,127); + curstack = newAV(); + mainstack = curstack; /* remember in case we switch stacks */ + AvREAL_off(curstack); /* not a real array */ + av_extend(curstack,127); - stack_base = AvARRAY(stack); + stack_base = AvARRAY(curstack); stack_sp = stack_base; stack_max = stack_base + 127; - New(54,markstack,64,I32); - markstack_ptr = markstack; - markstack_max = markstack + 64; - - New(54,scopestack,32,I32); - scopestack_ix = 0; - scopestack_max = 32; - - New(54,savestack,128,ANY); - savestack_ix = 0; - savestack_max = 128; - - New(54,retstack,16,OP*); - retstack_ix = 0; - retstack_max = 16; - - New(50,cxstack,128,CONTEXT); + cxstack_max = 8192 / sizeof(CONTEXT) - 2; /* Use most of 8K. */ + New(50,cxstack,cxstack_max + 1,CONTEXT); cxstack_ix = -1; - cxstack_max = 128; New(50,tmps_stack,128,SV*); tmps_ix = -1; @@ -1549,14 +2179,62 @@ init_stacks() New(51,debname,128,char); New(52,debdelim,128,char); } ) + + /* + * The following stacks almost certainly should be per-interpreter, + * but for now they're not. XXX + */ + + if (markstack) { + markstack_ptr = markstack; + } else { + New(54,markstack,64,I32); + markstack_ptr = markstack; + markstack_max = markstack + 64; + } + + if (scopestack) { + scopestack_ix = 0; + } else { + New(54,scopestack,32,I32); + scopestack_ix = 0; + scopestack_max = 32; + } + + if (savestack) { + savestack_ix = 0; + } else { + New(54,savestack,128,ANY); + savestack_ix = 0; + savestack_max = 128; + } + + if (retstack) { + retstack_ix = 0; + } else { + New(54,retstack,16,OP*); + retstack_ix = 0; + retstack_max = 16; + } +} + +static void +nuke_stacks() +{ + Safefree(cxstack); + Safefree(tmps_stack); + DEBUG( { + Safefree(debname); + Safefree(debdelim); + } ) } -static FILE *tmpfp; /* moved outside init_lexer() because of UNICOS bug */ +static PerlIO *tmpfp; /* moved outside init_lexer() because of UNICOS bug */ + static void init_lexer() { tmpfp = rsfp; - lex_start(linestr); rsfp = tmpfp; subname = newSVpv("main",4); @@ -1571,28 +2249,31 @@ init_predump_symbols() sv_setpvn(GvSV(gv_fetchpv("\"", TRUE, SVt_PV)), " ", 1); stdingv = gv_fetchpv("STDIN",TRUE, SVt_PVIO); - SvMULTI_on(stdingv); - IoIFP(GvIOp(stdingv)) = stdin; + GvMULTI_on(stdingv); + IoIFP(GvIOp(stdingv)) = PerlIO_stdin(); tmpgv = gv_fetchpv("stdin",TRUE, SVt_PV); + GvMULTI_on(tmpgv); GvIOp(tmpgv) = (IO*)SvREFCNT_inc(GvIOp(stdingv)); - SvMULTI_on(tmpgv); tmpgv = gv_fetchpv("STDOUT",TRUE, SVt_PVIO); - SvMULTI_on(tmpgv); - IoOFP(GvIOp(tmpgv)) = IoIFP(GvIOp(tmpgv)) = stdout; - defoutgv = tmpgv; + GvMULTI_on(tmpgv); + IoOFP(GvIOp(tmpgv)) = IoIFP(GvIOp(tmpgv)) = PerlIO_stdout(); + setdefout(tmpgv); tmpgv = gv_fetchpv("stdout",TRUE, SVt_PV); + GvMULTI_on(tmpgv); GvIOp(tmpgv) = (IO*)SvREFCNT_inc(GvIOp(defoutgv)); - SvMULTI_on(tmpgv); othergv = gv_fetchpv("STDERR",TRUE, SVt_PVIO); - SvMULTI_on(othergv); - IoOFP(GvIOp(othergv)) = IoIFP(GvIOp(othergv)) = stderr; + GvMULTI_on(othergv); + IoOFP(GvIOp(othergv)) = IoIFP(GvIOp(othergv)) = PerlIO_stderr(); tmpgv = gv_fetchpv("stderr",TRUE, SVt_PV); + GvMULTI_on(tmpgv); GvIOp(tmpgv) = (IO*)SvREFCNT_inc(GvIOp(othergv)); - SvMULTI_on(tmpgv); statname = NEWSV(66,0); /* last filename we did stat on */ + + if (!osname) + osname = savepv(OSNAME); } static void @@ -1630,17 +2311,15 @@ register char **env; sv_setpvn(bodytarget, "", 0); formtarget = bodytarget; - tainted = 1; + TAINT; if (tmpgv = gv_fetchpv("0",TRUE, SVt_PV)) { sv_setpv(GvSV(tmpgv),origfilename); magicname("0", "0", 1); } - if (tmpgv = gv_fetchpv("\024",TRUE, SVt_PV)) - time(&basetime); if (tmpgv = gv_fetchpv("\030",TRUE, SVt_PV)) sv_setpv(GvSV(tmpgv),origargv[0]); if (argvgv = gv_fetchpv("ARGV",TRUE, SVt_PVAV)) { - SvMULTI_on(argvgv); + GvMULTI_on(argvgv); (void)gv_AVadd(argvgv); av_clear(GvAVn(argvgv)); for (; argc > 0; argc--,argv++) { @@ -1649,33 +2328,38 @@ register char **env; } if (envgv = gv_fetchpv("ENV",TRUE, SVt_PVHV)) { HV *hv; - SvMULTI_on(envgv); + GvMULTI_on(envgv); hv = GvHVn(envgv); - hv_clear(hv); + hv_magic(hv, envgv, 'E'); #ifndef VMS /* VMS doesn't have environ array */ - if (env != environ) { + /* Note that if the supplied env parameter is actually a copy + of the global environ then it may now point to free'd memory + if the environment has been modified since. To avoid this + problem we treat env==NULL as meaning 'use the default' + */ + if (!env) + env = environ; + if (env != environ) environ[0] = Nullch; - hv_magic(hv, envgv, 'E'); - } -#endif -#ifdef DYNAMIC_ENV_FETCH - HvNAME(hv) = savepv(ENV_HV_NAME); -#endif for (; *env; env++) { if (!(s = strchr(*env,'='))) continue; *s++ = '\0'; +#ifdef WIN32 + (void)strupr(*env); +#endif sv = newSVpv(s--,0); - sv_magic(sv, sv, 'e', *env, s - *env); (void)hv_store(hv, *env, s - *env, sv, 0); *s = '='; } - hv_magic(hv, envgv, 'E'); +#endif +#ifdef DYNAMIC_ENV_FETCH + HvNAME(hv) = savepv(ENV_HV_NAME); +#endif } - tainted = 0; + TAINT_NOT; if (tmpgv = gv_fetchpv("$",TRUE, SVt_PV)) - sv_setiv(GvSV(tmpgv),(I32)getpid()); - + sv_setiv(GvSV(tmpgv), (IV)getpid()); } static void @@ -1683,74 +2367,208 @@ init_perllib() { char *s; if (!tainting) { +#ifndef VMS s = getenv("PERL5LIB"); if (s) - incpush(s); + incpush(s, TRUE); + else + incpush(getenv("PERLLIB"), FALSE); +#else /* VMS */ + /* Treat PERL5?LIB as a possible search list logical name -- the + * "natural" VMS idiom for a Unix path string. We allow each + * element to be a set of |-separated directories for compatibility. + */ + char buf[256]; + int idx = 0; + if (my_trnlnm("PERL5LIB",buf,0)) + do { incpush(buf,TRUE); } while (my_trnlnm("PERL5LIB",buf,++idx)); else - incpush(getenv("PERLLIB")); + while (my_trnlnm("PERLLIB",buf,idx++)) incpush(buf,FALSE); +#endif /* VMS */ } -#ifdef SITELIB_EXP - incpush(SITELIB_EXP); +/* Use the ~-expanded versions of APPLIB (undocumented), + ARCHLIB PRIVLIB SITEARCH SITELIB and OLDARCHLIB +*/ +#ifdef APPLLIB_EXP + incpush(APPLLIB_EXP, FALSE); #endif + #ifdef ARCHLIB_EXP - incpush(ARCHLIB_EXP); + incpush(ARCHLIB_EXP, FALSE); #endif #ifndef PRIVLIB_EXP #define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" #endif - incpush(PRIVLIB_EXP); + incpush(PRIVLIB_EXP, FALSE); + +#ifdef SITEARCH_EXP + incpush(SITEARCH_EXP, FALSE); +#endif +#ifdef SITELIB_EXP + incpush(SITELIB_EXP, FALSE); +#endif +#ifdef OLDARCHLIB_EXP /* 5.00[01] compatibility */ + incpush(OLDARCHLIB_EXP, FALSE); +#endif - av_push(GvAVn(incgv),newSVpv(".",1)); + if (!tainting) + incpush(".", FALSE); +} + +#if defined(DOSISH) +# define PERLLIB_SEP ';' +#else +# if defined(VMS) +# define PERLLIB_SEP '|' +# else +# define PERLLIB_SEP ':' +# endif +#endif +#ifndef PERLLIB_MANGLE +# define PERLLIB_MANGLE(s,n) (s) +#endif + +static void +incpush(p, addsubdirs) +char *p; +int addsubdirs; +{ + SV *subdir = Nullsv; + static char *archpat_auto; + + if (!p) + return; + + if (addsubdirs) { + subdir = newSV(0); + if (!archpat_auto) { + STRLEN len = (sizeof(ARCHNAME) + strlen(patchlevel) + + sizeof("//auto")); + New(55, archpat_auto, len, char); + sprintf(archpat_auto, "/%s/%s/auto", ARCHNAME, patchlevel); +#ifdef VMS + for (len = sizeof(ARCHNAME) + 2; + archpat_auto[len] != '\0' && archpat_auto[len] != '/'; len++) + if (archpat_auto[len] == '.') archpat_auto[len] = '_'; +#endif + } + } + + /* Break at all separators */ + while (p && *p) { + SV *libdir = newSV(0); + char *s; + + /* skip any consecutive separators */ + while ( *p == PERLLIB_SEP ) { + /* Uncomment the next line for PATH semantics */ + /* av_push(GvAVn(incgv), newSVpv(".", 1)); */ + p++; + } + + if ( (s = strchr(p, PERLLIB_SEP)) != Nullch ) { + sv_setpvn(libdir, PERLLIB_MANGLE(p, (STRLEN)(s - p)), + (STRLEN)(s - p)); + p = s + 1; + } + else { + sv_setpv(libdir, PERLLIB_MANGLE(p, 0)); + p = Nullch; /* break out */ + } + + /* + * BEFORE pushing libdir onto @INC we may first push version- and + * archname-specific sub-directories. + */ + if (addsubdirs) { + struct stat tmpstatbuf; +#ifdef VMS + char *unix; + STRLEN len; + + if ((unix = tounixspec_ts(SvPV(libdir,na),Nullch)) != Nullch) { + len = strlen(unix); + while (unix[len-1] == '/') len--; /* Cosmetic */ + sv_usepvn(libdir,unix,len); + } + else + PerlIO_printf(PerlIO_stderr(), + "Failed to unixify @INC element \"%s\"\n", + SvPV(libdir,na)); +#endif + /* .../archname/version if -d .../archname/version/auto */ + sv_setsv(subdir, libdir); + sv_catpv(subdir, archpat_auto); + if (Stat(SvPVX(subdir), &tmpstatbuf) >= 0 && + S_ISDIR(tmpstatbuf.st_mode)) + av_push(GvAVn(incgv), + newSVpv(SvPVX(subdir), SvCUR(subdir) - sizeof "auto")); + + /* .../archname if -d .../archname/auto */ + sv_insert(subdir, SvCUR(libdir) + sizeof(ARCHNAME), + strlen(patchlevel) + 1, "", 0); + if (Stat(SvPVX(subdir), &tmpstatbuf) >= 0 && + S_ISDIR(tmpstatbuf.st_mode)) + av_push(GvAVn(incgv), + newSVpv(SvPVX(subdir), SvCUR(subdir) - sizeof "auto")); + } + + /* finally push this lib directory on the end of @INC */ + av_push(GvAVn(incgv), libdir); + } + + SvREFCNT_dec(subdir); } void -calllist(list) +call_list(oldscope, list) +I32 oldscope; AV* list; { - jmp_buf oldtop; - STRLEN len; line_t oldline = curcop->cop_line; - - Copy(top_env, oldtop, 1, jmp_buf); + STRLEN len; + dJMPENV; + int ret; while (AvFILL(list) >= 0) { CV *cv = (CV*)av_shift(list); SAVEFREESV(cv); - switch (setjmp(top_env)) { + JMPENV_PUSH(ret); + switch (ret) { case 0: { - SV* atsv = GvSV(gv_fetchpv("@",TRUE, SVt_PV)); + SV* atsv = GvSV(errgv); PUSHMARK(stack_sp); perl_call_sv((SV*)cv, G_EVAL|G_DISCARD); (void)SvPV(atsv, len); if (len) { - Copy(oldtop, top_env, 1, jmp_buf); + JMPENV_POP; curcop = &compiling; curcop->cop_line = oldline; if (list == beginav) sv_catpv(atsv, "BEGIN failed--compilation aborted"); else sv_catpv(atsv, "END failed--cleanup aborted"); + while (scopestack_ix > oldscope) + LEAVE; croak("%s", SvPVX(atsv)); } } break; case 1: -#ifdef VMS - statusvalue = 255; /* XXX I don't think we use 1 anymore. */ -#else - statusvalue = 1; -#endif + STATUS_ALL_FAILURE; /* FALL THROUGH */ case 2: /* my_exit() was called */ + while (scopestack_ix > oldscope) + LEAVE; curstash = defstash; if (endav) - calllist(endav); + call_list(oldscope, endav); FREETMPS; - Copy(oldtop, top_env, 1, jmp_buf); + JMPENV_POP; curcop = &compiling; curcop->cop_line = oldline; if (statusvalue) { @@ -1759,22 +2577,87 @@ AV* list; else croak("END failed--cleanup aborted"); } - my_exit(statusvalue); + my_exit_jump(); /* NOTREACHED */ - return; case 3: if (!restartop) { - fprintf(stderr, "panic: restartop\n"); + PerlIO_printf(PerlIO_stderr(), "panic: restartop\n"); FREETMPS; break; } - Copy(oldtop, top_env, 1, jmp_buf); + JMPENV_POP; curcop = &compiling; curcop->cop_line = oldline; - longjmp(top_env, 3); + JMPENV_JUMP(3); } + JMPENV_POP; + } +} + +void +my_exit(status) +U32 status; +{ + switch (status) { + case 0: + STATUS_ALL_SUCCESS; + break; + case 1: + STATUS_ALL_FAILURE; + break; + default: + STATUS_NATIVE_SET(status); + break; } + my_exit_jump(); +} - Copy(oldtop, top_env, 1, jmp_buf); +void +my_failure_exit() +{ +#ifdef VMS + if (vaxc$errno & 1) { + if (STATUS_NATIVE & 1) /* fortuitiously includes "-1" */ + STATUS_NATIVE_SET(44); + } + else { + if (!vaxc$errno && errno) /* unlikely */ + STATUS_NATIVE_SET(44); + else + STATUS_NATIVE_SET(vaxc$errno); + } +#else + if (errno & 255) + STATUS_POSIX_SET(errno); + else if (STATUS_POSIX == 0) + STATUS_POSIX_SET(255); +#endif + my_exit_jump(); } +static void +my_exit_jump() +{ + register CONTEXT *cx; + I32 gimme; + SV **newsp; + + if (e_tmpname) { + if (e_fp) { + PerlIO_close(e_fp); + e_fp = Nullfp; + } + (void)UNLINK(e_tmpname); + Safefree(e_tmpname); + e_tmpname = Nullch; + } + + if (cxstack_ix >= 0) { + if (cxstack_ix > 0) + dounwind(0); + POPBLOCK(cx,curpm); + LEAVE; + } + + JMPENV_JUMP(2); +}