X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=doio.c;h=6135efa46d6b9014b682ac811507f2081f1aedeb;hb=6ed34527c34dc05915ae3caa982e733d04613a1e;hp=29b5b19f508dfd8554ce813c2053b1a5ac4618d7;hpb=6fca0082ec4f3b34a0dabc78331bad8c22489dd2;p=p5sagit%2Fp5-mst-13.2.git diff --git a/doio.c b/doio.c index 29b5b19..6135efa 100644 --- a/doio.c +++ b/doio.c @@ -1,7 +1,7 @@ /* doio.c * - * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others + * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + * 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -9,10 +9,12 @@ */ /* - * "Far below them they saw the white waters pour into a foaming bowl, and - * then swirl darkly about a deep oval basin in the rocks, until they found - * their way out again through a narrow gate, and flowed away, fuming and - * chattering, into calmer and more level reaches." + * Far below them they saw the white waters pour into a foaming bowl, and + * then swirl darkly about a deep oval basin in the rocks, until they found + * their way out again through a narrow gate, and flowed away, fuming and + * chattering, into calmer and more level reaches. + * + * [p.684 of _The Lord of the Rings_, IV/vi: "The Forbidden Pool"] */ /* This file contains functions that do the actual I/O on behalf of ops. @@ -79,6 +81,8 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, char mode[PERL_MODE_MAX]; /* file mode ("r\0", "rb\0", "ab\0" etc.) */ SV *namesv; + PERL_ARGS_ASSERT_DO_OPENN; + Zero(mode,sizeof(mode),char); PL_forkprocess = 1; /* assume true if no fork */ @@ -176,7 +180,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, IoTYPE(io) = PerlIO_intmode2str(rawmode, &mode[ix], &writing); - namesv = sv_2mortal(newSVpv(oname,0)); + namesv = newSVpvn_flags(oname, len, SVs_TEMP); num_svs = 1; svp = &namesv; type = NULL; @@ -210,7 +214,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, goto say_false; } #endif /* USE_STDIO */ - name = SvOK(*svp) ? savesvpv (*svp) : savepvn ("", 0); + name = SvOK(*svp) ? savesvpv (*svp) : savepvs (""); SAVEFREEPV(name); } else { @@ -259,9 +263,9 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, mode[0] = 'w'; writing = 1; if (out_raw) - my_strlcat(mode, "b", PERL_MODE_MAX - 1); + mode[1] = 'b'; else if (out_crlf) - my_strlcat(mode, "t", PERL_MODE_MAX - 1); + mode[1] = 't'; if (num_svs > 1) { fp = PerlProc_popen_list(mode, num_svs, svp); } @@ -290,9 +294,9 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, writing = 1; if (out_raw) - my_strlcat(mode, "b", PERL_MODE_MAX - 1); + mode[1] = 'b'; else if (out_crlf) - my_strlcat(mode, "t", PERL_MODE_MAX - 1); + mode[1] = 't'; if (*type == '&') { duplicity: dodup = PERLIO_DUP_FD; @@ -399,7 +403,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, } else { if (!num_svs) { - namesv = sv_2mortal(newSVpvn(type,tend - type)); + namesv = newSVpvn_flags(type, tend - type, SVs_TEMP); num_svs = 1; svp = &namesv; type = NULL; @@ -416,9 +420,9 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, } while (isSPACE(*type)); mode[0] = 'r'; if (in_raw) - my_strlcat(mode, "b", PERL_MODE_MAX - 1); + mode[1] = 'b'; else if (in_crlf) - my_strlcat(mode, "t", PERL_MODE_MAX - 1); + mode[1] = 't'; if (*type == '&') { goto duplicity; } @@ -432,7 +436,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, } else { if (!num_svs) { - namesv = sv_2mortal(newSVpvn(type,tend - type)); + namesv = newSVpvn_flags(type, tend - type, SVs_TEMP); num_svs = 1; svp = &namesv; type = NULL; @@ -470,9 +474,9 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, mode[0] = 'r'; if (in_raw) - my_strlcat(mode, "b", PERL_MODE_MAX - 1); + mode[1] = 'b'; else if (in_crlf) - my_strlcat(mode, "t", PERL_MODE_MAX - 1); + mode[1] = 't'; if (num_svs > 1) { fp = PerlProc_popen_list(mode,num_svs,svp); @@ -501,9 +505,9 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, mode[0] = 'r'; if (in_raw) - my_strlcat(mode, "b", PERL_MODE_MAX - 1); + mode[1] = 'b'; else if (in_crlf) - my_strlcat(mode, "t", PERL_MODE_MAX - 1); + mode[1] = 't'; if (*name == '-' && name[1] == '\0') { fp = PerlIO_stdin(); @@ -511,7 +515,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, } else { if (!num_svs) { - namesv = sv_2mortal(newSVpvn(type,tend - type)); + namesv = newSVpvn_flags(type, tend - type, SVs_TEMP); num_svs = 1; svp = &namesv; type = NULL; @@ -659,9 +663,9 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, } #if defined(HAS_FCNTL) && defined(F_SETFD) if (fd >= 0) { - const int save_errno = errno; + dSAVE_ERRNO; fcntl(fd,F_SETFD,fd > PL_maxsysfd); /* can change errno */ - errno = save_errno; + RESTORE_ERRNO; } #endif IoIFP(io) = fp; @@ -705,15 +709,16 @@ Perl_nextargv(pTHX_ register GV *gv) Gid_t filegid; IO * const io = GvIOp(gv); + PERL_ARGS_ASSERT_NEXTARGV; + if (!PL_argvoutgv) PL_argvoutgv = gv_fetchpvs("ARGVOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); if (io && (IoFLAGS(io) & IOf_ARGV) && (IoFLAGS(io) & IOf_START)) { IoFLAGS(io) &= ~IOf_START; if (PL_inplace) { - if (!PL_argvout_stack) - PL_argvout_stack = newAV(); assert(PL_defoutgv); - av_push(PL_argvout_stack, SvREFCNT_inc_simple_NN(PL_defoutgv)); + Perl_av_create_and_push(aTHX_ &PL_argvout_stack, + SvREFCNT_inc_simple_NN(PL_defoutgv)); } } if (PL_filemode & (S_ISUID|S_ISGID)) { @@ -763,7 +768,7 @@ Perl_nextargv(pTHX_ register GV *gv) const char *star = strchr(PL_inplace, '*'); if (star) { const char *begin = PL_inplace; - sv_setpvn(sv, "", 0); + sv_setpvs(sv, ""); do { sv_catpvn(sv, begin, star - begin); sv_catpvn(sv, PL_oldname, oldlen); @@ -787,7 +792,7 @@ Perl_nextargv(pTHX_ register GV *gv) if (ckWARN_d(WARN_INPLACE)) Perl_warner(aTHX_ packWARN(WARN_INPLACE), "Can't do inplace edit: %"SVf" would not be unique", - sv); + SVfARG(sv)); do_close(gv,FALSE); continue; } @@ -798,7 +803,7 @@ Perl_nextargv(pTHX_ register GV *gv) if (ckWARN_d(WARN_INPLACE)) Perl_warner(aTHX_ packWARN(WARN_INPLACE), "Can't rename %s to %"SVf": %s, skipping file", - PL_oldname, (void*)sv, Strerror(errno)); + PL_oldname, SVfARG(sv), Strerror(errno)); do_close(gv,FALSE); continue; } @@ -806,8 +811,7 @@ Perl_nextargv(pTHX_ register GV *gv) do_close(gv,FALSE); (void)PerlLIO_unlink(SvPVX_const(sv)); (void)PerlLIO_rename(PL_oldname,SvPVX_const(sv)); - do_open(gv,(char*)SvPVX_const(sv),SvCUR(sv),PL_inplace!=0, - O_RDONLY,0,NULL); + do_open(gv,(char*)SvPVX_const(sv),SvCUR(sv),TRUE,O_RDONLY,0,NULL); #endif /* DOSISH */ #else (void)UNLINK(SvPVX_const(sv)); @@ -815,7 +819,7 @@ Perl_nextargv(pTHX_ register GV *gv) if (ckWARN_d(WARN_INPLACE)) Perl_warner(aTHX_ packWARN(WARN_INPLACE), "Can't rename %s to %"SVf": %s, skipping file", - PL_oldname, sv, Strerror(errno) ); + PL_oldname, SVfARG(sv), Strerror(errno) ); do_close(gv,FALSE); continue; } @@ -839,18 +843,16 @@ Perl_nextargv(pTHX_ register GV *gv) #endif } - sv_setpvn(sv,">",!PL_inplace); - sv_catpvn(sv,PL_oldname,oldlen); + sv_setpvn(sv,PL_oldname,oldlen); SETERRNO(0,0); /* in case sprintf set errno */ + if (!Perl_do_openn(aTHX_ PL_argvoutgv, (char*)SvPVX_const(sv), + SvCUR(sv), TRUE, #ifdef VMS - if (!do_open(PL_argvoutgv,(char*)SvPVX_const(sv),SvCUR(sv), - PL_inplace!=0,O_WRONLY|O_CREAT|O_TRUNC,0,NULL)) + O_WRONLY|O_CREAT|O_TRUNC,0, #else - if (!do_open(PL_argvoutgv,(char*)SvPVX_const(sv),SvCUR(sv), - PL_inplace!=0,O_WRONLY|O_CREAT|OPEN_EXCL,0666, - NULL)) + O_WRONLY|O_CREAT|OPEN_EXCL,0600, #endif - { + NULL, NULL, 0)) { if (ckWARN_d(WARN_INPLACE)) Perl_warner(aTHX_ packWARN(WARN_INPLACE), "Can't do inplace edit on %s: %s", PL_oldname, Strerror(errno) ); @@ -903,7 +905,7 @@ Perl_nextargv(pTHX_ register GV *gv) if (io && (IoFLAGS(io) & IOf_ARGV) && PL_argvout_stack && AvFILLp(PL_argvout_stack) >= 0) { - GV * const oldout = (GV*)av_pop(PL_argvout_stack); + GV * const oldout = MUTABLE_GV(av_pop(PL_argvout_stack)); setdefout(oldout); SvREFCNT_dec(oldout); return NULL; @@ -923,7 +925,7 @@ Perl_do_close(pTHX_ GV *gv, bool not_implicit) if (!gv) gv = PL_argvgv; - if (!gv || SvTYPE(gv) != SVt_PVGV) { + if (!gv || !isGV_with_GP(gv)) { if (not_implicit) SETERRNO(EBADF,SS_IVCHAN); return FALSE; @@ -953,6 +955,8 @@ Perl_io_close(pTHX_ IO *io, bool not_implicit) dVAR; bool retval = FALSE; + PERL_ARGS_ASSERT_IO_CLOSE; + if (IoIFP(io)) { if (IoTYPE(io) == IoTYPE_PIPE) { const int status = PerlProc_pclose(IoIFP(io)); @@ -992,6 +996,8 @@ Perl_do_eof(pTHX_ GV *gv) dVAR; register IO * const io = GvIO(gv); + PERL_ARGS_ASSERT_DO_EOF; + if (!io) return TRUE; else if ((IoTYPE(io) == IoTYPE_WRONLY) && ckWARN(WARN_IO)) @@ -1005,14 +1011,14 @@ Perl_do_eof(pTHX_ GV *gv) { /* getc and ungetc can stomp on errno */ - const int saverrno = errno; + dSAVE_ERRNO; const int ch = PerlIO_getc(IoIFP(io)); if (ch != EOF) { (void)PerlIO_ungetc(IoIFP(io),ch); - errno = saverrno; + RESTORE_ERRNO; return FALSE; } - errno = saverrno; + RESTORE_ERRNO; } if (PerlIO_has_cntptr(IoIFP(io)) && PerlIO_canset_cnt(IoIFP(io))) { @@ -1036,6 +1042,8 @@ Perl_do_tell(pTHX_ GV *gv) register IO *io = NULL; register PerlIO *fp; + PERL_ARGS_ASSERT_DO_TELL; + if (gv && (io = GvIO(gv)) && (fp = IoIFP(io))) { #ifdef ULTRIX_STDIO_BOTCH if (PerlIO_eof(fp)) @@ -1076,6 +1084,8 @@ Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence) register IO *io = NULL; register PerlIO *fp; + PERL_ARGS_ASSERT_DO_SYSSEEK; + if (gv && (io = GvIO(gv)) && (fp = IoIFP(io))) return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence); if (ckWARN2(WARN_UNOPENED,WARN_CLOSED)) @@ -1085,12 +1095,10 @@ Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence) } int -Perl_mode_from_discipline(pTHX_ SV *discp) +Perl_mode_from_discipline(pTHX_ const char *s, STRLEN len) { int mode = O_BINARY; - if (discp) { - STRLEN len; - const char *s = SvPV_const(discp,len); + if (s) { while (*s) { if (*s == ':') { switch (s[1]) { @@ -1197,32 +1205,27 @@ bool Perl_do_print(pTHX_ register SV *sv, PerlIO *fp) { dVAR; - register const char *tmps; - STRLEN len; - U8 *tmpbuf = NULL; - bool happy = TRUE; + + PERL_ARGS_ASSERT_DO_PRINT; /* assuming fp is checked earlier */ if (!sv) return TRUE; - switch (SvTYPE(sv)) { - case SVt_NULL: - if (ckWARN(WARN_UNINITIALIZED)) - report_uninit(sv); - return TRUE; - case SVt_IV: - if (SvIOK(sv)) { - assert(!SvGMAGICAL(sv)); - if (SvIsUV(sv)) - PerlIO_printf(fp, "%"UVuf, (UV)SvUVX(sv)); - else - PerlIO_printf(fp, "%"IVdf, (IV)SvIVX(sv)); - return !PerlIO_error(fp); - } - /* FALL THROUGH */ - default: + if (SvTYPE(sv) == SVt_IV && SvIOK(sv)) { + assert(!SvGMAGICAL(sv)); + if (SvIsUV(sv)) + PerlIO_printf(fp, "%"UVuf, (UV)SvUVX(sv)); + else + PerlIO_printf(fp, "%"IVdf, (IV)SvIVX(sv)); + return !PerlIO_error(fp); + } + else { + STRLEN len; /* Do this first to trigger any overloading. */ - tmps = SvPV_const(sv, len); + const char *tmps = SvPV_const(sv, len); + U8 *tmpbuf = NULL; + bool happy = TRUE; + if (PerlIO_isutf8(fp)) { if (!SvUTF8(sv)) { /* We don't modify the original scalar. */ @@ -1247,18 +1250,17 @@ Perl_do_print(pTHX_ register SV *sv, PerlIO *fp) } } } - break; + /* To detect whether the process is about to overstep its + * filesize limit we would need getrlimit(). We could then + * also transparently raise the limit with setrlimit() -- + * but only until the system hard limit/the filesystem limit, + * at which we would get EPERM. Note that when using buffered + * io the write failure can be delayed until the flush/close. --jhi */ + if (len && (PerlIO_write(fp,tmps,len) == 0)) + happy = FALSE; + Safefree(tmpbuf); + return happy ? !PerlIO_error(fp) : FALSE; } - /* To detect whether the process is about to overstep its - * filesize limit we would need getrlimit(). We could then - * also transparently raise the limit with setrlimit() -- - * but only until the system hard limit/the filesystem limit, - * at which we would get EPERM. Note that when using buffered - * io the write failure can be delayed until the flush/close. --jhi */ - if (len && (PerlIO_write(fp,tmps,len) == 0)) - happy = FALSE; - Safefree(tmpbuf); - return happy ? !PerlIO_error(fp) : FALSE; } I32 @@ -1276,18 +1278,15 @@ Perl_my_stat(pTHX) if (gv == PL_defgv) return PL_laststatval; io = GvIO(gv); + do_fstat_have_io: PL_laststype = OP_STAT; PL_statgv = gv; - sv_setpvn(PL_statname, "", 0); + sv_setpvs(PL_statname, ""); if(io) { if (IoIFP(io)) { return (PL_laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &PL_statcache)); } else if (IoDIRP(io)) { -#ifdef HAS_DIRFD - return (PL_laststatval = PerlLIO_fstat(dirfd(IoDIRP(io)), &PL_statcache)); -#else - Perl_die(aTHX_ PL_no_func, "dirfd"); -#endif + return (PL_laststatval = PerlLIO_fstat(my_dirfd(IoDIRP(io)), &PL_statcache)); } else { if (ckWARN2(WARN_UNOPENED,WARN_CLOSED)) report_evil_fh(gv, io, PL_op->op_type); @@ -1307,14 +1306,19 @@ Perl_my_stat(pTHX) const char *s; STRLEN len; PUTBACK; - if (SvTYPE(sv) == SVt_PVGV) { - gv = (GV*)sv; + if (isGV_with_GP(sv)) { + gv = MUTABLE_GV(sv); goto do_fstat; } - else if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVGV) { - gv = (GV*)SvRV(sv); + else if (SvROK(sv) && isGV_with_GP(SvRV(sv))) { + gv = MUTABLE_GV(SvRV(sv)); goto do_fstat; } + else if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVIO) { + io = MUTABLE_IO(SvRV(sv)); + gv = NULL; + goto do_fstat_have_io; + } s = SvPV_const(sv, len); PL_statgv = NULL; @@ -1336,6 +1340,7 @@ Perl_my_lstat(pTHX) static const char no_prev_lstat[] = "The stat preceding -l _ wasn't an lstat"; dSP; SV *sv; + const char *file; if (PL_op->op_flags & OPf_REF) { EXTEND(SP,1); if (cGVOP_gv == PL_defgv) { @@ -1357,15 +1362,15 @@ Perl_my_lstat(pTHX) PL_statgv = NULL; sv = POPs; PUTBACK; - if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVGV && ckWARN(WARN_IO)) { + if (SvROK(sv) && isGV_with_GP(SvRV(sv)) && ckWARN(WARN_IO)) { Perl_warner(aTHX_ packWARN(WARN_IO), "Use of -l on filehandle %s", - GvENAME((GV*) SvRV(sv))); + GvENAME((const GV *)SvRV(sv))); return (PL_laststatval = -1); } - /* XXX Do really need to be calling SvPV() all these times? */ - sv_setpv(PL_statname,SvPV_nolen_const(sv)); - PL_laststatval = PerlLIO_lstat(SvPV_nolen_const(sv),&PL_statcache); - if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && strchr(SvPV_nolen_const(sv), '\n')) + file = SvPV_nolen_const(sv); + sv_setpv(PL_statname,file); + PL_laststatval = PerlLIO_lstat(file,&PL_statcache); + if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && strchr(file, '\n')) Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "lstat"); return PL_laststatval; } @@ -1374,6 +1379,7 @@ static void S_exec_failed(pTHX_ const char *cmd, int fd, int do_report) { const int e = errno; + PERL_ARGS_ASSERT_EXEC_FAILED; if (ckWARN(WARN_EXEC)) Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s", cmd, Strerror(e)); @@ -1388,18 +1394,19 @@ Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp, int fd, int do_report) { dVAR; -#if defined(MACOS_TRADITIONAL) || defined(__SYMBIAN32__) + PERL_ARGS_ASSERT_DO_AEXEC5; +#if defined(MACOS_TRADITIONAL) || defined(__SYMBIAN32__) || defined(__LIBCATAMOUNT__) Perl_croak(aTHX_ "exec? I'm not *that* kind of operating system"); #else if (sp > mark) { - char **a; + const char **a; const char *tmps = NULL; - Newx(PL_Argv, sp - mark + 1, char*); + Newx(PL_Argv, sp - mark + 1, const char*); a = PL_Argv; while (++mark <= sp) { if (*mark) - *a++ = (char*)SvPV_nolen_const(*mark); + *a++ = SvPV_nolen_const(*mark); else *a++ = ""; } @@ -1438,14 +1445,18 @@ bool Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) { dVAR; - register char **a; + register const char **a; register char *s; + char *buf; char *cmd; - /* Make a copy so we can change it */ const Size_t cmdlen = strlen(incmd) + 1; - Newx(cmd, cmdlen, char); - my_strlcpy(cmd, incmd, cmdlen); + + PERL_ARGS_ASSERT_DO_EXEC3; + + Newx(buf, cmdlen, char); + cmd = buf; + memcpy(cmd, incmd, cmdlen); while (*cmd && isSPACE(*cmd)) cmd++; @@ -1475,11 +1486,11 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) if (s[-1] == '\'') { *--s = '\0'; PERL_FPU_PRE_EXEC - PerlProc_execl(PL_cshname, "csh", flags, ncmd, NULL); + PerlProc_execl(PL_cshname, "csh", flags, ncmd, (char*)NULL); PERL_FPU_POST_EXEC *s = '\''; S_exec_failed(aTHX_ PL_cshname, fd, do_report); - Safefree(cmd); + Safefree(buf); return FALSE; } } @@ -1524,15 +1535,15 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) } doshell: PERL_FPU_PRE_EXEC - PerlProc_execl(PL_sh_path, "sh", "-c", cmd, NULL); + PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char *)NULL); PERL_FPU_POST_EXEC S_exec_failed(aTHX_ PL_sh_path, fd, do_report); - Safefree(cmd); + Safefree(buf); return FALSE; } } - Newx(PL_Argv, (s - cmd) / 2 + 2, char*); + Newx(PL_Argv, (s - cmd) / 2 + 2, const char*); PL_Cmd = savepvn(cmd, s-cmd); a = PL_Argv; for (s = PL_Cmd; *s;) { @@ -1548,7 +1559,7 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) *a = NULL; if (PL_Argv[0]) { PERL_FPU_PRE_EXEC - PerlProc_execvp(PL_Argv[0],PL_Argv); + PerlProc_execvp(PL_Argv[0],EXEC_ARGV_CAST(PL_Argv)); PERL_FPU_POST_EXEC if (errno == ENOEXEC) { /* for system V NIH syndrome */ do_execfree(); @@ -1557,7 +1568,7 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) S_exec_failed(aTHX_ PL_Argv[0], fd, do_report); } do_execfree(); - Safefree(cmd); + Safefree(buf); return FALSE; } @@ -1573,6 +1584,8 @@ Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) const char *s; SV ** const oldmark = mark; + PERL_ARGS_ASSERT_APPLY; + /* Doing this ahead of the switch statement preserves the old behaviour, where attempting to use kill as a taint test test would fail on platforms where kill was not defined. */ @@ -1605,13 +1618,13 @@ Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) case OP_CHMOD: APPLY_TAINT_PROPER(); if (++mark <= sp) { - val = SvIVx(*mark); + val = SvIV(*mark); APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { GV* gv; - if (SvTYPE(*mark) == SVt_PVGV) { - gv = (GV*)*mark; + if (isGV_with_GP(*mark)) { + gv = MUTABLE_GV(*mark); do_fchmod: if (GvIO(gv) && IoIFP(GvIOp(gv))) { #ifdef HAS_FCHMOD @@ -1626,8 +1639,8 @@ Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) tot--; } } - else if (SvROK(*mark) && SvTYPE(SvRV(*mark)) == SVt_PVGV) { - gv = (GV*)SvRV(*mark); + else if (SvROK(*mark) && isGV_with_GP(SvRV(*mark))) { + gv = MUTABLE_GV(SvRV(*mark)); goto do_fchmod; } else { @@ -1650,8 +1663,8 @@ Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) tot = sp - mark; while (++mark <= sp) { GV* gv; - if (SvTYPE(*mark) == SVt_PVGV) { - gv = (GV*)*mark; + if (isGV_with_GP(*mark)) { + gv = MUTABLE_GV(*mark); do_fchown: if (GvIO(gv) && IoIFP(GvIOp(gv))) { #ifdef HAS_FCHOWN @@ -1666,8 +1679,8 @@ Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) tot--; } } - else if (SvROK(*mark) && SvTYPE(SvRV(*mark)) == SVt_PVGV) { - gv = (GV*)SvRV(*mark); + else if (SvROK(*mark) && isGV_with_GP(SvRV(*mark))) { + gv = MUTABLE_GV(SvRV(*mark)); goto do_fchown; } else { @@ -1699,7 +1712,7 @@ nothing in the core. Perl_croak(aTHX_ "Unrecognized signal name \"%s\"",s); } else - val = SvIVx(*mark); + val = SvIV(*mark); APPLY_TAINT_PROPER(); tot = sp - mark; #ifdef VMS @@ -1712,7 +1725,7 @@ nothing in the core. * CRTL's emulation of Unix-style signals and kill() */ while (++mark <= sp) { - I32 proc = SvIVx(*mark); + I32 proc = SvIV(*mark); register unsigned long int __vmssts; APPLY_TAINT_PROPER(); if (!((__vmssts = sys$delprc(&proc,0)) & 1)) { @@ -1736,7 +1749,7 @@ nothing in the core. if (val < 0) { val = -val; while (++mark <= sp) { - const I32 proc = SvIVx(*mark); + const I32 proc = SvIV(*mark); APPLY_TAINT_PROPER(); #ifdef HAS_KILLPG if (PerlProc_killpg(proc,val)) /* BSD */ @@ -1748,7 +1761,7 @@ nothing in the core. } else { while (++mark <= sp) { - const I32 proc = SvIVx(*mark); + const I32 proc = SvIV(*mark); APPLY_TAINT_PROPER(); if (PerlProc_kill(proc, val)) tot--; @@ -1806,29 +1819,30 @@ nothing in the core. else { Zero(&utbuf, sizeof utbuf, char); #ifdef HAS_FUTIMES - utbuf[0].tv_sec = (long)SvIVx(accessed); /* time accessed */ + utbuf[0].tv_sec = (long)SvIV(accessed); /* time accessed */ utbuf[0].tv_usec = 0; - utbuf[1].tv_sec = (long)SvIVx(modified); /* time modified */ + utbuf[1].tv_sec = (long)SvIV(modified); /* time modified */ utbuf[1].tv_usec = 0; #elif defined(BIG_TIME) - utbuf.actime = (Time_t)SvNVx(accessed); /* time accessed */ - utbuf.modtime = (Time_t)SvNVx(modified); /* time modified */ + utbuf.actime = (Time_t)SvNV(accessed); /* time accessed */ + utbuf.modtime = (Time_t)SvNV(modified); /* time modified */ #else - utbuf.actime = (Time_t)SvIVx(accessed); /* time accessed */ - utbuf.modtime = (Time_t)SvIVx(modified); /* time modified */ + utbuf.actime = (Time_t)SvIV(accessed); /* time accessed */ + utbuf.modtime = (Time_t)SvIV(modified); /* time modified */ #endif } APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { GV* gv; - if (SvTYPE(*mark) == SVt_PVGV) { - gv = (GV*)*mark; + if (isGV_with_GP(*mark)) { + gv = MUTABLE_GV(*mark); do_futimes: if (GvIO(gv) && IoIFP(GvIOp(gv))) { #ifdef HAS_FUTIMES APPLY_TAINT_PROPER(); - if (futimes(PerlIO_fileno(IoIFP(GvIOn(gv))), utbufp)) + if (futimes(PerlIO_fileno(IoIFP(GvIOn(gv))), + (struct timeval *) utbufp)) tot--; #else Perl_die(aTHX_ PL_no_func, "futimes"); @@ -1838,15 +1852,15 @@ nothing in the core. tot--; } } - else if (SvROK(*mark) && SvTYPE(SvRV(*mark)) == SVt_PVGV) { - gv = (GV*)SvRV(*mark); + else if (SvROK(*mark) && isGV_with_GP(SvRV(*mark))) { + gv = MUTABLE_GV(SvRV(*mark)); goto do_futimes; } else { const char * const name = SvPV_nolen_const(*mark); APPLY_TAINT_PROPER(); #ifdef HAS_FUTIMES - if (utimes(name, utbufp)) + if (utimes(name, (struct timeval *)utbufp)) #else if (PerlLIO_utime(name, utbufp)) #endif @@ -1874,6 +1888,9 @@ Perl_cando(pTHX_ Mode_t mode, bool effective, register const Stat_t *statbufp) */ { dVAR; + + PERL_ARGS_ASSERT_CANDO; + #ifdef DOSISH /* [Comments and code from Len Reed] * MS-DOS "user" is similar to UNIX's "superuser," but can't write @@ -1923,8 +1940,8 @@ Perl_cando(pTHX_ Mode_t mode, bool effective, register const Stat_t *statbufp) } #endif /* ! VMS */ -bool -Perl_ingroup(pTHX_ Gid_t testgid, bool effective) +static bool +S_ingroup(pTHX_ Gid_t testgid, bool effective) { #ifdef MACOS_TRADITIONAL /* This is simply not correct for AppleShare, but fix it yerself. */ @@ -1967,6 +1984,7 @@ Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) const I32 n = (optype == OP_MSGGET) ? 0 : SvIVx(*++mark); const I32 flags = SvIVx(*++mark); + PERL_ARGS_ASSERT_DO_IPCGET; PERL_UNUSED_ARG(sp); SETERRNO(0,0); @@ -2007,6 +2025,7 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) STRLEN infosize = 0; I32 getinfo = (cmd == IPC_STAT); + PERL_ARGS_ASSERT_DO_IPCCTL; PERL_UNUSED_ARG(sp); switch (optype) @@ -2129,6 +2148,7 @@ Perl_do_msgsnd(pTHX_ SV **mark, SV **sp) const char * const mbuf = SvPV_const(mstr, len); const I32 msize = len - sizeof(long); + PERL_ARGS_ASSERT_DO_MSGSND; PERL_UNUSED_ARG(sp); if (msize < 0) @@ -2136,6 +2156,8 @@ Perl_do_msgsnd(pTHX_ SV **mark, SV **sp) SETERRNO(0,0); return msgsnd(id, (struct msgbuf *)mbuf, msize, flags); #else + PERL_UNUSED_ARG(sp); + PERL_UNUSED_ARG(mark); Perl_croak(aTHX_ "msgsnd not implemented"); #endif } @@ -2150,11 +2172,13 @@ Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) I32 msize, flags, ret; const I32 id = SvIVx(*++mark); SV * const mstr = *++mark; + + PERL_ARGS_ASSERT_DO_MSGRCV; PERL_UNUSED_ARG(sp); /* suppress warning when reading into undef var --jhi */ if (! SvOK(mstr)) - sv_setpvn(mstr, "", 0); + sv_setpvs(mstr, ""); msize = SvIVx(*++mark); mtype = (long)SvIVx(*++mark); flags = SvIVx(*++mark); @@ -2173,6 +2197,8 @@ Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) } return ret; #else + PERL_UNUSED_ARG(sp); + PERL_UNUSED_ARG(mark); Perl_croak(aTHX_ "msgrcv not implemented"); #endif } @@ -2186,6 +2212,8 @@ Perl_do_semop(pTHX_ SV **mark, SV **sp) const I32 id = SvIVx(*++mark); SV * const opstr = *++mark; const char * const opbuf = SvPV_const(opstr, opsize); + + PERL_ARGS_ASSERT_DO_SEMOP; PERL_UNUSED_ARG(sp); if (opsize < 3 * SHORTSIZE @@ -2240,12 +2268,15 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) SV * const mstr = *++mark; const I32 mpos = SvIVx(*++mark); const I32 msize = SvIVx(*++mark); + + PERL_ARGS_ASSERT_DO_SHMIO; PERL_UNUSED_ARG(sp); SETERRNO(0,0); if (shmctl(id, IPC_STAT, &shmds) == -1) return -1; - if (mpos < 0 || msize < 0 || (size_t)mpos + msize > shmds.shm_segsz) { + if (mpos < 0 || msize < 0 + || (size_t)mpos + msize > (size_t)shmds.shm_segsz) { SETERRNO(EFAULT,SS_ACCVIO); /* can't do as caller requested */ return -1; } @@ -2253,10 +2284,10 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) if (shm == (char *)-1) /* I hate System V IPC, I really do */ return -1; if (optype == OP_SHMREAD) { - const char *mbuf; + char *mbuf; /* suppress warning when reading into undef var (tchrist 3/Mar/00) */ if (! SvOK(mstr)) - sv_setpvn(mstr, "", 0); + sv_setpvs(mstr, ""); SvPV_force_nolen(mstr); mbuf = SvGROW(mstr, (STRLEN)msize+1); @@ -2273,7 +2304,7 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) STRLEN len; const char *mbuf = SvPV_const(mstr, len); - const I32 n = (len > msize) ? msize : len; + const I32 n = ((I32)len > msize) ? msize : (I32)len; Copy(mbuf, shm + mpos, n, char); if (n < msize) memzero(shm + mpos + n, msize - n); @@ -2305,6 +2336,9 @@ Perl_start_glob (pTHX_ SV *tmpglob, IO *io) dVAR; SV * const tmpcmd = newSV(0); PerlIO *fp; + + PERL_ARGS_ASSERT_START_GLOB; + ENTER; SAVEFREESV(tmpcmd); #ifdef VMS /* expand the wildcards right here, rather than opening a pipe, */