X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/c9e30dd8153632a4205f5780cc54d922f26feb15..c2bfdfaf3f7731071c0d7c0684c538dffecf7ac6:/perl.c diff --git a/perl.c b/perl.c index 8bb1da72..dfd5f83 100644 --- a/perl.c +++ b/perl.c @@ -1,7 +1,7 @@ /* perl.c * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -122,30 +122,24 @@ static I32 read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen); #endif #endif +static void +S_init_tls_and_interp(PerlInterpreter *my_perl) +{ + dVAR; + if (!PL_curinterp) { + PERL_SET_INTERP(my_perl); #if defined(USE_ITHREADS) -# define INIT_TLS_AND_INTERP \ - STMT_START { \ - if (!PL_curinterp) { \ - PERL_SET_INTERP(my_perl); \ - INIT_THREADS; \ - ALLOC_THREAD_KEY; \ - PERL_SET_THX(my_perl); \ - OP_REFCNT_INIT; \ - MUTEX_INIT(&PL_dollarzero_mutex); \ - } \ - else { \ - PERL_SET_THX(my_perl); \ - } \ - } STMT_END -#else -# define INIT_TLS_AND_INTERP \ - STMT_START { \ - if (!PL_curinterp) { \ - PERL_SET_INTERP(my_perl); \ - } \ - PERL_SET_THX(my_perl); \ - } STMT_END + INIT_THREADS; + ALLOC_THREAD_KEY; + PERL_SET_THX(my_perl); + OP_REFCNT_INIT; + MUTEX_INIT(&PL_dollarzero_mutex); # endif + } + else { + PERL_SET_THX(my_perl); + } +} #ifdef PERL_IMPLICIT_SYS PerlInterpreter * @@ -158,7 +152,7 @@ perl_alloc_using(struct IPerlMem* ipM, struct IPerlMem* ipMS, PerlInterpreter *my_perl; /* New() needs interpreter, so call malloc() instead */ my_perl = (PerlInterpreter*)(*ipM->pMalloc)(ipM, sizeof(PerlInterpreter)); - INIT_TLS_AND_INTERP; + S_init_tls_and_interp(my_perl); Zero(my_perl, 1, PerlInterpreter); PL_Mem = ipM; PL_MemShared = ipMS; @@ -188,15 +182,12 @@ PerlInterpreter * perl_alloc(void) { PerlInterpreter *my_perl; -#ifdef USE_5005THREADS - dTHX; -#endif /* New() needs interpreter, so call malloc() instead */ my_perl = (PerlInterpreter*)PerlMem_malloc(sizeof(PerlInterpreter)); - INIT_TLS_AND_INTERP; - return ZeroD(my_perl, 1, PerlInterpreter); + S_init_tls_and_interp(my_perl); + return (PerlInterpreter *) ZeroD(my_perl, 1, PerlInterpreter); } #endif /* PERL_IMPLICIT_SYS */ @@ -211,6 +202,7 @@ Initializes a new Perl interpreter. See L. void perl_construct(pTHXx) { + dVAR; #ifdef MULTIPLICITY init_interp(); PL_perl_destruct_level = 1; @@ -220,10 +212,6 @@ perl_construct(pTHXx) #endif /* Init the real globals (and main thread)? */ if (!PL_linestr) { -#ifdef PERL_FLEXIBLE_EXCEPTIONS - PL_protect = MEMBER_TO_FPTR(Perl_default_protect); /* for exceptions */ -#endif - PL_curcop = &PL_compiling; /* needed by ckWARN, right away */ PL_linestr = NEWSV(65,79); @@ -237,11 +225,15 @@ perl_construct(pTHXx) SvREFCNT(&PL_sv_undef) = (~(U32)0)/2; sv_setpv(&PL_sv_no,PL_No); + /* value lookup in void context - happens to have the side effect + of caching the numeric forms. */ + SvIV(&PL_sv_no); SvNV(&PL_sv_no); SvREADONLY_on(&PL_sv_no); SvREFCNT(&PL_sv_no) = (~(U32)0)/2; sv_setpv(&PL_sv_yes,PL_Yes); + SvIV(&PL_sv_yes); SvNV(&PL_sv_yes); SvREADONLY_on(&PL_sv_yes); SvREFCNT(&PL_sv_yes) = (~(U32)0)/2; @@ -312,8 +304,11 @@ perl_construct(pTHXx) #endif /* Use sysconf(_SC_CLK_TCK) if available, if not - * available or if the sysconf() fails, use the HZ. */ -#if defined(HAS_SYSCONF) && defined(_SC_CLK_TCK) + * available or if the sysconf() fails, use the HZ. + * BeOS has those, but returns the wrong value. + * The HZ if not originally defined has been by now + * been defined as CLK_TCK, if available. */ +#if defined(HAS_SYSCONF) && defined(_SC_CLK_TCK) && !defined(__BEOS__) PL_clocktick = sysconf(_SC_CLK_TCK); if (PL_clocktick <= 0) #endif @@ -328,6 +323,51 @@ perl_construct(pTHXx) (int)PERL_SUBVERSION ), 0 ); +#ifdef HAS_MMAP + if (!PL_mmap_page_size) { +#if defined(HAS_SYSCONF) && (defined(_SC_PAGESIZE) || defined(_SC_MMAP_PAGE_SIZE)) + { + SETERRNO(0, SS_NORMAL); +# ifdef _SC_PAGESIZE + PL_mmap_page_size = sysconf(_SC_PAGESIZE); +# else + PL_mmap_page_size = sysconf(_SC_MMAP_PAGE_SIZE); +# endif + if ((long) PL_mmap_page_size < 0) { + if (errno) { + SV *error = ERRSV; + char *msg; + STRLEN n_a; + (void) SvUPGRADE(error, SVt_PV); + msg = SvPVx(error, n_a); + Perl_croak(aTHX_ "panic: sysconf: %s", msg); + } + else + Perl_croak(aTHX_ "panic: sysconf: pagesize unknown"); + } + } +#else +# ifdef HAS_GETPAGESIZE + PL_mmap_page_size = getpagesize(); +# else +# if defined(I_SYS_PARAM) && defined(PAGESIZE) + PL_mmap_page_size = PAGESIZE; /* compiletime, bad */ +# endif +# endif +#endif + if (PL_mmap_page_size <= 0) + Perl_croak(aTHX_ "panic: bad pagesize %" IVdf, + (IV) PL_mmap_page_size); + } +#endif /* HAS_MMAP */ + +#if defined(HAS_TIMES) && defined(PERL_NEED_TIMESBASE) + PL_timesbase.tms_utime = 0; + PL_timesbase.tms_stime = 0; + PL_timesbase.tms_cutime = 0; + PL_timesbase.tms_cstime = 0; +#endif + ENTER; } @@ -357,11 +397,9 @@ Shuts down a Perl interpreter. See L. int perl_destruct(pTHXx) { + dVAR; volatile int destruct_level; /* 0=none, 1=full, 2=full with checks */ HV *hv; -#ifdef USE_5005THREADS - dTHX; -#endif /* USE_5005THREADS */ /* wait for all pseudo-forked children to finish */ PERL_WAIT_FOR_CHILDREN; @@ -371,15 +409,14 @@ perl_destruct(pTHXx) { char *s; if ((s = PerlEnv_getenv("PERL_DESTRUCT_LEVEL"))) { - int i = atoi(s); + const int i = atoi(s); if (destruct_level < i) destruct_level = i; } } #endif - - if(PL_exit_flags & PERL_EXIT_DESTRUCT_END) { + if (PL_exit_flags & PERL_EXIT_DESTRUCT_END) { dJMPENV; int x = 0; @@ -467,7 +504,7 @@ perl_destruct(pTHXx) */ #ifndef PERL_MICRO #if defined(USE_ENVIRON_ARRAY) && !defined(PERL_USE_SAFE_PUTENV) - if (environ != PL_origenviron + if (environ != PL_origenviron && !PL_use_safe_putenv #ifdef USE_ITHREADS /* only main thread can free environ[0] contents */ && PL_curinterp == aTHX @@ -837,9 +874,18 @@ perl_destruct(pTHXx) svend = &sva[SvREFCNT(sva)]; for (sv = sva + 1; sv < svend; ++sv) { if (SvTYPE(sv) != SVTYPEMASK) { - PerlIO_printf(Perl_debug_log, "leaked: 0x%p" - pTHX__FORMAT "\n", - sv pTHX__VALUE); + PerlIO_printf(Perl_debug_log, "leaked: sv=0x%p" + " flags=0x08%"UVxf + " refcnt=%"UVuf pTHX__FORMAT "\n" + "\tallocated at %s:%d %s %s%s\n", + sv, sv->sv_flags, sv->sv_refcnt pTHX__VALUE, + sv->sv_debug_file ? sv->sv_debug_file : "(unknown)", + sv->sv_debug_line, + sv->sv_debug_inpad ? "for" : "by", + sv->sv_debug_optype ? + PL_op_name[sv->sv_debug_optype]: "(none)", + sv->sv_debug_cloned ? " (cloned)" : "" + ); } } } @@ -952,6 +998,32 @@ perl_free(pTHXx) #endif } +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) +/* provide destructors to clean up the thread key when libperl is unloaded */ +#ifndef WIN32 /* handled during DLL_PROCESS_DETACH in win32/perllib.c */ + +#if defined(__hpux) && !defined(__GNUC__) +#pragma fini "perl_fini" +#endif + +#if defined(__GNUC__) && defined(__attribute__) +/* want to make sure __attribute__ works here even + * for -Dd_attribut=undef builds. + */ +#undef __attribute__ +#endif + +static void __attribute__((destructor)) +perl_fini(void) +{ + dVAR; + if (PL_curinterp) + FREE_THREAD_KEY; +} + +#endif /* WIN32 */ +#endif /* THREADS */ + void Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr) { @@ -961,6 +1033,57 @@ Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr) ++PL_exitlistlen; } +#ifdef HAS_PROCSELFEXE +/* This is a function so that we don't hold on to MAXPATHLEN + bytes of stack longer than necessary + */ +STATIC void +S_procself_val(pTHX_ SV *sv, const char *arg0) +{ + char buf[MAXPATHLEN]; + int len = readlink(PROCSELFEXE_PATH, buf, sizeof(buf) - 1); + + /* On Playstation2 Linux V1.0 (kernel 2.2.1) readlink(/proc/self/exe) + includes a spurious NUL which will cause $^X to fail in system + or backticks (this will prevent extensions from being built and + many tests from working). readlink is not meant to add a NUL. + Normal readlink works fine. + */ + if (len > 0 && buf[len-1] == '\0') { + len--; + } + + /* FreeBSD's implementation is acknowledged to be imperfect, sometimes + returning the text "unknown" from the readlink rather than the path + to the executable (or returning an error from the readlink). Any valid + path has a '/' in it somewhere, so use that to validate the result. + See http://www.freebsd.org/cgi/query-pr.cgi?pr=35703 + */ + if (len > 0 && memchr(buf, '/', len)) { + sv_setpvn(sv,buf,len); + } + else { + sv_setpv(sv,arg0); + } +} +#endif /* HAS_PROCSELFEXE */ + +STATIC void +S_set_caret_X(pTHX) { + GV* tmpgv = gv_fetchpv("\030",TRUE, SVt_PV); /* $^X */ + if (tmpgv) { +#ifdef HAS_PROCSELFEXE + S_procself_val(aTHX_ GvSV(tmpgv), PL_origargv[0]); +#else +#ifdef OS2 + sv_setpv(GvSV(tmpgv), os2_execname(aTHX)); +#else + sv_setpv(GvSV(tmpgv),PL_origargv[0]); +#endif +#endif + } +} + /* =for apidoc perl_parse @@ -972,12 +1095,10 @@ Tells a Perl interpreter to parse a Perl script. See L. int perl_parse(pTHXx_ XSINIT_t xsinit, int argc, char **argv, char **env) { + dVAR; I32 oldscope; int ret; dJMPENV; -#ifdef USE_5005THREADS - dTHX; -#endif #ifdef SETUID_SCRIPTS_ARE_SECURE_NOW #ifdef IAMSUID @@ -1019,7 +1140,7 @@ setuid perl scripts securely.\n"); * the area we are able to modify is limited to the size of * the original argv[0]. (See below for 'contiguous', though.) * --jhi */ - char *s = NULL; + const char *s = NULL; int i; UV mask = ~(UV)(PTRSIZE == 4 ? 3 : PTRSIZE == 8 ? 7 : PTRSIZE == 16 ? 15 : 0); @@ -1106,6 +1227,10 @@ setuid perl scripts securely.\n"); PL_do_undump = FALSE; cxstack_ix = -1; /* start label stack again */ init_ids(); + assert (!PL_tainted); + TAINT; + S_set_caret_X(aTHX); + TAINT_NOT; init_postdump_symbols(argc,argv,env); return 0; } @@ -1122,16 +1247,10 @@ setuid perl scripts securely.\n"); oldscope = PL_scopestack_ix; PL_dowarn = G_WARN_OFF; -#ifdef PERL_FLEXIBLE_EXCEPTIONS - CALLPROTECT(aTHX_ pcur_env, &ret, MEMBER_TO_FPTR(S_vparse_body), env, xsinit); -#else JMPENV_PUSH(ret); -#endif switch (ret) { case 0: -#ifndef PERL_FLEXIBLE_EXCEPTIONS parse_body(env,xsinit); -#endif if (PL_checkav) call_list(oldscope, PL_checkav); ret = 0; @@ -1158,28 +1277,19 @@ setuid perl scripts securely.\n"); return ret; } -#ifdef PERL_FLEXIBLE_EXCEPTIONS -STATIC void * -S_vparse_body(pTHX_ va_list args) -{ - char **env = va_arg(args, char**); - XSINIT_t xsinit = va_arg(args, XSINIT_t); - - return parse_body(env, xsinit); -} -#endif - STATIC void * S_parse_body(pTHX_ char **env, XSINIT_t xsinit) { + dVAR; int argc = PL_origargc; char **argv = PL_origargv; - char *scriptname = NULL; + const char *scriptname = NULL; VOL bool dosearch = FALSE; - char *validarg = ""; + const char *validarg = ""; register SV *sv; register char *s; - char *cddir = Nullch; + const char *cddir = Nullch; + bool minus_f = FALSE; PL_fdscript = -1; PL_suidscript = -1; @@ -1273,6 +1383,11 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) sv_catpv(PL_e_script, "\n"); break; + case 'f': + minus_f = TRUE; + s++; + goto reswitch; + case 'I': /* -I handled both here and in moreswitches() */ forbid_setid("-I"); if (!*++s && (s=argv[1]) != Nullch) { @@ -1282,7 +1397,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) char *p; STRLEN len = strlen(s); p = savepvn(s, len); - incpush(p, TRUE, TRUE, FALSE); + incpush(p, TRUE, TRUE, FALSE, FALSE); sv_catpvn(sv, "-I", 2); sv_catpvn(sv, p, len); sv_catpvn(sv, " ", 1); @@ -1306,12 +1421,16 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) PL_preambleav = newAV(); av_push(PL_preambleav, newSVpv("use Config qw(myconfig config_vars)",0)); if (*++s != ':') { + STRLEN opts; + PL_Sv = newSVpv("print myconfig();",0); #ifdef VMS sv_catpv(PL_Sv,"print \"\\nCharacteristics of this PERLSHR image: \\n\","); #else sv_catpv(PL_Sv,"print \"\\nCharacteristics of this binary (from libperl): \\n\","); #endif + opts = SvCUR(PL_Sv); + sv_catpv(PL_Sv,"\" Compile-time options:"); # ifdef DEBUGGING sv_catpv(PL_Sv," DEBUGGING"); @@ -1340,12 +1459,34 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) # ifdef USE_SOCKS sv_catpv(PL_Sv," USE_SOCKS"); # endif +# ifdef USE_SITECUSTOMIZE + sv_catpv(PL_Sv," USE_SITECUSTOMIZE"); +# endif # ifdef PERL_IMPLICIT_CONTEXT sv_catpv(PL_Sv," PERL_IMPLICIT_CONTEXT"); # endif # ifdef PERL_IMPLICIT_SYS sv_catpv(PL_Sv," PERL_IMPLICIT_SYS"); # endif + + while (SvCUR(PL_Sv) > opts+76) { + /* find last space after "options: " and before col 76 */ + + const char *space; + char *pv = SvPV_nolen(PL_Sv); + const char c = pv[opts+76]; + pv[opts+76] = '\0'; + space = strrchr(pv+opts+26, ' '); + pv[opts+76] = c; + if (!space) break; /* "Can't happen" */ + + /* break the line before that space */ + + opts = space - pv; + sv_insert(PL_Sv, opts, 0, + "\\n ", 25); + } + sv_catpv(PL_Sv,"\\n\","); #if defined(LOCAL_PATCH_COUNT) @@ -1402,11 +1543,11 @@ print \" \\@INC:\\n @INC\\n\";"); } /* catch use of gnu style long options */ if (strEQ(s, "version")) { - s = "v"; + s = (char *)"v"; goto reswitch; } if (strEQ(s, "help")) { - s = "h"; + s = (char *)"h"; goto reswitch; } s--; @@ -1423,7 +1564,7 @@ print \" \\@INC:\\n @INC\\n\";"); #endif (s = PerlEnv_getenv("PERL5OPT"))) { - char *popt = s; + const char *popt = s; while (isSPACE(*s)) s++; if (*s == '-' && *(s+1) == 'T') { @@ -1470,6 +1611,15 @@ print \" \\@INC:\\n @INC\\n\";"); } } +#ifdef USE_SITECUSTOMIZE + if (!minus_f) { + if (!PL_preambleav) + PL_preambleav = newAV(); + av_unshift(PL_preambleav, 1); + (void)av_store(PL_preambleav, 0, Perl_newSVpvf(aTHX_ "BEGIN { do '%s/sitecustomize.pl' }", SITELIB_EXP)); + } +#endif + if (PL_taint_warn && PL_dowarn != G_WARN_ALL_OFF) { PL_compiling.cop_warnings = newSVpvn(WARN_TAINTstring, WARNsize); } @@ -1488,6 +1638,11 @@ print \" \\@INC:\\n @INC\\n\";"); scriptname = "-"; } + /* Set $^X early so that it can be used for relocatable paths in @INC */ + assert (!PL_tainted); + TAINT; + S_set_caret_X(aTHX); + TAINT_NOT; init_perllib(); open_script(scriptname,dosearch,sv); @@ -1517,7 +1672,7 @@ print \" \\@INC:\\n @INC\\n\";"); if (PL_doextract) { #endif find_beginning(); - if (cddir && PerlDir_chdir(cddir) < 0) + if (cddir && PerlDir_chdir( (char *)cddir ) < 0) Perl_croak(aTHX_ "Can't chdir to %s",cddir); } @@ -1560,10 +1715,13 @@ print \" \\@INC:\\n @INC\\n\";"); if (!PL_do_undump) init_postdump_symbols(argc,argv,env); - /* PL_unicode is turned on by -C or by $ENV{PERL_UNICODE}. - * PL_utf8locale is conditionally turned on by + /* PL_unicode is turned on by -C, or by $ENV{PERL_UNICODE}, + * or explicitly in some platforms. * locale.c:Perl_init_i18nl10n() if the environment * look like the user wants to use UTF-8. */ +#if defined(SYMBIAN) + PL_unicode = PERL_UNICODE_STD_FLAG; /* See PERL_SYMBIAN_CONSOLE_UTF8. */ +#endif if (PL_unicode) { /* Requires init_predump_symbols(). */ if (!(PL_unicode & PERL_UNICODE_LOCALE_FLAG) || PL_utf8locale) { @@ -1680,30 +1838,20 @@ perl_run(pTHXx) I32 oldscope; int ret = 0; dJMPENV; -#ifdef USE_5005THREADS - dTHX; -#endif oldscope = PL_scopestack_ix; #ifdef VMS VMSISH_HUSHED = 0; #endif -#ifdef PERL_FLEXIBLE_EXCEPTIONS - redo_body: - CALLPROTECT(aTHX_ pcur_env, &ret, MEMBER_TO_FPTR(S_vrun_body), oldscope); -#else JMPENV_PUSH(ret); -#endif switch (ret) { case 1: cxstack_ix = -1; /* start context stack again */ goto redo_body; case 0: /* normal completion */ -#ifndef PERL_FLEXIBLE_EXCEPTIONS redo_body: run_body(oldscope); -#endif /* FALL THROUGH */ case 2: /* my_exit() */ while (PL_scopestack_ix > oldscope) @@ -1734,18 +1882,8 @@ perl_run(pTHXx) return ret; } -#ifdef PERL_FLEXIBLE_EXCEPTIONS -STATIC void * -S_vrun_body(pTHX_ va_list args) -{ - I32 oldscope = va_arg(args, I32); - - return run_body(oldscope); -} -#endif - -STATIC void * +STATIC void S_run_body(pTHX_ I32 oldscope) { DEBUG_r(PerlIO_printf(Perl_debug_log, "%s $` $& $' support.\n", @@ -1786,10 +1924,8 @@ S_run_body(pTHX_ I32 oldscope) PL_op = PL_main_start; CALLRUNOPS(aTHX); } - my_exit(0); /* NOTREACHED */ - return NULL; } /* @@ -1977,7 +2113,7 @@ I32 Perl_call_sv(pTHX_ SV *sv, I32 flags) /* See G_* flags in cop.h */ { - dSP; + dVAR; dSP; LOGOP myop; /* fake syntax tree node */ UNOP method_op; I32 oldmark; @@ -2054,19 +2190,11 @@ Perl_call_sv(pTHX_ SV *sv, I32 flags) } PL_markstack_ptr++; -#ifdef PERL_FLEXIBLE_EXCEPTIONS - redo_body: - CALLPROTECT(aTHX_ pcur_env, &ret, MEMBER_TO_FPTR(S_vcall_body), - (OP*)&myop, FALSE); -#else JMPENV_PUSH(ret); -#endif switch (ret) { case 0: -#ifndef PERL_FLEXIBLE_EXCEPTIONS redo_body: call_body((OP*)&myop, FALSE); -#endif retval = PL_stack_sp - (PL_stack_base + oldmark); if (!(flags & G_KEEPERR)) sv_setpv(ERRSV,""); @@ -2124,20 +2252,8 @@ Perl_call_sv(pTHX_ SV *sv, I32 flags) return retval; } -#ifdef PERL_FLEXIBLE_EXCEPTIONS -STATIC void * -S_vcall_body(pTHX_ va_list args) -{ - OP *myop = va_arg(args, OP*); - int is_eval = va_arg(args, int); - - call_body(myop, is_eval); - return NULL; -} -#endif - STATIC void -S_call_body(pTHX_ OP *myop, int is_eval) +S_call_body(pTHX_ const OP *myop, bool is_eval) { if (PL_op == myop) { if (is_eval) @@ -2195,23 +2311,15 @@ Perl_eval_sv(pTHX_ SV *sv, I32 flags) if (flags & G_KEEPERR) myop.op_flags |= OPf_SPECIAL; -#ifdef PERL_FLEXIBLE_EXCEPTIONS - redo_body: - CALLPROTECT(aTHX_ pcur_env, &ret, MEMBER_TO_FPTR(S_vcall_body), - (OP*)&myop, TRUE); -#else /* fail now; otherwise we could fail after the JMPENV_PUSH but * before a PUSHEVAL, which corrupts the stack after a croak */ TAINT_PROPER("eval_sv()"); JMPENV_PUSH(ret); -#endif switch (ret) { case 0: -#ifndef PERL_FLEXIBLE_EXCEPTIONS redo_body: call_body((OP*)&myop,TRUE); -#endif retval = PL_stack_sp - (PL_stack_base + oldmark); if (!(flags & G_KEEPERR)) sv_setpv(ERRSV,""); @@ -2314,7 +2422,7 @@ Perl_require_pv(pTHX_ const char *pv) } void -Perl_magicname(pTHX_ char *sym, char *name, I32 namlen) +Perl_magicname(pTHX_ const char *sym, const char *name, I32 namlen) { register GV *gv; @@ -2323,19 +2431,23 @@ Perl_magicname(pTHX_ char *sym, char *name, I32 namlen) } STATIC void -S_usage(pTHX_ char *name) /* XXX move this out into a module ? */ +S_usage(pTHX_ const char *name) /* XXX move this out into a module ? */ { /* This message really ought to be max 23 lines. * Removed -h because the user already knows that option. Others? */ - static char *usage_msg[] = { + static const char * const usage_msg[] = { "-0[octal] specify record separator (\\0, if no argument)", +"-A[name] activate all/given assertions", "-a autosplit mode with -n or -p (splits $_ into @F)", "-C[number/list] enables the listed Unicode features", "-c check syntax only (runs BEGIN and CHECK blocks)", "-d[:debugger] run program under debugger", "-D[number/list] set debugging flags (argument is a bit mask or alphabets)", "-e program one line of program (several -e's allowed, omit programfile)", +#ifdef USE_SITECUSTOMIZE +"-f don't do $sitelib/sitecustomize.pl at startup", +#endif "-F/pattern/ split() pattern for -a switch (//'s are optional)", "-i[extension] edit <> files in place (makes backup if extension supplied)", "-Idirectory specify @INC/#include directory (several -I's allowed)", @@ -2359,7 +2471,7 @@ S_usage(pTHX_ char *name) /* XXX move this out into a module ? */ "\n", NULL }; - char **p = usage_msg; + const char * const *p = usage_msg; PerlIO_printf(PerlIO_stdout(), "\nUsage: %s [switches] [--] [programfile] [arguments]", @@ -2373,9 +2485,9 @@ NULL #ifdef DEBUGGING int -Perl_get_debug_opts(pTHX_ char **s, bool givehelp) +Perl_get_debug_opts(pTHX_ const char **s, bool givehelp) { - static char *usage_msgd[] = { + static const char * const usage_msgd[] = { " Debugging flag values: (see also -d)", " p Tokenizing and parsing (with v, displays parse stack)", " s Stack snapshots (with v, displays all stacks)", @@ -2405,10 +2517,10 @@ Perl_get_debug_opts(pTHX_ char **s, bool givehelp) int i = 0; if (isALPHA(**s)) { /* if adding extra options, remember to update DEBUG_MASK */ - static char debopts[] = "psltocPmfrxu HXDSTRJvCAq"; + static const char debopts[] = "psltocPmfrxu HXDSTRJvCAq"; for (; isALNUM(**s); (*s)++) { - char *d = strchr(debopts,**s); + const char *d = strchr(debopts,**s); if (d) i |= 1 << (d - debopts); else if (ckWARN_d(WARN_DEBUGGING)) @@ -2421,7 +2533,7 @@ Perl_get_debug_opts(pTHX_ char **s, bool givehelp) for (; isALNUM(**s); (*s)++) ; } else if (givehelp) { - char **p = usage_msgd; + char **p = (char **)usage_msgd; while (*p) PerlIO_printf(PerlIO_stdout(), "%s\n", *p++); } # ifdef EBCDIC @@ -2438,6 +2550,7 @@ Perl_get_debug_opts(pTHX_ char **s, bool givehelp) char * Perl_moreswitches(pTHX_ char *s) { + dVAR; STRLEN numlen; UV rschar; @@ -2484,7 +2597,7 @@ Perl_moreswitches(pTHX_ char *s) } case 'C': s++; - PL_unicode = parse_unicode_opts(&s); + PL_unicode = parse_unicode_opts( (const char **)&s ); return s; case 'F': PL_minus_F = TRUE; @@ -2514,7 +2627,7 @@ Perl_moreswitches(pTHX_ char *s) /* The following permits -d:Mod to accepts arguments following an = in the fashion that -MSome::Mod does. */ if (*s == ':' || *s == '=') { - char *start; + const char *start; SV *sv; sv = newSVpv("use Devel::", 0); start = ++s; @@ -2541,7 +2654,7 @@ Perl_moreswitches(pTHX_ char *s) #ifdef DEBUGGING forbid_setid("-D"); s++; - PL_debug = get_debug_opts(&s, 1) | DEBUG_TOP_FLAG; + PL_debug = get_debug_opts( (const char **)&s, 1) | DEBUG_TOP_FLAG; #else /* !DEBUGGING */ if (ckWARN_d(WARN_DEBUGGING)) Perl_warner(aTHX_ packWARN(WARN_DEBUGGING), @@ -2588,7 +2701,7 @@ Perl_moreswitches(pTHX_ char *s) p++; } while (*p && *p != '-'); e = savepvn(s, e-s); - incpush(e, TRUE, TRUE, FALSE); + incpush(e, TRUE, TRUE, FALSE, FALSE); Safefree(e); s = p; if (*s == '-') @@ -2643,7 +2756,7 @@ Perl_moreswitches(pTHX_ char *s) if (*++s) { char *start; SV *sv; - char *use = "use "; + const char *use = "use "; /* -M-foo == 'no foo' */ if (*s == '-') { use = "no "; ++s; } sv = newSVpv(use,0); @@ -2673,7 +2786,7 @@ Perl_moreswitches(pTHX_ char *s) av_push(PL_preambleav, sv); } else - Perl_croak(aTHX_ "No space allowed after -%c", *(s-1)); + Perl_croak(aTHX_ "Missing argument to -%c", *(s-1)); return s; case 'n': PL_minus_n = TRUE; @@ -2714,13 +2827,13 @@ Perl_moreswitches(pTHX_ char *s) (void *)upg_version(PL_patchlevel); #if !defined(DGUX) PerlIO_printf(PerlIO_stdout(), - Perl_form(aTHX_ "\nThis is perl, v%_ built for %s", + Perl_form(aTHX_ "\nThis is perl, v%"SVf" built for %s", vstringify(PL_patchlevel), ARCHNAME)); #else /* DGUX */ /* Adjust verbose output as in the perl that ships with the DG/UX OS from EMC */ PerlIO_printf(PerlIO_stdout(), - Perl_form(aTHX_ "\nThis is perl, v%_\n", + Perl_form(aTHX_ "\nThis is perl, v%"SVf"\n", vstringify(PL_patchlevel))); PerlIO_printf(PerlIO_stdout(), Perl_form(aTHX_ " built under %s at %s %s\n", @@ -2740,7 +2853,7 @@ Perl_moreswitches(pTHX_ char *s) #endif PerlIO_printf(PerlIO_stdout(), - "\n\nCopyright 1987-2004, Larry Wall\n"); + "\n\nCopyright 1987-2005, Larry Wall\n"); #ifdef MACOS_TRADITIONAL PerlIO_printf(PerlIO_stdout(), "\nMac OS port Copyright 1991-2002, Matthias Neeracher;\n" @@ -2801,6 +2914,10 @@ Perl_moreswitches(pTHX_ char *s) PerlIO_printf(PerlIO_stdout(),"Built on " __DATE__ " " __TIME__ "\n\n"); wce_hitreturn(); #endif +#ifdef SYMBIAN + PerlIO_printf(PerlIO_stdout(), + "Symbian port by Nokia, 2004-2005\n"); +#endif #ifdef BINARY_BUILD_NOTICE BINARY_BUILD_NOTICE; #endif @@ -2901,7 +3018,7 @@ S_init_interp(pTHX) # if defined(PERL_IMPLICIT_CONTEXT) # if defined(USE_5005THREADS) # define PERLVARI(var,type,init) PERL_GET_INTERP->var = init; -# define PERLVARIC(var,type,init) PERL_GET_INTERP->var = init; +# define PERLVARIC(var,type,init) PERL_GET_INTERP->var = init; # else /* !USE_5005THREADS */ # define PERLVARI(var,type,init) aTHX->var = init; # define PERLVARIC(var,type,init) aTHX->var = init; @@ -2946,7 +3063,7 @@ S_init_main_stash(pTHX) SvREFCNT_dec(GvHV(gv)); GvHV(gv) = (HV*)SvREFCNT_inc(PL_defstash); SvREADONLY_on(gv); - HvNAME(PL_defstash) = savepv("main"); + HvNAME(PL_defstash) = savepvn("main", 4); PL_incgv = gv_HVadd(gv_AVadd(gv_fetchpv("INC",TRUE, SVt_PVAV))); GvMULTI_on(PL_incgv); PL_hintgv = gv_fetchpv("\010",TRUE, SVt_PV); /* ^H */ @@ -2969,27 +3086,28 @@ S_init_main_stash(pTHX) /* PSz 18 Nov 03 fdscript now global but do not change prototype */ STATIC void -S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv) +S_open_script(pTHX_ const char *scriptname, bool dosearch, SV *sv) { #ifndef IAMSUID - char *quote; - char *code; - char *cpp_discard_flag; - char *perl; + const char *quote; + const char *code; + const char *cpp_discard_flag; + const char *perl; #endif + dVAR; PL_fdscript = -1; PL_suidscript = -1; if (PL_e_script) { - PL_origfilename = savepv("-e"); + PL_origfilename = savepvn("-e", 2); } else { /* if find_script() returns, it returns a malloc()-ed value */ - PL_origfilename = scriptname = find_script(scriptname, dosearch, NULL, 1); + scriptname = PL_origfilename = find_script(scriptname, dosearch, NULL, 1); if (strnEQ(scriptname, "/dev/fd/", 8) && isDIGIT(scriptname[8]) ) { - char *s = scriptname + 8; + const char *s = scriptname + 8; PL_fdscript = atoi(s); while (isDIGIT(*s)) s++; @@ -3016,15 +3134,15 @@ S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv) } scriptname = savepv(s + 1); Safefree(PL_origfilename); - PL_origfilename = scriptname; + PL_origfilename = (char *)scriptname; } } } CopFILE_free(PL_curcop); CopFILE_set(PL_curcop, PL_origfilename); - if (strEQ(PL_origfilename,"-")) - scriptname = ""; + if (*PL_origfilename == '-' && PL_origfilename[1] == '\0') + scriptname = (char *)""; if (PL_fdscript >= 0) { PL_rsfp = PerlIO_fdopen(PL_fdscript,PERL_SCRIPT_MODE); # if defined(HAS_FCNTL) && defined(F_SETFD) @@ -3051,7 +3169,7 @@ S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv) } #else /* IAMSUID */ else if (PL_preprocess) { - char *cpp_cfg = CPPSTDIN; + const char *cpp_cfg = CPPSTDIN; SV *cpp = newSVpvn("",0); SV *cmd = NEWSV(0,0); @@ -3111,7 +3229,7 @@ S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv) "PL_preprocess: cmd=\"%s\"\n", SvPVX(cmd))); - PL_rsfp = PerlProc_popen(SvPVX(cmd), "r"); + PL_rsfp = PerlProc_popen(SvPVX(cmd), (char *)"r"); SvREFCNT_dec(cmd); SvREFCNT_dec(cpp); } @@ -3271,8 +3389,9 @@ S_fd_on_nosuid_fs(pTHX_ int fd) #endif /* IAMSUID */ STATIC void -S_validate_suid(pTHX_ char *validarg, char *scriptname) +S_validate_suid(pTHX_ const char *validarg, const char *scriptname) { + dVAR; #ifdef IAMSUID /* int which; */ #endif /* IAMSUID */ @@ -3422,7 +3541,8 @@ S_validate_suid(pTHX_ char *validarg, char *scriptname) /* Sanity check on buffer end */ while ((*s) && !isSPACE(*s)) s++; for (s2 = s; (s2 > SvPV(PL_linestr,n_a)+2 && - (isDIGIT(s2[-1]) || strchr("._-", s2[-1]))); s2--) ; + (isDIGIT(s2[-1]) || s2[-1] == '.' || s2[-1] == '_' + || s2[-1] == '-')); s2--) ; /* Sanity check on buffer start */ if ( (s2-4 < SvPV(PL_linestr,n_a)+2 || strnNE(s2-4,"perl",4)) && (s-9 < SvPV(PL_linestr,n_a)+2 || strnNE(s-9,"perl",4)) ) @@ -3664,12 +3784,15 @@ FIX YOUR KERNEL, PUT A C WRAPPER AROUND THIS SCRIPT, OR USE -u AND UNDUMP!\n"); /* not set-id, must be wrapped */ } #endif /* DOSUID */ + (void)validarg; + (void)scriptname; } STATIC void S_find_beginning(pTHX) { - register char *s, *s2; + register char *s; + register const char *s2; #ifdef MACOS_TRADITIONAL int maclines = 0; #endif @@ -3709,7 +3832,8 @@ S_find_beginning(pTHX) s2 = s; while (*s == ' ' || *s == '\t') s++; if (*s++ == '-') { - while (isDIGIT(s2[-1]) || strchr("-._", s2[-1])) s2--; + while (isDIGIT(s2[-1]) || s2[-1] == '-' || s2[-1] == '.' + || s2[-1] == '_') s2--; if (strnEQ(s2-4,"perl",4)) /*SUPPRESS 530*/ while ((s = moreswitches(s))) @@ -3778,6 +3902,7 @@ Perl_doing_taint(int argc, char *argv[], char *envp[]) int euid = PerlProc_geteuid(); int gid = PerlProc_getgid(); int egid = PerlProc_getegid(); + (void)envp; #ifdef VMS uid |= gid << 16; @@ -3796,7 +3921,7 @@ Perl_doing_taint(int argc, char *argv[], char *envp[]) } STATIC void -S_forbid_setid(pTHX_ char *s) +S_forbid_setid(pTHX_ const char *s) { #ifdef SETUID_SCRIPTS_ARE_SECURE_NOW if (PL_euid != PL_uid) @@ -3845,7 +3970,6 @@ Perl_init_debugger(pTHX) PL_DBgv = gv_fetchpv("DB::DB", GV_ADDMULTI, SVt_PVGV); PL_DBline = gv_fetchpv("DB::dbline", GV_ADDMULTI, SVt_PVAV); PL_DBsub = gv_HVadd(gv_fetchpv("DB::sub", GV_ADDMULTI, SVt_PVHV)); - sv_upgrade(GvSV(PL_DBsub), SVt_IV); /* IVX accessed if PERLDB_SUB_NN */ PL_DBsingle = GvSV((gv_fetchpv("DB::single", GV_ADDMULTI, SVt_PV))); sv_setiv(PL_DBsingle, 0); PL_DBtrace = GvSV((gv_fetchpv("DB::trace", GV_ADDMULTI, SVt_PV))); @@ -4008,46 +4132,10 @@ Perl_init_argv_symbols(pTHX_ register int argc, register char **argv) } } -#ifdef HAS_PROCSELFEXE -/* This is a function so that we don't hold on to MAXPATHLEN - bytes of stack longer than necessary - */ -STATIC void -S_procself_val(pTHX_ SV *sv, char *arg0) -{ - char buf[MAXPATHLEN]; - int len = readlink(PROCSELFEXE_PATH, buf, sizeof(buf) - 1); - - /* On Playstation2 Linux V1.0 (kernel 2.2.1) readlink(/proc/self/exe) - includes a spurious NUL which will cause $^X to fail in system - or backticks (this will prevent extensions from being built and - many tests from working). readlink is not meant to add a NUL. - Normal readlink works fine. - */ - if (len > 0 && buf[len-1] == '\0') { - len--; - } - - /* FreeBSD's implementation is acknowledged to be imperfect, sometimes - returning the text "unknown" from the readlink rather than the path - to the executable (or returning an error from the readlink). Any valid - path has a '/' in it somewhere, so use that to validate the result. - See http://www.freebsd.org/cgi/query-pr.cgi?pr=35703 - */ - if (len > 0 && memchr(buf, '/', len)) { - sv_setpvn(sv,buf,len); - } - else { - sv_setpv(sv,arg0); - } -} -#endif /* HAS_PROCSELFEXE */ - STATIC void S_init_postdump_symbols(pTHX_ register int argc, register char **argv, register char **env) { - char *s; - SV *sv; + dVAR; GV* tmpgv; PL_toptarget = NEWSV(0,0); @@ -4071,17 +4159,6 @@ S_init_postdump_symbols(pTHX_ register int argc, register char **argv, register magicname("0", "0", 1); #endif } - if ((tmpgv = gv_fetchpv("\030",TRUE, SVt_PV))) {/* $^X */ -#ifdef HAS_PROCSELFEXE - S_procself_val(aTHX_ GvSV(tmpgv), PL_origargv[0]); -#else -#ifdef OS2 - sv_setpv(GvSV(tmpgv), os2_execname(aTHX)); -#else - sv_setpv(GvSV(tmpgv),PL_origargv[0]); -#endif -#endif - } if ((PL_envgv = gv_fetchpv("ENV",TRUE, SVt_PVHV))) { HV *hv; GvMULTI_on(PL_envgv); @@ -4106,6 +4183,8 @@ S_init_postdump_symbols(pTHX_ register int argc, register char **argv, register } if (env) { char** origenv = environ; + char *s; + SV *sv; for (; *env; env++) { if (!(s = strchr(*env,'=')) || s == *env) continue; @@ -4155,9 +4234,9 @@ S_init_perllib(pTHX) #ifndef VMS s = PerlEnv_getenv("PERL5LIB"); if (s) - incpush(s, TRUE, TRUE, TRUE); + incpush(s, TRUE, TRUE, TRUE, FALSE); else - incpush(PerlEnv_getenv("PERLLIB"), FALSE, FALSE, TRUE); + incpush(PerlEnv_getenv("PERLLIB"), FALSE, FALSE, TRUE, FALSE); #else /* VMS */ /* Treat PERL5?LIB as a possible search list logical name -- the * "natural" VMS idiom for a Unix path string. We allow each @@ -4166,9 +4245,9 @@ S_init_perllib(pTHX) char buf[256]; int idx = 0; if (my_trnlnm("PERL5LIB",buf,0)) - do { incpush(buf,TRUE,TRUE,TRUE); } while (my_trnlnm("PERL5LIB",buf,++idx)); + do { incpush(buf,TRUE,TRUE,TRUE,FALSE); } while (my_trnlnm("PERL5LIB",buf,++idx)); else - while (my_trnlnm("PERLLIB",buf,idx++)) incpush(buf,FALSE,FALSE,TRUE); + while (my_trnlnm("PERLLIB",buf,idx++)) incpush(buf,FALSE,FALSE,TRUE,FALSE); #endif /* VMS */ } @@ -4176,11 +4255,11 @@ S_init_perllib(pTHX) ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB */ #ifdef APPLLIB_EXP - incpush(APPLLIB_EXP, TRUE, TRUE, TRUE); + incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE); #endif #ifdef ARCHLIB_EXP - incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); + incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); #endif #ifdef MACOS_TRADITIONAL { @@ -4193,76 +4272,76 @@ S_init_perllib(pTHX) Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl); if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) - incpush(SvPVX(privdir), TRUE, FALSE, TRUE); + incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE); Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl); if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) - incpush(SvPVX(privdir), TRUE, FALSE, TRUE); + incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE); SvREFCNT_dec(privdir); } if (!PL_tainting) - incpush(":", FALSE, FALSE, TRUE); + incpush(":", FALSE, FALSE, TRUE, FALSE); #else #ifndef PRIVLIB_EXP # define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" #endif #if defined(WIN32) - incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); + incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE); #else - incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); + incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE); #endif #ifdef SITEARCH_EXP /* sitearch is always relative to sitelib on Windows for * DLL-based path intuition to work correctly */ # if !defined(WIN32) - incpush(SITEARCH_EXP, FALSE, FALSE, TRUE); + incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE); # endif #endif #ifdef SITELIB_EXP # if defined(WIN32) /* this picks up sitearch as well */ - incpush(SITELIB_EXP, TRUE, FALSE, TRUE); + incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE); # else - incpush(SITELIB_EXP, FALSE, FALSE, TRUE); + incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE); # endif #endif #ifdef SITELIB_STEM /* Search for version-specific dirs below here */ - incpush(SITELIB_STEM, FALSE, TRUE, TRUE); + incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE); #endif #ifdef PERL_VENDORARCH_EXP /* vendorarch is always relative to vendorlib on Windows for * DLL-based path intuition to work correctly */ # if !defined(WIN32) - incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE); + incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE, TRUE); # endif #endif #ifdef PERL_VENDORLIB_EXP # if defined(WIN32) - incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE); /* this picks up vendorarch as well */ + incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE, TRUE); /* this picks up vendorarch as well */ # else - incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE); + incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE, TRUE); # endif #endif #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */ - incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); + incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE); #endif #ifdef PERL_OTHERLIBDIRS - incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE); + incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE); #endif if (!PL_tainting) - incpush(".", FALSE, FALSE, TRUE); + incpush(".", FALSE, FALSE, TRUE, FALSE); #endif /* MACOS_TRADITIONAL */ } -#if defined(DOSISH) || defined(EPOC) +#if defined(DOSISH) || defined(EPOC) || defined(SYMBIAN) # define PERLLIB_SEP ';' #else # if defined(VMS) @@ -4279,22 +4358,39 @@ S_init_perllib(pTHX) # define PERLLIB_MANGLE(s,n) (s) #endif +/* Push a directory onto @INC if it exists. + Generate a new SV if we do this, to save needing to copy the SV we push + onto @INC */ +STATIC SV * +S_incpush_if_exists(pTHX_ SV *dir) +{ + Stat_t tmpstatbuf; + if (PerlLIO_stat(SvPVX(dir), &tmpstatbuf) >= 0 && + S_ISDIR(tmpstatbuf.st_mode)) { + av_push(GvAVn(PL_incgv), dir); + dir = NEWSV(0,0); + } + return dir; +} + STATIC void -S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep) +S_incpush(pTHX_ const char *dir, bool addsubdirs, bool addoldvers, bool usesep, + bool canrelocate) { SV *subdir = Nullsv; + const char *p = dir; if (!p || !*p) return; if (addsubdirs || addoldvers) { - subdir = sv_newmortal(); + subdir = NEWSV(0,0); } /* Break at all separators */ while (p && *p) { SV *libdir = NEWSV(55,0); - char *s; + const char *s; /* skip any consecutive separators */ if (usesep) { @@ -4324,6 +4420,104 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep) sv_catpv(libdir, ":"); #endif + /* Do the if() outside the #ifdef to avoid warnings about an unused + parameter. */ + if (canrelocate) { +#ifdef PERL_RELOCATABLE_INC + /* + * Relocatable include entries are marked with a leading .../ + * + * The algorithm is + * 0: Remove that leading ".../" + * 1: Remove trailing executable name (anything after the last '/') + * from the perl path to give a perl prefix + * Then + * While the @INC element starts "../" and the prefix ends with a real + * directory (ie not . or ..) chop that real directory off the prefix + * and the leading "../" from the @INC element. ie a logical "../" + * cleanup + * Finally concatenate the prefix and the remainder of the @INC element + * The intent is that /usr/local/bin/perl and .../../lib/perl5 + * generates /usr/local/lib/perl5 + */ + char *libpath = SvPVX(libdir); + STRLEN libpath_len = SvCUR(libdir); + if (libpath_len >= 4 && memEQ (libpath, ".../", 4)) { + /* Game on! */ + SV *caret_X = get_sv("\030", 0); + /* Going to use the SV just as a scratch buffer holding a C + string: */ + SV *prefix_sv; + char *prefix; + char *lastslash; + + /* $^X is *the* source of taint if tainting is on, hence + SvPOK() won't be true. */ + assert(caret_X); + assert(SvPOKp(caret_X)); + prefix_sv = newSVpvn(SvPVX(caret_X), SvCUR(caret_X)); + /* Firstly take off the leading .../ + If all else fail we'll do the paths relative to the current + directory. */ + sv_chop(libdir, libpath + 4); + /* Don't use SvPV as we're intentionally bypassing taining, + mortal copies that the mg_get of tainting creates, and + corruption that seems to come via the save stack. + I guess that the save stack isn't correctly set up yet. */ + libpath = SvPVX(libdir); + libpath_len = SvCUR(libdir); + + /* This would work more efficiently with memrchr, but as it's + only a GNU extension we'd need to probe for it and + implement our own. Not hard, but maybe not worth it? */ + + prefix = SvPVX(prefix_sv); + lastslash = strrchr(prefix, '/'); + + /* First time in with the *lastslash = '\0' we just wipe off + the trailing /perl from (say) /usr/foo/bin/perl + */ + if (lastslash) { + SV *tempsv; + while ((*lastslash = '\0'), /* Do that, come what may. */ + (libpath_len >= 3 && memEQ(libpath, "../", 3) + && (lastslash = strrchr(prefix, '/')))) { + if (lastslash[1] == '\0' + || (lastslash[1] == '.' + && (lastslash[2] == '/' /* ends "/." */ + || (lastslash[2] == '/' + && lastslash[3] == '/' /* or "/.." */ + )))) { + /* Prefix ends "/" or "/." or "/..", any of which + are fishy, so don't do any more logical cleanup. + */ + break; + } + /* Remove leading "../" from path */ + libpath += 3; + libpath_len -= 3; + /* Next iteration round the loop removes the last + directory name from prefix by writing a '\0' in + the while clause. */ + } + /* prefix has been terminated with a '\0' to the correct + length. libpath points somewhere into the libdir SV. + We need to join the 2 with '/' and drop the result into + libdir. */ + tempsv = Perl_newSVpvf(aTHX_ "%s/%s", prefix, libpath); + SvREFCNT_dec(libdir); + /* And this is the new libdir. */ + libdir = tempsv; + if (PL_tainting && + (PL_uid != PL_euid || PL_gid != PL_egid)) { + /* Need to taint reloccated paths if running set ID */ + SvTAINTED_on(libdir); + } + } + SvREFCNT_dec(prefix_sv); + } +#endif + } /* * BEFORE pushing libdir onto @INC we may first push version- and * archname-specific sub-directories. @@ -4334,7 +4528,6 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep) const char *incverlist[] = { PERL_INC_VERSION_LIST }; const char **incver; #endif - Stat_t tmpstatbuf; #ifdef VMS char *unix; STRLEN len; @@ -4364,23 +4557,18 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep) libdir, (int)PERL_REVISION, (int)PERL_VERSION, (int)PERL_SUBVERSION, ARCHNAME); - if (PerlLIO_stat(SvPVX(subdir), &tmpstatbuf) >= 0 && - S_ISDIR(tmpstatbuf.st_mode)) - av_push(GvAVn(PL_incgv), newSVsv(subdir)); + subdir = S_incpush_if_exists(aTHX_ subdir); /* .../version if -d .../version */ Perl_sv_setpvf(aTHX_ subdir, "%"SVf PERL_ARCH_FMT_PATH, libdir, (int)PERL_REVISION, (int)PERL_VERSION, (int)PERL_SUBVERSION); - if (PerlLIO_stat(SvPVX(subdir), &tmpstatbuf) >= 0 && - S_ISDIR(tmpstatbuf.st_mode)) - av_push(GvAVn(PL_incgv), newSVsv(subdir)); + subdir = S_incpush_if_exists(aTHX_ subdir); /* .../archname if -d .../archname */ Perl_sv_setpvf(aTHX_ subdir, "%"SVf PERL_ARCH_FMT, libdir, ARCHNAME); - if (PerlLIO_stat(SvPVX(subdir), &tmpstatbuf) >= 0 && - S_ISDIR(tmpstatbuf.st_mode)) - av_push(GvAVn(PL_incgv), newSVsv(subdir)); + subdir = S_incpush_if_exists(aTHX_ subdir); + } #ifdef PERL_INC_VERSION_LIST @@ -4388,9 +4576,7 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep) for (incver = incverlist; *incver; incver++) { /* .../xxx if -d .../xxx */ Perl_sv_setpvf(aTHX_ subdir, "%"SVf PERL_ARCH_FMT, libdir, *incver); - if (PerlLIO_stat(SvPVX(subdir), &tmpstatbuf) >= 0 && - S_ISDIR(tmpstatbuf.st_mode)) - av_push(GvAVn(PL_incgv), newSVsv(subdir)); + subdir = S_incpush_if_exists(aTHX_ subdir); } } #endif @@ -4399,6 +4585,10 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep) /* finally push this lib directory on the end of @INC */ av_push(GvAVn(PL_incgv), libdir); } + if (subdir) { + assert (SvREFCNT(subdir) == 1); + SvREFCNT_dec(subdir); + } } #ifdef USE_5005THREADS @@ -4425,7 +4615,7 @@ S_init_main_thread(pTHX) SvFLAGS(PL_thrsv) = SVt_PV; SvANY(PL_thrsv) = (void*)xpv; SvREFCNT(PL_thrsv) = 1 << 30; /* practically infinite */ - SvPVX(PL_thrsv) = (char*)thr; + SvPV_set(PL_thrsvr, (char*)thr); SvCUR_set(PL_thrsv, sizeof(thr)); SvLEN_set(PL_thrsv, sizeof(thr)); *SvEND(PL_thrsv) = '\0'; /* in the trailing_nul field */ @@ -4484,14 +4674,15 @@ S_init_main_thread(pTHX) void Perl_call_list(pTHX_ I32 oldscope, AV *paramList) { + dVAR; SV *atsv; - line_t oldline = CopLINE(PL_curcop); + const line_t oldline = CopLINE(PL_curcop); CV *cv; STRLEN len; int ret; dJMPENV; - while (AvFILL(paramList) >= 0) { + while (av_len(paramList) >= 0) { cv = (CV*)av_shift(paramList); if (PL_savebegin) { if (paramList == PL_beginav) { @@ -4509,16 +4700,10 @@ Perl_call_list(pTHX_ I32 oldscope, AV *paramList) } else { SAVEFREESV(cv); } -#ifdef PERL_FLEXIBLE_EXCEPTIONS - CALLPROTECT(aTHX_ pcur_env, &ret, MEMBER_TO_FPTR(S_vcall_list_body), cv); -#else JMPENV_PUSH(ret); -#endif switch (ret) { case 0: -#ifndef PERL_FLEXIBLE_EXCEPTIONS call_list_body(cv); -#endif atsv = ERRSV; (void)SvPV(atsv, len); if (len) { @@ -4575,15 +4760,6 @@ Perl_call_list(pTHX_ I32 oldscope, AV *paramList) } } -#ifdef PERL_FLEXIBLE_EXCEPTIONS -STATIC void * -S_vcall_list_body(pTHX_ va_list args) -{ - CV *cv = va_arg(args, CV*); - return call_list_body(cv); -} -#endif - STATIC void * S_call_list_body(pTHX_ CV *cv) { @@ -4643,6 +4819,7 @@ Perl_my_failure_exit(pTHX) STATIC void S_my_exit_jump(pTHX) { + dVAR; register PERL_CONTEXT *cx; I32 gimme; SV **newsp; @@ -4667,6 +4844,9 @@ static I32 read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen) { char *p, *nl; + (void)idx; + (void)maxlen; + p = SvPVX(PL_e_script); nl = strchr(p, '\n'); nl = (nl) ? nl+1 : SvEND(PL_e_script);