X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/3280af22f58e7b37514ed104858e2c2fc55ceeeb..95667ae449650939b6e6a521264f3846244da96a:/doio.c diff --git a/doio.c b/doio.c index 886add2..d55acb1 100644 --- a/doio.c +++ b/doio.c @@ -1,6 +1,6 @@ /* doio.c * - * Copyright (c) 1991-1997, Larry Wall + * Copyright (c) 1991-1999, Larry Wall * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -15,20 +15,20 @@ */ #include "EXTERN.h" +#define PERL_IN_DOIO_C #include "perl.h" #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) +#ifndef HAS_SEM #include +#endif #ifdef HAS_MSG #include #endif -#ifdef HAS_SEM -#include -#endif #ifdef HAS_SHM #include # ifndef HAS_SHMAT_PROTOTYPE - extern Shmat_t shmat _((int, char *, int)); + extern Shmat_t shmat (int, char *, int); # endif #endif #endif @@ -64,7 +64,12 @@ #if defined(HAS_SOCKET) && !defined(VMS) /* VMS handles sockets via vmsish.h */ # include -# include +# if defined(USE_SOCKS) && defined(I_SOCKS) +# include +# endif +# ifdef I_NETBSD +# include +# endif # ifndef ENOTSOCK # ifdef I_NET_ERRNO # include @@ -82,7 +87,7 @@ #endif bool -do_open(GV *gv, register char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp) +Perl_do_open(pTHX_ GV *gv, register char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp) { register IO *io = GvIOn(gv); PerlIO *saveifp = Nullfp; @@ -125,22 +130,42 @@ do_open(GV *gv, register char *name, I32 len, int as_raw, int rawmode, int rawpe } if (as_raw) { - result = rawmode & 3; - IoTYPE(io) = "<>++"[result]; +#if defined(O_LARGEFILE) + rawmode |= O_LARGEFILE; +#endif + +#ifndef O_ACCMODE +#define O_ACCMODE 3 /* Assume traditional implementation */ +#endif + + switch (result = rawmode & O_ACCMODE) { + case O_RDONLY: + IoTYPE(io) = '<'; + break; + case O_WRONLY: + IoTYPE(io) = '>'; + break; + case O_RDWR: + default: + IoTYPE(io) = '+'; + break; + } + writing = (result > 0); fd = PerlLIO_open3(name, rawmode, rawperm); + if (fd == -1) fp = NULL; else { char *fpmode; - if (result == 0) + if (result == O_RDONLY) fpmode = "r"; #ifdef O_APPEND else if (rawmode & O_APPEND) - fpmode = (result == 1) ? "a" : "a+"; + fpmode = (result == O_WRONLY) ? "a" : "a+"; #endif else - fpmode = (result == 1) ? "w" : "r+"; + fpmode = (result == O_WRONLY) ? "w" : "r+"; fp = PerlIO_fdopen(fd, fpmode); if (!fp) PerlLIO_close(fd); @@ -168,13 +193,21 @@ do_open(GV *gv, register char *name, I32 len, int as_raw, int rawmode, int rawpe if (*name == '|') { /*SUPPRESS 530*/ for (name++; isSPACE(*name); name++) ; + if (*name == '\0') { /* command is missing 19990114 */ + dTHR; + if (ckWARN(WARN_PIPE)) + Perl_warner(aTHX_ WARN_PIPE, "Missing command in piped open"); + errno = EPIPE; + goto say_false; + } if (strNE(name,"-")) TAINT_ENV(); TAINT_PROPER("piped open"); if (name[strlen(name)-1] == '|') { + dTHR; name[strlen(name)-1] = '\0' ; - if (PL_dowarn) - warn("Can't do bidirectional pipe"); + if (ckWARN(WARN_PIPE)) + Perl_warner(aTHX_ WARN_PIPE, "Can't do bidirectional pipe"); } fp = PerlProc_popen(name,"w"); writing = 1; @@ -264,6 +297,13 @@ do_open(GV *gv, register char *name, I32 len, int as_raw, int rawmode, int rawpe name[--len] = '\0'; /*SUPPRESS 530*/ for (; isSPACE(*name); name++) ; + if (*name == '\0') { /* command is missing 19990114 */ + dTHR; + if (ckWARN(WARN_PIPE)) + Perl_warner(aTHX_ WARN_PIPE, "Missing command in piped open"); + errno = EPIPE; + goto say_false; + } if (strNE(name,"-")) TAINT_ENV(); TAINT_PROPER("piped open"); @@ -283,8 +323,9 @@ do_open(GV *gv, register char *name, I32 len, int as_raw, int rawmode, int rawpe } } if (!fp) { - if (PL_dowarn && IoTYPE(io) == '<' && strchr(name, '\n')) - warn(warn_nl, "open"); + dTHR; + if (ckWARN(WARN_NEWLINE) && IoTYPE(io) == '<' && strchr(name, '\n')) + Perl_warner(aTHX_ WARN_NEWLINE, PL_warn_nl, "open"); goto say_false; } if (IoTYPE(io) && @@ -301,7 +342,7 @@ do_open(GV *gv, register char *name, I32 len, int as_raw, int rawmode, int rawpe #ifdef S_IFMT !(PL_statbuf.st_mode & S_IFMT) #else - !statbuf.st_mode + !PL_statbuf.st_mode #endif ) { char tmpbuf[256]; @@ -344,8 +385,12 @@ do_open(GV *gv, register char *name, I32 len, int as_raw, int rawmode, int rawpe PerlIO_clearerr(fp); } #if defined(HAS_FCNTL) && defined(F_SETFD) - fd = PerlIO_fileno(fp); - fcntl(fd,F_SETFD,fd > PL_maxsysfd); + { + int save_errno = errno; + fd = PerlIO_fileno(fp); + fcntl(fd,F_SETFD,fd > PL_maxsysfd); /* can change errno */ + errno = save_errno; + } #endif IoIFP(io) = fp; if (writing) { @@ -371,15 +416,15 @@ say_false: } PerlIO * -nextargv(register GV *gv) +Perl_nextargv(pTHX_ register GV *gv) { register SV *sv; #ifndef FLEXFILENAMES int filedev; int fileino; #endif - int fileuid; - int filegid; + Uid_t fileuid; + Gid_t filegid; if (!PL_argvoutgv) PL_argvoutgv = gv_fetchpv("ARGVOUT",TRUE,SVt_PVIO); @@ -388,7 +433,7 @@ nextargv(register GV *gv) #ifdef HAS_FCHMOD (void)fchmod(PL_lastfd,PL_filemode); #else - (void)PerlLIO_chmod(oldname,filemode); + (void)PerlLIO_chmod(PL_oldname,PL_filemode); #endif } PL_filemode = 0; @@ -400,7 +445,7 @@ nextargv(register GV *gv) sv_setsv(GvSV(gv),sv); SvSETMAGIC(GvSV(gv)); PL_oldname = SvPVx(GvSV(gv), oldlen); - if (do_open(gv,PL_oldname,oldlen,PL_inplace!=0,0,0,Nullfp)) { + if (do_open(gv,PL_oldname,oldlen,PL_inplace!=0,O_RDONLY,0,Nullfp)) { if (PL_inplace) { TAINT_PROPER("inplace open"); if (oldlen == 1 && *PL_oldname == '-') { @@ -408,15 +453,17 @@ nextargv(register GV *gv) return IoIFP(GvIOp(gv)); } #ifndef FLEXFILENAMES - filedev = statbuf.st_dev; - fileino = statbuf.st_ino; + filedev = PL_statbuf.st_dev; + fileino = PL_statbuf.st_ino; #endif PL_filemode = PL_statbuf.st_mode; fileuid = PL_statbuf.st_uid; filegid = PL_statbuf.st_gid; if (!S_ISREG(PL_filemode)) { - warn("Can't do inplace edit: %s is not a regular file", - PL_oldname ); + if (ckWARN_d(WARN_INPLACE)) + Perl_warner(aTHX_ WARN_INPLACE, + "Can't do inplace edit: %s is not a regular file", + PL_oldname ); do_close(gv,FALSE); continue; } @@ -437,15 +484,18 @@ nextargv(register GV *gv) sv_catpv(sv,PL_inplace); } #ifndef FLEXFILENAMES - if (PerlLIO_stat(SvPVX(sv),&statbuf) >= 0 - && statbuf.st_dev == filedev - && statbuf.st_ino == fileino + if (PerlLIO_stat(SvPVX(sv),&PL_statbuf) >= 0 + && PL_statbuf.st_dev == filedev + && PL_statbuf.st_ino == fileino #ifdef DJGPP || (_djstat_fail_bits & _STFAIL_TRUENAME)!=0 #endif - ) { - warn("Can't do inplace edit: %s would not be uniq", - SvPVX(sv) ); + ) + { + if (ckWARN_d(WARN_INPLACE)) + Perl_warner(aTHX_ WARN_INPLACE, + "Can't do inplace edit: %s would not be unique", + SvPVX(sv)); do_close(gv,FALSE); continue; } @@ -453,50 +503,62 @@ nextargv(register GV *gv) #ifdef HAS_RENAME #ifndef DOSISH if (PerlLIO_rename(PL_oldname,SvPVX(sv)) < 0) { - warn("Can't rename %s to %s: %s, skipping file", - PL_oldname, SvPVX(sv), Strerror(errno) ); + if (ckWARN_d(WARN_INPLACE)) + Perl_warner(aTHX_ WARN_INPLACE, + "Can't rename %s to %s: %s, skipping file", + PL_oldname, SvPVX(sv), Strerror(errno) ); do_close(gv,FALSE); continue; } #else do_close(gv,FALSE); (void)PerlLIO_unlink(SvPVX(sv)); - (void)PerlLIO_rename(oldname,SvPVX(sv)); - do_open(gv,SvPVX(sv),SvCUR(sv),inplace!=0,0,0,Nullfp); + (void)PerlLIO_rename(PL_oldname,SvPVX(sv)); + do_open(gv,SvPVX(sv),SvCUR(sv),PL_inplace!=0,O_RDONLY,0,Nullfp); #endif /* DOSISH */ #else (void)UNLINK(SvPVX(sv)); - if (link(oldname,SvPVX(sv)) < 0) { - warn("Can't rename %s to %s: %s, skipping file", - oldname, SvPVX(sv), Strerror(errno) ); + if (link(PL_oldname,SvPVX(sv)) < 0) { + if (ckWARN_d(WARN_INPLACE)) + Perl_warner(aTHX_ WARN_INPLACE, + "Can't rename %s to %s: %s, skipping file", + PL_oldname, SvPVX(sv), Strerror(errno) ); do_close(gv,FALSE); continue; } - (void)UNLINK(oldname); + (void)UNLINK(PL_oldname); #endif } else { #if !defined(DOSISH) && !defined(AMIGAOS) # ifndef VMS /* Don't delete; use automatic file versioning */ if (UNLINK(PL_oldname) < 0) { - warn("Can't remove %s: %s, skipping file", - PL_oldname, Strerror(errno) ); + if (ckWARN_d(WARN_INPLACE)) + Perl_warner(aTHX_ WARN_INPLACE, + "Can't remove %s: %s, skipping file", + PL_oldname, Strerror(errno) ); do_close(gv,FALSE); continue; } # endif #else - croak("Can't do inplace edit without backup"); + Perl_croak(aTHX_ "Can't do inplace edit without backup"); #endif } sv_setpvn(sv,">",!PL_inplace); 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)) { +#else if (!do_open(PL_argvoutgv,SvPVX(sv),SvCUR(sv),PL_inplace!=0, O_WRONLY|O_CREAT|OPEN_EXCL,0666,Nullfp)) { - warn("Can't do inplace edit on %s: %s", - PL_oldname, Strerror(errno) ); +#endif + if (ckWARN_d(WARN_INPLACE)) + Perl_warner(aTHX_ WARN_INPLACE, "Can't do inplace edit on %s: %s", + PL_oldname, Strerror(errno) ); do_close(gv,FALSE); continue; } @@ -508,7 +570,7 @@ nextargv(register GV *gv) #else # if !(defined(WIN32) && defined(__BORLANDC__)) /* Borland runtime creates a readonly file! */ - (void)PerlLIO_chmod(oldname,filemode); + (void)PerlLIO_chmod(PL_oldname,PL_filemode); # endif #endif if (fileuid != PL_statbuf.st_uid || filegid != PL_statbuf.st_gid) { @@ -516,16 +578,25 @@ nextargv(register GV *gv) (void)fchown(PL_lastfd,fileuid,filegid); #else #ifdef HAS_CHOWN - (void)PerlLIO_chown(oldname,fileuid,filegid); + (void)PerlLIO_chown(PL_oldname,fileuid,filegid); #endif #endif } } return IoIFP(GvIOp(gv)); } - else - PerlIO_printf(PerlIO_stderr(), "Can't open %s: %s\n", - SvPV(sv, PL_na), Strerror(errno)); + else { + dTHR; + if (ckWARN_d(WARN_INPLACE)) { + if (!S_ISREG(PL_statbuf.st_mode)) + Perl_warner(aTHX_ WARN_INPLACE, + "Can't do inplace edit: %s is not a regular file", + PL_oldname ); + else + Perl_warner(aTHX_ WARN_INPLACE, "Can't open %s: %s\n", + PL_oldname, Strerror(errno)); + } + } } if (PL_inplace) { (void)do_close(PL_argvoutgv,FALSE); @@ -536,7 +607,7 @@ nextargv(register GV *gv) #ifdef HAS_PIPE void -do_pipe(SV *sv, GV *rgv, GV *wgv) +Perl_do_pipe(pTHX_ SV *sv, GV *rgv, GV *wgv) { register IO *rstio; register IO *wstio; @@ -581,7 +652,7 @@ badexit: /* explicit renamed to avoid C++ conflict -- kja */ bool -do_close(GV *gv, bool not_implicit) +Perl_do_close(pTHX_ GV *gv, bool not_implicit) { bool retval; IO *io; @@ -596,8 +667,10 @@ do_close(GV *gv, bool not_implicit) io = GvIO(gv); if (!io) { /* never opened */ if (not_implicit) { - if (PL_dowarn) - warn("Close on unopened file <%s>",GvENAME(gv)); + dTHR; + if (ckWARN(WARN_UNOPENED)) + Perl_warner(aTHX_ WARN_UNOPENED, + "Close on unopened file <%s>",GvENAME(gv)); SETERRNO(EBADF,SS$_IVCHAN); } return FALSE; @@ -613,7 +686,7 @@ do_close(GV *gv, bool not_implicit) } bool -io_close(IO *io) +Perl_io_close(pTHX_ IO *io) { bool retval = FALSE; int status; @@ -644,7 +717,7 @@ io_close(IO *io) } bool -do_eof(GV *gv) +Perl_do_eof(pTHX_ GV *gv) { dTHR; register IO *io; @@ -654,6 +727,15 @@ do_eof(GV *gv) if (!io) return TRUE; + else if (ckWARN(WARN_IO) + && (IoTYPE(io) == '>' || IoIFP(io) == PerlIO_stdout() + || IoIFP(io) == PerlIO_stderr())) + { + SV* sv = sv_newmortal(); + gv_efullname3(sv, gv, Nullch); + Perl_warner(aTHX_ WARN_IO, "Filehandle %s opened only for output", + SvPV_nolen(sv)); + } while (IoIFP(io)) { @@ -671,7 +753,7 @@ do_eof(GV *gv) if (PerlIO_get_cnt(IoIFP(io)) < -1) PerlIO_set_cnt(IoIFP(io),-1); } - if (op->op_flags & OPf_SPECIAL) { /* not necessarily a real EOF yet? */ + if (PL_op->op_flags & OPf_SPECIAL) { /* not necessarily a real EOF yet? */ if (!nextargv(PL_argvgv)) /* get another fp handy */ return TRUE; } @@ -681,8 +763,8 @@ do_eof(GV *gv) return TRUE; } -long -do_tell(GV *gv) +Off_t +Perl_do_tell(pTHX_ GV *gv) { register IO *io; register PerlIO *fp; @@ -694,14 +776,17 @@ do_tell(GV *gv) #endif return PerlIO_tell(fp); } - if (PL_dowarn) - warn("tell() on unopened file"); + { + dTHR; + if (ckWARN(WARN_UNOPENED)) + Perl_warner(aTHX_ WARN_UNOPENED, "tell() on unopened file"); + } SETERRNO(EBADF,RMS$_IFI); - return -1L; + return (Off_t)-1; } bool -do_seek(GV *gv, long int pos, int whence) +Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence) { register IO *io; register PerlIO *fp; @@ -713,33 +798,39 @@ do_seek(GV *gv, long int pos, int whence) #endif return PerlIO_seek(fp, pos, whence) >= 0; } - if (PL_dowarn) - warn("seek() on unopened file"); + { + dTHR; + if (ckWARN(WARN_UNOPENED)) + Perl_warner(aTHX_ WARN_UNOPENED, "seek() on unopened file"); + } SETERRNO(EBADF,RMS$_IFI); return FALSE; } -long -do_sysseek(GV *gv, long int pos, int whence) +Off_t +Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence) { register IO *io; register PerlIO *fp; if (gv && (io = GvIO(gv)) && (fp = IoIFP(io))) return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence); - if (PL_dowarn) - warn("sysseek() on unopened file"); + { + dTHR; + if (ckWARN(WARN_UNOPENED)) + Perl_warner(aTHX_ WARN_UNOPENED, "sysseek() on unopened file"); + } SETERRNO(EBADF,RMS$_IFI); return -1L; } int -do_binmode(PerlIO *fp, int iotype, int flag) +Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int flag) { if (flag != TRUE) - croak("panic: unsetting binmode"); /* Not implemented yet */ + Perl_croak(aTHX_ "panic: unsetting binmode"); /* Not implemented yet */ #ifdef DOSISH -#ifdef atarist +#if defined(atarist) || defined(__MINT__) if (!PerlIO_flush(fp) && (fp->_flag |= _IOBIN)) return 1; else @@ -763,7 +854,7 @@ do_binmode(PerlIO *fp, int iotype, int flag) #endif #else #if defined(USEMYBINMODE) - if (my_binmode(fp,iotype) != NULL) + if (my_binmode(fp,iotype) != FALSE) return 1; else return 0; @@ -825,7 +916,7 @@ Off_t length; /* length to set file to */ #endif /* F_FREESP */ bool -do_print(register SV *sv, PerlIO *fp) +Perl_do_print(pTHX_ register SV *sv, PerlIO *fp) { register char *tmps; STRLEN len; @@ -837,7 +928,7 @@ do_print(register SV *sv, PerlIO *fp) if (SvGMAGICAL(sv)) mg_get(sv); if (SvIOK(sv) && SvIVX(sv) != 0) { - PerlIO_printf(fp, PL_ofmt, (double)SvIVX(sv)); + PerlIO_printf(fp, PL_ofmt, (NV)SvIVX(sv)); return !PerlIO_error(fp); } if ( (SvNOK(sv) && SvNVX(sv) != 0.0) @@ -848,14 +939,20 @@ do_print(register SV *sv, PerlIO *fp) } switch (SvTYPE(sv)) { case SVt_NULL: - if (PL_dowarn) - warn(warn_uninit); + { + dTHR; + if (ckWARN(WARN_UNINITIALIZED)) + Perl_warner(aTHX_ WARN_UNINITIALIZED, PL_warn_uninit); + } return TRUE; case SVt_IV: if (SvIOK(sv)) { if (SvGMAGICAL(sv)) mg_get(sv); - PerlIO_printf(fp, "%ld", (long)SvIVX(sv)); + if (SvIsUV(sv)) /* XXXX 64-bit? */ + PerlIO_printf(fp, "%lu", (unsigned long)SvUVX(sv)); + else + PerlIO_printf(fp, "%ld", (long)SvIVX(sv)); return !PerlIO_error(fp); } /* FALL THROUGH */ @@ -869,13 +966,13 @@ do_print(register SV *sv, PerlIO *fp) } I32 -my_stat(ARGSproto) +Perl_my_stat(pTHX) { djSP; IO *io; GV* tmpgv; - if (op->op_flags & OPf_REF) { + if (PL_op->op_flags & OPf_REF) { EXTEND(SP,1); tmpgv = cGVOP->op_gv; do_fstat: @@ -889,8 +986,8 @@ my_stat(ARGSproto) else { if (tmpgv == PL_defgv) return PL_laststatval; - if (PL_dowarn) - warn("Stat on unopened file <%s>", + if (ckWARN(WARN_UNOPENED)) + Perl_warner(aTHX_ WARN_UNOPENED, "Stat on unopened file <%s>", GvENAME(tmpgv)); PL_statgv = Nullgv; sv_setpv(PL_statname,""); @@ -900,6 +997,7 @@ my_stat(ARGSproto) else { SV* sv = POPs; char *s; + STRLEN n_a; PUTBACK; if (SvTYPE(sv) == SVt_PVGV) { tmpgv = (GV*)sv; @@ -910,52 +1008,57 @@ my_stat(ARGSproto) goto do_fstat; } - s = SvPV(sv, PL_na); + s = SvPV(sv, n_a); PL_statgv = Nullgv; sv_setpv(PL_statname, s); PL_laststype = OP_STAT; PL_laststatval = PerlLIO_stat(s, &PL_statcache); - if (PL_laststatval < 0 && PL_dowarn && strchr(s, '\n')) - warn(warn_nl, "stat"); + if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && strchr(s, '\n')) + Perl_warner(aTHX_ WARN_NEWLINE, PL_warn_nl, "stat"); return PL_laststatval; } } I32 -my_lstat(ARGSproto) +Perl_my_lstat(pTHX) { djSP; SV *sv; - if (op->op_flags & OPf_REF) { + STRLEN n_a; + if (PL_op->op_flags & OPf_REF) { EXTEND(SP,1); if (cGVOP->op_gv == PL_defgv) { if (PL_laststype != OP_LSTAT) - croak("The stat preceding -l _ wasn't an lstat"); + Perl_croak(aTHX_ "The stat preceding -l _ wasn't an lstat"); return PL_laststatval; } - croak("You can't use -l on a filehandle"); + Perl_croak(aTHX_ "You can't use -l on a filehandle"); } PL_laststype = OP_LSTAT; PL_statgv = Nullgv; sv = POPs; PUTBACK; - sv_setpv(PL_statname,SvPV(sv, PL_na)); -#ifdef HAS_LSTAT - PL_laststatval = PerlLIO_lstat(SvPV(sv, PL_na),&PL_statcache); -#else - laststatval = PerlLIO_stat(SvPV(sv, na),&statcache); -#endif - if (PL_laststatval < 0 && PL_dowarn && strchr(SvPV(sv, PL_na), '\n')) - warn(warn_nl, "lstat"); + 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')) + Perl_warner(aTHX_ WARN_NEWLINE, PL_warn_nl, "lstat"); return PL_laststatval; } bool -do_aexec(SV *really, register SV **mark, register SV **sp) +Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp) +{ + return do_aexec5(really, mark, sp, 0, 0); +} + +bool +Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp, + int fd, int do_report) { register char **a; char *tmps; + STRLEN n_a; if (sp > mark) { dTHR; @@ -963,26 +1066,33 @@ do_aexec(SV *really, register SV **mark, register SV **sp) a = PL_Argv; while (++mark <= sp) { if (*mark) - *a++ = SvPVx(*mark, PL_na); + *a++ = SvPVx(*mark, n_a); else *a++ = ""; } *a = Nullch; if (*PL_Argv[0] != '/') /* will execvp use PATH? */ TAINT_ENV(); /* testing IFS here is overkill, probably */ - if (really && *(tmps = SvPV(really, PL_na))) + if (really && *(tmps = SvPV(really, n_a))) PerlProc_execvp(tmps,PL_Argv); else PerlProc_execvp(PL_Argv[0],PL_Argv); - if (PL_dowarn) - warn("Can't exec \"%s\": %s", PL_Argv[0], Strerror(errno)); + if (ckWARN(WARN_EXEC)) + Perl_warner(aTHX_ WARN_EXEC, "Can't exec \"%s\": %s", + PL_Argv[0], Strerror(errno)); + if (do_report) { + int e = errno; + + PerlLIO_write(fd, (void*)&e, sizeof(int)); + PerlLIO_close(fd); + } } do_execfree(); return FALSE; } void -do_execfree(void) +Perl_do_execfree(pTHX) { if (PL_Argv) { Safefree(PL_Argv); @@ -994,10 +1104,16 @@ do_execfree(void) } } -#if !defined(OS2) && !defined(WIN32) && !defined(DJGPP) +#if !defined(OS2) && !defined(WIN32) && !defined(DJGPP) && !defined(EPOC) bool -do_exec(char *cmd) +Perl_do_exec(pTHX_ char *cmd) +{ + return do_exec3(cmd,0,0); +} + +bool +Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) { register char **a; register char *s; @@ -1053,6 +1169,20 @@ do_exec(char *cmd) *s = '\0'; break; } + /* handle the 2>&1 construct at the end */ + if (*s == '>' && s[1] == '&' && s[2] == '1' + && s > cmd + 1 && s[-1] == '2' && isSPACE(s[-2]) + && (!s[3] || isSPACE(s[3]))) + { + char *t = s + 3; + + while (*t && isSPACE(*t)) + ++t; + if (!*t && (dup2(1,2) != -1)) { + s[-2] = '\0'; + break; + } + } doshell: PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char*)0); return FALSE; @@ -1077,8 +1207,18 @@ do_exec(char *cmd) do_execfree(); goto doshell; } - if (PL_dowarn) - warn("Can't exec \"%s\": %s", PL_Argv[0], Strerror(errno)); + { + dTHR; + int e = errno; + + if (ckWARN(WARN_EXEC)) + Perl_warner(aTHX_ 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); + } + } } do_execfree(); return FALSE; @@ -1087,7 +1227,7 @@ do_exec(char *cmd) #endif /* OS2 || WIN32 */ I32 -apply(I32 type, register SV **mark, register SV **sp) +Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) { dTHR; register I32 val; @@ -1096,10 +1236,11 @@ apply(I32 type, register SV **mark, register SV **sp) char *what; char *s; SV **oldmark = mark; + STRLEN n_a; #define APPLY_TAINT_PROPER() \ STMT_START { \ - if (PL_tainting && PL_tainted) { goto taint_proper_label; } \ + if (PL_tainted) { TAINT_PROPER(what); } \ } STMT_END /* This is a first heuristic; it doesn't catch tainting magic. */ @@ -1121,7 +1262,7 @@ apply(I32 type, register SV **mark, register SV **sp) APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - char *name = SvPVx(*mark, PL_na); + char *name = SvPVx(*mark, n_a); APPLY_TAINT_PROPER(); if (PerlLIO_chmod(name, val)) tot--; @@ -1138,7 +1279,7 @@ apply(I32 type, register SV **mark, register SV **sp) APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - char *name = SvPVx(*mark, PL_na); + char *name = SvPVx(*mark, n_a); APPLY_TAINT_PROPER(); if (PerlLIO_chown(name, val, val2)) tot--; @@ -1158,12 +1299,12 @@ nothing in the core. APPLY_TAINT_PROPER(); if (mark == sp) break; - s = SvPVx(*++mark, PL_na); + s = SvPVx(*++mark, n_a); if (isUPPER(*s)) { if (*s == 'S' && s[1] == 'I' && s[2] == 'G') s += 3; if (!(val = whichsig(s))) - croak("Unrecognized signal name \"%s\"",s); + Perl_croak(aTHX_ "Unrecognized signal name \"%s\"",s); } else val = SvIVx(*mark); @@ -1228,18 +1369,14 @@ nothing in the core. APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - s = SvPVx(*mark, PL_na); + s = SvPVx(*mark, n_a); APPLY_TAINT_PROPER(); if (PL_euid || PL_unsafe) { if (UNLINK(s)) tot--; } else { /* don't let root wipe out directories without -U */ -#ifdef HAS_LSTAT if (PerlLIO_lstat(s,&PL_statbuf) < 0 || S_ISDIR(PL_statbuf.st_mode)) -#else - if (PerlLIO_stat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode)) -#endif tot--; else { if (UNLINK(s)) @@ -1257,23 +1394,23 @@ nothing in the core. struct utimbuf utbuf; #else struct { - long actime; - long modtime; + Time_t actime; + Time_t modtime; } utbuf; #endif Zero(&utbuf, sizeof utbuf, char); #ifdef BIG_TIME - utbuf.actime = (Time_t)SvNVx(*++mark); /* time accessed */ - utbuf.modtime = (Time_t)SvNVx(*++mark); /* time modified */ + utbuf.actime = (Time_t)SvNVx(*++mark); /* time accessed */ + utbuf.modtime = (Time_t)SvNVx(*++mark); /* time modified */ #else - utbuf.actime = SvIVx(*++mark); /* time accessed */ - utbuf.modtime = SvIVx(*++mark); /* time modified */ + utbuf.actime = (Time_t)SvIVx(*++mark); /* time accessed */ + utbuf.modtime = (Time_t)SvIVx(*++mark); /* time modified */ #endif APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - char *name = SvPVx(*mark, PL_na); + char *name = SvPVx(*mark, n_a); APPLY_TAINT_PROPER(); if (PerlLIO_utime(name, &utbuf)) tot--; @@ -1286,17 +1423,13 @@ nothing in the core. } return tot; - taint_proper_label: - TAINT_PROPER(what); - return 0; /* this should never happen */ - #undef APPLY_TAINT_PROPER } /* Do the permissions allow some operation? Assumes statcache already set. */ #ifndef VMS /* VMS' cando is in vms.c */ I32 -cando(I32 bit, I32 effective, register struct stat *statbufp) +Perl_cando(pTHX_ I32 bit, I32 effective, register struct stat *statbufp) { #ifdef DOSISH /* [Comments and code from Len Reed] @@ -1348,7 +1481,7 @@ cando(I32 bit, I32 effective, register struct stat *statbufp) #endif /* ! VMS */ I32 -ingroup(I32 testgid, I32 effective) +Perl_ingroup(pTHX_ I32 testgid, I32 effective) { if (testgid == (effective ? PL_egid : PL_gid)) return TRUE; @@ -1372,7 +1505,7 @@ ingroup(I32 testgid, I32 effective) #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) I32 -do_ipcget(I32 optype, SV **mark, SV **sp) +Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) { dTHR; key_t key; @@ -1398,14 +1531,14 @@ do_ipcget(I32 optype, SV **mark, SV **sp) #endif #if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM) default: - croak("%s not implemented", op_desc[optype]); + Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]); #endif } return -1; /* should never happen */ } I32 -do_ipcctl(I32 optype, SV **mark, SV **sp) +Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) { dTHR; SV *astr; @@ -1436,6 +1569,7 @@ do_ipcctl(I32 optype, SV **mark, SV **sp) #endif #ifdef HAS_SEM case OP_SEMCTL: +#ifdef Semctl if (cmd == IPC_STAT || cmd == IPC_SET) infosize = sizeof(struct semid_ds); else if (cmd == GETALL || cmd == SETALL) @@ -1451,11 +1585,14 @@ do_ipcctl(I32 optype, SV **mark, SV **sp) /* "short" is technically wrong but much more portable than guessing about u_?short(_t)? */ } +#else + Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]); +#endif break; #endif #if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM) default: - croak("%s not implemented", op_desc[optype]); + Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]); #endif } @@ -1471,8 +1608,10 @@ do_ipcctl(I32 optype, SV **mark, SV **sp) { a = SvPV(astr, len); if (len != infosize) - croak("Bad arg length for %s, is %lu, should be %ld", - op_desc[optype], (unsigned long)len, (long)infosize); + Perl_croak(aTHX_ "Bad arg length for %s, is %lu, should be %ld", + PL_op_desc[optype], + (unsigned long)len, + (long)infosize); } } else @@ -1490,10 +1629,14 @@ do_ipcctl(I32 optype, SV **mark, SV **sp) #endif #ifdef HAS_SEM case OP_SEMCTL: { +#ifdef Semctl union semun unsemds; unsemds.buf = (struct semid_ds *)a; ret = Semctl(id, n, cmd, unsemds); +#else + Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]); +#endif } break; #endif @@ -1512,7 +1655,7 @@ do_ipcctl(I32 optype, SV **mark, SV **sp) } I32 -do_msgsnd(SV **mark, SV **sp) +Perl_do_msgsnd(pTHX_ SV **mark, SV **sp) { #ifdef HAS_MSG dTHR; @@ -1526,16 +1669,16 @@ do_msgsnd(SV **mark, SV **sp) flags = SvIVx(*++mark); mbuf = SvPV(mstr, len); if ((msize = len - sizeof(long)) < 0) - croak("Arg too short for msgsnd"); + Perl_croak(aTHX_ "Arg too short for msgsnd"); SETERRNO(0,0); return msgsnd(id, (struct msgbuf *)mbuf, msize, flags); #else - croak("msgsnd not implemented"); + Perl_croak(aTHX_ "msgsnd not implemented"); #endif } I32 -do_msgrcv(SV **mark, SV **sp) +Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) { #ifdef HAS_MSG dTHR; @@ -1550,12 +1693,6 @@ do_msgrcv(SV **mark, SV **sp) msize = SvIVx(*++mark); mtype = (long)SvIVx(*++mark); flags = SvIVx(*++mark); - if (SvTHINKFIRST(mstr)) { - if (SvREADONLY(mstr)) - croak("Can't msgrcv to readonly var"); - if (SvROK(mstr)) - sv_unref(mstr); - } SvPV_force(mstr, len); mbuf = SvGROW(mstr, sizeof(long)+msize+1); @@ -1567,12 +1704,12 @@ do_msgrcv(SV **mark, SV **sp) } return ret; #else - croak("msgrcv not implemented"); + Perl_croak(aTHX_ "msgrcv not implemented"); #endif } I32 -do_semop(SV **mark, SV **sp) +Perl_do_semop(pTHX_ SV **mark, SV **sp) { #ifdef HAS_SEM dTHR; @@ -1592,12 +1729,12 @@ do_semop(SV **mark, SV **sp) SETERRNO(0,0); return semop(id, (struct sembuf *)opbuf, opsize/sizeof(struct sembuf)); #else - croak("semop not implemented"); + Perl_croak(aTHX_ "semop not implemented"); #endif } I32 -do_shmio(I32 optype, SV **mark, SV **sp) +Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) { #ifdef HAS_SHM dTHR; @@ -1642,7 +1779,7 @@ do_shmio(I32 optype, SV **mark, SV **sp) } return shmdt(shm); #else - croak("shm I/O not implemented"); + Perl_croak(aTHX_ "shm I/O not implemented"); #endif }