X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/e6827a76d6739cf7ead59ff0f2fbe7afeb7086ed..17fbfdf6c6f5ee46c01833862a16cddc094c4bd5:/perl.c diff --git a/perl.c b/perl.c index b4b2aad..838f911 100644 --- a/perl.c +++ b/perl.c @@ -92,6 +92,12 @@ char *nw_get_sitelib(const char *pl); #include #endif +#ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP +# ifdef I_SYS_WAIT +# include +# endif +#endif + #ifdef __BEOS__ # define HZ 1000000 #endif @@ -123,8 +129,9 @@ static I32 read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen); #endif static void -S_init_tls_and_interp(pTHX) +S_init_tls_and_interp(PerlInterpreter *my_perl) { + dVAR; if (!PL_curinterp) { PERL_SET_INTERP(my_perl); #if defined(USE_ITHREADS) @@ -181,15 +188,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)); S_init_tls_and_interp(my_perl); - return ZeroD(my_perl, 1, PerlInterpreter); + return (PerlInterpreter *) ZeroD(my_perl, 1, PerlInterpreter); } #endif /* PERL_IMPLICIT_SYS */ @@ -204,6 +208,7 @@ Initializes a new Perl interpreter. See L. void perl_construct(pTHXx) { + dVAR; #ifdef MULTIPLICITY init_interp(); PL_perl_destruct_level = 1; @@ -213,10 +218,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); @@ -310,7 +311,9 @@ perl_construct(pTHXx) /* Use sysconf(_SC_CLK_TCK) if available, if not * available or if the sysconf() fails, use the HZ. - * BeOS has those, but returns the wrong value. */ + * 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) @@ -326,6 +329,48 @@ 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; + (void) SvUPGRADE(error, SVt_PV); + Perl_croak(aTHX_ "panic: sysconf: %s", SvPV_nolen_const(error)); + } + 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; } @@ -355,11 +400,13 @@ 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 */ +#ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP + int sock; + pid_t child; +#endif /* wait for all pseudo-forked children to finish */ PERL_WAIT_FOR_CHILDREN; @@ -367,21 +414,21 @@ perl_destruct(pTHXx) destruct_level = PL_perl_destruct_level; #ifdef DEBUGGING { - char *s; + const 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; JMPENV_PUSH(x); + PERL_UNUSED_VAR(x); if (PL_endav && !PL_minus_c) call_list(PL_scopestack_ix, PL_endav); JMPENV_POP; @@ -397,9 +444,74 @@ perl_destruct(pTHXx) return STATUS_NATIVE_EXPORT; } +#ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP + if (destruct_level != 0) { + /* Fork here to create a child. Our child's job is to preserve the + state of scalars prior to destruction, so that we can instruct it + to dump any scalars that we later find have leaked. + There's no subtlety in this code - it assumes POSIX, and it doesn't + fail gracefully */ + int fd[2]; + + if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) { + perror("Debug leaking scalars socketpair failed"); + abort(); + } + + child = fork(); + if(child == -1) { + perror("Debug leaking scalars fork failed"); + abort(); + } + if (!child) { + /* We are the child */ + close(fd[0]); + sock = fd[1]; + + while (1) { + SV *target; + ssize_t got = read(sock, &target, sizeof(target)); + + if(got == 0) + break; + if(got < 0) { + perror("Debug leaking scalars child read failed"); + abort(); + } + if(got < sizeof(target)) { + perror("Debug leaking scalars child short read"); + abort(); + } + sv_dump(target); + PerlIO_flush(Perl_debug_log); + + /* Write something back as synchronisation. */ + got = write(sock, &target, sizeof(target)); + + if(got < 0) { + perror("Debug leaking scalars child write failed"); + abort(); + } + if(got < sizeof(target)) { + perror("Debug leaking scalars child short write"); + abort(); + } + } + _exit(0); + } + sock = fd[0]; + close(fd[1]); + } +#endif + /* We must account for everything. */ /* Destroy the main CV and syntax tree */ + /* Do this now, because destroying ops can cause new SVs to be generated + in Perl_pad_swipe, and when running with -DDEBUG_LEAKING_SCALARS they + PL_curcop to point to a valid op from which the filename structure + member is copied. */ + PL_curcop = &PL_compiling; if (PL_main_root) { /* ensure comppad/curpad to refer to main's pad */ if (CvPADLIST(PL_main_cv)) { @@ -408,7 +520,6 @@ perl_destruct(pTHXx) op_free(PL_main_root); PL_main_root = Nullop; } - PL_curcop = &PL_compiling; PL_main_start = Nullop; SvREFCNT_dec(PL_main_cv); PL_main_cv = Nullcv; @@ -500,7 +611,6 @@ perl_destruct(pTHXx) while (i) { SV *resv = ary[--i]; - REGEXP *re = INT2PTR(REGEXP *,SvIVX(resv)); if (SvFLAGS(resv) & SVf_BREAK) { /* this is PL_reg_curpm, already freed @@ -511,7 +621,8 @@ perl_destruct(pTHXx) else if(SvREPADTMP(resv)) { SvREPADTMP_off(resv); } - else { + else if(SvIOKp(resv)) { + REGEXP *re = INT2PTR(REGEXP *,SvIVX(resv)); ReREFCNT_dec(re); } } @@ -767,23 +878,23 @@ perl_destruct(pTHXx) { /* Yell and reset the HeVAL() slots that are still holding refcounts, * so that sv_free() won't fail on them. + * Now that the global string table is using a single hunk of memory + * for both HE and HEK, we either need to explicitly unshare it the + * correct way, or actually free things here. */ - I32 riter; - I32 max; - HE *hent; - HE **array; - - riter = 0; - max = HvMAX(PL_strtab); - array = HvARRAY(PL_strtab); - hent = array[0]; + I32 riter = 0; + const I32 max = HvMAX(PL_strtab); + HE **array = HvARRAY(PL_strtab); + HE *hent = array[0]; + for (;;) { if (hent && ckWARN_d(WARN_INTERNAL)) { + HE *next = HeNEXT(hent); Perl_warner(aTHX_ packWARN(WARN_INTERNAL), "Unbalanced string table refcount: (%d) for \"%s\"", HeVAL(hent) - Nullsv, HeKEY(hent)); - HeVAL(hent) = Nullsv; - hent = HeNEXT(hent); + Safefree(hent); + hent = next; } if (!hent) { if (++riter > max) @@ -791,11 +902,16 @@ perl_destruct(pTHXx) hent = array[riter]; } } + + Safefree(array); + HvARRAY(PL_strtab) = 0; + HvTOTALKEYS(PL_strtab) = 0; + HvFILL(PL_strtab) = 0; } SvREFCNT_dec(PL_strtab); #ifdef USE_ITHREADS - /* free the pointer table used for cloning */ + /* free the pointer tables used for cloning */ ptr_table_free(PL_ptr_table); PL_ptr_table = (PTR_TBL_t*)NULL; #endif @@ -835,14 +951,70 @@ perl_destruct(pTHXx) svend = &sva[SvREFCNT(sva)]; for (sv = sva + 1; sv < svend; ++sv) { if (SvTYPE(sv) != SVTYPEMASK) { +#ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP + ssize_t got; + SV *target; +#endif + PerlIO_printf(Perl_debug_log, "leaked: sv=0x%p" - " flags=0x08%"UVxf - " refcnt=%"UVuf pTHX__FORMAT "\n", - sv, sv->sv_flags, sv->sv_refcnt pTHX__VALUE); + " flags=0x%"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)" : "" + ); + +#ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP + PerlIO_flush(Perl_debug_log); + + got = write(sock, &sv, sizeof(sv)); + + if(got < 0) { + perror("Debug leaking scalars parent write failed"); + abort(); + } + if(got < sizeof(target)) { + perror("Debug leaking scalars parent short write"); + abort(); + } + + got = read(sock, &target, sizeof(target)); + + if(got < 0) { + perror("Debug leaking scalars parent read failed"); + abort(); + } + if(got < sizeof(target)) { + perror("Debug leaking scalars parent short read"); + abort(); + } +#endif } } } } +#ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP + { + int status; + fd_set rset; + /* Wait for up to 4 seconds for child to terminate. + This seems to be the least effort way of timing out on reaping + its exit status. */ + struct timeval waitfor = {4, 0}; + + shutdown(sock, 1); + FD_ZERO(&rset); + FD_SET(sock, &rset); + select(sock + 1, &rset, NULL, NULL, &waitfor); + waitpid(child, &status, WNOHANG); + close(sock); + } +#endif #endif PL_sv_count = 0; @@ -878,8 +1050,6 @@ perl_destruct(pTHXx) Safefree(PL_psig_pend); PL_psig_pend = (int*)NULL; PL_formfeed = Nullsv; - Safefree(PL_ofmt); - PL_ofmt = Nullch; nuke_stacks(); PL_tainting = FALSE; PL_taint_warn = FALSE; @@ -897,21 +1067,21 @@ perl_destruct(pTHXx) /* As the absolutely last thing, free the non-arena SV for mess() */ if (PL_mess_sv) { + /* we know that type == SVt_PVMG */ + /* it could have accumulated taint magic */ - if (SvTYPE(PL_mess_sv) >= SVt_PVMG) { - MAGIC* mg; - MAGIC* moremagic; - for (mg = SvMAGIC(PL_mess_sv); mg; mg = moremagic) { - moremagic = mg->mg_moremagic; - if (mg->mg_ptr && mg->mg_type != PERL_MAGIC_regex_global - && mg->mg_len >= 0) - Safefree(mg->mg_ptr); - Safefree(mg); - } + MAGIC* mg; + MAGIC* moremagic; + for (mg = SvMAGIC(PL_mess_sv); mg; mg = moremagic) { + moremagic = mg->mg_moremagic; + if (mg->mg_ptr && mg->mg_type != PERL_MAGIC_regex_global + && mg->mg_len >= 0) + Safefree(mg->mg_ptr); + Safefree(mg); } + /* we know that type >= SVt_PV */ - SvOOK_off(PL_mess_sv); - Safefree(SvPVX(PL_mess_sv)); + SvPV_free(PL_mess_sv); Safefree(SvANY(PL_mess_sv)); Safefree(PL_mess_sv); PL_mess_sv = Nullsv; @@ -951,6 +1121,28 @@ 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) && __ux_version > 1020 && !defined(__GNUC__) +#pragma fini "perl_fini" +#endif + +static void +#if defined(__GNUC__) +__attribute__((destructor)) +#endif +perl_fini(void) +{ + dVAR; + if (PL_curinterp) + FREE_THREAD_KEY; +} + +#endif /* WIN32 */ +#endif /* THREADS */ + void Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr) { @@ -965,7 +1157,7 @@ Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr) bytes of stack longer than necessary */ STATIC void -S_procself_val(pTHX_ SV *sv, char *arg0) +S_procself_val(pTHX_ SV *sv, const char *arg0) { char buf[MAXPATHLEN]; int len = readlink(PROCSELFEXE_PATH, buf, sizeof(buf) - 1); @@ -1022,12 +1214,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 @@ -1046,15 +1236,10 @@ setuid perl scripts securely.\n"); if (!PL_rehash_seed_set) PL_rehash_seed = get_hash_seed(); { - char *s = PerlEnv_getenv("PERL_HASH_SEED_DEBUG"); + const char *s = PerlEnv_getenv("PERL_HASH_SEED_DEBUG"); - if (s) { - int i = atoi(s); - - if (i == 1) - PerlIO_printf(Perl_debug_log, "HASH_SEED = %"UVuf"\n", - PL_rehash_seed); - } + if (s && (atoi(s) == 1)) + PerlIO_printf(Perl_debug_log, "HASH_SEED = %"UVuf"\n", PL_rehash_seed); } #endif /* #if defined(USE_HASH_SEED) || defined(USE_HASH_SEED_EXPLICIT) */ @@ -1069,12 +1254,12 @@ 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 = + const UV mask = ~(UV)(PTRSIZE == 4 ? 3 : PTRSIZE == 8 ? 7 : PTRSIZE == 16 ? 15 : 0); /* Do the mask check only if the args seem like aligned. */ - UV aligned = + const UV aligned = (mask < ~(UV)0) && ((PTR2UV(argv[0]) & mask) == PTR2UV(argv[0])); /* See if all the arguments are contiguous in memory. Note @@ -1176,16 +1361,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; @@ -1212,28 +1391,21 @@ 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; +#ifdef USE_SITECUSTOMIZE + bool minus_f = FALSE; +#endif PL_fdscript = -1; PL_suidscript = -1; @@ -1327,6 +1499,13 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) sv_catpv(PL_e_script, "\n"); break; + case 'f': +#ifdef USE_SITECUSTOMIZE + minus_f = TRUE; +#endif + s++; + goto reswitch; + case 'I': /* -I handled both here and in moreswitches() */ forbid_setid("-I"); if (!*++s && (s=argv[1]) != Nullch) { @@ -1360,12 +1539,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"); @@ -1394,12 +1577,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) @@ -1456,11 +1661,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--; @@ -1477,7 +1682,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') { @@ -1524,6 +1729,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); } @@ -1576,7 +1790,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); } @@ -1619,10 +1833,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) { @@ -1739,30 +1956,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) @@ -1793,18 +2000,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", @@ -1845,10 +2042,8 @@ S_run_body(pTHX_ I32 oldscope) PL_op = PL_main_start; CALLRUNOPS(aTHX); } - my_exit(0); /* NOTREACHED */ - return NULL; } /* @@ -2036,7 +2231,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; @@ -2096,7 +2291,7 @@ Perl_call_sv(pTHX_ SV *sv, I32 flags) /* we're trying to emulate pp_entertry() here */ { register PERL_CONTEXT *cx; - I32 gimme = GIMME_V; + const I32 gimme = GIMME_V; ENTER; SAVETMPS; @@ -2109,26 +2304,18 @@ Perl_call_sv(pTHX_ SV *sv, I32 flags) if (flags & G_KEEPERR) PL_in_eval |= EVAL_KEEPERR; else - sv_setpv(ERRSV,""); + sv_setpvn(ERRSV,"",0); } 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,""); + sv_setpvn(ERRSV,"",0); break; case 1: STATUS_ALL_FAILURE; @@ -2183,20 +2370,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) @@ -2227,7 +2402,6 @@ Perl_eval_sv(pTHX_ SV *sv, I32 flags) UNOP myop; /* fake syntax tree node */ volatile I32 oldmark = SP - PL_stack_base; volatile I32 retval = 0; - I32 oldscope; int ret; OP* oldop = PL_op; dJMPENV; @@ -2242,7 +2416,6 @@ Perl_eval_sv(pTHX_ SV *sv, I32 flags) Zero(PL_op, 1, UNOP); EXTEND(PL_stack_sp, 1); *++PL_stack_sp = sv; - oldscope = PL_scopestack_ix; if (!(flags & G_NOARGS)) myop.op_flags = OPf_STACKED; @@ -2254,26 +2427,18 @@ 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,""); + sv_setpvn(ERRSV,"",0); break; case 1: STATUS_ALL_FAILURE; @@ -2336,8 +2501,7 @@ Perl_eval_pv(pTHX_ const char *p, I32 croak_on_error) PUTBACK; if (croak_on_error && SvTRUE(ERRSV)) { - STRLEN n_a; - Perl_croak(aTHX_ SvPVx(ERRSV, n_a)); + Perl_croak(aTHX_ SvPVx_nolen_const(ERRSV)); } return sv; @@ -2373,7 +2537,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; @@ -2382,43 +2546,45 @@ 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[] = { -"-0[octal] specify record separator (\\0, if no argument)", -"-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)", -"-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)", -"-l[octal] enable line ending processing, specifies line terminator", -"-[mM][-]module execute `use/no module...' before executing program", -"-n assume 'while (<>) { ... }' loop around program", -"-p assume loop like -n but print line also, like sed", -"-P run program through C preprocessor before compilation", -"-s enable rudimentary parsing for switches after programfile", -"-S look for programfile using PATH environment variable", -"-t enable tainting warnings", -"-T enable tainting checks", -"-u dump core after parsing program", -"-U allow unsafe operations", -"-v print version, subversion (includes VERY IMPORTANT perl info)", -"-V[:variable] print configuration summary (or a single Config.pm variable)", -"-w enable many useful warnings (RECOMMENDED)", -"-W enable all warnings", -"-x[directory] strip off text before #!perl line and perhaps cd to directory", -"-X disable all warnings", + static const char * const usage_msg[] = { +"-0[octal] specify record separator (\\0, if no argument)", +"-A[mod][=pattern] 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)", +"-f don't do $sitelib/sitecustomize.pl at startup", +"-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)", +"-l[octal] enable line ending processing, specifies line terminator", +"-[mM][-]module execute \"use/no module...\" before executing program", +"-n assume \"while (<>) { ... }\" loop around program", +"-p assume loop like -n but print line also, like sed", +"-P run program through C preprocessor before compilation", +"-s enable rudimentary parsing for switches after programfile", +"-S look for programfile using PATH environment variable", +"-t enable tainting warnings", +"-T enable tainting checks", +"-u dump core after parsing program", +"-U allow unsafe operations", +"-v print version, subversion (includes VERY IMPORTANT perl info)", +"-V[:variable] print configuration summary (or a single Config.pm variable)", +"-w enable many useful warnings (RECOMMENDED)", +"-W enable all warnings", +"-x[directory] strip off text before #!perl line and perhaps cd to directory", +"-X disable all warnings", "\n", NULL }; - char **p = usage_msg; + const char * const *p = usage_msg; PerlIO_printf(PerlIO_stdout(), "\nUsage: %s [switches] [--] [programfile] [arguments]", @@ -2432,9 +2598,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)", @@ -2464,10 +2630,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)) @@ -2480,7 +2646,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 @@ -2497,20 +2663,22 @@ Perl_get_debug_opts(pTHX_ char **s, bool givehelp) char * Perl_moreswitches(pTHX_ char *s) { - STRLEN numlen; + dVAR; UV rschar; switch (*s) { case '0': { I32 flags = 0; + STRLEN numlen; SvREFCNT_dec(PL_rs); if (s[1] == 'x' && s[2]) { - char *e; + const char *e = s+=2; U8 *tmps; - for (s += 2, e = s; *e; e++); + while (*e) + e++; numlen = e - s; flags = PERL_SCAN_SILENT_ILLDIGIT; rschar = (U32)grok_hex(s, &numlen, &flags, NULL); @@ -2543,7 +2711,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; @@ -2573,7 +2741,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; @@ -2600,14 +2768,13 @@ 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), "Recompile perl with -DDEBUGGING to use -D switch (did you mean -d ?)\n"); for (s++; isALNUM(*s); s++) ; #endif - /*SUPPRESS 530*/ return s; } case 'h': @@ -2623,8 +2790,8 @@ Perl_moreswitches(pTHX_ char *s) } #endif /* __CYGWIN__ */ PL_inplace = savepv(s+1); - /*SUPPRESS 530*/ - for (s = PL_inplace; *s && !isSPACE(*s); s++) ; + for (s = PL_inplace; *s && !isSPACE(*s); s++) + ; if (*s) { *s++ = '\0'; if (*s == '-') /* Additional switches on #! line. */ @@ -2665,6 +2832,7 @@ Perl_moreswitches(pTHX_ char *s) } if (isDIGIT(*s)) { I32 flags = 0; + STRLEN numlen; PL_ors_sv = newSVpvn("\n",1); numlen = 3 + (*s == '0'); *SvPVX(PL_ors_sv) = (char)grok_oct(s, &numlen, &flags, NULL); @@ -2683,17 +2851,27 @@ Perl_moreswitches(pTHX_ char *s) forbid_setid("-A"); if (!PL_preambleav) PL_preambleav = newAV(); - if (*++s) { - SV *sv = newSVpv("use assertions::activate split(/,/,q", 0); - sv_catpvn(sv, "\0", 1); /* Use NUL as q//-delimiter. */ - sv_catpv(sv,s); - sv_catpvn(sv, "\0)", 2); - s+=strlen(s); + s++; + { + char *start = s; + SV *sv = newSVpv("use assertions::activate", 24); + while(isALNUM(*s) || *s == ':') ++s; + if (s != start) { + sv_catpvn(sv, "::", 2); + sv_catpvn(sv, start, s-start); + } + if (*s == '=') { + sv_catpvn(sv, " split(/,/,q\0", 13); + sv_catpv(sv, s+1); + sv_catpvn(sv, "\0)", 2); + s+=strlen(s); + } + else if (*s != '\0') { + Perl_croak(aTHX_ "Can't use '%c' after -A%.*s", *s, s-start, start); + } av_push(PL_preambleav, sv); + return s; } - else - av_push(PL_preambleav, newSVpvn("use assertions::activate",24)); - return s; case 'M': forbid_setid("-M"); /* XXX ? */ /* FALL THROUGH */ @@ -2702,7 +2880,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); @@ -2773,13 +2951,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, %"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, %"SVf"\n", vstringify(PL_patchlevel))); PerlIO_printf(PerlIO_stdout(), Perl_form(aTHX_ " built under %s at %s %s\n", @@ -2799,7 +2977,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" @@ -2860,6 +3038,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 @@ -2868,7 +3050,7 @@ Perl_moreswitches(pTHX_ char *s) 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 source kit.\n\n\ Complete documentation for Perl, including FAQ lists, should be found on\n\ -this system using `man perl' or `perldoc perl'. If you have access to the\n\ +this system using \"man perl\" or \"perldoc perl\". If you have access to the\n\ Internet, point your browser at http://www.perl.org/, the Perl Home Page.\n\n"); my_exit(0); case 'w': @@ -2960,7 +3142,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; @@ -3005,7 +3187,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"); + Perl_hv_name_set(aTHX_ PL_defstash, "main", 4, 0); 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 */ @@ -3028,27 +3210,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++; @@ -3075,7 +3258,7 @@ S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv) } scriptname = savepv(s + 1); Safefree(PL_origfilename); - PL_origfilename = scriptname; + PL_origfilename = (char *)scriptname; } } } @@ -3083,7 +3266,7 @@ S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv) CopFILE_free(PL_curcop); CopFILE_set(PL_curcop, PL_origfilename); if (*PL_origfilename == '-' && PL_origfilename[1] == '\0') - scriptname = ""; + scriptname = (char *)""; if (PL_fdscript >= 0) { PL_rsfp = PerlIO_fdopen(PL_fdscript,PERL_SCRIPT_MODE); # if defined(HAS_FCNTL) && defined(F_SETFD) @@ -3110,7 +3293,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); @@ -3127,7 +3310,8 @@ S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv) DEBUG_P(PerlIO_printf(Perl_debug_log, "PL_preprocess: scriptname=\"%s\", cpp=\"%s\", sv=\"%s\", CPPMINUS=\"%s\"\n", - scriptname, SvPVX (cpp), SvPVX (sv), CPPMINUS)); + scriptname, SvPVX_const (cpp), SvPVX_const (sv), + CPPMINUS)); # if defined(MSDOS) || defined(WIN32) || defined(VMS) quote = "\""; @@ -3168,9 +3352,9 @@ S_open_script(pTHX_ char *scriptname, bool dosearch, SV *sv) DEBUG_P(PerlIO_printf(Perl_debug_log, "PL_preprocess: cmd=\"%s\"\n", - SvPVX(cmd))); + SvPVX_const(cmd))); - PL_rsfp = PerlProc_popen(SvPVX(cmd), "r"); + PL_rsfp = PerlProc_popen((char *)SvPVX_const(cmd), (char *)"r"); SvREFCNT_dec(cmd); SvREFCNT_dec(cpp); } @@ -3330,8 +3514,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 */ @@ -3364,13 +3549,13 @@ S_validate_suid(pTHX_ char *validarg, char *scriptname) */ #ifdef DOSUID - char *s, *s2; + const char *s, *s2; if (PerlLIO_fstat(PerlIO_fileno(PL_rsfp),&PL_statbuf) < 0) /* normal stat is insecure */ Perl_croak(aTHX_ "Can't stat script \"%s\"",PL_origfilename); if (PL_statbuf.st_mode & (S_ISUID|S_ISGID)) { I32 len; - STRLEN n_a; + const char *linestr; #ifdef IAMSUID if (PL_fdscript < 0 || PL_suidscript != 1) @@ -3468,10 +3653,12 @@ S_validate_suid(pTHX_ char *validarg, char *scriptname) PL_doswitches = FALSE; /* -s is insecure in suid */ /* PSz 13 Nov 03 But -s was caught elsewhere ... so unsetting it here is useless(?!) */ CopLINE_inc(PL_curcop); + linestr = SvPV_nolen_const(PL_linestr); if (sv_gets(PL_linestr, PL_rsfp, 0) == Nullch || - strnNE(SvPV(PL_linestr,n_a),"#!",2) ) /* required even on Sys V */ + strnNE(linestr,"#!",2) ) /* required even on Sys V */ Perl_croak(aTHX_ "No #! line"); - s = SvPV(PL_linestr,n_a)+2; + linestr+=2; + s = linestr; /* PSz 27 Feb 04 */ /* Sanity check on line length */ if (strlen(s) < 1 || strlen(s) > 4000) @@ -3480,12 +3667,12 @@ S_validate_suid(pTHX_ char *validarg, char *scriptname) while (isSPACE(*s)) s++; /* Sanity check on buffer end */ while ((*s) && !isSPACE(*s)) s++; - for (s2 = s; (s2 > SvPV(PL_linestr,n_a)+2 && + for (s2 = s; (s2 > linestr && (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)) ) + if ( (s2-4 < linestr || strnNE(s2-4,"perl",4)) && + (s-9 < linestr || strnNE(s-9,"perl",4)) ) Perl_croak(aTHX_ "Not a perl script"); while (*s == ' ' || *s == '\t') s++; /* @@ -3724,12 +3911,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 @@ -3772,7 +3962,6 @@ S_find_beginning(pTHX) while (isDIGIT(s2[-1]) || s2[-1] == '-' || s2[-1] == '.' || s2[-1] == '_') s2--; if (strnEQ(s2-4,"perl",4)) - /*SUPPRESS 530*/ while ((s = moreswitches(s))) ; } @@ -3839,6 +4028,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; @@ -3857,7 +4047,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) @@ -3906,7 +4096,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))); @@ -4072,8 +4261,7 @@ Perl_init_argv_symbols(pTHX_ register int argc, register char **argv) 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); @@ -4121,6 +4309,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; @@ -4277,7 +4467,7 @@ S_init_perllib(pTHX) #endif /* MACOS_TRADITIONAL */ } -#if defined(DOSISH) || defined(EPOC) +#if defined(DOSISH) || defined(EPOC) || defined(SYMBIAN) # define PERLLIB_SEP ';' #else # if defined(VMS) @@ -4301,7 +4491,7 @@ STATIC SV * S_incpush_if_exists(pTHX_ SV *dir) { Stat_t tmpstatbuf; - if (PerlLIO_stat(SvPVX(dir), &tmpstatbuf) >= 0 && + if (PerlLIO_stat(SvPVX_const(dir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) { av_push(GvAVn(PL_incgv), dir); dir = NEWSV(0,0); @@ -4310,10 +4500,11 @@ S_incpush_if_exists(pTHX_ SV *dir) } STATIC void -S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep, - int canrelocate) +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; @@ -4325,7 +4516,7 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep, /* Break at all separators */ while (p && *p) { SV *libdir = NEWSV(55,0); - char *s; + const char *s; /* skip any consecutive separators */ if (usesep) { @@ -4355,6 +4546,9 @@ 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 .../ @@ -4372,7 +4566,6 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep, * 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)) { @@ -4449,8 +4642,8 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers, int usesep, } SvREFCNT_dec(prefix_sv); } - } #endif + } /* * BEFORE pushing libdir onto @INC we may first push version- and * archname-specific sub-directories. @@ -4548,7 +4741,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 */ @@ -4607,14 +4800,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) { @@ -4632,18 +4826,12 @@ 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); + (void)SvPV_const(atsv, len); if (len) { PL_curcop = &PL_compiling; CopLINE_set(PL_curcop, oldline); @@ -4698,15 +4886,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) { @@ -4751,13 +4930,13 @@ Perl_my_failure_exit(pTHX) #else int exitstatus; if (errno & 255) - STATUS_POSIX_SET(errno); + STATUS_UNIX_SET(errno); else { - exitstatus = STATUS_POSIX >> 8; + exitstatus = STATUS_UNIX >> 8; if (exitstatus & 255) - STATUS_POSIX_SET(exitstatus); + STATUS_UNIX_SET(exitstatus); else - STATUS_POSIX_SET(255); + STATUS_UNIX_SET(255); } #endif my_exit_jump(); @@ -4766,6 +4945,7 @@ Perl_my_failure_exit(pTHX) STATIC void S_my_exit_jump(pTHX) { + dVAR; register PERL_CONTEXT *cx; I32 gimme; SV **newsp; @@ -4789,8 +4969,11 @@ S_my_exit_jump(pTHX) static I32 read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen) { - char *p, *nl; - p = SvPVX(PL_e_script); + const char *p, *nl; + (void)idx; + (void)maxlen; + + p = SvPVX_const(PL_e_script); nl = strchr(p, '\n'); nl = (nl) ? nl+1 : SvEND(PL_e_script); if (nl-p == 0) { @@ -4801,3 +4984,13 @@ read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen) sv_chop(PL_e_script, nl); return 1; } + +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */