X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.c;h=27d2f61ba932dd04c3465b4e7e45f6f6dbc8d963;hb=f93b4edd807be1c6102dad09f884828c27c4a58b;hp=e638e175ae69418682e4b835bc5dea9f9ab06564;hpb=85e6fe838fb25b257a1b363debf8691c0992ef71;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perl.c b/perl.c index e638e17..27d2f61 100644 --- a/perl.c +++ b/perl.c @@ -1,64 +1,27 @@ -/* - * Copyright (c) 1991, 1992, 1993, 1994 Larry Wall +/* perl.c + * + * Copyright (c) 1987-1996 Larry Wall * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. * - * $Log: perl.c,v $ - * Revision 4.1 92/08/07 18:25:50 lwall - * - * Revision 4.0.1.7 92/06/08 14:50:39 lwall - * patch20: PERLLIB now supports multiple directories - * patch20: running taintperl explicitly now does checks even if $< == $> - * patch20: -e 'cmd' no longer fails silently if /tmp runs out of space - * patch20: perl -P now uses location of sed determined by Configure - * patch20: form feed for formats is now specifiable via $^L - * patch20: paragraph mode now skips extra newlines automatically - * patch20: oldeval "1 #comment" didn't work - * patch20: couldn't require . files - * patch20: semantic compilation errors didn't abort execution - * - * Revision 4.0.1.6 91/11/11 16:38:45 lwall - * patch19: default arg for shift was wrong after first subroutine definition - * patch19: op/regexp.t failed from missing arg to bcmp() - * - * Revision 4.0.1.5 91/11/05 18:03:32 lwall - * patch11: random cleanup - * patch11: $0 was being truncated at times - * patch11: cppstdin now installed outside of source directory - * patch11: -P didn't allow use of #elif or #undef - * patch11: prepared for ctype implementations that don't define isascii() - * patch11: added oldeval {} - * patch11: oldeval confused by string containing null - * - * Revision 4.0.1.4 91/06/10 01:23:07 lwall - * patch10: perl -v printed incorrect copyright notice - * - * Revision 4.0.1.3 91/06/07 11:40:18 lwall - * patch4: changed old $^P to $^X - * - * Revision 4.0.1.2 91/06/07 11:26:16 lwall - * patch4: new copyright notice - * patch4: added $^P variable to control calling of perldb routines - * patch4: added $^F variable to specify maximum system fd, default 2 - * patch4: debugger lost track of lines in oldeval - * - * Revision 4.0.1.1 91/04/11 17:49:05 lwall - * patch1: fixed undefined environ problem - * - * Revision 4.0 91/03/20 01:37:44 lwall - * 4.0 baseline. - * */ -/*SUPPRESS 560*/ +/* + * "A ship then new they built for him/of mithril and of elven glass" --Bilbo + */ #include "EXTERN.h" #include "perl.h" -#include "perly.h" #include "patchlevel.h" -char rcsid[] = "$RCSfile: perl.c,v $$Revision: 5.0 $$Date: 92/08/07 18:25:50 $\nPatch level: ###\n"; +/* Omit -- it causes too much grief on mixed systems. +#ifdef I_UNISTD +#include +#endif +*/ + +dEXT char rcsid[] = "perl.c\nPatch level: ###\n"; #ifdef IAMSUID #ifndef DOSUID @@ -72,26 +35,30 @@ char rcsid[] = "$RCSfile: perl.c,v $$Revision: 5.0 $$Date: 92/08/07 18:25:50 $\n #endif #endif -static void incpush(); -static void validate_suid(); -static void find_beginning(); -static void init_main_stash(); -static void open_script(); -static void init_debugger(); -static void init_stacks(); -static void init_lexer(); -static void init_predump_symbols(); -static void init_postdump_symbols(); -static void init_perllib(); +static void find_beginning _((void)); +static void incpush _((char *)); +static void init_ids _((void)); +static void init_debugger _((void)); +static void init_lexer _((void)); +static void init_main_stash _((void)); +static void init_perllib _((void)); +static void init_postdump_symbols _((int, char **, char **)); +static void init_predump_symbols _((void)); +static void open_script _((char *, bool, SV *)); +#ifdef USE_THREADS +static void thread_destruct _((void *)); +#endif /* USE_THREADS */ +static void usage _((char *)); +static void validate_suid _((char *, char*)); + +static int fdscript = -1; PerlInterpreter * perl_alloc() { PerlInterpreter *sv_interp; - PerlInterpreter junk; curinterp = 0; -/* Zero(&junk, 1, PerlInterpreter); */ New(53, sv_interp, 1, PerlInterpreter); return sv_interp; } @@ -100,8 +67,10 @@ void perl_construct( sv_interp ) register PerlInterpreter *sv_interp; { - char* s; - +#ifdef USE_THREADS + struct thread *thr; +#endif /* USE_THREADS */ + if (!(curinterp = sv_interp)) return; @@ -109,6 +78,21 @@ register PerlInterpreter *sv_interp; Zero(sv_interp, 1, PerlInterpreter); #endif +#ifdef USE_THREADS +#ifdef NEED_PTHREAD_INIT + pthread_init(); +#endif /* NEED_PTHREAD_INIT */ + New(53, thr, 1, struct thread); + self = pthread_self(); + if (pthread_key_create(&thr_key, thread_destruct)) + croak("panic: pthread_key_create"); + if (pthread_setspecific(thr_key, (void *) thr)) + croak("panic: pthread_setspecific"); + nthreads = 1; + cvcache = newHV(); + thrflags = 0; +#endif /* USE_THREADS */ + /* Init the real globals? */ if (!linestr) { linestr = NEWSV(65,80); @@ -124,6 +108,15 @@ register PerlInterpreter *sv_interp; SvNV(&sv_yes); SvREADONLY_on(&sv_yes); + nrs = newSVpv("\n", 1); + rs = SvREFCNT_inc(nrs); + + MUTEX_INIT(&malloc_mutex); + MUTEX_INIT(&sv_mutex); + MUTEX_INIT(&eval_mutex); + MUTEX_INIT(&nthreads_mutex); + COND_INIT(&nthreads_cond); + #ifdef MSDOS /* * There is no way we can refer to them from Perl so close them to save @@ -139,93 +132,147 @@ register PerlInterpreter *sv_interp; chopset = " \n-"; copline = NOLINE; curcop = &compiling; + dbargs = 0; 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; #endif - uid = (int)getuid(); - euid = (int)geteuid(); - gid = (int)getgid(); - egid = (int)getegid(); - tainting = (euid != uid || egid != gid); - if (s = strchr(rcsid,'#')) { - (void)sprintf(s, "%d\n", PATCHLEVEL); - sprintf(patchlevel,"%3.3s%2.2d", strchr(rcsid,'5'), PATCHLEVEL); - } + init_ids(); + +#if defined(SUBVERSION) && SUBVERSION > 0 + sprintf(patchlevel, "%7.5f", 5.0 + (PATCHLEVEL / 1000.0) + + (SUBVERSION / 100000.0)); +#else + sprintf(patchlevel, "%5.3f", 5.0 + (PATCHLEVEL / 1000.0)); +#endif + +#if defined(LOCAL_PATCH_COUNT) + Ilocalpatches = local_patches; /* For possible -v */ +#endif fdpid = newAV(); /* for remembering popen pids by fd */ pidstatus = newHV();/* for remembering status of dead pids */ - init_stacks(); + init_stacks(ARGS); + DEBUG( { + New(51,debname,128,char); + New(52,debdelim,128,char); + } ) + ENTER; } +#ifdef USE_THREADS +void +thread_destruct(arg) +void *arg; +{ + struct thread *thr = (struct thread *) arg; + /* + * Decrement the global thread count and signal anyone listening. + * The only official thread listening is the original thread while + * in perl_destruct. It waits until it's the only thread and then + * performs END blocks and other process clean-ups. + */ + DEBUG_L(fprintf(stderr, "thread_destruct: 0x%lx\n", (unsigned long) thr)); + + Safefree(thr); + MUTEX_LOCK(&nthreads_mutex); + nthreads--; + COND_BROADCAST(&nthreads_cond); + MUTEX_UNLOCK(&nthreads_mutex); +} +#endif /* USE_THREADS */ + void perl_destruct(sv_interp) register PerlInterpreter *sv_interp; { + dTHR; + int destruct_level; /* 0=none, 1=full, 2=full with checks */ I32 last_sv_count; + HV *hv; if (!(curinterp = sv_interp)) return; - LEAVE; - FREE_TMPS(); -#ifndef EMBED - /* The exit() function may do everything that needs doing. */ - if (!sv_rvcount) - return; +#ifdef USE_THREADS + /* Wait until all user-created threads go away */ + MUTEX_LOCK(&nthreads_mutex); + while (nthreads > 1) + { + DEBUG_L(fprintf(stderr, "perl_destruct: waiting for %d threads\n", + nthreads - 1)); + COND_WAIT(&nthreads_cond, &nthreads_mutex); + } + /* At this point, we're the last thread */ + MUTEX_UNLOCK(&nthreads_mutex); + DEBUG_L(fprintf(stderr, "perl_destruct: armageddon has arrived\n")); + MUTEX_DESTROY(&nthreads_mutex); + COND_DESTROY(&nthreads_cond); +#endif /* USE_THREADS */ + + destruct_level = perl_destruct_level; +#ifdef DEBUGGING + { + char *s; + if (s = getenv("PERL_DESTRUCT_LEVEL")) + destruct_level = atoi(s); + } #endif - /* Not so lucky. We must account for everything. First the syntax tree. */ - if (main_root) { - curpad = AvARRAY(comppad); - op_free(main_root); - main_root = 0; + 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; + } + } + if (sv_objcount) { + /* + * Try to destruct global references. We do this first so that the + * destructors and destructees still exist. Some sv's might remain. + * Non-referenced objects are on their own. + */ + + dirty = TRUE; + sv_clean_objs(); } - /* - * Try to destruct global references. We do this first so that the - * destructors and destructees still exist. This code currently - * will break simple reference loops but may fail on more complicated - * ones. If so, the code below will clean up, but any destructors - * may fail to find what they're looking for. - */ - dirty = TRUE; - if (sv_count != 0) - sv_clean_refs(); - - /* Delete self-reference from main symbol table */ - GvHV(gv_fetchpv("::_main",TRUE, SVt_PVHV)) = 0; - --SvREFCNT(defstash); + if (destruct_level == 0){ - /* Try to destruct main symbol table. May fail on reference loops. */ - SvREFCNT_dec(defstash); + DEBUG_P(debprofdump()); + + /* The exit() function will do everything that needs doing. */ + return; + } + + /* Prepare to destruct main symbol table. */ + hv = defstash; defstash = 0; - - FREE_TMPS(); -#ifdef DEBUGGING - if (scopestack_ix != 0) - warn("Unbalanced scopes: %d more ENTERs than LEAVEs\n", scopestack_ix); - if (savestack_ix != 0) - warn("Unbalanced saves: %d more saves than restores\n", savestack_ix); - if (tmps_floor != -1) - warn("Unbalanced tmps: %d more allocs than frees\n", tmps_floor + 1); - if (cxstack_ix != -1) - warn("Unbalanced context: %d more PUSHes than POPs\n", cxstack_ix + 1); -#endif + SvREFCNT_dec(hv); + + FREETMPS; + if (destruct_level >= 2) { + if (scopestack_ix != 0) + warn("Unbalanced scopes: %d more ENTERs than LEAVEs\n", scopestack_ix); + if (savestack_ix != 0) + warn("Unbalanced saves: %d more saves than restores\n", savestack_ix); + if (tmps_floor != -1) + warn("Unbalanced tmps: %d more allocs than frees\n", tmps_floor + 1); + if (cxstack_ix != -1) + warn("Unbalanced context: %d more PUSHes than POPs\n", cxstack_ix + 1); + } /* Now absolutely destruct everything, somehow or other, loops or no. */ last_sv_count = 0; @@ -235,6 +282,14 @@ register PerlInterpreter *sv_interp; } if (sv_count != 0) warn("Scalars leaked: %d\n", sv_count); + sv_free_arenas(); + + DEBUG_P(debprofdump()); +#ifdef USE_THREADS + MUTEX_DESTROY(&sv_mutex); + MUTEX_DESTROY(&malloc_mutex); + MUTEX_DESTROY(&eval_mutex); +#endif /* USE_THREADS */ } void @@ -245,20 +300,25 @@ 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, argc, argv, env) +perl_parse(sv_interp, xsinit, argc, argv, env) PerlInterpreter *sv_interp; -register int argc; -register char **argv; +void (*xsinit)_((void)); +int argc; +char **argv; char **env; { + dTHR; register SV *sv; register char *s; - char *scriptname; - char *getenv(); - bool dosearch = FALSE; + char *scriptname = NULL; + VOL bool dosearch = FALSE; char *validarg = ""; + AV* comppadlist; #ifdef SETUID_SCRIPTS_ARE_SECURE_NOW #ifdef IAMSUID @@ -271,17 +331,36 @@ setuid perl scripts securely.\n"); if (!(curinterp = sv_interp)) return 255; - if (main_root) - op_free(main_root); - main_root = 0; - origargv = argv; origargc = argc; +#ifndef VMS /* VMS doesn't have environ array */ origenviron = environ; +#endif + e_tmpname = Nullch; + + if (do_undump) { + + /* Come here if running an undumped a.out. */ + + origfilename = savepv(argv[0]); + do_undump = FALSE; + cxstack_ix = -1; /* start label stack again */ + init_ids(); + init_postdump_symbols(argc,argv,env); + return 0; + } - switch (setjmp(top_env)) { + if (main_root) + op_free(main_root); + main_root = 0; + + switch (Sigsetjmp(top_env,1)) { case 1: +#ifdef VMS statusvalue = 255; +#else + statusvalue = 1; +#endif case 2: curstash = defstash; if (endav) @@ -292,17 +371,6 @@ setuid perl scripts securely.\n"); return 1; } - if (do_undump) { - - /* Come here if running an undumped a.out. */ - - origfilename = savestr(argv[0]); - do_undump = FALSE; - cxstack_ix = -1; /* start label stack again */ - init_postdump_symbols(argc,argv,env); - return 0; - } - sv_setpvn(linestr,"",0); sv = newSVpv("",0); /* first used for -I flags */ SAVEFREESV(sv); @@ -325,8 +393,11 @@ 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': @@ -343,7 +414,7 @@ setuid perl scripts securely.\n"); if (euid != uid || egid != gid) croak("No -e allowed in setuid scripts"); if (!e_fp) { - e_tmpname = savestr(TMPPATH); + e_tmpname = savepv(TMPPATH); (void)mktemp(e_tmpname); if (!*e_tmpname) croak("Can't mktemp()"); @@ -363,10 +434,10 @@ setuid perl scripts securely.\n"); sv_catpv(sv,s); sv_catpv(sv," "); if (*++s) { - (void)av_push(GvAVn(incgv),newSVpv(s,0)); + av_push(GvAVn(incgv),newSVpv(s,0)); } else if (argv[1]) { - (void)av_push(GvAVn(incgv),newSVpv(argv[1],0)); + av_push(GvAVn(incgv),newSVpv(argv[1],0)); sv_catpv(sv,argv[1]); argc--,argv++; sv_catpv(sv," "); @@ -382,11 +453,27 @@ setuid perl scripts securely.\n"); 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(),'@INC: '.\"@INC\\n\"",0); + } + 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++; if (*s) - cddir = savestr(s); + cddir = savepv(s); break; case '-': argc--,argv++; @@ -398,10 +485,12 @@ setuid perl scripts securely.\n"); } } switch_end: - scriptname = argv[0]; + if (!scriptname) + scriptname = argv[0]; if (e_fp) { - if (fflush(e_fp) || ferror(e_fp) || fclose(e_fp)) + if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp)) croak("Can't write to temp file for -e: %s", Strerror(errno)); + e_fp = Nullfp; argc++,argv--; scriptname = e_tmpname; } @@ -417,13 +506,20 @@ setuid perl scripts securely.\n"); open_script(scriptname,dosearch,sv); - validate_suid(validarg); + validate_suid(validarg, scriptname); if (doextract) find_beginning(); - if (perldb) - init_debugger(); + compcv = (CV*)NEWSV(1104,0); + sv_upgrade((SV *)compcv, SVt_PVCV); +#ifdef USE_THREADS + CvOWNER(compcv) = 0; + New(666, CvMUTEXP(compcv), 1, pthread_mutex_t); + MUTEX_INIT(CvMUTEXP(compcv)); + New(666, CvCONDP(compcv), 1, pthread_cond_t); + COND_INIT(CvCONDP(compcv)); +#endif /* USE_THREADS */ pad = newAV(); comppad = pad; @@ -432,10 +528,23 @@ setuid perl scripts securely.\n"); padname = newAV(); comppad_name = padname; comppad_name_fill = 0; +#ifdef USE_THREADS + av_store(comppad_name, 0, newSVpv("@_", 2)); +#endif /* USE_THREADS */ min_intro_pending = 0; padix = 0; - perl_init_ext(); /* in case linked C routines want magical variables */ + comppadlist = newAV(); + AvREAL_off(comppadlist); + av_store(comppadlist, 0, (SV*)comppad_name); + av_store(comppadlist, 1, (SV*)comppad); + CvPADLIST(compcv) = comppadlist; + + if (xsinit) + (*xsinit)(); /* in case linked C routines want magical variables */ +#ifdef VMS + init_os_extras(); +#endif init_predump_symbols(); if (!do_undump) @@ -457,18 +566,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(); @@ -476,6 +583,16 @@ setuid perl scripts securely.\n"); if (dowarn) gv_check(defstash); + LEAVE; + FREETMPS; + +#ifdef DEBUGGING_MSTATS + if ((s=getenv("PERL_DEBUG_MSTATS")) && atoi(s) >= 2) + dump_mstats("after compilation:"); +#endif + + ENTER; + restartop = 0; return 0; } @@ -483,9 +600,10 @@ int perl_run(sv_interp) PerlInterpreter *sv_interp; { + dTHR; if (!(curinterp = sv_interp)) return 255; - switch (setjmp(top_env)) { + switch (Sigsetjmp(top_env,1)) { case 1: cxstack_ix = -1; /* start context stack again */ break; @@ -493,12 +611,16 @@ PerlInterpreter *sv_interp; curstash = defstash; if (endav) calllist(endav); - FREE_TMPS(); + FREETMPS; +#ifdef DEBUGGING_MSTATS + if (getenv("PERL_DEBUG_MSTATS")) + dump_mstats("after execution: "); +#endif return(statusvalue); /* my_exit() was called */ case 3: if (!restartop) { fprintf(stderr, "panic: restartop\n"); - FREE_TMPS(); + FREETMPS; return 1; } if (stack != mainstack) { @@ -511,11 +633,16 @@ PerlInterpreter *sv_interp; if (!restartop) { DEBUG_x(dump_all()); DEBUG(fprintf(stderr,"\nEXECUTING...\n\n")); +#ifdef USE_THREADS + DEBUG_L(fprintf(stderr,"main thread is 0x%lx\n", (unsigned long) thr)); +#endif /* USE_THREADS */ if (minus_c) { fprintf(stderr,"%s syntax OK\n", origfilename); my_exit(0); } + if (perldb && DBsingle) + sv_setiv(DBsingle, 1); } /* do it */ @@ -523,92 +650,371 @@ PerlInterpreter *sv_interp; if (restartop) { op = restartop; restartop = 0; - run(); + runops(); } else if (main_start) { op = main_start; - run(); + runops(); } my_exit(0); + return 0; } void my_exit(status) -int status; +U32 status; +{ + dTHR; + register CONTEXT *cx; + I32 gimme; + SV **newsp; + +#ifdef USE_THREADS + DEBUG_L(fprintf(stderr, "my_exit: thread 0x%lx, status %lu\n", + (unsigned long) thr, (unsigned long) status)); +#endif /* USE_THREADS */ + statusvalue = FIXSTATUS(status); + if (cxstack_ix >= 0) { + if (cxstack_ix > 0) + dounwind(0); + POPBLOCK(cx,curpm); + LEAVE; + } + Siglongjmp(top_env, 2); +} + +SV* +perl_get_sv(name, create) +char* name; +I32 create; +{ + GV* gv = gv_fetchpv(name, create, SVt_PV); + if (gv) + return GvSV(gv); + return Nullsv; +} + +AV* +perl_get_av(name, create) +char* name; +I32 create; +{ + GV* gv = gv_fetchpv(name, create, SVt_PVAV); + if (create) + return GvAVn(gv); + if (gv) + return GvAV(gv); + return Nullav; +} + +HV* +perl_get_hv(name, create) +char* name; +I32 create; { - statusvalue = (unsigned short)(status & 0xffff); - longjmp(top_env, 2); + GV* gv = gv_fetchpv(name, create, SVt_PVHV); + if (create) + return GvHVn(gv); + if (gv) + return GvHV(gv); + return Nullhv; +} + +CV* +perl_get_cv(name, create) +char* name; +I32 create; +{ + GV* gv = gv_fetchpv(name, create, SVt_PVCV); + if (create && !GvCV(gv)) + return newSUB(start_subparse(), + newSVOP(OP_CONST, 0, newSVpv(name,0)), + Nullop, + Nullop); + if (gv) + return GvCV(gv); + return Nullcv; } /* Be sure to refetch the stack pointer after calling these routines. */ -int -perl_callargv(subname, sp, gimme, argv) +I32 +perl_call_argv(subname, flags, argv) char *subname; -register I32 sp; /* current stack pointer */ -I32 gimme; /* TRUE if called in list context */ -register char **argv; /* null terminated arg list, NULL for no arglist */ +I32 flags; /* See G_* flags in cop.h */ +register char **argv; /* null terminated arg list */ { - register I32 items = 0; - I32 hasargs = (argv != 0); + dTHR; + dSP; - av_store(stack, ++sp, Nullsv); /* reserve spot for sub reference */ - if (hasargs) { + PUSHMARK(sp); + if (argv) { while (*argv) { - av_store(stack, ++sp, sv_2mortal(newSVpv(*argv,0))); - items++; + XPUSHs(sv_2mortal(newSVpv(*argv,0))); argv++; } + PUTBACK; } - return perl_callpv(subname, sp, gimme, hasargs, items); + return perl_call_pv(subname, flags); } -int -perl_callpv(subname, sp, gimme, hasargs, numargs) -char *subname; -I32 sp; /* stack pointer after args are pushed */ -I32 gimme; /* TRUE if called in list context */ -I32 hasargs; /* whether to create a @_ array for routine */ -I32 numargs; /* how many args are pushed on the stack */ +I32 +perl_call_pv(subname, flags) +char *subname; /* name of the subroutine */ +I32 flags; /* See G_* flags in cop.h */ { - return perl_callsv((SV*)gv_fetchpv(subname, TRUE, SVt_PVCV), - sp, gimme, hasargs, numargs); + return perl_call_sv((SV*)perl_get_cv(subname, TRUE), flags); +} + +I32 +perl_call_method(methname, flags) +char *methname; /* name of the subroutine */ +I32 flags; /* See G_* flags in cop.h */ +{ + dTHR; + dSP; + OP myop; + if (!op) + op = &myop; + XPUSHs(sv_2mortal(newSVpv(methname,0))); + PUTBACK; + pp_method(ARGS); + return perl_call_sv(*stack_sp--, flags); } /* May be called with any of a CV, a GV, or an SV containing the name. */ -int -perl_callsv(sv, sp, gimme, hasargs, numargs) +I32 +perl_call_sv(sv, flags) SV* sv; -I32 sp; /* stack pointer after args are pushed */ -I32 gimme; /* TRUE if called in list context */ -I32 hasargs; /* whether to create a @_ array for routine */ -I32 numargs; /* how many args are pushed on the stack */ +I32 flags; /* See G_* flags in cop.h */ { - BINOP myop; /* fake syntax tree node */ + dTHR; + LOGOP myop; /* fake syntax tree node */ + SV** sp = stack_sp; + I32 oldmark = TOPMARK; + I32 retval; + Sigjmp_buf oldtop; + I32 oldscope; - ENTER; - SAVETMPS; + if (flags & G_DISCARD) { + ENTER; + SAVETMPS; + } + SAVESPTR(op); - stack_base = AvARRAY(stack); - stack_sp = stack_base + sp - numargs - 1; op = (OP*)&myop; - Zero(op, 1, BINOP); - pp_pushmark(); /* doesn't look at op, actually, except to return */ + Zero(op, 1, LOGOP); + EXTEND(stack_sp, 1); *++stack_sp = sv; - stack_sp += numargs; + oldscope = scopestack_ix; - if (hasargs) { + if (!(flags & G_NOARGS)) myop.op_flags = OPf_STACKED; - myop.op_last = (OP*)&myop; + myop.op_next = Nullop; + myop.op_flags |= OPf_KNOW; + if (flags & G_ARRAY) + myop.op_flags |= OPf_LIST; + + if (flags & G_EVAL) { + Copy(top_env, oldtop, 1, Sigjmp_buf); + + cLOGOP->op_other = op; + markstack_ptr--; + /* we're trying to emulate pp_entertry() here */ + { + register CONTEXT *cx; + I32 gimme = GIMME; + + 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 (Sigsetjmp(top_env,1)) { + case 0: + break; + case 1: +#ifdef VMS + statusvalue = 255; /* XXX I don't think we use 1 anymore. */ +#else + statusvalue = 1; +#endif + /* FALL THROUGH */ + case 2: + /* my_exit() was called */ + curstash = defstash; + FREETMPS; + Copy(oldtop, top_env, 1, Sigjmp_buf); + if (statusvalue) + croak("Callback called exit"); + my_exit(statusvalue); + /* NOTREACHED */ + case 3: + if (restartop) { + op = restartop; + restartop = 0; + goto restart; + } + 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_entersub(ARGS); + if (op) + runops(); + retval = stack_sp - (stack_base + oldmark); + if ((flags & G_EVAL) && !(flags & G_KEEPERR)) + sv_setpv(GvSV(errgv),""); + + cleanup: + if (flags & G_EVAL) { + if (scopestack_ix > oldscope) { + SV **newsp; + PMOP *newpm; + I32 gimme; + register CONTEXT *cx; + I32 optype; + + POPBLOCK(cx,newpm); + POPEVAL(cx); + pop_return(); + curpm = newpm; + LEAVE; + } + Copy(oldtop, top_env, 1, Sigjmp_buf); + } + if (flags & G_DISCARD) { + stack_sp = stack_base + oldmark; + retval = 0; + FREETMPS; + LEAVE; + } + return retval; +} + +/* Eval a string. */ + +I32 +perl_eval_sv(sv, flags) +SV* sv; +I32 flags; /* See G_* flags in cop.h */ +{ + dTHR; + UNOP myop; /* fake syntax tree node */ + SV** sp = stack_sp; + I32 oldmark = sp - stack_base; + I32 retval; + Sigjmp_buf oldtop; + I32 oldscope; + + if (flags & G_DISCARD) { + ENTER; + SAVETMPS; + } + + 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_flags |= OPf_KNOW; + if (flags & G_ARRAY) + myop.op_flags |= OPf_LIST; - if (op = pp_entersubr()) - run(); - FREE_TMPS(); - LEAVE; - return stack_sp - stack_base; + Copy(top_env, oldtop, 1, Sigjmp_buf); + +restart: + switch (Sigsetjmp(top_env,1)) { + case 0: + break; + case 1: +#ifdef VMS + statusvalue = 255; /* XXX I don't think we use 1 anymore. */ +#else + statusvalue = 1; +#endif + /* FALL THROUGH */ + case 2: + /* my_exit() was called */ + curstash = defstash; + FREETMPS; + Copy(oldtop, top_env, 1, Sigjmp_buf); + if (statusvalue) + croak("Callback called exit"); + my_exit(statusvalue); + /* NOTREACHED */ + case 3: + if (restartop) { + op = restartop; + restartop = 0; + goto restart; + } + 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(ARGS); + if (op) + runops(); + retval = stack_sp - (stack_base + oldmark); + if ((flags & G_EVAL) && !(flags & G_KEEPERR)) + sv_setpv(GvSV(errgv),""); + + cleanup: + Copy(oldtop, top_env, 1, Sigjmp_buf); + if (flags & G_DISCARD) { + stack_sp = stack_base + oldmark; + retval = 0; + FREETMPS; + LEAVE; + } + return retval; +} + +/* Require a module. */ + +void +perl_require_pv(pv) +char* pv; +{ + SV* sv = sv_newmortal(); + sv_setpv(sv, "require '"); + sv_catpv(sv, pv); + sv_catpv(sv, "'"); + perl_eval_sv(sv, G_DISCARD); } void @@ -623,10 +1029,14 @@ I32 namlen; sv_magic(GvSV(gv), (SV*)gv, 0, name, namlen); } -#ifdef DOSISH -#define PERLLIB_SEP ';' +#if defined(DOSISH) +# define PERLLIB_SEP ';' #else -#define PERLLIB_SEP ':' +# if defined(VMS) +# define PERLLIB_SEP '|' +# else +# define PERLLIB_SEP ':' +# endif #endif static void @@ -643,19 +1053,54 @@ char *p; /* First, skip any consecutive separators */ while ( *p == PERLLIB_SEP ) { /* Uncomment the next line for PATH semantics */ - /* (void)av_push(GvAVn(incgv), newSVpv(".", 1)); */ + /* av_push(GvAVn(incgv), newSVpv(".", 1)); */ p++; } if ( (s = strchr(p, PERLLIB_SEP)) != Nullch ) { - (void)av_push(GvAVn(incgv), newSVpv(p, (I32)(s - p))); + av_push(GvAVn(incgv), newSVpv(p, (STRLEN)(s - p))); p = s + 1; } else { - (void)av_push(GvAVn(incgv), newSVpv(p, 0)); + av_push(GvAVn(incgv), newSVpv(p, 0)); break; } } } +static void +usage(name) /* XXX move this out into a module ? */ +char *name; +{ + /* 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"); +#ifdef OS2 + printf("\n -R enable REXX variable pool"); +#endif + 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 */ char * @@ -663,25 +1108,24 @@ moreswitches(s) char *s; { I32 numlen; + U32 rschar; switch (*s) { case '0': - nrschar = scan_oct(s, 4, &numlen); - nrs = nsavestr("\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': minus_F = TRUE; - splitstr = savestr(s + 1); + splitstr = savepv(s + 1); s += strlen(s); return s; case 'a': @@ -694,8 +1138,16 @@ char *s; return s; case 'd': taint_not("-d"); - perldb = TRUE; s++; + if (*s == ':' || *s == '=') { + sprintf(buf, "use Devel::%s;", ++s); + s += strlen(s); + my_setenv("PERL5DB",buf); + } + if (!perldb) { + perldb = TRUE; + init_debugger(); + } return s; case 'D': #ifdef DEBUGGING @@ -714,14 +1166,17 @@ char *s; debug |= 0x80000000; #else warn("Recompile perl with -DDEBUGGING to use -D switch\n"); - for (s++; isDIGIT(*s); s++) ; + for (s++; isALNUM(*s); s++) ; #endif /*SUPPRESS 530*/ return s; + case 'h': + usage(origargv[0]); + exit(0); case 'i': if (inplace) Safefree(inplace); - inplace = savestr(s+1); + inplace = savepv(s+1); /*SUPPRESS 530*/ for (s = inplace; *s && !isSPACE(*s); s++) ; *s = '\0'; @@ -729,7 +1184,11 @@ char *s; case 'I': taint_not("-I"); if (*++s) { - (void)av_push(GvAVn(incgv),newSVpv(s,0)); + char *e; + for (e = s; *e && !isSPACE(*e); e++) ; + av_push(GvAVn(incgv),newSVpv(s,e-s)); + if (*e) + return e; } else croak("No space allowed after -I"); @@ -737,17 +1196,59 @@ char *s; case 'l': minus_l = TRUE; s++; + if (ors) + Safefree(ors); if (isDIGIT(*s)) { - ors = savestr("\n"); + ors = savepv("\n"); orslen = 1; *ors = scan_oct(s, 3 + (*s == '0'), &numlen); s += numlen; } else { - ors = nsavestr(nrs,nrslen); - orslen = nrslen; + if (RsPARA(nrs)) { + ors = savepvn("\n\n", 2); + orslen = 2; + } + else + ors = SvPV(nrs, orslen); } return s; + case 'M': + taint_not("-M"); /* XXX ? */ + /* FALL THROUGH */ + case 'm': + taint_not("-m"); /* XXX ? */ + if (*++s) { + char *start; + SV *sv; + 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++; @@ -774,23 +1275,59 @@ char *s; s++; return s; case 'v': - fputs("\nThis is perl, version 5.0, Alpha 9 (unsupported)\n\n",stdout); - fputs(rcsid,stdout); - fputs("\nCopyright (c) 1989, 1990, 1991, 1992, 1993, 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 + +#if defined(DEBUGGING) || defined(EMBED) || defined(MULTIPLICITY) + fputs(" with", stdout); +#ifdef DEBUGGING + fputs(" DEBUGGING", stdout); +#endif +#ifdef EMBED + fputs(" EMBED", stdout); +#endif +#ifdef MULTIPLICITY + fputs(" MULTIPLICITY", stdout); +#endif +#endif + +#if defined(LOCAL_PATCH_COUNT) + if (LOCAL_PATCH_COUNT > 0) + { int i; + fputs("\n\tLocally applied patches:\n", stdout); + for (i = 1; i <= LOCAL_PATCH_COUNT; i++) { + if (Ilocalpatches[i]) + fprintf(stdout, "\t %s\n", Ilocalpatches[i]); + } + } +#endif + printf("\n\tbuilt under %s",OSNAME); +#ifdef __DATE__ +# ifdef __TIME__ + printf(" at %s %s",__DATE__,__TIME__); +# else + printf(" on %s",__DATE__); +# endif +#endif + fputs("\n\t+ suidperl security patch", stdout); + fputs("\n\nCopyright 1987-1996, Larry Wall\n",stdout); #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); #endif +#ifdef OS2 + fputs("OS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n" + "Version 5 port Copyright (c) 1994-1995, Andreas Kaiser\n", stdout); #endif #ifdef atarist - fputs("atariST series port, ++jrb bammi@cadence.com\n", stdout); + fputs("atariST series port, ++jrb bammi@cadence.com\n", stdout); #endif fputs("\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); +GNU General Public License, which may be found in the Perl 5.0 source kit.\n\n",stdout); #ifdef MSDOS usage(origargv[0]); #endif @@ -799,16 +1336,22 @@ GNU General Public License, which may be found in the Perl 5.0 source kit.\n",st dowarn = TRUE; s++; return s; + case '*': case ' ': if (s[1] == '-') /* Additional switches on #! line. */ return s+2; break; + case '-': case 0: case '\n': case '\t': break; + case 'P': + if (preprocess) + return s+1; + /* FALL THROUGH */ default: - croak("Switch meaningless after -x: -%s",s); + croak("Can't emulate -%.1s on #! line",s); } return Nullch; } @@ -830,39 +1373,76 @@ my_unexec() status = unexec(buf, tokenbuf, &etext, sbrk(0), 0); if (status) fprintf(stderr, "unexec of %s into %s failed!\n", tokenbuf, buf); - my_exit(status); + exit(status); +#else +# ifdef VMS +# include + lib$signal(SS$_DEBUG); /* ssdef.h #included from vmsish.h */ #else ABORT(); /* for use with undump */ #endif +#endif } static void init_main_stash() { + dTHR; GV *gv; curstash = defstash = newHV(); curstname = newSVpv("main",4); - GvHV(gv = gv_fetchpv("_main",TRUE, SVt_PVHV)) = (HV*)SvREFCNT_inc(defstash); + gv = gv_fetchpv("main::",TRUE, SVt_PVHV); + SvREFCNT_dec(GvHV(gv)); + GvHV(gv) = (HV*)SvREFCNT_inc(defstash); SvREADONLY_on(gv); - HvNAME(defstash) = savestr("main"); + HvNAME(defstash) = savepv("main"); incgv = gv_HVadd(gv_AVadd(gv_fetchpv("INC",TRUE, SVt_PVAV))); - SvMULTI_on(incgv); - defgv = gv_fetchpv("_",TRUE, SVt_PV); + GvMULTI_on(incgv); + defgv = gv_fetchpv("_",TRUE, SVt_PVAV); + errgv = gv_HVadd(gv_fetchpv("@", TRUE, SVt_PV)); + GvMULTI_on(errgv); 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 +static void +open_script(char *scriptname, bool dosearch, SV *sv) +#else static void open_script(scriptname,dosearch,sv) char *scriptname; bool dosearch; SV *sv; +#endif { char *xfound = Nullch; char *xfailed = Nullch; register char *s; I32 len; + int retval; +#if defined(DOSISH) && !defined(OS2) && !defined(atarist) +#define SEARCH_EXTS ".bat", ".cmd", NULL +#endif +#ifdef VMS +# define SEARCH_EXTS ".pl", ".com", NULL +#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 */ +#endif +#ifdef VMS + if (dosearch && !strpbrk(scriptname,":[ 0) /* reset after previous loop */ + extidx = 0; + do { +#endif + DEBUG_p(fprintf(stderr,"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)) { @@ -900,7 +1495,7 @@ SV *sv; break; } if (!xfailed) - xfailed = savestr(tokenbuf); + xfailed = savepv(tokenbuf); } if (!xfound) croak("Can't execute %s", xfailed ? xfailed : scriptname ); @@ -909,11 +1504,27 @@ SV *sv; scriptname = xfound; } - origfilename = savestr(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) { + if (fdscript >= 0) { + rsfp = fdopen(fdscript,"r"); +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(fileno(rsfp),F_SETFD,1); /* ensure close-on-exec */ +#endif + } + else if (preprocess) { char *cpp = CPPSTDIN; if (strEQ(cpp,"cppstdin")) @@ -921,7 +1532,7 @@ SV *sv; else sprintf(tokenbuf, "%s", cpp); sv_catpv(sv,"-I"); - sv_catpv(sv,PRIVLIB); + sv_catpv(sv,PRIVLIB_EXP); #ifdef MSDOS (void)sprintf(buf, "\ sed %s -e \"/^[^#]/b\" \ @@ -959,7 +1570,6 @@ sed %s -e \"/^[^#]/b\" \ (doextract ? "-e '1,/^#/d\n'" : ""), #endif scriptname, tokenbuf, SvPV(sv, na), CPPMINUS); - DEBUG_P(fprintf(stderr, "%s\n", buf)); doextract = FALSE; #ifdef IAMSUID /* actually, this is caught earlier */ if (euid != uid && !euid) { /* if running suidperl */ @@ -986,12 +1596,16 @@ sed %s -e \"/^[^#]/b\" \ taint_not("program input from stdin"); rsfp = stdin; } - else + else { rsfp = fopen(scriptname,"r"); +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(fileno(rsfp),F_SETFD,1); /* ensure close-on-exec */ +#endif + } if ((FILE*)rsfp == Nullfp) { #ifdef DOSUID #ifndef IAMSUID /* in case script is not readable before setuid */ - if (euid && stat(SvPVX(GvSV(curcop->cop_filegv)),&statbuf) >= 0 && + 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 */ @@ -1005,10 +1619,12 @@ sed %s -e \"/^[^#]/b\" \ } static void -validate_suid(validarg) +validate_suid(validarg, scriptname) char *validarg; +char *scriptname; { - char *s; + int which; + /* do we need to emulate setuid on scripts? */ /* This code is for those BSD systems that have setuid #! scripts disabled @@ -1030,9 +1646,11 @@ char *validarg; */ #ifdef DOSUID - if (fstat(fileno(rsfp),&statbuf) < 0) /* normal stat is insecure */ + char *s; + + if (Fstat(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 @@ -1059,12 +1677,14 @@ char *validarg; if ( #ifdef HAS_SETREUID setreuid(euid,uid) < 0 -#elif HAS_SETRESUID +#else +# if HAS_SETRESUID setresuid(euid,uid,(Uid_t)-1) < 0 +# endif #endif || getuid() != euid || geteuid() != uid) croak("Can't swap uid and euid"); /* really paranoid */ - if (stat(SvPVX(GvSV(curcop->cop_filegv)),&tmpstatbuf) < 0) + if (Stat(SvPVX(GvSV(curcop->cop_filegv)),&tmpstatbuf) < 0) croak("Permission denied"); /* testing full pathname here */ if (tmpstatbuf.st_dev != statbuf.st_dev || tmpstatbuf.st_ino != statbuf.st_ino) { @@ -1084,8 +1704,10 @@ char *validarg; if ( #ifdef HAS_SETREUID setreuid(uid,euid) < 0 -#elif defined(HAS_SETRESUID) +#else +# if defined(HAS_SETRESUID) setresuid(uid,euid,(Uid_t)-1) < 0 +# endif #endif || getuid() != uid || geteuid() != euid) croak("Can't reswap uid and euid"); @@ -1189,24 +1811,40 @@ FIX YOUR KERNEL, PUT A C WRAPPER AROUND THIS SCRIPT, OR USE -u AND UNDUMP!\n"); if (geteuid() != uid) croak("Can't do seteuid!\n"); } - uid = (int)getuid(); - euid = (int)geteuid(); - gid = (int)getgid(); - egid = (int)getegid(); - tainting |= (euid != uid || egid != gid); + init_ids(); if (!cando(S_IXUSR,TRUE,&statbuf)) croak("Permission denied\n"); /* they can't do this */ } #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.) */ + rewind(rsfp); + for (which = 1; origargv[which] && origargv[which] != scriptname; which++) ; + if (!origargv[which]) + croak("Permission denied"); + (void)sprintf(buf, "/dev/fd/%d/%.127s", fileno(rsfp), origargv[which]); + origargv[which] = buf; + +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(fileno(rsfp),F_SETFD,0); /* ensure no close-on-exec */ +#endif + + (void)sprintf(tokenbuf, "%s/perl%s", BIN, patchlevel); + execv(tokenbuf, 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(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) @@ -1246,48 +1884,56 @@ find_beginning() } static void -init_debugger() +init_ids() { - GV* tmpgv; + uid = (int)getuid(); + euid = (int)geteuid(); + gid = (int)getgid(); + egid = (int)getegid(); +#ifdef VMS + uid |= gid << 16; + euid |= egid << 16; +#endif + tainting |= (uid && (euid != uid || egid != gid)); +} - debstash = newHV(); - GvHV(gv_fetchpv("::_DB",TRUE, SVt_PVHV)) = debstash; +static void +init_debugger() +{ + dTHR; curstash = debstash; - dbargs = GvAV(gv_AVadd((tmpgv = gv_fetchpv("args",TRUE, SVt_PVAV)))); - SvMULTI_on(tmpgv); + dbargs = GvAV(gv_AVadd((gv_fetchpv("args", GV_ADDMULTI, SVt_PVAV)))); AvREAL_off(dbargs); - DBgv = gv_fetchpv("DB",TRUE, SVt_PVGV); - SvMULTI_on(DBgv); - DBline = gv_fetchpv("dbline",TRUE, SVt_PVAV); - SvMULTI_on(DBline); - DBsub = gv_HVadd(tmpgv = gv_fetchpv("sub",TRUE, SVt_PVHV)); - SvMULTI_on(tmpgv); - DBsingle = GvSV((tmpgv = gv_fetchpv("single",TRUE, SVt_PV))); - SvMULTI_on(tmpgv); - DBtrace = GvSV((tmpgv = gv_fetchpv("trace",TRUE, SVt_PV))); - SvMULTI_on(tmpgv); - DBsignal = GvSV((tmpgv = gv_fetchpv("signal",TRUE, SVt_PV))); - SvMULTI_on(tmpgv); + DBgv = gv_fetchpv("DB", GV_ADDMULTI, SVt_PVGV); + 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() +void +init_stacks(ARGS) +dARGS { stack = newAV(); mainstack = stack; /* remember in case we switch stacks */ AvREAL_off(stack); /* not a real array */ - av_fill(stack,127); av_fill(stack,-1); /* preextend stack */ + av_extend(stack,127); stack_base = AvARRAY(stack); stack_sp = stack_base; stack_max = stack_base + 127; - New(54,markstack,64,int); + New(54,markstack,64,I32); markstack_ptr = markstack; markstack_max = markstack + 64; - New(54,scopestack,32,int); + New(54,scopestack,32,I32); scopestack_ix = 0; scopestack_max = 32; @@ -1299,24 +1945,20 @@ init_stacks() 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; tmps_max = 128; - - DEBUG( { - New(51,debname,128,char); - New(52,debdelim,128,char); - } ) } +static FILE *tmpfp; /* moved outside init_lexer() because of UNICOS bug */ static void init_lexer() { - FILE* tmpfp = rsfp; + tmpfp = rsfp; lex_start(linestr); rsfp = tmpfp; @@ -1326,40 +1968,37 @@ init_lexer() static void init_predump_symbols() { + dTHR; GV *tmpgv; + GV *othergv; sv_setpvn(GvSV(gv_fetchpv("\"", TRUE, SVt_PV)), " ", 1); stdingv = gv_fetchpv("STDIN",TRUE, SVt_PVIO); - SvMULTI_on(stdingv); - if (!GvIO(stdingv)) - GvIO(stdingv) = newIO(); - IoIFP(GvIO(stdingv)) = stdin; - tmpgv = gv_fetchpv("stdin",TRUE, SVt_PVIO); - GvIO(tmpgv) = (IO*)SvREFCNT_inc(GvIO(stdingv)); - SvMULTI_on(tmpgv); + GvMULTI_on(stdingv); + IoIFP(GvIOp(stdingv)) = stdin; + tmpgv = gv_fetchpv("stdin",TRUE, SVt_PV); + GvMULTI_on(tmpgv); + GvIOp(tmpgv) = (IO*)SvREFCNT_inc(GvIOp(stdingv)); tmpgv = gv_fetchpv("STDOUT",TRUE, SVt_PVIO); - SvMULTI_on(tmpgv); - if (!GvIO(tmpgv)) - GvIO(tmpgv) = newIO(); - IoOFP(GvIO(tmpgv)) = IoIFP(GvIO(tmpgv)) = stdout; - defoutgv = tmpgv; - tmpgv = gv_fetchpv("stdout",TRUE, SVt_PVIO); - GvIO(tmpgv) = (IO*)SvREFCNT_inc(GvIO(defoutgv)); - SvMULTI_on(tmpgv); - - curoutgv = gv_fetchpv("STDERR",TRUE, SVt_PVIO); - SvMULTI_on(curoutgv); - if (!GvIO(curoutgv)) - GvIO(curoutgv) = newIO(); - IoOFP(GvIO(curoutgv)) = IoIFP(GvIO(curoutgv)) = stderr; - tmpgv = gv_fetchpv("stderr",TRUE, SVt_PVIO); - GvIO(tmpgv) = (IO*)SvREFCNT_inc(GvIO(curoutgv)); - SvMULTI_on(tmpgv); - curoutgv = defoutgv; /* switch back to STDOUT */ + GvMULTI_on(tmpgv); + IoOFP(GvIOp(tmpgv)) = IoIFP(GvIOp(tmpgv)) = stdout; + setdefout(tmpgv); + tmpgv = gv_fetchpv("stdout",TRUE, SVt_PV); + GvMULTI_on(tmpgv); + GvIOp(tmpgv) = (IO*)SvREFCNT_inc(GvIOp(defoutgv)); + + othergv = gv_fetchpv("STDERR",TRUE, SVt_PVIO); + GvMULTI_on(othergv); + IoOFP(GvIOp(othergv)) = IoIFP(GvIOp(othergv)) = stderr; + tmpgv = gv_fetchpv("stderr",TRUE, SVt_PV); + GvMULTI_on(tmpgv); + GvIOp(tmpgv) = (IO*)SvREFCNT_inc(GvIOp(othergv)); statname = NEWSV(66,0); /* last filename we did stat on */ + + osname = savepv(OSNAME); } static void @@ -1392,8 +2031,7 @@ register char **env; toptarget = NEWSV(0,0); sv_upgrade(toptarget, SVt_PVFM); sv_setpvn(toptarget, "", 0); - tmpgv = gv_fetchpv("\001",TRUE, SVt_PV); - bodytarget = GvSV(tmpgv); + bodytarget = NEWSV(0,0); sv_upgrade(bodytarget, SVt_PVFM); sv_setpvn(bodytarget, "", 0); formtarget = bodytarget; @@ -1408,18 +2046,26 @@ register char **env; 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++) { - (void)av_push(GvAVn(argvgv),newSVpv(argv[0],0)); + av_push(GvAVn(argvgv),newSVpv(argv[0],0)); } } if (envgv = gv_fetchpv("ENV",TRUE, SVt_PVHV)) { HV *hv; - SvMULTI_on(envgv); + GvMULTI_on(envgv); hv = GvHVn(envgv); hv_clear(hv); +#ifndef VMS /* VMS doesn't have environ array */ + /* 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'); @@ -1433,6 +2079,10 @@ register char **env; (void)hv_store(hv, *env, s - *env, sv, 0); *s = '='; } +#endif +#ifdef DYNAMIC_ENV_FETCH + HvNAME(hv) = savepv(ENV_HV_NAME); +#endif hv_magic(hv, envgv, 'E'); } tainted = 0; @@ -1453,67 +2103,104 @@ init_perllib() incpush(getenv("PERLLIB")); } -#ifndef PRIVLIB -#define PRIVLIB "/usr/local/lib/perl5:/usr/local/lib/perl" +#ifdef APPLLIB_EXP + incpush(APPLLIB_EXP); #endif - incpush(PRIVLIB); - (void)av_push(GvAVn(incgv),newSVpv(".",1)); + +#ifdef ARCHLIB_EXP + incpush(ARCHLIB_EXP); +#endif +#ifndef PRIVLIB_EXP +#define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" +#endif + incpush(PRIVLIB_EXP); + +#ifdef SITEARCH_EXP + incpush(SITEARCH_EXP); +#endif +#ifdef SITELIB_EXP + incpush(SITELIB_EXP); +#endif +#ifdef OLDARCHLIB_EXP /* 5.00[01] compatibility */ + incpush(OLDARCHLIB_EXP); +#endif + + if (!tainting) + incpush("."); } void calllist(list) AV* list; { - jmp_buf oldtop; - I32 sp = stack_sp - stack_base; + dTHR; + Sigjmp_buf oldtop; + STRLEN len; + line_t oldline = curcop->cop_line; - av_store(stack, ++sp, Nullsv); /* reserve spot for sub reference */ - Copy(top_env, oldtop, 1, jmp_buf); + Copy(top_env, oldtop, 1, Sigjmp_buf); while (AvFILL(list) >= 0) { CV *cv = (CV*)av_shift(list); SAVEFREESV(cv); - switch (setjmp(top_env)) { - case 0: - perl_callsv((SV*)cv, sp, G_SCALAR, 0, 0); + + switch (Sigsetjmp(top_env,1)) { + case 0: { + 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, Sigjmp_buf); + curcop = &compiling; + curcop->cop_line = oldline; + if (list == beginav) + sv_catpv(atsv, "BEGIN failed--compilation aborted"); + else + sv_catpv(atsv, "END failed--cleanup aborted"); + croak("%s", SvPVX(atsv)); + } + } break; case 1: +#ifdef VMS statusvalue = 255; /* XXX I don't think we use 1 anymore. */ +#else + statusvalue = 1; +#endif /* FALL THROUGH */ case 2: /* my_exit() was called */ curstash = defstash; if (endav) calllist(endav); - FREE_TMPS(); + FREETMPS; + Copy(oldtop, top_env, 1, Sigjmp_buf); + curcop = &compiling; + curcop->cop_line = oldline; if (statusvalue) { if (list == beginav) - warn("BEGIN failed--execution aborted"); + croak("BEGIN failed--compilation aborted"); else - warn("END failed--execution aborted"); + croak("END failed--cleanup aborted"); } - Copy(oldtop, top_env, 1, jmp_buf); my_exit(statusvalue); /* NOTREACHED */ return; case 3: if (!restartop) { fprintf(stderr, "panic: restartop\n"); - FREE_TMPS(); + FREETMPS; break; } - if (stack != mainstack) { - dSP; - SWITCHSTACK(stack, mainstack); - } - op = restartop; - restartop = 0; - run(); - break; + Copy(oldtop, top_env, 1, Sigjmp_buf); + curcop = &compiling; + curcop->cop_line = oldline; + Siglongjmp(top_env, 3); } } - Copy(oldtop, top_env, 1, jmp_buf); + Copy(oldtop, top_env, 1, Sigjmp_buf); }