X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=doio.c;h=e1ddfcb99eb7ab2f83fbfd1091624229ed920800;hb=0bcc34c2b0b0cb62c0df3d5e562b779fb96595ba;hp=224f72d64f0a028aa5c5392a20134e9d4f97f22a;hpb=37442d52629699d89ef62d315d35efbc0facec21;p=p5sagit%2Fp5-mst-13.2.git diff --git a/doio.c b/doio.c index 224f72d..e1ddfcb 100644 --- a/doio.c +++ b/doio.c @@ -59,30 +59,12 @@ #include bool -Perl_do_open(pTHX_ GV *gv, register char *name, I32 len, int as_raw, - int rawmode, int rawperm, PerlIO *supplied_fp) -{ - return do_openn(gv, name, len, as_raw, rawmode, rawperm, - supplied_fp, (SV **) NULL, 0); -} - -bool -Perl_do_open9(pTHX_ GV *gv, register char *name, I32 len, int as_raw, - int rawmode, int rawperm, PerlIO *supplied_fp, SV *svs, - I32 num_svs) -{ - (void)num_svs; - return do_openn(gv, name, len, as_raw, rawmode, rawperm, - supplied_fp, &svs, 1); -} - -bool -Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, +Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV **svp, I32 num_svs) { dVAR; - register IO *io = GvIOn(gv); + register IO * const io = GvIOn(gv); PerlIO *saveifp = Nullfp; PerlIO *saveofp = Nullfp; int savefd = -1; @@ -103,7 +85,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, /* Collect default raw/crlf info from the op */ if (PL_op && PL_op->op_type == OP_OPEN) { /* set up IO layers */ - U8 flags = PL_op->op_private; + const U8 flags = PL_op->op_private; in_raw = (flags & OPpOPEN_IN_RAW); in_crlf = (flags & OPpOPEN_IN_CRLF); out_raw = (flags & OPpOPEN_OUT_RAW); @@ -194,7 +176,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, IoTYPE(io) = PerlIO_intmode2str(rawmode, &mode[ix], &writing); - namesv = sv_2mortal(newSVpvn(name,strlen(name))); + namesv = sv_2mortal(newSVpv(oname,0)); num_svs = 1; svp = &namesv; type = Nullch; @@ -202,18 +184,17 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } else { /* Regular (non-sys) open */ - char *oname = name; + char *name; STRLEN olen = len; char *tend; int dodup = 0; PerlIO *that_fp = NULL; - type = savepvn(name, len); + type = savepvn(oname, len); tend = type+len; SAVEFREEPV(type); /* Lose leading and trailing white space */ - /*SUPPRESS 530*/ for (; isSPACE(*type); type++) ; while (tend > type && isSPACE(tend[-1])) *--tend = '\0'; @@ -221,7 +202,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, if (num_svs) { /* New style explicit name, type is just mode and layer info */ #ifdef USE_STDIO - if (SvROK(*svp) && !strchr(name,'&')) { + if (SvROK(*svp) && !strchr(oname,'&')) { if (ckWARN(WARN_IO)) Perl_warner(aTHX_ packWARN(WARN_IO), "Can't open a reference"); @@ -253,7 +234,6 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } type++; } - /*SUPPRESS 530*/ for (type++; isSPACE(*type); type++) ; if (!num_svs) { name = type; @@ -341,7 +321,6 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, if (num_svs > 1) { Perl_croak(aTHX_ "More than one argument to '%c&' open",IoTYPE(io)); } - /*SUPPRESS 530*/ for (; isSPACE(*type); type++) ; if (num_svs && (SvIOK(*svp) || (SvPOK(*svp) && looks_like_number(*svp)))) { fd = SvUV(*svp); @@ -375,7 +354,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, #ifdef USE_SFIO /* sfio fails to clear error on next sfwrite, contrary to documentation. - -- Nick Clark */ + -- Nicholas Clark */ if (PerlIO_seek(that_fp, 0, SEEK_CUR) == -1) PerlIO_clearerr(that_fp); #endif @@ -411,17 +390,15 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, else was_fdopen = TRUE; if (!(fp = PerlIO_openn(aTHX_ type,mode,fd,0,0,NULL,num_svs,svp))) { - if (dodup) + if (dodup && fd >= 0) PerlLIO_close(fd); } } } } /* & */ else { - /*SUPPRESS 530*/ for (; isSPACE(*type); type++) ; if (*type == IoTYPE_STD && (!type[1] || isSPACE(type[1]) || type[1] == ':')) { - /*SUPPRESS 530*/ type++; fp = PerlIO_stdout(); IoTYPE(io) = IoTYPE_STD; @@ -431,7 +408,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } else { if (!num_svs) { - namesv = sv_2mortal(newSVpvn(type,strlen(type))); + namesv = sv_2mortal(newSVpvn(type,tend - type)); num_svs = 1; svp = &namesv; type = Nullch; @@ -443,7 +420,6 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, goto unknown_open_mode; } /* IoTYPE_WRONLY */ else if (*type == IoTYPE_RDONLY) { - /*SUPPRESS 530*/ for (type++; isSPACE(*type); type++) ; mode[0] = 'r'; #ifdef HAS_STRLCAT @@ -461,7 +437,6 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, goto duplicity; } if (*type == IoTYPE_STD && (!type[1] || isSPACE(type[1]) || type[1] == ':')) { - /*SUPPRESS 530*/ type++; fp = PerlIO_stdin(); IoTYPE(io) = IoTYPE_STD; @@ -471,7 +446,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } else { if (!num_svs) { - namesv = sv_2mortal(newSVpvn(type,strlen(type))); + namesv = sv_2mortal(newSVpvn(type,tend - type)); num_svs = 1; svp = &namesv; type = Nullch; @@ -491,8 +466,8 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, *--tend = '\0'; while (tend > type && isSPACE(tend[-1])) *--tend = '\0'; - /*SUPPRESS 530*/ - for (; isSPACE(*type); type++) ; + for (; isSPACE(*type); type++) + ; name = type; len = tend-type; } @@ -541,8 +516,8 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, goto unknown_open_mode; name = type; IoTYPE(io) = IoTYPE_RDONLY; - /*SUPPRESS 530*/ - for (; isSPACE(*name); name++) ; + for (; isSPACE(*name); name++) + ; mode[0] = 'r'; #ifdef HAS_STRLCAT @@ -563,7 +538,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } else { if (!num_svs) { - namesv = sv_2mortal(newSVpvn(type,strlen(type))); + namesv = sv_2mortal(newSVpvn(type,tend - type)); num_svs = 1; svp = &namesv; type = Nullch; @@ -573,7 +548,10 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } } if (!fp) { - if (ckWARN(WARN_NEWLINE) && IoTYPE(io) == IoTYPE_RDONLY && strchr(name, '\n')) + if (IoTYPE(io) == IoTYPE_RDONLY && ckWARN(WARN_NEWLINE) + && strchr(oname, '\n') + + ) Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "open"); goto say_false; } @@ -673,11 +651,11 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, LOCK_FDPID_MUTEX; sv = *av_fetch(PL_fdpid,fd,TRUE); - (void)SvUPGRADE(sv, SVt_IV); + SvUPGRADE(sv, SVt_IV); pid = SvIVX(sv); SvIV_set(sv, 0); sv = *av_fetch(PL_fdpid,savefd,TRUE); - (void)SvUPGRADE(sv, SVt_IV); + SvUPGRADE(sv, SVt_IV); SvIV_set(sv, pid); UNLOCK_FDPID_MUTEX; } @@ -708,7 +686,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } #if defined(HAS_FCNTL) && defined(F_SETFD) if (fd >= 0) { - int save_errno = errno; + const int save_errno = errno; fcntl(fd,F_SETFD,fd > PL_maxsysfd); /* can change errno */ errno = save_errno; } @@ -751,7 +729,7 @@ Perl_nextargv(pTHX_ register GV *gv) #endif Uid_t fileuid; Gid_t filegid; - IO *io = GvIOp(gv); + IO * const io = GvIOp(gv); if (!PL_argvoutgv) PL_argvoutgv = gv_fetchpv("ARGVOUT",TRUE,SVt_PVIO); @@ -780,7 +758,7 @@ Perl_nextargv(pTHX_ register GV *gv) STRLEN oldlen; sv = av_shift(GvAV(gv)); SAVEFREESV(sv); - sv_setsv(GvSV(gv),sv); + sv_setsv(GvSVn(gv),sv); SvSETMAGIC(GvSV(gv)); PL_oldname = SvPVx(GvSV(gv), oldlen); if (do_open(gv,PL_oldname,oldlen,PL_inplace!=0,O_RDONLY,0,Nullfp)) { @@ -806,9 +784,9 @@ Perl_nextargv(pTHX_ register GV *gv) continue; } if (*PL_inplace) { - char *star = strchr(PL_inplace, '*'); + const char *star = strchr(PL_inplace, '*'); if (star) { - char *begin = PL_inplace; + const char *begin = PL_inplace; sv_setpvn(sv, "", 0); do { sv_catpvn(sv, begin, star - begin); @@ -822,7 +800,7 @@ Perl_nextargv(pTHX_ register GV *gv) sv_catpv(sv,PL_inplace); } #ifndef FLEXFILENAMES - if ((PerlLIO_stat(SvPVX(sv),&PL_statbuf) >= 0 + if ((PerlLIO_stat(SvPVX_const(sv),&PL_statbuf) >= 0 && PL_statbuf.st_dev == filedev && PL_statbuf.st_ino == fileino) #ifdef DJGPP @@ -840,7 +818,7 @@ Perl_nextargv(pTHX_ register GV *gv) #endif #ifdef HAS_RENAME #if !defined(DOSISH) && !defined(__CYGWIN__) && !defined(EPOC) - if (PerlLIO_rename(PL_oldname,SvPVX(sv)) < 0) { + if (PerlLIO_rename(PL_oldname,SvPVX_const(sv)) < 0) { if (ckWARN_d(WARN_INPLACE)) Perl_warner(aTHX_ packWARN(WARN_INPLACE), "Can't rename %s to %"SVf": %s, skipping file", @@ -850,13 +828,14 @@ Perl_nextargv(pTHX_ register GV *gv) } #else do_close(gv,FALSE); - (void)PerlLIO_unlink(SvPVX(sv)); - (void)PerlLIO_rename(PL_oldname,SvPVX(sv)); - do_open(gv,SvPVX(sv),SvCUR(sv),PL_inplace!=0,O_RDONLY,0,Nullfp); + (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,Nullfp); #endif /* DOSISH */ #else - (void)UNLINK(SvPVX(sv)); - if (link(PL_oldname,SvPVX(sv)) < 0) { + (void)UNLINK(SvPVX_const(sv)); + if (link(PL_oldname,SvPVX_const(sv)) < 0) { if (ckWARN_d(WARN_INPLACE)) Perl_warner(aTHX_ packWARN(WARN_INPLACE), "Can't rename %s to %"SVf": %s, skipping file", @@ -888,11 +867,12 @@ Perl_nextargv(pTHX_ register GV *gv) sv_catpvn(sv,PL_oldname,oldlen); SETERRNO(0,0); /* in case sprintf set errno */ #ifdef VMS - if (!do_open(PL_argvoutgv,SvPVX(sv),SvCUR(sv),PL_inplace!=0, - O_WRONLY|O_CREAT|O_TRUNC,0,Nullfp)) + if (!do_open(PL_argvoutgv,(char*)SvPVX_const(sv),SvCUR(sv), + PL_inplace!=0,O_WRONLY|O_CREAT|O_TRUNC,0,Nullfp)) #else - if (!do_open(PL_argvoutgv,SvPVX(sv),SvCUR(sv),PL_inplace!=0, - O_WRONLY|O_CREAT|OPEN_EXCL,0666,Nullfp)) + if (!do_open(PL_argvoutgv,(char*)SvPVX_const(sv),SvCUR(sv), + PL_inplace!=0,O_WRONLY|O_CREAT|OPEN_EXCL,0666, + Nullfp)) #endif { if (ckWARN_d(WARN_INPLACE)) @@ -957,52 +937,6 @@ Perl_nextargv(pTHX_ register GV *gv) return Nullfp; } -#ifdef HAS_PIPE -void -Perl_do_pipe(pTHX_ SV *sv, GV *rgv, GV *wgv) -{ - register IO *rstio; - register IO *wstio; - int fd[2]; - - if (!rgv) - goto badexit; - if (!wgv) - goto badexit; - - rstio = GvIOn(rgv); - wstio = GvIOn(wgv); - - if (IoIFP(rstio)) - do_close(rgv,FALSE); - if (IoIFP(wstio)) - do_close(wgv,FALSE); - - if (PerlProc_pipe(fd) < 0) - goto badexit; - IoIFP(rstio) = PerlIO_fdopen(fd[0], "r"PIPE_OPEN_MODE); - IoOFP(wstio) = PerlIO_fdopen(fd[1], "w"PIPE_OPEN_MODE); - IoOFP(rstio) = IoIFP(rstio); - IoIFP(wstio) = IoOFP(wstio); - IoTYPE(rstio) = IoTYPE_RDONLY; - IoTYPE(wstio) = IoTYPE_WRONLY; - if (!IoIFP(rstio) || !IoOFP(wstio)) { - if (IoIFP(rstio)) PerlIO_close(IoIFP(rstio)); - else PerlLIO_close(fd[0]); - if (IoOFP(wstio)) PerlIO_close(IoOFP(wstio)); - else PerlLIO_close(fd[1]); - goto badexit; - } - - sv_setsv(sv,&PL_sv_yes); - return; - -badexit: - sv_setsv(sv,&PL_sv_undef); - return; -} -#endif - /* explicit renamed to avoid C++ conflict -- kja */ bool Perl_do_close(pTHX_ GV *gv, bool not_implicit) @@ -1045,8 +979,8 @@ Perl_io_close(pTHX_ IO *io, bool not_implicit) if (IoTYPE(io) == IoTYPE_PIPE) { const int status = PerlProc_pclose(IoIFP(io)); if (not_implicit) { - STATUS_NATIVE_SET(status); - retval = (STATUS_POSIX == 0); + STATUS_NATIVE_CHILD_SET(status); + retval = (STATUS_UNIX == 0); } else { retval = (status != -1); @@ -1056,12 +990,12 @@ Perl_io_close(pTHX_ IO *io, bool not_implicit) retval = TRUE; else { if (IoOFP(io) && IoOFP(io) != IoIFP(io)) { /* a socket */ - bool prev_err = PerlIO_error(IoOFP(io)); + const bool prev_err = PerlIO_error(IoOFP(io)); retval = (PerlIO_close(IoOFP(io)) != EOF && !prev_err); PerlIO_close(IoIFP(io)); /* clear stdio, fd already closed */ } else { - bool prev_err = PerlIO_error(IoIFP(io)); + const bool prev_err = PerlIO_error(IoIFP(io)); retval = (PerlIO_close(IoIFP(io)) != EOF && !prev_err); } } @@ -1077,18 +1011,16 @@ Perl_io_close(pTHX_ IO *io, bool not_implicit) bool Perl_do_eof(pTHX_ GV *gv) { - register IO *io; - int ch; - - io = GvIO(gv); + register IO * const io = GvIO(gv); if (!io) return TRUE; - else if (ckWARN(WARN_IO) && (IoTYPE(io) == IoTYPE_WRONLY)) + else if ((IoTYPE(io) == IoTYPE_WRONLY) && ckWARN(WARN_IO)) report_evil_fh(gv, io, OP_phoney_OUTPUT_ONLY); while (IoIFP(io)) { int saverrno; + int ch; if (PerlIO_has_cntptr(IoIFP(io))) { /* (the code works without this) */ if (PerlIO_get_cnt(IoIFP(io)) > 0) /* cheat a little, since */ @@ -1176,7 +1108,7 @@ Perl_mode_from_discipline(pTHX_ SV *discp) int mode = O_BINARY; if (discp) { STRLEN len; - const char *s = SvPV(discp,len); + const char *s = SvPV_const(discp,len); while (*s) { if (*s == ':') { switch (s[1]) { @@ -1226,20 +1158,6 @@ fail_discipline: return mode; } -int -Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode) -{ - /* The old body of this is now in non-LAYER part of perlio.c - * This is a stub for any XS code which might have been calling it. - */ - const char *name = ":raw"; -#ifdef PERLIO_USING_CRLF - if (!(mode & O_BINARY)) - name = ":crlf"; -#endif - return PerlIO_binmode(aTHX_ fp, iotype, mode, name); -} - #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) I32 my_chsize(int fd, Off_t length) @@ -1303,19 +1221,6 @@ Perl_do_print(pTHX_ register SV *sv, PerlIO *fp) /* assuming fp is checked earlier */ if (!sv) return TRUE; - if (PL_ofmt) { - if (SvGMAGICAL(sv)) - mg_get(sv); - if (SvIOK(sv) && SvIVX(sv) != 0) { - PerlIO_printf(fp, PL_ofmt, (NV)SvIVX(sv)); - return !PerlIO_error(fp); - } - if ( (SvNOK(sv) && SvNVX(sv) != 0.0) - || (looks_like_number(sv) && sv_2nv(sv) != 0.0) ) { - PerlIO_printf(fp, PL_ofmt, SvNVX(sv)); - return !PerlIO_error(fp); - } - } switch (SvTYPE(sv)) { case SVt_NULL: if (ckWARN(WARN_UNINITIALIZED)) @@ -1323,8 +1228,7 @@ Perl_do_print(pTHX_ register SV *sv, PerlIO *fp) return TRUE; case SVt_IV: if (SvIOK(sv)) { - if (SvGMAGICAL(sv)) - mg_get(sv); + SvGETMAGIC(sv); if (SvIsUV(sv)) PerlIO_printf(fp, "%"UVuf, (UV)SvUVX(sv)); else @@ -1345,7 +1249,7 @@ Perl_do_print(pTHX_ register SV *sv, PerlIO *fp) Perl_warner(aTHX_ packWARN(WARN_UTF8), "Wide character in print"); } } - tmps = SvPV(sv, len); + tmps = SvPV_const(sv, len); break; } /* To detect whether the process is about to overstep its @@ -1391,7 +1295,7 @@ Perl_my_stat(pTHX) return PL_laststatval; } else { - SV* sv = POPs; + SV* const sv = POPs; const char *s; STRLEN len; PUTBACK; @@ -1404,10 +1308,10 @@ Perl_my_stat(pTHX) goto do_fstat; } - s = SvPV(sv, len); + s = SvPV_const(sv, len); PL_statgv = Nullgv; sv_setpvn(PL_statname, s, len); - s = SvPVX(PL_statname); /* s now NUL-terminated */ + s = SvPVX_const(PL_statname); /* s now NUL-terminated */ PL_laststype = OP_STAT; PL_laststatval = PerlLIO_stat(s, &PL_statcache); if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && strchr(s, '\n')) @@ -1423,7 +1327,6 @@ Perl_my_lstat(pTHX) { dSP; SV *sv; - STRLEN n_a; if (PL_op->op_flags & OPf_REF) { EXTEND(SP,1); if (cGVOP_gv == PL_defgv) { @@ -1437,8 +1340,8 @@ Perl_my_lstat(pTHX) return (PL_laststatval = -1); } } - else if (ckWARN(WARN_IO) && PL_laststype != OP_LSTAT - && (PL_op->op_private & OPpFT_STACKED)) + else if (PL_laststype != OP_LSTAT + && (PL_op->op_private & OPpFT_STACKED) && ckWARN(WARN_IO)) Perl_croak(aTHX_ no_prev_lstat); PL_laststype = OP_LSTAT; @@ -1451,45 +1354,36 @@ Perl_my_lstat(pTHX) return (PL_laststatval = -1); } /* XXX Do really need to be calling SvPV() all these times? */ - sv_setpv(PL_statname,SvPV(sv, n_a)); - PL_laststatval = PerlLIO_lstat(SvPV(sv, n_a),&PL_statcache); - if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && strchr(SvPV(sv, n_a), '\n')) + 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')) Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "lstat"); return PL_laststatval; } -#ifndef OS2 -bool -Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp) -{ - return do_aexec5(really, mark, sp, 0, 0); -} -#endif - bool Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp, int fd, int do_report) { dVAR; -#if defined(MACOS_TRADITIONAL) || defined(SYMBIAN) +#if defined(MACOS_TRADITIONAL) || defined(__SYMBIAN32__) Perl_croak(aTHX_ "exec? I'm not *that* kind of operating system"); #else - register char **a; - const char *tmps = Nullch; - STRLEN n_a; - if (sp > mark) { - New(401,PL_Argv, sp - mark + 1, char*); + char **a; + const char *tmps = Nullch; + Newx(PL_Argv, sp - mark + 1, char*); a = PL_Argv; + while (++mark <= sp) { if (*mark) - *a++ = SvPVx(*mark, n_a); + *a++ = (char*)SvPV_nolen_const(*mark); else *a++ = ""; } *a = Nullch; if (really) - tmps = SvPV(really, n_a); + tmps = SvPV_nolen_const(really); if ((!really && *PL_Argv[0] != '/') || (really && *tmps != '/')) /* will execvp use PATH? */ TAINT_ENV(); /* testing IFS here is overkill, probably */ @@ -1517,30 +1411,27 @@ Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp, void Perl_do_execfree(pTHX) { - if (PL_Argv) { - Safefree(PL_Argv); - PL_Argv = Null(char **); - } - if (PL_Cmd) { - Safefree(PL_Cmd); - PL_Cmd = Nullch; - } + Safefree(PL_Argv); + PL_Argv = Null(char **); + Safefree(PL_Cmd); + PL_Cmd = Nullch; } -#if !defined(OS2) && !defined(WIN32) && !defined(DJGPP) && !defined(EPOC) && !defined(SYMBIAN) && !defined(MACOS_TRADITIONAL) +#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION bool -Perl_do_exec(pTHX_ char *cmd) -{ - return do_exec3(cmd,0,0); -} - -bool -Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) +Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) { dVAR; register char **a; register char *s; + char *cmd; + + /* Make a copy so we can change it */ + const int cmdlen = strlen(incmd); + Newx(cmd, cmdlen+1, char); + strncpy(cmd, incmd, cmdlen); + cmd[cmdlen] = 0; while (*cmd && isSPACE(*cmd)) cmd++; @@ -1569,7 +1460,7 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) if (*s == ' ') s++; if (*s++ == '\'') { - char *ncmd = s; + char * const ncmd = s; while (*s) s++; @@ -1581,6 +1472,7 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) PerlProc_execl(PL_cshname,"csh", flags, ncmd, (char*)0); PERL_FPU_POST_EXEC *s = '\''; + Safefree(cmd); return FALSE; } } @@ -1625,11 +1517,12 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) PERL_FPU_PRE_EXEC PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char*)0); PERL_FPU_POST_EXEC + Safefree(cmd); return FALSE; } } - New(402,PL_Argv, (s - cmd) / 2 + 2, char*); + Newx(PL_Argv, (s - cmd) / 2 + 2, char*); PL_Cmd = savepvn(cmd, s-cmd); a = PL_Argv; for (s = PL_Cmd; *s;) { @@ -1661,6 +1554,7 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) } } do_execfree(); + Safefree(cmd); return FALSE; } @@ -1672,9 +1566,21 @@ Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) register I32 val; register I32 tot = 0; const char *what; - char *s; - SV **oldmark = mark; - STRLEN n_a; + const char *s; + SV ** const oldmark = mark; + + /* 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. */ +#ifndef HAS_KILL + if (type == OP_KILL) + Perl_die(aTHX_ PL_no_func, "kill"); +#endif +#ifndef HAS_CHOWN + if (type == OP_CHOWN) + Perl_die(aTHX_ PL_no_func, "chown"); +#endif + #define APPLY_TAINT_PROPER() \ STMT_START { \ @@ -1700,10 +1606,33 @@ Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - const char *name = SvPVx(*mark, n_a); - APPLY_TAINT_PROPER(); - if (PerlLIO_chmod(name, val)) - tot--; + GV* gv; + if (SvTYPE(*mark) == SVt_PVGV) { + gv = (GV*)*mark; + do_fchmod: + if (GvIO(gv) && IoIFP(GvIOp(gv))) { +#ifdef HAS_FCHMOD + APPLY_TAINT_PROPER(); + if (fchmod(PerlIO_fileno(IoIFP(GvIOn(gv))), val)) + tot--; +#else + Perl_die(aTHX_ PL_no_func, "fchmod"); +#endif + } + else { + tot--; + } + } + else if (SvROK(*mark) && SvTYPE(SvRV(*mark)) == SVt_PVGV) { + gv = (GV*)SvRV(*mark); + goto do_fchmod; + } + else { + const char *name = SvPV_nolen_const(*mark); + APPLY_TAINT_PROPER(); + if (PerlLIO_chmod(name, val)) + tot--; + } } } break; @@ -1718,10 +1647,33 @@ Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - const char *name = SvPVx(*mark, n_a); - APPLY_TAINT_PROPER(); - if (PerlLIO_chown(name, val, val2)) - tot--; + GV* gv; + if (SvTYPE(*mark) == SVt_PVGV) { + gv = (GV*)*mark; + do_fchown: + if (GvIO(gv) && IoIFP(GvIOp(gv))) { +#ifdef HAS_FCHOWN + APPLY_TAINT_PROPER(); + if (fchown(PerlIO_fileno(IoIFP(GvIOn(gv))), val, val2)) + tot--; +#else + Perl_die(aTHX_ PL_no_func, "fchown"); +#endif + } + else { + tot--; + } + } + else if (SvROK(*mark) && SvTYPE(SvRV(*mark)) == SVt_PVGV) { + gv = (GV*)SvRV(*mark); + goto do_fchown; + } + else { + const char *name = SvPV_nolen_const(*mark); + APPLY_TAINT_PROPER(); + if (PerlLIO_chown(name, val, val2)) + tot--; + } } } break; @@ -1738,7 +1690,7 @@ nothing in the core. APPLY_TAINT_PROPER(); if (mark == sp) break; - s = SvPVx(*++mark, n_a); + s = SvPVx_nolen_const(*++mark); if (isALPHA(*s)) { if (*s == 'S' && s[1] == 'I' && s[2] == 'G') s += 3; @@ -1783,7 +1735,7 @@ nothing in the core. if (val < 0) { val = -val; while (++mark <= sp) { - I32 proc = SvIVx(*mark); + const I32 proc = SvIVx(*mark); APPLY_TAINT_PROPER(); #ifdef HAS_KILLPG if (PerlProc_killpg(proc,val)) /* BSD */ @@ -1795,7 +1747,7 @@ nothing in the core. } else { while (++mark <= sp) { - I32 proc = SvIVx(*mark); + const I32 proc = SvIVx(*mark); APPLY_TAINT_PROPER(); if (PerlProc_kill(proc, val)) tot--; @@ -1808,7 +1760,7 @@ nothing in the core. APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - s = SvPVx(*mark, n_a); + s = SvPV_nolen_const(*mark); APPLY_TAINT_PROPER(); if (PL_euid || PL_unsafe) { if (UNLINK(s)) @@ -1824,12 +1776,15 @@ nothing in the core. } } break; -#ifdef HAS_UTIME +#if defined(HAS_UTIME) || defined(HAS_FUTIMES) case OP_UTIME: what = "utime"; APPLY_TAINT_PROPER(); if (sp - mark > 2) { -#if defined(I_UTIME) || defined(VMS) +#if defined(HAS_FUTIMES) + struct timeval utbuf[2]; + void *utbufp = utbuf; +#elif defined(I_UTIME) || defined(VMS) struct utimbuf utbuf; struct utimbuf *utbufp = &utbuf; #else @@ -1840,8 +1795,8 @@ nothing in the core. void *utbufp = &utbuf; #endif - SV* accessed = *++mark; - SV* modified = *++mark; + SV* const accessed = *++mark; + SV* const modified = *++mark; /* Be like C, and if both times are undefined, let the C * library figure out what to do. This usually means @@ -1851,7 +1806,12 @@ nothing in the core. utbufp = NULL; else { Zero(&utbuf, sizeof utbuf, char); -#ifdef BIG_TIME +#ifdef HAS_FUTIMES + utbuf[0].tv_sec = (long)SvIVx(accessed); /* time accessed */ + utbuf[0].tv_usec = 0; + utbuf[1].tv_sec = (long)SvIVx(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 */ #else @@ -1862,11 +1822,38 @@ nothing in the core. APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - STRLEN n_a; - const char *name = SvPVx(*mark, n_a); - APPLY_TAINT_PROPER(); - if (PerlLIO_utime(name, utbufp)) - tot--; + GV* gv; + if (SvTYPE(*mark) == SVt_PVGV) { + gv = (GV*)*mark; + do_futimes: + if (GvIO(gv) && IoIFP(GvIOp(gv))) { +#ifdef HAS_FUTIMES + APPLY_TAINT_PROPER(); + if (futimes(PerlIO_fileno(IoIFP(GvIOn(gv))), utbufp)) + tot--; +#else + Perl_die(aTHX_ PL_no_func, "futimes"); +#endif + } + else { + tot--; + } + } + else if (SvROK(*mark) && SvTYPE(SvRV(*mark)) == SVt_PVGV) { + gv = (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)) +#else + if (PerlLIO_utime(name, utbufp)) +#endif + tot--; + } + } } else @@ -1882,9 +1869,10 @@ nothing in the core. /* Do the permissions allow some operation? Assumes statcache already set. */ #ifndef VMS /* VMS' cando is in vms.c */ bool -Perl_cando(pTHX_ Mode_t mode, Uid_t effective, register const Stat_t *statbufp) -/* Note: we use `effective' both for uids and gids. - * Here we are betting on Uid_t being equal or wider than Gid_t. */ +Perl_cando(pTHX_ Mode_t mode, bool effective, register const Stat_t *statbufp) +/* effective is a flag, true for EUID, or for checking if the effective gid + * is in the list of groups returned from getgroups(). + */ { #ifdef DOSISH /* [Comments and code from Len Reed] @@ -1936,7 +1924,7 @@ Perl_cando(pTHX_ Mode_t mode, Uid_t effective, register const Stat_t *statbufp) #endif /* ! VMS */ bool -Perl_ingroup(pTHX_ Gid_t testgid, Uid_t effective) +Perl_ingroup(pTHX_ Gid_t testgid, bool effective) { #ifdef MACOS_TRADITIONAL /* This is simply not correct for AppleShare, but fix it yerself. */ @@ -1967,7 +1955,7 @@ Perl_ingroup(pTHX_ Gid_t testgid, Uid_t effective) I32 Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) { - key_t key = (key_t)SvNVx(*++mark); + const key_t key = (key_t)SvNVx(*++mark); const I32 n = (optype == OP_MSGGET) ? 0 : SvIVx(*++mark); const I32 flags = SvIVx(*++mark); (void)sp; @@ -1998,18 +1986,16 @@ Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) I32 Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) { - SV *astr; char *a; - I32 infosize, getinfo; I32 ret = -1; const I32 id = SvIVx(*++mark); const I32 n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0; const I32 cmd = SvIVx(*++mark); - (void)sp; + SV * const astr = *++mark; + STRLEN infosize = 0; + I32 getinfo = (cmd == IPC_STAT); - astr = *++mark; - infosize = 0; - getinfo = (cmd == IPC_STAT); + PERL_UNUSED_ARG(sp); switch (optype) { @@ -2059,14 +2045,14 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) if (infosize) { - STRLEN len; if (getinfo) { - SvPV_force(astr, len); + SvPV_force_nolen(astr); a = SvGROW(astr, infosize+1); } else { + STRLEN len; a = SvPV(astr, len); if (len != infosize) Perl_croak(aTHX_ "Bad arg length for %s, is %lu, should be %ld", @@ -2077,7 +2063,7 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) } else { - IV i = SvIV(astr); + const IV i = SvIV(astr); a = INT2PTR(char *,i); /* ouch */ } SETERRNO(0,0); @@ -2123,17 +2109,16 @@ I32 Perl_do_msgsnd(pTHX_ SV **mark, SV **sp) { #ifdef HAS_MSG - SV *mstr; - char *mbuf; - I32 msize, flags; STRLEN len; const I32 id = SvIVx(*++mark); - (void)sp; + SV * const mstr = *++mark; + const I32 flags = SvIVx(*++mark); + const char * const mbuf = SvPV_const(mstr, len); + const I32 msize = len - sizeof(long); - mstr = *++mark; - flags = SvIVx(*++mark); - mbuf = SvPV(mstr, len); - if ((msize = len - sizeof(long)) < 0) + PERL_UNUSED_ARG(sp); + + if (msize < 0) Perl_croak(aTHX_ "Arg too short for msgsnd"); SETERRNO(0,0); return msgsnd(id, (struct msgbuf *)mbuf, msize, flags); @@ -2146,22 +2131,20 @@ I32 Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) { #ifdef HAS_MSG - SV *mstr; char *mbuf; long mtype; I32 msize, flags, ret; - STRLEN len; const I32 id = SvIVx(*++mark); - (void)sp; + SV * const mstr = *++mark; + PERL_UNUSED_ARG(sp); - mstr = *++mark; /* suppress warning when reading into undef var --jhi */ if (! SvOK(mstr)) sv_setpvn(mstr, "", 0); msize = SvIVx(*++mark); mtype = (long)SvIVx(*++mark); flags = SvIVx(*++mark); - SvPV_force(mstr, len); + SvPV_force_nolen(mstr); mbuf = SvGROW(mstr, sizeof(long)+msize+1); SETERRNO(0,0); @@ -2184,14 +2167,12 @@ I32 Perl_do_semop(pTHX_ SV **mark, SV **sp) { #ifdef HAS_SEM - SV *opstr; - char *opbuf; STRLEN opsize; const I32 id = SvIVx(*++mark); - (void)sp; + SV * const opstr = *++mark; + const char * const opbuf = SvPV_const(opstr, opsize); + PERL_UNUSED_ARG(sp); - opstr = *++mark; - opbuf = SvPV(opstr, opsize); if (opsize < 3 * SHORTSIZE || (opsize % (3 * SHORTSIZE))) { SETERRNO(EINVAL,LIB_INVARG); @@ -2202,12 +2183,12 @@ Perl_do_semop(pTHX_ SV **mark, SV **sp) { const int nsops = opsize / (3 * sizeof (short)); int i = nsops; - short *ops = (short *) opbuf; + short * const ops = (short *) opbuf; short *o = ops; struct sembuf *temps, *t; I32 result; - New (0, temps, nsops, struct sembuf); + Newx (temps, nsops, struct sembuf); t = temps; while (i--) { t->sem_num = *o++; @@ -2237,17 +2218,14 @@ I32 Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) { #ifdef HAS_SHM - SV *mstr; char *shm; - I32 mpos, msize; - STRLEN len; struct shmid_ds shmds; const I32 id = SvIVx(*++mark); - (void)sp; + SV * const mstr = *++mark; + const I32 mpos = SvIVx(*++mark); + const I32 msize = SvIVx(*++mark); + PERL_UNUSED_ARG(sp); - mstr = *++mark; - mpos = SvIVx(*++mark); - msize = SvIVx(*++mark); SETERRNO(0,0); if (shmctl(id, IPC_STAT, &shmds) == -1) return -1; @@ -2263,7 +2241,7 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) /* suppress warning when reading into undef var (tchrist 3/Mar/00) */ if (! SvOK(mstr)) sv_setpvn(mstr, "", 0); - SvPV_force(mstr, len); + SvPV_force_nolen(mstr); mbuf = SvGROW(mstr, msize+1); Copy(shm + mpos, mbuf, msize, char); @@ -2277,8 +2255,9 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) } else { I32 n; + STRLEN len; - const char *mbuf = SvPV(mstr, len); + const char *mbuf = SvPV_const(mstr, len); if ((n = len) > msize) n = msize; Copy(mbuf, shm + mpos, n, char); @@ -2310,7 +2289,7 @@ PerlIO * Perl_start_glob (pTHX_ SV *tmpglob, IO *io) { dVAR; - SV *tmpcmd = NEWSV(55, 0); + SV * const tmpcmd = NEWSV(55, 0); PerlIO *fp; ENTER; SAVEFREESV(tmpcmd); @@ -2323,7 +2302,8 @@ Perl_start_glob (pTHX_ SV *tmpglob, IO *io) #include char rslt[NAM$C_MAXRSS+1+sizeof(unsigned short int)] = {'\0','\0'}; char vmsspec[NAM$C_MAXRSS+1]; - char *rstr = rslt + sizeof(unsigned short int), *begin, *end, *cp; + char * const rstr = rslt + sizeof(unsigned short int); + char *begin, *end, *cp; $DESCRIPTOR(dfltdsc,"SYS$DISK:[]*.*;"); PerlIO *tmpfp; STRLEN i; @@ -2356,7 +2336,7 @@ Perl_start_glob (pTHX_ SV *tmpglob, IO *io) } if ((tmpfp = PerlIO_tmpfile()) != NULL) { Stat_t st; - if (!PerlLIO_stat(SvPVX(tmpglob),&st) && S_ISDIR(st.st_mode)) + if (!PerlLIO_stat(SvPVX_const(tmpglob),&st) && S_ISDIR(st.st_mode)) ok = ((wilddsc.dsc$a_pointer = tovmspath(SvPVX(tmpglob),vmsspec)) != NULL); else ok = ((wilddsc.dsc$a_pointer = tovmsspec(SvPVX(tmpglob),vmsspec)) != NULL); if (ok) wilddsc.dsc$w_length = (unsigned short int) strlen(wilddsc.dsc$a_pointer); @@ -2436,7 +2416,7 @@ Perl_start_glob (pTHX_ SV *tmpglob, IO *io) #endif /* !CSH */ #endif /* !DOSISH */ #endif /* MACOS_TRADITIONAL */ - (void)do_open(PL_last_in_gv, SvPVX(tmpcmd), SvCUR(tmpcmd), + (void)do_open(PL_last_in_gv, (char*)SvPVX_const(tmpcmd), SvCUR(tmpcmd), FALSE, O_RDONLY, 0, Nullfp); fp = IoIFP(io); #endif /* !VMS */