X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=doio.c;h=cd470c486b2af88a4c8da463085733df5af6e096;hb=a9a5a0dc04939697af9865334c538bca556f5472;hp=e23a2ca7d34e6429284b911044e76ca8596d544c;hpb=35c1215df9ec9cb54402afdda4ed360fdbf58539;p=p5sagit%2Fp5-mst-13.2.git diff --git a/doio.c b/doio.c index e23a2ca..cd470c4 100644 --- a/doio.c +++ b/doio.c @@ -1,6 +1,7 @@ /* doio.c * - * Copyright (c) 1991-2002, Larry Wall + * 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. @@ -8,10 +9,17 @@ */ /* - * "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. + * For example, pp_print() calls the do_print() function in this file for + * each argument needing printing. */ #include "EXTERN.h" @@ -47,35 +55,20 @@ # define OPEN_EXCL 0 #endif -#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) -#include -#endif - -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); -} +#define PERL_MODE_MAX 8 +#define PERL_FLAGS_MAX 10 -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) -{ - return do_openn(gv, name, len, as_raw, rawmode, rawperm, - supplied_fp, &svs, 1); -} +#include 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) { - register IO *io = GvIOn(gv); - PerlIO *saveifp = Nullfp; - PerlIO *saveofp = Nullfp; + dVAR; + register IO * const io = GvIOn(gv); + PerlIO *saveifp = NULL; + PerlIO *saveofp = NULL; int savefd = -1; char savetype = IoTYPE_CLOSED; int writing = 0; @@ -85,16 +78,18 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, bool was_fdopen = FALSE; bool in_raw = 0, in_crlf = 0, out_raw = 0, out_crlf = 0; char *type = NULL; - char mode[8]; /* stdio file mode ("r\0", "rb\0", "r+b\0" etc.) */ + 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 */ /* Collect default raw/crlf info from the op */ if (PL_op && PL_op->op_type == OP_OPEN) { - /* set up disciplines */ - U8 flags = PL_op->op_private; + /* set up IO layers */ + 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); @@ -134,13 +129,13 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, "Warning: unable to close filehandle %s properly.\n", GvENAME(gv)); } - IoOFP(io) = IoIFP(io) = Nullfp; + IoOFP(io) = IoIFP(io) = NULL; } if (as_raw) { /* sysopen style args, i.e. integer mode and permissions */ STRLEN ix = 0; - int appendtrunc = + const int appendtrunc = 0 #ifdef O_APPEND /* Not fully portable. */ |O_APPEND @@ -149,8 +144,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, |O_TRUNC #endif ; - int modifyingmode = - O_WRONLY|O_RDWR|O_CREAT|appendtrunc; + const int modifyingmode = O_WRONLY|O_RDWR|O_CREAT|appendtrunc; int ismodifying; if (num_svs != 0) { @@ -178,7 +172,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, (ismodifying & (O_CREAT|appendtrunc))) TAINT_PROPER("sysopen"); } - mode[ix++] = '#'; /* Marker to openn to use numeric "sysopen" */ + mode[ix++] = IoTYPE_NUMERIC; /* Marker to openn to use numeric "sysopen" */ #if defined(USE_64_BIT_RAWIO) && defined(O_LARGEFILE) rawmode |= O_LARGEFILE; /* Transparently largefiley. */ @@ -186,35 +180,33 @@ 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 = newSVpvn_flags(oname, len, SVs_TEMP); num_svs = 1; svp = &namesv; - type = Nullch; + type = NULL; fp = PerlIO_openn(aTHX_ type, mode, -1, rawmode, rawperm, NULL, num_svs, svp); } 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 (isSPACE(*type)) + type++; while (tend > type && isSPACE(tend[-1])) *--tend = '\0'; if (num_svs) { - /* New style explict name, type is just mode and discipline/layer info */ - STRLEN l = 0; + /* 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"); @@ -222,9 +214,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, goto say_false; } #endif /* USE_STDIO */ - name = SvOK(*svp) ? SvPV(*svp, l) : ""; - len = (I32)l; - name = savepvn(name, len); + name = SvOK(*svp) ? savesvpv (*svp) : savepvs (""); SAVEFREEPV(name); } else { @@ -235,7 +225,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, if ((*type == IoTYPE_RDWR) && /* scary */ (*(type+1) == IoTYPE_RDONLY || *(type+1) == IoTYPE_WRONLY) && ((!num_svs || (tend > type+1 && tend[-1] != IoTYPE_PIPE)))) { - TAINT_PROPER("open"); + TAINT_PROPER("open"); mode[1] = *type++; writing = 1; } @@ -243,13 +233,14 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, if (*type == IoTYPE_PIPE) { if (num_svs) { if (type[1] != IoTYPE_STD) { - unknown_desr: + unknown_open_mode: Perl_croak(aTHX_ "Unknown open() mode '%.*s'", (int)olen, oname); } type++; } - /*SUPPRESS 530*/ - for (type++; isSPACE(*type); type++) ; + do { + type++; + } while (isSPACE(*type)); if (!num_svs) { name = type; len = tend-type; @@ -261,7 +252,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, errno = EPIPE; goto say_false; } - if (strNE(name,"-") || num_svs) + if (!(*name == '-' && name[1] == '\0') || num_svs) TAINT_ENV(); TAINT_PROPER("piped open"); if (!num_svs && name[len-1] == '|') { @@ -271,10 +262,10 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } mode[0] = 'w'; writing = 1; - if (out_raw) - strcat(mode, "b"); - else if (out_crlf) - strcat(mode, "t"); + if (out_raw) + mode[1] = 'b'; + else if (out_crlf) + mode[1] = 't'; if (num_svs > 1) { fp = PerlProc_popen_list(mode, num_svs, svp); } @@ -288,7 +279,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } } } - } + } /* IoTYPE_PIPE */ else if (*type == IoTYPE_WRONLY) { TAINT_PROPER("open"); type++; @@ -302,11 +293,10 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } writing = 1; - if (out_raw) - strcat(mode, "b"); - else if (out_crlf) - strcat(mode, "t"); - + if (out_raw) + mode[1] = 'b'; + else if (out_crlf) + mode[1] = 't'; if (*type == '&') { duplicity: dodup = PERLIO_DUP_FD; @@ -320,28 +310,28 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, fp = supplied_fp; } else { + PerlIO *that_fp = NULL; if (num_svs > 1) { + /* diag_listed_as: More than one argument to '%s' open */ Perl_croak(aTHX_ "More than one argument to '%c&' open",IoTYPE(io)); } + while (isSPACE(*type)) + type++; if (num_svs && (SvIOK(*svp) || (SvPOK(*svp) && looks_like_number(*svp)))) { fd = SvUV(*svp); num_svs = 0; } else if (isDIGIT(*type)) { - /*SUPPRESS 530*/ - for (; isSPACE(*type); type++) ; fd = atoi(type); } else { - IO* thatio; + const IO* thatio; if (num_svs) { thatio = sv_2io(*svp); } else { - GV *thatgv; - /*SUPPRESS 530*/ - for (; isSPACE(*type); type++) ; - thatgv = gv_fetchpv(type,FALSE,SVt_PVIO); + GV * const thatgv = gv_fetchpvn_flags(type, tend - type, + 0, SVt_PVIO); thatio = GvIO(thatgv); } if (!thatio) { @@ -359,7 +349,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 @@ -385,7 +375,7 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, fd = -1; } if (!num_svs) - type = Nullch; + type = NULL; if (that_fp) { fp = PerlIO_fdupopen(aTHX_ that_fp, NULL, dodup); } @@ -395,67 +385,72 @@ 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++) ; + while (isSPACE(*type)) + type++; if (*type == IoTYPE_STD && (!type[1] || isSPACE(type[1]) || type[1] == ':')) { - /*SUPPRESS 530*/ type++; fp = PerlIO_stdout(); IoTYPE(io) = IoTYPE_STD; if (num_svs > 1) { + /* diag_listed_as: More than one argument to '%s' open */ Perl_croak(aTHX_ "More than one argument to '>%c' open",IoTYPE_STD); } } else { if (!num_svs) { - namesv = sv_2mortal(newSVpvn(type,strlen(type))); + namesv = newSVpvn_flags(type, tend - type, SVs_TEMP); num_svs = 1; svp = &namesv; - type = Nullch; + type = NULL; } fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp); } } /* !& */ - } + if (!fp && type && *type && *type != ':' && !isIDFIRST(*type)) + goto unknown_open_mode; + } /* IoTYPE_WRONLY */ else if (*type == IoTYPE_RDONLY) { - /*SUPPRESS 530*/ - for (type++; isSPACE(*type); type++) ; + do { + type++; + } while (isSPACE(*type)); mode[0] = 'r'; - if (in_raw) - strcat(mode, "b"); - else if (in_crlf) - strcat(mode, "t"); - + if (in_raw) + mode[1] = 'b'; + else if (in_crlf) + mode[1] = 't'; if (*type == '&') { goto duplicity; } if (*type == IoTYPE_STD && (!type[1] || isSPACE(type[1]) || type[1] == ':')) { - /*SUPPRESS 530*/ type++; fp = PerlIO_stdin(); IoTYPE(io) = IoTYPE_STD; if (num_svs > 1) { + /* diag_listed_as: More than one argument to '%s' open */ Perl_croak(aTHX_ "More than one argument to '<%c' open",IoTYPE_STD); } } else { if (!num_svs) { - namesv = sv_2mortal(newSVpvn(type,strlen(type))); + namesv = newSVpvn_flags(type, tend - type, SVs_TEMP); num_svs = 1; svp = &namesv; - type = Nullch; + type = NULL; } fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp); } - } - else if ((num_svs && type[0] == IoTYPE_STD && type[1] == IoTYPE_PIPE) || + if (!fp && type && *type && *type != ':' && !isIDFIRST(*type)) + goto unknown_open_mode; + } /* IoTYPE_RDONLY */ + else if ((num_svs && /* '-|...' or '...|' */ + type[0] == IoTYPE_STD && type[1] == IoTYPE_PIPE) || (!num_svs && tend > type+1 && tend[-1] == IoTYPE_PIPE)) { if (num_svs) { type += 2; /* skip over '-|' */ @@ -464,8 +459,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; } @@ -476,14 +471,16 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, errno = EPIPE; goto say_false; } - if (strNE(name,"-") || num_svs) + if (!(*name == '-' && name[1] == '\0') || num_svs) TAINT_ENV(); TAINT_PROPER("piped open"); mode[0] = 'r'; - if (in_raw) - strcat(mode, "b"); - else if (in_crlf) - strcat(mode, "t"); + + if (in_raw) + mode[1] = 'b'; + else if (in_crlf) + mode[1] = 't'; + if (num_svs > 1) { fp = PerlProc_popen_list(mode,num_svs,svp); } @@ -492,7 +489,8 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } IoTYPE(io) = IoTYPE_PIPE; if (num_svs) { - for (; isSPACE(*type); type++) ; + while (isSPACE(*type)) + type++; if (*type) { if (PerlIO_apply_layers(aTHX_ fp, mode, type) != 0) { goto say_false; @@ -500,35 +498,40 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, } } } - else { + else { /* layer(Args) */ if (num_svs) - goto unknown_desr; + goto unknown_open_mode; name = type; IoTYPE(io) = IoTYPE_RDONLY; - /*SUPPRESS 530*/ - for (; isSPACE(*name); name++) ; + for (; isSPACE(*name); name++) + ; mode[0] = 'r'; - if (in_raw) - strcat(mode, "b"); - else if (in_crlf) - strcat(mode, "t"); - if (strEQ(name,"-")) { + + if (in_raw) + mode[1] = 'b'; + else if (in_crlf) + mode[1] = 't'; + + if (*name == '-' && name[1] == '\0') { fp = PerlIO_stdin(); IoTYPE(io) = IoTYPE_STD; } else { if (!num_svs) { - namesv = sv_2mortal(newSVpvn(type,strlen(type))); + namesv = newSVpvn_flags(type, tend - type, SVs_TEMP); num_svs = 1; svp = &namesv; - type = Nullch; + type = NULL; } fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp); } } } 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; } @@ -626,15 +629,13 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, Pid_t pid; SV *sv; - LOCK_FDPID_MUTEX; sv = *av_fetch(PL_fdpid,fd,TRUE); - (void)SvUPGRADE(sv, SVt_IV); + SvUPGRADE(sv, SVt_IV); pid = SvIVX(sv); - SvIVX(sv) = 0; + SvIV_set(sv, 0); sv = *av_fetch(PL_fdpid,savefd,TRUE); - (void)SvUPGRADE(sv, SVt_IV); - SvIVX(sv) = pid; - UNLOCK_FDPID_MUTEX; + SvUPGRADE(sv, SVt_IV); + SvIV_set(sv, pid); } #endif @@ -642,8 +643,16 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, /* need to close fp without closing underlying fd */ int ofd = PerlIO_fileno(fp); int dupfd = PerlLIO_dup(ofd); +#if defined(HAS_FCNTL) && defined(F_SETFD) + /* Assume if we have F_SETFD we have F_GETFD */ + int coe = fcntl(ofd,F_GETFD); +#endif PerlIO_close(fp); PerlLIO_dup2(dupfd,ofd); +#if defined(HAS_FCNTL) && defined(F_SETFD) + /* The dup trick has lost close-on-exec on ofd */ + fcntl(ofd,F_SETFD, coe); +#endif PerlLIO_close(dupfd); } else @@ -655,9 +664,9 @@ 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; + dSAVE_ERRNO; fcntl(fd,F_SETFD,fd > PL_maxsysfd); /* can change errno */ - errno = save_errno; + RESTORE_ERRNO; } #endif IoIFP(io) = fp; @@ -667,12 +676,12 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, if (IoTYPE(io) == IoTYPE_SOCKET || (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(PL_statbuf.st_mode)) ) { char *s = mode; - if (*s == 'I' || *s == '#') - s++; + if (*s == IoTYPE_IMPLICIT || *s == IoTYPE_NUMERIC) + s++; *s = 'w'; if (!(IoOFP(io) = PerlIO_openn(aTHX_ type,s,fd,0,0,NULL,0,svp))) { PerlIO_close(fp); - IoIFP(io) = Nullfp; + IoIFP(io) = NULL; goto say_false; } } @@ -691,6 +700,7 @@ say_false: PerlIO * Perl_nextargv(pTHX_ register GV *gv) { + dVAR; register SV *sv; #ifndef FLEXFILENAMES int filedev; @@ -698,39 +708,46 @@ Perl_nextargv(pTHX_ register GV *gv) #endif Uid_t fileuid; Gid_t filegid; - IO *io = GvIOp(gv); + IO * const io = GvIOp(gv); + + PERL_ARGS_ASSERT_NEXTARGV; if (!PL_argvoutgv) - PL_argvoutgv = gv_fetchpv("ARGVOUT",TRUE,SVt_PVIO); + 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(); - av_push(PL_argvout_stack, SvREFCNT_inc(PL_defoutgv)); + assert(PL_defoutgv); + Perl_av_create_and_push(aTHX_ &PL_argvout_stack, + SvREFCNT_inc_simple_NN(PL_defoutgv)); } } if (PL_filemode & (S_ISUID|S_ISGID)) { PerlIO_flush(IoIFP(GvIOn(PL_argvoutgv))); /* chmod must follow last write */ #ifdef HAS_FCHMOD - (void)fchmod(PL_lastfd,PL_filemode); + if (PL_lastfd != -1) + (void)fchmod(PL_lastfd,PL_filemode); #else (void)PerlLIO_chmod(PL_oldname,PL_filemode); #endif } + PL_lastfd = -1; PL_filemode = 0; + if (!GvAV(gv)) + return NULL; while (av_len(GvAV(gv)) >= 0) { 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)) { + if (do_open(gv,PL_oldname,oldlen,PL_inplace!=0,O_RDONLY,0,NULL)) { if (PL_inplace) { TAINT_PROPER("inplace open"); if (oldlen == 1 && *PL_oldname == '-') { - setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO)); + setdefout(gv_fetchpvs("STDOUT", GV_ADD|GV_NOTQUAL, + SVt_PVIO)); return IoIFP(GvIOp(gv)); } #ifndef FLEXFILENAMES @@ -741,18 +758,17 @@ Perl_nextargv(pTHX_ register GV *gv) fileuid = PL_statbuf.st_uid; filegid = PL_statbuf.st_gid; if (!S_ISREG(PL_filemode)) { - if (ckWARN_d(WARN_INPLACE)) - Perl_warner(aTHX_ packWARN(WARN_INPLACE), - "Can't do inplace edit: %s is not a regular file", - PL_oldname ); + Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), + "Can't do inplace edit: %s is not a regular file", + PL_oldname ); do_close(gv,FALSE); continue; } if (*PL_inplace) { - char *star = strchr(PL_inplace, '*'); + const char *star = strchr(PL_inplace, '*'); if (star) { - char *begin = PL_inplace; - sv_setpvn(sv, "", 0); + const char *begin = PL_inplace; + sv_setpvs(sv, ""); do { sv_catpvn(sv, begin, star - begin); sv_catpvn(sv, PL_oldname, oldlen); @@ -765,7 +781,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 @@ -773,37 +789,34 @@ Perl_nextargv(pTHX_ register GV *gv) #endif ) { - if (ckWARN_d(WARN_INPLACE)) - Perl_warner(aTHX_ packWARN(WARN_INPLACE), - "Can't do inplace edit: %"SVf" would not be unique", - sv); + Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), + "Can't do inplace edit: %"SVf" would not be unique", + SVfARG(sv)); do_close(gv,FALSE); continue; } #endif #ifdef HAS_RENAME #if !defined(DOSISH) && !defined(__CYGWIN__) && !defined(EPOC) - if (PerlLIO_rename(PL_oldname,SvPVX(sv)) < 0) { - 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) ); + if (PerlLIO_rename(PL_oldname,SvPVX_const(sv)) < 0) { + Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), + "Can't rename %s to %"SVf": %s, skipping file", + PL_oldname, SVfARG(sv), Strerror(errno)); do_close(gv,FALSE); continue; } #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),TRUE,O_RDONLY,0,NULL); #endif /* DOSISH */ #else - (void)UNLINK(SvPVX(sv)); - if (link(PL_oldname,SvPVX(sv)) < 0) { - 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) ); + (void)UNLINK(SvPVX_const(sv)); + if (link(PL_oldname,SvPVX_const(sv)) < 0) { + Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), + "Can't rename %s to %"SVf": %s, skipping file", + PL_oldname, SVfARG(sv), Strerror(errno) ); do_close(gv,FALSE); continue; } @@ -814,10 +827,9 @@ Perl_nextargv(pTHX_ register GV *gv) #if !defined(DOSISH) && !defined(AMIGAOS) # ifndef VMS /* Don't delete; use automatic file versioning */ if (UNLINK(PL_oldname) < 0) { - if (ckWARN_d(WARN_INPLACE)) - Perl_warner(aTHX_ packWARN(WARN_INPLACE), - "Can't remove %s: %s, skipping file", - PL_oldname, Strerror(errno) ); + Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), + "Can't remove %s: %s, skipping file", + PL_oldname, Strerror(errno) ); do_close(gv,FALSE); continue; } @@ -827,20 +839,18 @@ 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,SvPVX(sv),SvCUR(sv),PL_inplace!=0, - O_WRONLY|O_CREAT|O_TRUNC,0,Nullfp)) + O_WRONLY|O_CREAT|O_TRUNC,0, #else - if (!do_open(PL_argvoutgv,SvPVX(sv),SvCUR(sv),PL_inplace!=0, - O_WRONLY|O_CREAT|OPEN_EXCL,0666,Nullfp)) + O_WRONLY|O_CREAT|OPEN_EXCL,0600, #endif - { - if (ckWARN_d(WARN_INPLACE)) - Perl_warner(aTHX_ packWARN(WARN_INPLACE), "Can't do inplace edit on %s: %s", - PL_oldname, Strerror(errno) ); + NULL, NULL, 0)) { + Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), "Can't do inplace edit on %s: %s", + PL_oldname, Strerror(errno) ); do_close(gv,FALSE); continue; } @@ -869,7 +879,7 @@ Perl_nextargv(pTHX_ register GV *gv) } else { if (ckWARN_d(WARN_INPLACE)) { - int eno = errno; + const int eno = errno; if (PerlLIO_stat(PL_oldname, &PL_statbuf) >= 0 && !S_ISREG(PL_statbuf.st_mode)) { @@ -890,72 +900,27 @@ Perl_nextargv(pTHX_ register GV *gv) if (io && (IoFLAGS(io) & IOf_ARGV) && PL_argvout_stack && AvFILLp(PL_argvout_stack) >= 0) { - GV *oldout = (GV*)av_pop(PL_argvout_stack); + GV * const oldout = MUTABLE_GV(av_pop(PL_argvout_stack)); setdefout(oldout); SvREFCNT_dec(oldout); - return Nullfp; + return NULL; } - setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO)); - } - 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"PIPESOCK_MODE); - IoOFP(wstio) = PerlIO_fdopen(fd[1], "w"PIPESOCK_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; + setdefout(gv_fetchpvs("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO)); } - - sv_setsv(sv,&PL_sv_yes); - return; - -badexit: - sv_setsv(sv,&PL_sv_undef); - return; + return NULL; } -#endif /* explicit renamed to avoid C++ conflict -- kja */ bool Perl_do_close(pTHX_ GV *gv, bool not_implicit) { + dVAR; bool retval; IO *io; 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; @@ -982,15 +947,17 @@ Perl_do_close(pTHX_ GV *gv, bool not_implicit) bool Perl_io_close(pTHX_ IO *io, bool not_implicit) { + dVAR; bool retval = FALSE; - int status; + + PERL_ARGS_ASSERT_IO_CLOSE; if (IoIFP(io)) { if (IoTYPE(io) == IoTYPE_PIPE) { - status = PerlProc_pclose(IoIFP(io)); + 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); @@ -1000,13 +967,16 @@ Perl_io_close(pTHX_ IO *io, bool not_implicit) retval = TRUE; else { if (IoOFP(io) && IoOFP(io) != IoIFP(io)) { /* a socket */ - retval = (PerlIO_close(IoOFP(io)) != EOF); + 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 - retval = (PerlIO_close(IoIFP(io)) != EOF); + else { + const bool prev_err = PerlIO_error(IoIFP(io)); + retval = (PerlIO_close(IoIFP(io)) != EOF && !prev_err); + } } - IoOFP(io) = IoIFP(io) = Nullfp; + IoOFP(io) = IoIFP(io) = NULL; } else if (not_implicit) { SETERRNO(EBADF,SS_IVCHAN); @@ -1018,27 +988,32 @@ Perl_io_close(pTHX_ IO *io, bool not_implicit) bool Perl_do_eof(pTHX_ GV *gv) { - register IO *io; - int ch; + dVAR; + register IO * const io = GvIO(gv); - io = GvIO(gv); + PERL_ARGS_ASSERT_DO_EOF; 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)) { - if (PerlIO_has_cntptr(IoIFP(io))) { /* (the code works without this) */ if (PerlIO_get_cnt(IoIFP(io)) > 0) /* cheat a little, since */ return FALSE; /* this is the most usual case */ } - ch = PerlIO_getc(IoIFP(io)); - if (ch != EOF) { - (void)PerlIO_ungetc(IoIFP(io),ch); - return FALSE; + { + /* getc and ungetc can stomp on errno */ + dSAVE_ERRNO; + const int ch = PerlIO_getc(IoIFP(io)); + if (ch != EOF) { + (void)PerlIO_ungetc(IoIFP(io),ch); + RESTORE_ERRNO; + return FALSE; + } + RESTORE_ERRNO; } if (PerlIO_has_cntptr(IoIFP(io)) && PerlIO_canset_cnt(IoIFP(io))) { @@ -1058,9 +1033,12 @@ Perl_do_eof(pTHX_ GV *gv) Off_t Perl_do_tell(pTHX_ GV *gv) { - register IO *io = 0; + dVAR; + 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)) @@ -1077,7 +1055,8 @@ Perl_do_tell(pTHX_ GV *gv) bool Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence) { - register IO *io = 0; + dVAR; + register IO *io = NULL; register PerlIO *fp; if (gv && (io = GvIO(gv)) && (fp = IoIFP(io))) { @@ -1096,9 +1075,12 @@ Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence) Off_t Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence) { - register IO *io = 0; + dVAR; + 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)) @@ -1108,17 +1090,15 @@ 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; - char *s = SvPV(discp,len); + if (s) { while (*s) { if (*s == ':') { switch (s[1]) { case 'r': - if (len > 3 && strnEQ(s+1, "raw", 3) + if (s[2] == 'a' && s[3] == 'w' && (!s[4] || s[4] == ':' || isSPACE(s[4]))) { mode = O_BINARY; @@ -1128,7 +1108,7 @@ Perl_mode_from_discipline(pTHX_ SV *discp) } /* FALL THROUGH */ case 'c': - if (len > 4 && strnEQ(s+1, "crlf", 4) + if (s[2] == 'r' && s[3] == 'l' && s[4] == 'f' && (!s[5] || s[5] == ':' || isSPACE(s[5]))) { mode = O_TEXT; @@ -1146,14 +1126,15 @@ Perl_mode_from_discipline(pTHX_ SV *discp) --len; } else { - char *end; + const char *end; fail_discipline: end = strchr(s+1, ':'); if (!end) end = s+len; #ifndef PERLIO_LAYERS - Perl_croak(aTHX_ "Unknown discipline '%.*s'", end-s, s); + Perl_croak(aTHX_ "IO layers (like '%.*s') unavailable", end-s, s); #else + len -= end-s; s = end; #endif } @@ -1162,29 +1143,14 @@ fail_discipline: return mode; } -int -Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode) +#if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) +I32 +my_chsize(int fd, Off_t length) { - /* 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. - */ - 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) && defined(F_FREESP) +#ifdef F_FREESP /* code courtesy of William Kucharski */ #define HAS_CHSIZE -I32 my_chsize(fd, length) -I32 fd; /* file descriptor */ -Off_t length; /* length to set file to */ -{ - struct flock fl; Stat_t filebuf; if (PerlLIO_fstat(fd, &filebuf) < 0) @@ -1204,7 +1170,7 @@ Off_t length; /* length to set file to */ } else { /* truncate length */ - + struct flock fl; fl.l_whence = 0; fl.l_len = 0; fl.l_start = length; @@ -1222,78 +1188,78 @@ Off_t length; /* length to set file to */ return -1; } - return 0; -} +#else + Perl_croak_nocontext("truncate not implemented"); #endif /* F_FREESP */ + return -1; +} +#endif /* !HAS_TRUNCATE && !HAS_CHSIZE */ bool Perl_do_print(pTHX_ register SV *sv, PerlIO *fp) { - register char *tmps; - STRLEN len; + dVAR; + + PERL_ARGS_ASSERT_DO_PRINT; /* 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); - } + 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); } - switch (SvTYPE(sv)) { - case SVt_NULL: - if (ckWARN(WARN_UNINITIALIZED)) - report_uninit(); - return TRUE; - case SVt_IV: - if (SvIOK(sv)) { - if (SvGMAGICAL(sv)) - mg_get(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: + else { + STRLEN len; + /* Do this first to trigger any overloading. */ + const char *tmps = SvPV_const(sv, len); + U8 *tmpbuf = NULL; + bool happy = TRUE; + if (PerlIO_isutf8(fp)) { - if (!SvUTF8(sv)) - sv_utf8_upgrade(sv = sv_mortalcopy(sv)); + if (!SvUTF8(sv)) { + /* We don't modify the original scalar. */ + tmpbuf = bytes_to_utf8((const U8*) tmps, &len); + tmps = (char *) tmpbuf; + } } else if (DO_UTF8(sv)) { - if (!sv_utf8_downgrade((sv = sv_mortalcopy(sv)), TRUE) - && ckWARN_d(WARN_UTF8)) - { - Perl_warner(aTHX_ packWARN(WARN_UTF8), "Wide character in print"); + STRLEN tmplen = len; + bool utf8 = TRUE; + U8 * const result = bytes_from_utf8((const U8*) tmps, &tmplen, &utf8); + if (!utf8) { + tmpbuf = result; + tmps = (char *) tmpbuf; + len = tmplen; + } + else { + assert((char *)result == tmps); + Perl_ck_warner_d(aTHX_ packWARN(WARN_UTF8), + "Wide character in print"); } } - tmps = SvPV(sv, len); - 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)) - return FALSE; - return !PerlIO_error(fp); } I32 Perl_my_stat(pTHX) { + dVAR; dSP; IO *io; GV* gv; @@ -1302,40 +1268,55 @@ Perl_my_stat(pTHX) EXTEND(SP,1); gv = cGVOP_gv; do_fstat: + if (gv == PL_defgv) + return PL_laststatval; io = GvIO(gv); - if (io && IoIFP(io)) { - PL_statgv = gv; - sv_setpv(PL_statname,""); - PL_laststype = OP_STAT; - return (PL_laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &PL_statcache)); - } - else { - if (gv == PL_defgv) - return PL_laststatval; - if (ckWARN2(WARN_UNOPENED,WARN_CLOSED)) - report_evil_fh(gv, io, PL_op->op_type); - PL_statgv = Nullgv; - sv_setpv(PL_statname,""); - return (PL_laststatval = -1); - } + do_fstat_have_io: + PL_laststype = OP_STAT; + PL_statgv = gv; + sv_setpvs(PL_statname, ""); + if(io) { + if (IoIFP(io)) { + return (PL_laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &PL_statcache)); + } else if (IoDIRP(io)) { + 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); + return (PL_laststatval = -1); + } + } else { + if (ckWARN2(WARN_UNOPENED,WARN_CLOSED)) + report_evil_fh(gv, io, PL_op->op_type); + return (PL_laststatval = -1); + } + } + else if (PL_op->op_private & OPpFT_STACKED) { + return PL_laststatval; } else { - SV* sv = POPs; - char *s; - STRLEN n_a; + SV* const sv = POPs; + 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(sv, n_a); - PL_statgv = Nullgv; - sv_setpv(PL_statname, s); + s = SvPV_const(sv, len); + PL_statgv = NULL; + sv_setpvn(PL_statname, s, len); + 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')) @@ -1344,17 +1325,20 @@ Perl_my_stat(pTHX) } } + I32 Perl_my_lstat(pTHX) { + dVAR; + static const char no_prev_lstat[] = "The stat preceding -l _ wasn't an lstat"; dSP; SV *sv; - STRLEN n_a; + const char *file; if (PL_op->op_flags & OPf_REF) { EXTEND(SP,1); if (cGVOP_gv == PL_defgv) { if (PL_laststype != OP_LSTAT) - Perl_croak(aTHX_ "The stat preceding -l _ wasn't an lstat"); + Perl_croak(aTHX_ no_prev_lstat); return PL_laststatval; } if (ckWARN(WARN_IO)) { @@ -1363,68 +1347,75 @@ Perl_my_lstat(pTHX) return (PL_laststatval = -1); } } + 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; - PL_statgv = Nullgv; + 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); } - 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')) + 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; } -bool -Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp) +static void +S_exec_failed(pTHX_ const char *cmd, int fd, int do_report) { - return do_aexec5(really, mark, sp, 0, 0); + 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)); + if (do_report) { + PerlLIO_write(fd, (void*)&e, sizeof(int)); + PerlLIO_close(fd); + } } bool Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp, int fd, int do_report) { -#ifdef MACOS_TRADITIONAL + dVAR; + PERL_ARGS_ASSERT_DO_AEXEC5; +#if defined(__SYMBIAN32__) || defined(__LIBCATAMOUNT__) Perl_croak(aTHX_ "exec? I'm not *that* kind of operating system"); #else - register char **a; - char *tmps = Nullch; - STRLEN n_a; - if (sp > mark) { - New(401,PL_Argv, sp - mark + 1, char*); + const char **a; + const char *tmps = NULL; + Newx(PL_Argv, sp - mark + 1, const char*); a = PL_Argv; + while (++mark <= sp) { if (*mark) - *a++ = SvPVx(*mark, n_a); + *a++ = SvPV_nolen_const(*mark); else *a++ = ""; } - *a = Nullch; + *a = NULL; 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 */ + PERL_FPU_PRE_EXEC if (really && *tmps) PerlProc_execvp(tmps,EXEC_ARGV_CAST(PL_Argv)); else PerlProc_execvp(PL_Argv[0],EXEC_ARGV_CAST(PL_Argv)); - if (ckWARN(WARN_EXEC)) - Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s", - (really ? tmps : PL_Argv[0]), Strerror(errno)); - if (do_report) { - int e = errno; - - PerlLIO_write(fd, (void*)&e, sizeof(int)); - PerlLIO_close(fd); - } + PERL_FPU_POST_EXEC + S_exec_failed(aTHX_ (really ? tmps : PL_Argv[0]), fd, do_report); } do_execfree(); #endif @@ -1434,29 +1425,31 @@ 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; - } + dVAR; + Safefree(PL_Argv); + PL_Argv = NULL; + Safefree(PL_Cmd); + PL_Cmd = NULL; } -#if !defined(OS2) && !defined(WIN32) && !defined(DJGPP) && !defined(EPOC) && !defined(MACOS_TRADITIONAL) +#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION bool -Perl_do_exec(pTHX_ char *cmd) +Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) { - return do_exec3(cmd,0,0); -} - -bool -Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) -{ - register char **a; + dVAR; + 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; + + PERL_ARGS_ASSERT_DO_EXEC3; + + Newx(buf, cmdlen, char); + cmd = buf; + memcpy(cmd, incmd, cmdlen); while (*cmd && isSPACE(*cmd)) cmd++; @@ -1465,19 +1458,19 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) #ifdef CSH { - char flags[10]; + char flags[PERL_FLAGS_MAX]; if (strnEQ(cmd,PL_cshname,PL_cshlen) && strnEQ(cmd+PL_cshlen," -c",3)) { - strcpy(flags,"-c"); + my_strlcpy(flags, "-c", PERL_FLAGS_MAX); s = cmd+PL_cshlen+3; if (*s == 'f') { s++; - strcat(flags,"f"); + my_strlcat(flags, "f", PERL_FLAGS_MAX - 2); } if (*s == ' ') s++; if (*s++ == '\'') { - char *ncmd = s; + char * const ncmd = s; while (*s) s++; @@ -1485,8 +1478,12 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) *--s = '\0'; if (s[-1] == '\'') { *--s = '\0'; - PerlProc_execl(PL_cshname,"csh", flags, ncmd, (char*)0); + PERL_FPU_PRE_EXEC + PerlProc_execl(PL_cshname, "csh", flags, ncmd, (char*)NULL); + PERL_FPU_POST_EXEC *s = '\''; + S_exec_failed(aTHX_ PL_cshname, fd, do_report); + Safefree(buf); return FALSE; } } @@ -1502,7 +1499,9 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) if (strnEQ(cmd,"exec",4) && isSPACE(cmd[4])) goto doshell; - for (s = cmd; *s && isALNUM(*s); s++) ; /* catch VAR=val gizmo */ + s = cmd; + while (isALNUM(*s)) + s++; /* catch VAR=val gizmo */ if (*s == '=') goto doshell; @@ -1518,52 +1517,51 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) && s > cmd + 1 && s[-1] == '2' && isSPACE(s[-2]) && (!s[3] || isSPACE(s[3]))) { - char *t = s + 3; + const char *t = s + 3; while (*t && isSPACE(*t)) ++t; - if (!*t && (dup2(1,2) != -1)) { + if (!*t && (PerlLIO_dup2(1,2) != -1)) { s[-2] = '\0'; break; } } doshell: - PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char*)0); + PERL_FPU_PRE_EXEC + 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(buf); return FALSE; } } - New(402,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;) { - while (*s && isSPACE(*s)) s++; + while (isSPACE(*s)) + s++; if (*s) *(a++) = s; - while (*s && !isSPACE(*s)) s++; + while (*s && !isSPACE(*s)) + s++; if (*s) *s++ = '\0'; } - *a = Nullch; + *a = NULL; if (PL_Argv[0]) { - PerlProc_execvp(PL_Argv[0],PL_Argv); + PERL_FPU_PRE_EXEC + PerlProc_execvp(PL_Argv[0],EXEC_ARGV_CAST(PL_Argv)); + PERL_FPU_POST_EXEC if (errno == ENOEXEC) { /* for system V NIH syndrome */ do_execfree(); goto doshell; } - { - int e = errno; - - if (ckWARN(WARN_EXEC)) - Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s", - PL_Argv[0], Strerror(errno)); - if (do_report) { - PerlLIO_write(fd, (void*)&e, sizeof(int)); - PerlLIO_close(fd); - } - } + S_exec_failed(aTHX_ PL_Argv[0], fd, do_report); } do_execfree(); + Safefree(buf); return FALSE; } @@ -1572,13 +1570,27 @@ Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) I32 Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) { + dVAR; register I32 val; - register I32 val2; register I32 tot = 0; - char *what; - char *s; - SV **oldmark = mark; - STRLEN n_a; + const char *const what = PL_op_name[type]; + 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. */ +#ifndef HAS_KILL + if (type == OP_KILL) + Perl_die(aTHX_ PL_no_func, what); +#endif +#ifndef HAS_CHOWN + if (type == OP_CHOWN) + Perl_die(aTHX_ PL_no_func, what); +#endif + #define APPLY_TAINT_PROPER() \ STMT_START { \ @@ -1597,34 +1609,79 @@ Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) } switch (type) { case OP_CHMOD: - what = "chmod"; APPLY_TAINT_PROPER(); if (++mark <= sp) { - val = SvIVx(*mark); + val = SvIV(*mark); APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - char *name = SvPVx(*mark, n_a); - APPLY_TAINT_PROPER(); - if (PerlLIO_chmod(name, val)) - tot--; + GV* gv; + if (isGV_with_GP(*mark)) { + gv = MUTABLE_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) && isGV_with_GP(SvRV(*mark))) { + gv = MUTABLE_GV(SvRV(*mark)); + goto do_fchmod; + } + else { + const char *name = SvPV_nolen_const(*mark); + APPLY_TAINT_PROPER(); + if (PerlLIO_chmod(name, val)) + tot--; + } } } break; #ifdef HAS_CHOWN case OP_CHOWN: - what = "chown"; APPLY_TAINT_PROPER(); if (sp - mark > 2) { + register I32 val2; val = SvIVx(*++mark); val2 = SvIVx(*++mark); APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - char *name = SvPVx(*mark, n_a); - APPLY_TAINT_PROPER(); - if (PerlLIO_chown(name, val, val2)) - tot--; + GV* gv; + if (isGV_with_GP(*mark)) { + gv = MUTABLE_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) && isGV_with_GP(SvRV(*mark))) { + gv = MUTABLE_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; @@ -1637,19 +1694,18 @@ nothing in the core. */ #ifdef HAS_KILL case OP_KILL: - what = "kill"; APPLY_TAINT_PROPER(); if (mark == sp) break; - s = SvPVx(*++mark, n_a); - if (isUPPER(*s)) { + s = SvPVx_nolen_const(*++mark); + if (isALPHA(*s)) { if (*s == 'S' && s[1] == 'I' && s[2] == 'G') s += 3; - if (!(val = whichsig(s))) + if ((val = whichsig(s)) < 0) Perl_croak(aTHX_ "Unrecognized signal name \"%s\"",s); } else - val = SvIVx(*mark); + val = SvIV(*mark); APPLY_TAINT_PROPER(); tot = sp - mark; #ifdef VMS @@ -1662,8 +1718,11 @@ nothing in the core. * CRTL's emulation of Unix-style signals and kill() */ while (++mark <= sp) { - I32 proc = SvIVx(*mark); + I32 proc; register unsigned long int __vmssts; + if (!(SvIOK(*mark) || SvNOK(*mark) || looks_like_number(*mark))) + Perl_croak(aTHX_ "Can't kill a non-numeric process ID"); + proc = SvIV(*mark); APPLY_TAINT_PROPER(); if (!((__vmssts = sys$delprc(&proc,0)) & 1)) { tot--; @@ -1686,7 +1745,10 @@ nothing in the core. if (val < 0) { val = -val; while (++mark <= sp) { - I32 proc = SvIVx(*mark); + I32 proc; + if (!(SvIOK(*mark) || SvNOK(*mark) || looks_like_number(*mark))) + Perl_croak(aTHX_ "Can't kill a non-numeric process ID"); + proc = SvIV(*mark); APPLY_TAINT_PROPER(); #ifdef HAS_KILLPG if (PerlProc_killpg(proc,val)) /* BSD */ @@ -1698,7 +1760,10 @@ nothing in the core. } else { while (++mark <= sp) { - I32 proc = SvIVx(*mark); + I32 proc; + if (!(SvIOK(*mark) || SvNOK(*mark) || looks_like_number(*mark))) + Perl_croak(aTHX_ "Can't kill a non-numeric process ID"); + proc = SvIV(*mark); APPLY_TAINT_PROPER(); if (PerlProc_kill(proc, val)) tot--; @@ -1707,11 +1772,10 @@ nothing in the core. break; #endif case OP_UNLINK: - what = "unlink"; 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)) @@ -1727,46 +1791,84 @@ 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 struct { Time_t actime; Time_t modtime; } utbuf; + void *utbufp = &utbuf; #endif - SV* accessed = *++mark; - SV* modified = *++mark; - void * utbufp = &utbuf; + 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 - "current time" */ + /* Be like C, and if both times are undefined, let the C + * library figure out what to do. This usually means + * "current time". */ if ( accessed == &PL_sv_undef && modified == &PL_sv_undef ) - utbufp = NULL; - - Zero(&utbuf, sizeof utbuf, char); -#ifdef BIG_TIME - utbuf.actime = (Time_t)SvNVx(accessed); /* time accessed */ - utbuf.modtime = (Time_t)SvNVx(modified); /* time modified */ + utbufp = NULL; + else { + Zero(&utbuf, sizeof utbuf, char); +#ifdef HAS_FUTIMES + utbuf[0].tv_sec = (long)SvIV(accessed); /* time accessed */ + utbuf[0].tv_usec = 0; + utbuf[1].tv_sec = (long)SvIV(modified); /* time modified */ + utbuf[1].tv_usec = 0; +#elif defined(BIG_TIME) + 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) { - char *name = SvPVx(*mark, n_a); - APPLY_TAINT_PROPER(); - if (PerlLIO_utime(name, utbufp)) - tot--; + GV* gv; + 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))), + (struct timeval *) utbufp)) + tot--; +#else + Perl_die(aTHX_ PL_no_func, "futimes"); +#endif + } + else { + tot--; + } + } + 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, (struct timeval *)utbufp)) +#else + if (PerlLIO_utime(name, utbufp)) +#endif + tot--; + } + } } else @@ -1782,10 +1884,15 @@ 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 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(). + */ { + 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 @@ -1835,29 +1942,31 @@ Perl_cando(pTHX_ Mode_t mode, Uid_t effective, register Stat_t *statbufp) } #endif /* ! VMS */ -bool -Perl_ingroup(pTHX_ Gid_t testgid, Uid_t 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. */ - return TRUE; -#else + dVAR; if (testgid == (effective ? PL_egid : PL_gid)) return TRUE; #ifdef HAS_GETGROUPS -#ifndef NGROUPS -#define NGROUPS 32 -#endif { - Groups_t gary[NGROUPS]; + Groups_t *gary = NULL; I32 anum; + bool rc = FALSE; - anum = getgroups(NGROUPS,gary); + anum = getgroups(0, gary); + Newx(gary, anum, Groups_t); + anum = getgroups(anum, gary); while (--anum >= 0) - if (gary[anum] == testgid) - return TRUE; + if (gary[anum] == testgid) { + rc = TRUE; + break; + } + + Safefree(gary); + return rc; } -#endif +#else return FALSE; #endif } @@ -1867,12 +1976,14 @@ Perl_ingroup(pTHX_ Gid_t testgid, Uid_t effective) I32 Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) { - key_t key; - I32 n, flags; + dVAR; + const key_t key = (key_t)SvNVx(*++mark); + SV *nsv = optype == OP_MSGGET ? NULL : *++mark; + const I32 flags = SvIVx(*++mark); + + PERL_ARGS_ASSERT_DO_IPCGET; + PERL_UNUSED_ARG(sp); - key = (key_t)SvNVx(*++mark); - n = (optype == OP_MSGGET) ? 0 : SvIVx(*++mark); - flags = SvIVx(*++mark); SETERRNO(0,0); switch (optype) { @@ -1882,14 +1993,15 @@ Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) #endif #ifdef HAS_SEM case OP_SEMGET: - return semget(key, n, flags); + return semget(key, (int) SvIV(nsv), flags); #endif #ifdef HAS_SHM case OP_SHMGET: - return shmget(key, n, flags); + return shmget(key, (size_t) SvUV(nsv), flags); #endif #if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM) default: + /* diag_listed_as: msg%s not implemented */ Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]); #endif } @@ -1899,17 +2011,20 @@ Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) I32 Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) { - SV *astr; + dVAR; char *a; - I32 id, n, cmd, infosize, getinfo; I32 ret = -1; + const I32 id = SvIVx(*++mark); +#ifdef Semctl + const I32 n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0; +#endif + const I32 cmd = SvIVx(*++mark); + SV * const astr = *++mark; + STRLEN infosize = 0; + I32 getinfo = (cmd == IPC_STAT); - id = SvIVx(*++mark); - n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0; - cmd = SvIVx(*++mark); - astr = *++mark; - infosize = 0; - getinfo = (cmd == IPC_STAT); + PERL_ARGS_ASSERT_DO_IPCCTL; + PERL_UNUSED_ARG(sp); switch (optype) { @@ -1947,26 +2062,28 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) than guessing about u_?short(_t)? */ } #else + /* diag_listed_as: sem%s not implemented */ Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]); #endif break; #endif #if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM) default: + /* diag_listed_as: shm%s not implemented */ Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]); #endif } 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", @@ -1977,7 +2094,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); @@ -2000,6 +2117,7 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) #endif ret = Semctl(id, n, cmd, unsemds); #else + /* diag_listed_as: sem%s not implemented */ Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]); #endif } @@ -2022,21 +2140,26 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) I32 Perl_do_msgsnd(pTHX_ SV **mark, SV **sp) { + dVAR; #ifdef HAS_MSG - SV *mstr; - char *mbuf; - I32 id, msize, flags; STRLEN len; + const I32 id = SvIVx(*++mark); + SV * const mstr = *++mark; + const I32 flags = SvIVx(*++mark); + const char * const mbuf = SvPV_const(mstr, len); + const I32 msize = len - sizeof(long); - id = SvIVx(*++mark); - mstr = *++mark; - flags = SvIVx(*++mark); - mbuf = SvPV(mstr, len); - if ((msize = len - sizeof(long)) < 0) + PERL_ARGS_ASSERT_DO_MSGSND; + 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); #else + PERL_UNUSED_ARG(sp); + PERL_UNUSED_ARG(mark); + /* diag_listed_as: msg%s not implemented */ Perl_croak(aTHX_ "msgsnd not implemented"); #endif } @@ -2045,21 +2168,23 @@ I32 Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) { #ifdef HAS_MSG - SV *mstr; + dVAR; char *mbuf; long mtype; - I32 id, msize, flags, ret; - STRLEN len; + I32 msize, flags, ret; + const I32 id = SvIVx(*++mark); + SV * const mstr = *++mark; + + PERL_ARGS_ASSERT_DO_MSGRCV; + PERL_UNUSED_ARG(sp); - id = SvIVx(*++mark); - mstr = *++mark; /* 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); - SvPV_force(mstr, len); + SvPV_force_nolen(mstr); mbuf = SvGROW(mstr, sizeof(long)+msize+1); SETERRNO(0,0); @@ -2074,6 +2199,9 @@ Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) } return ret; #else + PERL_UNUSED_ARG(sp); + PERL_UNUSED_ARG(mark); + /* diag_listed_as: msg%s not implemented */ Perl_croak(aTHX_ "msgrcv not implemented"); #endif } @@ -2082,14 +2210,15 @@ I32 Perl_do_semop(pTHX_ SV **mark, SV **sp) { #ifdef HAS_SEM - SV *opstr; - char *opbuf; - I32 id; + dVAR; STRLEN opsize; + 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); - id = SvIVx(*++mark); - opstr = *++mark; - opbuf = SvPV(opstr, opsize); if (opsize < 3 * SHORTSIZE || (opsize % (3 * SHORTSIZE))) { SETERRNO(EINVAL,LIB_INVARG); @@ -2098,14 +2227,14 @@ Perl_do_semop(pTHX_ SV **mark, SV **sp) SETERRNO(0,0); /* We can't assume that sizeof(struct sembuf) == 3 * sizeof(short). */ { - int nsops = opsize / (3 * sizeof (short)); + 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++; @@ -2127,6 +2256,7 @@ Perl_do_semop(pTHX_ SV **mark, SV **sp) return result; } #else + /* diag_listed_as: sem%s not implemented */ Perl_croak(aTHX_ "semop not implemented"); #endif } @@ -2135,32 +2265,35 @@ I32 Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) { #ifdef HAS_SHM - SV *mstr; - char *mbuf, *shm; - I32 id, mpos, msize; - STRLEN len; + dVAR; + char *shm; struct shmid_ds shmds; + const I32 id = SvIVx(*++mark); + SV * const mstr = *++mark; + const I32 mpos = SvIVx(*++mark); + const I32 msize = SvIVx(*++mark); + + PERL_ARGS_ASSERT_DO_SHMIO; + PERL_UNUSED_ARG(sp); - id = SvIVx(*++mark); - mstr = *++mark; - mpos = SvIVx(*++mark); - msize = SvIVx(*++mark); SETERRNO(0,0); if (shmctl(id, IPC_STAT, &shmds) == -1) return -1; - if (mpos < 0 || msize < 0 || 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; } - shm = (char *)shmat(id, (char*)NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0); + shm = (char *)shmat(id, NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0); if (shm == (char *)-1) /* I hate System V IPC, I really do */ return -1; if (optype == OP_SHMREAD) { + char *mbuf; /* suppress warning when reading into undef var (tchrist 3/Mar/00) */ if (! SvOK(mstr)) - sv_setpvn(mstr, "", 0); - SvPV_force(mstr, len); - mbuf = SvGROW(mstr, msize+1); + sv_setpvs(mstr, ""); + SvPV_force_nolen(mstr); + mbuf = SvGROW(mstr, (STRLEN)msize+1); Copy(shm + mpos, mbuf, msize, char); SvCUR_set(mstr, msize); @@ -2172,17 +2305,17 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) #endif } else { - I32 n; + STRLEN len; - mbuf = SvPV(mstr, len); - if ((n = len) > msize) - n = msize; + const char *mbuf = SvPV_const(mstr, 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); } return shmdt(shm); #else + /* diag_listed_as: shm%s not implemented */ Perl_croak(aTHX_ "shm I/O not implemented"); #endif } @@ -2205,99 +2338,25 @@ Moving it away shrinks pp_hot.c; shrinking pp_hot.c helps speed perl up. PerlIO * Perl_start_glob (pTHX_ SV *tmpglob, IO *io) { - SV *tmpcmd = NEWSV(55, 0); + 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, */ /* since spawning off a process is a real performance hit */ - { -#include -#include -#include -#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; - $DESCRIPTOR(dfltdsc,"SYS$DISK:[]*.*;"); - PerlIO *tmpfp; - STRLEN i; - struct dsc$descriptor_s wilddsc - = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; - struct dsc$descriptor_vs rsdsc - = {sizeof rslt, DSC$K_DTYPE_VT, DSC$K_CLASS_VS, rslt}; - unsigned long int cxt = 0, sts = 0, ok = 1, hasdir = 0, hasver = 0, isunix = 0; - - /* We could find out if there's an explicit dev/dir or version - by peeking into lib$find_file's internal context at - ((struct NAM *)((struct FAB *)cxt)->fab$l_nam)->nam$l_fnb - but that's unsupported, so I don't want to do it now and - have it bite someone in the future. */ - cp = SvPV(tmpglob,i); - for (; i; i--) { - if (cp[i] == ';') hasver = 1; - if (cp[i] == '.') { - if (sts) hasver = 1; - else sts = 1; - } - if (cp[i] == '/') { - hasdir = isunix = 1; - break; - } - if (cp[i] == ']' || cp[i] == '>' || cp[i] == ':') { - hasdir = 1; - break; - } - } - if ((tmpfp = PerlIO_tmpfile()) != NULL) { - Stat_t st; - if (!PerlLIO_stat(SvPVX(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); - for (cp=wilddsc.dsc$a_pointer; ok && cp && *cp; cp++) - if (*cp == '?') *cp = '%'; /* VMS style single-char wildcard */ - while (ok && ((sts = lib$find_file(&wilddsc,&rsdsc,&cxt, - &dfltdsc,NULL,NULL,NULL))&1)) { - end = rstr + (unsigned long int) *rslt; - if (!hasver) while (*end != ';') end--; - *(end++) = '\n'; *end = '\0'; - for (cp = rstr; *cp; cp++) *cp = _tolower(*cp); - if (hasdir) { - if (isunix) trim_unixpath(rstr,SvPVX(tmpglob),1); - begin = rstr; - } - else { - begin = end; - while (*(--begin) != ']' && *begin != '>') ; - ++begin; - } - ok = (PerlIO_puts(tmpfp,begin) != EOF); - } - if (cxt) (void)lib$find_file_end(&cxt); - if (ok && sts != RMS$_NMF && - sts != RMS$_DNF && sts != RMS_FNF) ok = 0; - if (!ok) { - if (!(sts & 1)) { - SETERRNO((sts == RMS$_SYN ? EINVAL : EVMSERR),sts); - } - PerlIO_close(tmpfp); - fp = NULL; - } - else { - PerlIO_rewind(tmpfp); - IoTYPE(io) = IoTYPE_RDONLY; - IoIFP(io) = fp = tmpfp; - IoFLAGS(io) &= ~IOf_UNTAINT; /* maybe redundant */ - } - } - } + +PerlIO * +Perl_vms_start_glob + (pTHX_ SV *tmpglob, + IO *io); + + fp = Perl_vms_start_glob(aTHX_ tmpglob, io); + #else /* !VMS */ -#ifdef MACOS_TRADITIONAL - sv_setpv(tmpcmd, "glob "); - sv_catsv(tmpcmd, tmpglob); - sv_catpv(tmpcmd, " |"); -#else #ifdef DOSISH #ifdef OS2 sv_setpv(tmpcmd, "for a in "); @@ -2329,11 +2388,20 @@ Perl_start_glob (pTHX_ SV *tmpglob, IO *io) #endif #endif /* !CSH */ #endif /* !DOSISH */ -#endif /* MACOS_TRADITIONAL */ - (void)do_open(PL_last_in_gv, SvPVX(tmpcmd), SvCUR(tmpcmd), - FALSE, O_RDONLY, 0, Nullfp); + (void)do_open(PL_last_in_gv, (char*)SvPVX_const(tmpcmd), SvCUR(tmpcmd), + FALSE, O_RDONLY, 0, NULL); fp = IoIFP(io); #endif /* !VMS */ LEAVE; return fp; } + +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */