X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.c;h=38c4f0723cabf08058ca477da2aeade3be596d09;hb=95146c060d4701c16367f59345531d4eb7a2d283;hp=f2ee6332010937187f014a466a839b72a07eba79;hpb=a0a2876f4683eca6ebc96f52b47823a87dd0ac4a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perl.c b/perl.c
index f2ee633..38c4f07 100644
--- a/perl.c
+++ b/perl.c
@@ -1,6 +1,6 @@
 /*    perl.c
  *
- *    Copyright (c) 1987-1994 Larry Wall
+ *    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.
@@ -15,13 +15,12 @@
 #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 <unistd.h>
 #endif
-*/
 
-char rcsid[] = "perl.c\nPatch level: ###\n";
+dEXT char rcsid[] = "perl.c\nPatch level: ###\n";
 
 #ifdef IAMSUID
 #ifndef DOSUID
@@ -37,6 +36,7 @@ char rcsid[] = "perl.c\nPatch level: ###\n";
 
 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));
@@ -44,8 +44,12 @@ 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 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()
@@ -61,8 +65,6 @@ void
 perl_construct( sv_interp )
 register PerlInterpreter *sv_interp;
 {
-    char* s;
-
     if (!(curinterp = sv_interp))
 	return;
 
@@ -75,15 +77,20 @@ 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);
 
 #ifdef MSDOS
 	/*
@@ -100,32 +107,33 @@ 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();
-#ifdef VMS
-    uid |= gid << 16;
-    euid |= egid << 16;
+    init_ids();
+
+#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
-    tainting = (euid != uid || egid != gid);
-    sprintf(patchlevel, "%5.3f", 5.0 + (PATCHLEVEL / 1000.0));
+
+    PerlIO_init();      /* Hook to IO system */
 
     fdpid = newAV();	/* for remembering popen pids by fd */
     pidstatus = newHV();/* for remembering status of dead pids */
@@ -135,25 +143,33 @@ register PerlInterpreter *sv_interp;
 }
 
 void
-perl_destruct(sv_interp, destruct_level)
+perl_destruct(sv_interp)
 register PerlInterpreter *sv_interp;
-int destruct_level;  /* 0=none, 1=full, 2=full with checks */
 {
+    int destruct_level;  /* 0=none, 1=full, 2=full with checks */
     I32 last_sv_count;
     HV *hv;
 
     if (!(curinterp = sv_interp))
 	return;
+
+    destruct_level = perl_destruct_level;
+#ifdef DEBUGGING
+    {
+	char *s;
+	if (s = getenv("PERL_DESTRUCT_LEVEL"))
+	    destruct_level = atoi(s);
+    }
+#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.  First the syntax tree. */
+    if (main_root) {
+	curpad = AvARRAY(comppad);
+	op_free(main_root);
+	main_root = 0;
     }
     if (sv_objcount) {
 	/*
@@ -193,12 +209,54 @@ int destruct_level;  /* 0=none, 1=full, 2=full with checks */
 
     /* 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);
+
+    sv_free_arenas();
+    
+    linestr = NULL;		/* No SVs have survived, need to clean out */
+    if (origfilename)
+    	Safefree(origfilename);
+    nuke_stacks();
+    hints = 0;			/* Reset hints. Should hints be per-interpreter ? */
     
     DEBUG_P(debprofdump());
 }
@@ -225,9 +283,10 @@ char **env;
 {
     register SV *sv;
     register char *s;
-    char *scriptname;
+    char *scriptname = NULL;
     VOL bool dosearch = FALSE;
     char *validarg = "";
+    AV* comppadlist;
 
 #ifdef SETUID_SCRIPTS_ARE_SECURE_NOW
 #ifdef IAMSUID
@@ -240,11 +299,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) {
 
@@ -253,6 +318,7 @@ setuid perl scripts securely.\n");
 	origfilename = savepv(argv[0]);
 	do_undump = FALSE;
 	cxstack_ix = -1;		/* start label stack again */
+	init_ids();
 	init_postdump_symbols(argc,argv,env);
 	return 0;
     }
@@ -261,16 +327,20 @@ setuid perl scripts securely.\n");
 	op_free(main_root);
     main_root = 0;
 
-    switch (setjmp(top_env)) {
+    switch (Sigsetjmp(top_env,1)) {
     case 1:
+#ifdef VMS
 	statusvalue = 255;
+#else
+	statusvalue = 1;
+#endif
     case 2:
 	curstash = defstash;
 	if (endav)
 	    calllist(endav);
 	return(statusvalue);	/* my_exit() was called */
     case 3:
-	fprintf(stderr, "panic: top_env\n");
+	PerlIO_printf(PerlIO_stderr(), "panic: top_env\n");
 	return 1;
     }
 
@@ -296,8 +366,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':
@@ -318,15 +391,15 @@ 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);
+		PerlIO_puts(e_fp,argv[1]);
 		argc--,argv++;
 	    }
-	    (void)putc('\n', e_fp);
+	    (void)PerlIO_putc(e_fp,'\n');
 	    break;
 	case 'I':
 	    taint_not("-I");
@@ -353,6 +426,64 @@ 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();",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(NOEMBED) || defined(MULTIPLICITY)
+		strcpy(buf,"\"  Compile-time options:");
+#  ifdef DEBUGGING
+		strcat(buf," DEBUGGING");
+#  endif
+#  ifdef NOEMBED
+		strcat(buf," NOEMBED");
+#  endif
+#  ifdef MULTIPLICITY
+		strcat(buf," MULTIPLICITY");
+#  endif
+		strcat(buf,"\\n\",");
+		sv_catpv(Sv,buf);
+#endif
+#if defined(LOCAL_PATCH_COUNT)
+		if (LOCAL_PATCH_COUNT > 0)
+		{   int i;
+		    sv_catpv(Sv,"print \"  Locally applied patches:\\n\",");
+		    for (i = 1; i <= LOCAL_PATCH_COUNT; i++) {
+			if (localpatches[i]) {
+			    sprintf(buf,"\"  \\t%s\\n\",",localpatches[i]);
+			    sv_catpv(Sv,buf);
+			}
+		    }
+		}
+#endif
+		sprintf(buf,"\"  Built under %s\\n\",",OSNAME);
+		sv_catpv(Sv,buf);
+#ifdef __DATE__
+#  ifdef __TIME__
+		sprintf(buf,"\"  Compiled at %s %s\\n\"",__DATE__,__TIME__);
+#  else
+		sprintf(buf,"\"  Compiled on %s\\n\"",__DATE__);
+#  endif
+		sv_catpv(Sv,buf);
+#endif
+		sv_catpv(Sv,"; $\"=\"\\n    \"; 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++;
@@ -369,16 +500,18 @@ 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 (PerlIO_flush(e_fp) || PerlIO_error(e_fp) || PerlIO_close(e_fp))
 	    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)) )
+	if ( isatty(PerlIO_fileno(PerlIO_stdin())) )
 	    moreswitches("v");
 #endif
 	scriptname = "-";
@@ -388,23 +521,34 @@ setuid perl scripts securely.\n");
 
     open_script(scriptname,dosearch,sv);
 
-    validate_suid(validarg);
+    validate_suid(validarg, scriptname);
 
     if (doextract)
 	find_beginning();
 
-    pad = newAV();
-    comppad = pad;
+    compcv = (CV*)NEWSV(1104,0);
+    sv_upgrade((SV *)compcv, SVt_PVCV);
+
+    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;
 
+    comppadlist = newAV();
+    AvREAL_off(comppadlist);
+    av_store(comppadlist, 0, (SV*)comppad_name);
+    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
+    init_os_extras();
+#endif
 
     init_predump_symbols();
     if (!do_undump)
@@ -426,18 +570,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();
@@ -447,6 +589,12 @@ 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;
     return 0;
@@ -458,7 +606,7 @@ PerlInterpreter *sv_interp;
 {
     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;
@@ -467,26 +615,33 @@ PerlInterpreter *sv_interp;
 	if (endav)
 	    calllist(endav);
 	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");
+	    PerlIO_printf(PerlIO_stderr(), "panic: restartop\n");
 	    FREETMPS;
 	    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)
@@ -498,11 +653,11 @@ PerlInterpreter *sv_interp;
     if (restartop) {
 	op = restartop;
 	restartop = 0;
-	run();
+	runops();
     }
     else if (main_start) {
 	op = main_start;
-	run();
+	runops();
     }
 
     my_exit(0);
@@ -511,20 +666,20 @@ PerlInterpreter *sv_interp;
 
 void
 my_exit(status)
-I32 status;
+U32 status;
 {
     register CONTEXT *cx;
     I32 gimme;
     SV **newsp;
 
-    statusvalue = (unsigned short)(status & 0xffff);
+    statusvalue = FIXSTATUS(status);
     if (cxstack_ix >= 0) {
 	if (cxstack_ix > 0)
 	    dounwind(0);
 	POPBLOCK(cx,curpm);
 	LEAVE;
     }
-    longjmp(top_env, 2);
+    Siglongjmp(top_env, 2);
 }
 
 SV*
@@ -573,6 +728,7 @@ I32 create;
     if (create && !GvCV(gv))
     	return newSUB(start_subparse(),
 		      newSVOP(OP_CONST, 0, newSVpv(name,0)),
+		      Nullop,
 		      Nullop);
     if (gv)
 	return GvCV(gv);
@@ -633,8 +789,9 @@ I32 flags;		/* See G_* flags in cop.h */
     SV** sp = stack_sp;
     I32 oldmark = TOPMARK;
     I32 retval;
-    jmp_buf oldtop;
+    Sigjmp_buf oldtop;
     I32 oldscope;
+    static CV *DBcv;
     
     if (flags & G_DISCARD) {
 	ENTER;
@@ -655,26 +812,52 @@ I32 flags;		/* See G_* flags in cop.h */
     if (flags & G_ARRAY)
       myop.op_flags |= OPf_LIST;
 
+    if (perldb && curstash != debstash 
+         && (DBcv || (DBcv = GvCV(DBsub)))) /* to handle first BEGIN of -d */
+	op->op_private |= OPpENTERSUB_DB;
+
     if (flags & G_EVAL) {
-	Copy(top_env, oldtop, 1, jmp_buf);
+	Copy(top_env, oldtop, 1, Sigjmp_buf);
 
 	cLOGOP->op_other = op;
 	markstack_ptr--;
-	pp_entertry();
+	/* 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 (setjmp(top_env)) {
+	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, jmp_buf);
+	    Copy(oldtop, top_env, 1, Sigjmp_buf);
 	    if (statusvalue)
 		croak("Callback called exit");
 	    my_exit(statusvalue);
@@ -699,10 +882,10 @@ I32 flags;		/* See G_* flags in cop.h */
     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) {
@@ -719,7 +902,7 @@ I32 flags;		/* See G_* flags in cop.h */
 	    curpm = newpm;
 	    LEAVE;
 	}
-	Copy(oldtop, top_env, 1, jmp_buf);
+	Copy(oldtop, top_env, 1, Sigjmp_buf);
     }
     if (flags & G_DISCARD) {
 	stack_sp = stack_base + oldmark;
@@ -730,78 +913,110 @@ I32 flags;		/* See G_* flags in cop.h */
     return retval;
 }
 
-/* Older forms, here grandfathered. */
-
-#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 */
-{
-    stack_sp = stack_base + spix;
-    return spix + perl_call_argv(subname, gimme, argv);
-}
-
-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);
-}
+/* Eval a string. The G_EVAL flag is always assumed. */
 
 I32
-perl_callsv(sv, spix, gimme, hasargs, numargs)
+perl_eval_sv(sv, flags)
 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 */
-{
-    stack_sp = stack_base + spix;
-    PUSHMARK(stack_sp - numargs);
-    return spix - numargs + perl_call_sv(sv, gimme, hasargs, numargs);
-}
-#endif
-
-/* Require a module. */
-
-void
-perl_requirepv(pv)
-char* pv;
+I32 flags;		/* See G_* flags in cop.h */
 {
     UNOP myop;		/* fake syntax tree node */
-    SV* sv;
-    dSP;
+    SV** sp = stack_sp;
+    I32 oldmark = sp - stack_base;
+    I32 retval;
+    Sigjmp_buf oldtop;
+    I32 oldscope;
     
-    ENTER;
-    SAVETMPS;
+    if (flags & G_DISCARD) {
+	ENTER;
+	SAVETMPS;
+    }
+
     SAVESPTR(op);
-    sv = sv_newmortal();
-    sv_setpv(sv, pv);
     op = (OP*)&myop;
     Zero(op, 1, UNOP);
-    XPUSHs(sv);
+    EXTEND(stack_sp, 1);
+    *++stack_sp = sv;
+    oldscope = scopestack_ix;
 
-    myop.op_type = OP_REQUIRE;
+    if (!(flags & G_NOARGS))
+	myop.op_flags = OPf_STACKED;
     myop.op_next = Nullop;
-    myop.op_private = 1;
-    myop.op_flags = OPf_KNOW;
+    myop.op_type = OP_ENTEREVAL;
+    myop.op_flags |= OPf_KNOW;
+    if (flags & G_KEEPERR)
+	myop.op_flags |= OPf_SPECIAL;
+    if (flags & G_ARRAY)
+	myop.op_flags |= OPf_LIST;
 
-    PUTBACK;
-    if (op = pp_require())
-	run();
-    stack_sp--;
-    FREETMPS;
-    LEAVE;
+    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();
+    if (op)
+	runops();
+    retval = stack_sp - (stack_base + oldmark);
+    if (!(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
@@ -816,11 +1031,18 @@ 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
+#ifndef PERLLIB_MANGLE
+#  define PERLLIB_MANGLE(s,n) (s)
+#endif 
 
 static void
 incpush(p)
@@ -840,15 +1062,48 @@ char *p;
 	    p++;
 	}
 	if ( (s = strchr(p, PERLLIB_SEP)) != Nullch ) {
-	    av_push(GvAVn(incgv), newSVpv(p, (STRLEN)(s - p)));
+	    av_push(GvAVn(incgv), newSVpv(PERLLIB_MANGLE(p, (STRLEN)(s - p)), 
+					  (STRLEN)(s - p)));
 	    p = s + 1;
 	} else {
-	    av_push(GvAVn(incgv), newSVpv(p, 0));
+	    av_push(GvAVn(incgv), newSVpv(PERLLIB_MANGLE(p, 0), 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");
+    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 *
@@ -856,20 +1111,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':
@@ -887,11 +1141,16 @@ char *s;
 	return s;
     case 'd':
 	taint_not("-d");
+	s++;
+	if (*s == ':' || *s == '=')  {
+	    sprintf(buf, "use Devel::%s;", ++s);
+	    s += strlen(s);
+	    my_setenv("PERL5DB",buf);
+	}
 	if (!perldb) {
 	    perldb = TRUE;
 	    init_debugger();
 	}
-	s++;
 	return s;
     case 'D':
 #ifdef DEBUGGING
@@ -914,6 +1173,9 @@ char *s;
 #endif
 	/*SUPPRESS 530*/
 	return s;
+    case 'h':
+	usage(origargv[0]);    
+	exit(0);
     case 'i':
 	if (inplace)
 	    Safefree(inplace);
@@ -925,7 +1187,11 @@ char *s;
     case 'I':
 	taint_not("-I");
 	if (*++s) {
-	    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");
@@ -942,10 +1208,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':
+	taint_not("-M");	/* XXX ? */
+	/* FALL THROUGH */
+    case 'm':
+	taint_not("-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++;
@@ -972,22 +1278,27 @@ char *s;
 	s++;
 	return s;
     case 'v':
-	printf("\nThis is perl, version %s\n\n",patchlevel);
-	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-1996, Larry Wall\n");
+	printf("\n\t+ suidperl security patch");
 #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("MS-DOS port Copyright (c) 1989, 1990, Diomidis Spinellis\n");
 #endif
+#ifdef OS2
+	printf("OS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n"
+	    "Version 5 port Copyright (c) 1994-1996, 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);
+GNU General Public License, which may be found in the Perl 5.0 source kit.\n\n");
 #ifdef MSDOS
         usage(origargv[0]);
 #endif
@@ -1032,30 +1343,48 @@ my_unexec()
 
     status = unexec(buf, tokenbuf, &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", tokenbuf, buf);
     exit(status);
 #else
+#  ifdef VMS
+#    include <lib$routines.h>
+     lib$signal(SS$_DEBUG);  /* ssdef.h #included from vmsish.h */
+#else
     ABORT();		/* for use with undump */
 #endif
+#endif
 }
 
 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);
-    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) = 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);
     curstash = defstash;
     compiling.cop_stash = defstash;
-    debstash = newHV();
-    GvHV(gv_fetchpv("DB::", GV_ADDMULTI, SVt_PVHV)) = debstash;
+    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
@@ -1073,7 +1402,30 @@ 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
+#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) {
+	int hasdir, idx = 0, deftypes = 1;
+
+	hasdir = (strpbrk(scriptname,":[</") != Nullch) ;
+	/* The first time through, just add SEARCH_EXTS to whatever we
+	 * already have, so we can check for default file types. */
+	while (deftypes || (!hasdir && my_trnlnm("DCL$PATH",tokenbuf,idx++)) ) {
+	    if (deftypes) { deftypes = 0; *tokenbuf = '\0'; }
+	    strcat(tokenbuf,scriptname);
+#else  /* !VMS */
     if (dosearch && !strchr(scriptname, '/') && (s = getenv("PATH"))) {
 
 	bufend = s + strlen(s);
@@ -1102,8 +1454,23 @@ SV *sv;
 #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? */
+#endif  /* !VMS */
+
+#ifdef SEARCH_EXTS
+	    len = strlen(tokenbuf);
+	    if (extidx > 0)	/* reset after previous loop */
+		extidx = 0;
+	    do {
+#endif
+	    	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)) {
@@ -1120,11 +1487,27 @@ 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) {
+    if (fdscript >= 0) {
+	rsfp = PerlIO_fdopen(fdscript,"r");
+#if defined(HAS_FCNTL) && defined(F_SETFD)
+	fcntl(PerlIO_fileno(rsfp),F_SETFD,1);	/* ensure close-on-exec */
+#endif
+    }
+    else if (preprocess) {
 	char *cpp = CPPSTDIN;
 
 	if (strEQ(cpp,"cppstdin"))
@@ -1132,7 +1515,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\" \
@@ -1194,11 +1577,15 @@ sed %s -e \"/^[^#]/b\" \
     }
     else if (!*scriptname) {
 	taint_not("program input from stdin");
-	rsfp = 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)
+	fcntl(PerlIO_fileno(rsfp),F_SETFD,1);	/* ensure close-on-exec */
+#endif
+    }
+    if ((PerlIO*)rsfp == Nullfp) {
 #ifdef DOSUID
 #ifndef IAMSUID		/* in case script is not readable before setuid */
 	if (euid && Stat(SvPVX(GvSV(curcop->cop_filegv)),&statbuf) >= 0 &&
@@ -1215,9 +1602,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
@@ -1239,11 +1629,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
@@ -1281,9 +1671,9 @@ 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,
+		    PerlIO_printf(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,
@@ -1316,13 +1706,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++;
 	/*
@@ -1344,7 +1736,7 @@ 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 */
@@ -1404,24 +1796,41 @@ 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.) */
+    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");
+    (void)sprintf(buf, "/dev/fd/%d/%.127s", PerlIO_fileno(rsfp), origargv[which]);
+    origargv[which] = buf;
+
+#if defined(HAS_FCNTL) && defined(F_SETFD)
+    fcntl(PerlIO_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(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)
@@ -1438,7 +1847,7 @@ 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? */
 
@@ -1446,13 +1855,17 @@ find_beginning()
     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);
@@ -1461,53 +1874,85 @@ 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));
+}
 
+static void
+init_debugger()
+{
     curstash = debstash;
-    dbargs = GvAV(gv_AVadd((tmpgv = gv_fetchpv("args", GV_ADDMULTI, SVt_PVAV))));
+    dbargs = GvAV(gv_AVadd((gv_fetchpv("args", GV_ADDMULTI, SVt_PVAV))));
     AvREAL_off(dbargs);
     DBgv = gv_fetchpv("DB", GV_ADDMULTI, SVt_PVGV);
     DBline = gv_fetchpv("dbline", GV_ADDMULTI, SVt_PVAV);
-    DBsub = gv_HVadd(tmpgv = gv_fetchpv("sub", GV_ADDMULTI, SVt_PVHV));
-    DBsingle = GvSV((tmpgv = gv_fetchpv("single", GV_ADDMULTI, SVt_PV)));
-    DBtrace = GvSV((tmpgv = gv_fetchpv("trace", GV_ADDMULTI, SVt_PV)));
-    DBsignal = GvSV((tmpgv = gv_fetchpv("signal", GV_ADDMULTI, SVt_PV)));
+    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;
+    /* Shouldn't these stacks be per-interpreter? */
+    if (markstack) {
+	markstack_ptr = markstack;
+    } else {
+	New(54,markstack,64,I32);
+	markstack_ptr = markstack;
+	markstack_max = markstack + 64;
+    }
 
-    New(54,scopestack,32,I32);
-    scopestack_ix = 0;
-    scopestack_max = 32;
+    if (scopestack) {
+	scopestack_ix = 0;
+    } else {
+	New(54,scopestack,32,I32);
+	scopestack_ix = 0;
+	scopestack_max = 32;
+    }
 
-    New(54,savestack,128,ANY);
-    savestack_ix = 0;
-    savestack_max = 128;
+    if (savestack) {
+	savestack_ix = 0;
+    } else {
+	New(54,savestack,128,ANY);
+	savestack_ix = 0;
+	savestack_max = 128;
+    }
 
-    New(54,retstack,16,OP*);
-    retstack_ix = 0;
-    retstack_max = 16;
+    if (retstack) {
+	retstack_ix = 0;
+    } else {
+	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;
@@ -1519,7 +1964,14 @@ init_stacks()
     } )
 }
 
-static FILE *tmpfp;  /* moved outside init_lexer() because of UNICOS bug */
+static void
+nuke_stacks()
+{
+    Safefree(cxstack);
+    Safefree(tmps_stack);
+}
+
+static PerlIO *tmpfp;  /* moved outside init_lexer() because of UNICOS bug */
 static void
 init_lexer()
 {
@@ -1539,28 +1991,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;
-    tmpgv = gv_fetchpv("stdin",TRUE, SVt_PVIO);
+    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;
-    tmpgv = gv_fetchpv("stdout",TRUE, SVt_PVIO);
+    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;
-    tmpgv = gv_fetchpv("stderr",TRUE, SVt_PVIO);
+    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
@@ -1593,8 +2048,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;
@@ -1609,7 +2063,7 @@ 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++) {
@@ -1618,18 +2072,21 @@ 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);
 #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');
 	}
-#endif
-#ifdef DYNAMIC_ENV_FETCH
-	HvNAME(hv) = savepv(ENV_HV_NAME);
-#endif
 	for (; *env; env++) {
 	    if (!(s = strchr(*env,'=')))
 		continue;
@@ -1639,6 +2096,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;
@@ -1659,50 +2120,74 @@ init_perllib()
 	    incpush(getenv("PERLLIB"));
     }
 
-#ifdef ARCHLIB
-    incpush(ARCHLIB);
+/* Use the ~-expanded versions of APPLIB (undocumented),
+    ARCHLIB PRIVLIB SITEARCH SITELIB and OLDARCHLIB
+*/
+#ifdef APPLLIB_EXP
+    incpush(APPLLIB_EXP);
+#endif
+
+#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
-#ifndef PRIVLIB
-#define PRIVLIB "/usr/local/lib/perl5:/usr/local/lib/perl"
+#ifdef OLDARCHLIB_EXP  /* 5.00[01] compatibility */
+    incpush(OLDARCHLIB_EXP);
 #endif
-    incpush(PRIVLIB);
     
-    av_push(GvAVn(incgv),newSVpv(".",1));
+    if (!tainting)
+	incpush(".");
 }
 
 void
 calllist(list)
 AV* list;
 {
-    jmp_buf oldtop;
-    char *mess;
+    Sigjmp_buf oldtop;
     STRLEN len;
     line_t oldline = curcop->cop_line;
 
-    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:
-	    PUSHMARK(stack_sp);
-	    perl_call_sv((SV*)cv, G_EVAL|G_DISCARD);
-	    mess = SvPVx(GvSV(gv_fetchpv("@",TRUE, SVt_PV)), len);
-	    if (len) {
-		Copy(oldtop, top_env, 1, jmp_buf);
-		curcop = &compiling;
-		curcop->cop_line = oldline;
-		if (list == beginav)
-		    croak("%sBEGIN failed--compilation aborted", mess);
-		else
-		    croak("%sEND failed--cleanup aborted", mess);
+	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 */
@@ -1710,7 +2195,7 @@ AV* list;
 	    if (endav)
 		calllist(endav);
 	    FREETMPS;
-	    Copy(oldtop, top_env, 1, jmp_buf);
+	    Copy(oldtop, top_env, 1, Sigjmp_buf);
 	    curcop = &compiling;
 	    curcop->cop_line = oldline;
 	    if (statusvalue) {
@@ -1724,17 +2209,17 @@ AV* list;
 	    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);
+	    Copy(oldtop, top_env, 1, Sigjmp_buf);
 	    curcop = &compiling;
 	    curcop->cop_line = oldline;
-	    longjmp(top_env, 3);
+	    Siglongjmp(top_env, 3);
 	}
     }
 
-    Copy(oldtop, top_env, 1, jmp_buf);
+    Copy(oldtop, top_env, 1, Sigjmp_buf);
 }