X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/1e422769b80038b1bfc4f5af33438b87cc1c7a22..95667ae449650939b6e6a521264f3846244da96a:/doio.c diff --git a/doio.c b/doio.c index f2973d1..d55acb1 100644 --- a/doio.c +++ b/doio.c @@ -1,6 +1,6 @@ /* doio.c * - * Copyright (c) 1991-1994, 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,33 +15,43 @@ */ #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 #ifdef I_UTIME -#include +# if defined(_MSC_VER) || defined(__MINGW32__) +# include +# else +# include +# endif #endif + #ifdef I_FCNTL #include #endif #ifdef I_SYS_FILE #include #endif +#ifdef O_EXCL +# define OPEN_EXCL O_EXCL +#else +# define OPEN_EXCL 0 +#endif #if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) #include @@ -54,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 @@ -62,14 +77,17 @@ # endif #endif +/* Put this after #includes because defines _XOPEN_*. */ +#ifndef Sock_size_t +# if _XOPEN_VERSION >= 5 || defined(_XOPEN_SOURCE_EXTENDED) || defined(__GLIBC__) +# define Sock_size_t Size_t +# else +# define Sock_size_t int +# endif +#endif + bool -do_open(gv,name,len,as_raw,rawmode,rawperm,supplied_fp) -GV *gv; -register char *name; -I32 len; -int as_raw; -int rawmode, 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; @@ -79,21 +97,22 @@ PerlIO *supplied_fp; PerlIO *fp; int fd; int result; + bool was_fdopen = FALSE; - forkprocess = 1; /* assume true if no fork */ + PL_forkprocess = 1; /* assume true if no fork */ if (IoIFP(io)) { fd = PerlIO_fileno(IoIFP(io)); if (IoTYPE(io) == '-') result = 0; - else if (fd <= maxsysfd) { + else if (fd <= PL_maxsysfd) { saveifp = IoIFP(io); saveofp = IoOFP(io); savetype = IoTYPE(io); result = 0; } else if (IoTYPE(io) == '|') - result = my_pclose(IoIFP(io)); + result = PerlProc_pclose(IoIFP(io)); else if (IoIFP(io) != IoOFP(io)) { if (IoOFP(io)) { result = PerlIO_close(IoOFP(io)); @@ -104,32 +123,52 @@ PerlIO *supplied_fp; } else result = PerlIO_close(IoIFP(io)); - if (result == EOF && fd > maxsysfd) + if (result == EOF && fd > PL_maxsysfd) PerlIO_printf(PerlIO_stderr(), "Warning: unable to close filehandle %s properly.\n", GvENAME(gv)); IoOFP(io) = IoIFP(io) = Nullfp; } 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 = open(name, rawmode, rawperm); + 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) - close(fd); + PerlLIO_close(fd); } } else { @@ -154,12 +193,23 @@ PerlIO *supplied_fp; 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 (dowarn && name[strlen(name)-1] == '|') - warn("Can't do bidirectional pipe"); - fp = my_popen(name,"w"); + if (name[strlen(name)-1] == '|') { + dTHR; + name[strlen(name)-1] = '\0' ; + if (ckWARN(WARN_PIPE)) + Perl_warner(aTHX_ WARN_PIPE, "Can't do bidirectional pipe"); + } + fp = PerlProc_popen(name,"w"); writing = 1; } else if (*name == '>') { @@ -207,10 +257,12 @@ PerlIO *supplied_fp; fd = -1; } if (dodup) - fd = dup(fd); + fd = PerlLIO_dup(fd); + else + was_fdopen = TRUE; if (!(fp = PerlIO_fdopen(fd,mode))) { if (dodup) - close(fd); + PerlLIO_close(fd); } } } @@ -239,16 +291,23 @@ PerlIO *supplied_fp; else fp = PerlIO_open(name,mode); } - else if (name[len-1] == '|') { + else if (len > 1 && name[len-1] == '|') { name[--len] = '\0'; while (len && isSPACE(name[len-1])) 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"); - fp = my_popen(name,"r"); + fp = PerlProc_popen(name,"r"); IoTYPE(io) = '|'; } else { @@ -264,29 +323,33 @@ PerlIO *supplied_fp; } } if (!fp) { - if (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) && IoTYPE(io) != '|' && IoTYPE(io) != '-') { - if (Fstat(PerlIO_fileno(fp),&statbuf) < 0) { + dTHR; + if (PerlLIO_fstat(PerlIO_fileno(fp),&PL_statbuf) < 0) { (void)PerlIO_close(fp); goto say_false; } - if (S_ISSOCK(statbuf.st_mode)) + if (S_ISSOCK(PL_statbuf.st_mode)) IoTYPE(io) = 's'; /* in case a socket was passed in to us */ #ifdef HAS_SOCKET else if ( #ifdef S_IFMT - !(statbuf.st_mode & S_IFMT) + !(PL_statbuf.st_mode & S_IFMT) #else - !statbuf.st_mode + !PL_statbuf.st_mode #endif ) { - int buflen = sizeof tokenbuf; - if (getsockname(PerlIO_fileno(fp), (struct sockaddr *)tokenbuf, &buflen) >= 0 - || errno != ENOTSOCK) + char tmpbuf[256]; + Sock_size_t buflen = sizeof tmpbuf; + if (PerlSock_getsockname(PerlIO_fileno(fp), (struct sockaddr *)tmpbuf, + &buflen) >= 0 + || errno != ENOTSOCK) IoTYPE(io) = 's'; /* some OS's return 0 on fstat()ed socket */ /* but some return 0 for streams too, sigh */ } @@ -306,28 +369,34 @@ PerlIO *supplied_fp; int pid; SV *sv; - dup2(PerlIO_fileno(fp), fd); - sv = *av_fetch(fdpid,PerlIO_fileno(fp),TRUE); + PerlLIO_dup2(PerlIO_fileno(fp), fd); + sv = *av_fetch(PL_fdpid,PerlIO_fileno(fp),TRUE); (void)SvUPGRADE(sv, SVt_IV); pid = SvIVX(sv); SvIVX(sv) = 0; - sv = *av_fetch(fdpid,fd,TRUE); + sv = *av_fetch(PL_fdpid,fd,TRUE); (void)SvUPGRADE(sv, SVt_IV); SvIVX(sv) = pid; - PerlIO_close(fp); + if (!was_fdopen) + PerlIO_close(fp); } fp = saveifp; PerlIO_clearerr(fp); } #if defined(HAS_FCNTL) && defined(F_SETFD) - fd = PerlIO_fileno(fp); - fcntl(fd,F_SETFD,fd > 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) { + dTHR; if (IoTYPE(io) == 's' - || (IoTYPE(io) == '>' && S_ISCHR(statbuf.st_mode)) ) { + || (IoTYPE(io) == '>' && S_ISCHR(PL_statbuf.st_mode)) ) { if (!(IoOFP(io) = PerlIO_fdopen(PerlIO_fileno(fp),"w"))) { PerlIO_close(fp); IoIFP(io) = Nullfp; @@ -347,145 +416,190 @@ say_false: } PerlIO * -nextargv(gv) -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 (!argvoutgv) - argvoutgv = gv_fetchpv("ARGVOUT",TRUE,SVt_PVIO); - if (filemode & (S_ISUID|S_ISGID)) { - PerlIO_flush(IoIFP(GvIOn(argvoutgv))); /* chmod must follow last write */ + if (!PL_argvoutgv) + PL_argvoutgv = gv_fetchpv("ARGVOUT",TRUE,SVt_PVIO); + if (PL_filemode & (S_ISUID|S_ISGID)) { + PerlIO_flush(IoIFP(GvIOn(PL_argvoutgv))); /* chmod must follow last write */ #ifdef HAS_FCHMOD - (void)fchmod(lastfd,filemode); + (void)fchmod(PL_lastfd,PL_filemode); #else - (void)chmod(oldname,filemode); + (void)PerlLIO_chmod(PL_oldname,PL_filemode); #endif } - filemode = 0; + PL_filemode = 0; while (av_len(GvAV(gv)) >= 0) { - STRLEN len; + dTHR; + STRLEN oldlen; sv = av_shift(GvAV(gv)); SAVEFREESV(sv); sv_setsv(GvSV(gv),sv); SvSETMAGIC(GvSV(gv)); - oldname = SvPVx(GvSV(gv), len); - if (do_open(gv,oldname,len,FALSE,0,0,Nullfp)) { - if (inplace) { + PL_oldname = SvPVx(GvSV(gv), oldlen); + if (do_open(gv,PL_oldname,oldlen,PL_inplace!=0,O_RDONLY,0,Nullfp)) { + if (PL_inplace) { TAINT_PROPER("inplace open"); - if (strEQ(oldname,"-")) { + if (oldlen == 1 && *PL_oldname == '-') { setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO)); 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 - filemode = statbuf.st_mode; - fileuid = statbuf.st_uid; - filegid = statbuf.st_gid; - if (!S_ISREG(filemode)) { - warn("Can't do inplace edit: %s is not a regular file", - oldname ); + PL_filemode = PL_statbuf.st_mode; + fileuid = PL_statbuf.st_uid; + filegid = PL_statbuf.st_gid; + if (!S_ISREG(PL_filemode)) { + 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; } - if (*inplace) { -#ifdef SUFFIX - add_suffix(sv,inplace); -#else - sv_catpv(sv,inplace); -#endif + if (*PL_inplace) { + char *star = strchr(PL_inplace, '*'); + if (star) { + char *begin = PL_inplace; + sv_setpvn(sv, "", 0); + do { + sv_catpvn(sv, begin, star - begin); + sv_catpvn(sv, PL_oldname, oldlen); + begin = ++star; + } while ((star = strchr(begin, '*'))); + if (*begin) + sv_catpv(sv,begin); + } + else { + sv_catpv(sv,PL_inplace); + } #ifndef FLEXFILENAMES - if (Stat(SvPVX(sv),&statbuf) >= 0 - && statbuf.st_dev == filedev - && statbuf.st_ino == fileino ) { - warn("Can't do inplace edit: %s > 14 characters", - SvPVX(sv) ); + 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 + ) + { + 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; } #endif #ifdef HAS_RENAME #ifndef DOSISH - if (rename(oldname,SvPVX(sv)) < 0) { - warn("Can't rename %s to %s: %s, skipping file", - oldname, SvPVX(sv), Strerror(errno) ); + if (PerlLIO_rename(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; } #else do_close(gv,FALSE); - (void)unlink(SvPVX(sv)); - (void)rename(oldname,SvPVX(sv)); - do_open(gv,SvPVX(sv),SvCUR(sv),FALSE,0,0,Nullfp); + (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); #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(oldname) < 0) { - warn("Can't rename %s to %s: %s, skipping file", - oldname, SvPVX(sv), Strerror(errno) ); + if (UNLINK(PL_oldname) < 0) { + 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,">",1); - sv_catpv(sv,oldname); + sv_setpvn(sv,">",!PL_inplace); + sv_catpvn(sv,PL_oldname,oldlen); SETERRNO(0,0); /* in case sprintf set errno */ - if (!do_open(argvoutgv,SvPVX(sv),SvCUR(sv),FALSE,0,0,Nullfp)) { - warn("Can't do inplace edit on %s: %s", - oldname, Strerror(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)) { +#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; } - setdefout(argvoutgv); - lastfd = PerlIO_fileno(IoIFP(GvIOp(argvoutgv))); - (void)Fstat(lastfd,&statbuf); + setdefout(PL_argvoutgv); + PL_lastfd = PerlIO_fileno(IoIFP(GvIOp(PL_argvoutgv))); + (void)PerlLIO_fstat(PL_lastfd,&PL_statbuf); #ifdef HAS_FCHMOD - (void)fchmod(lastfd,filemode); + (void)fchmod(PL_lastfd,PL_filemode); #else - (void)chmod(oldname,filemode); +# if !(defined(WIN32) && defined(__BORLANDC__)) + /* Borland runtime creates a readonly file! */ + (void)PerlLIO_chmod(PL_oldname,PL_filemode); +# endif #endif - if (fileuid != statbuf.st_uid || filegid != statbuf.st_gid) { + if (fileuid != PL_statbuf.st_uid || filegid != PL_statbuf.st_gid) { #ifdef HAS_FCHOWN - (void)fchown(lastfd,fileuid,filegid); + (void)fchown(PL_lastfd,fileuid,filegid); #else #ifdef HAS_CHOWN - (void)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, 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 (inplace) { - (void)do_close(argvoutgv,FALSE); + if (PL_inplace) { + (void)do_close(PL_argvoutgv,FALSE); setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO)); } return Nullfp; @@ -493,10 +607,7 @@ register GV *gv; #ifdef HAS_PIPE void -do_pipe(sv, rgv, wgv) -SV *sv; -GV *rgv; -GV *wgv; +Perl_do_pipe(pTHX_ SV *sv, GV *rgv, GV *wgv) { register IO *rstio; register IO *wstio; @@ -515,7 +626,7 @@ GV *wgv; if (IoIFP(wstio)) do_close(wgv,FALSE); - if (pipe(fd) < 0) + if (PerlProc_pipe(fd) < 0) goto badexit; IoIFP(rstio) = PerlIO_fdopen(fd[0], "r"); IoOFP(wstio) = PerlIO_fdopen(fd[1], "w"); @@ -524,44 +635,44 @@ GV *wgv; IoTYPE(wstio) = '>'; if (!IoIFP(rstio) || !IoOFP(wstio)) { if (IoIFP(rstio)) PerlIO_close(IoIFP(rstio)); - else close(fd[0]); + else PerlLIO_close(fd[0]); if (IoOFP(wstio)) PerlIO_close(IoOFP(wstio)); - else close(fd[1]); + else PerlLIO_close(fd[1]); goto badexit; } - sv_setsv(sv,&sv_yes); + sv_setsv(sv,&PL_sv_yes); return; badexit: - sv_setsv(sv,&sv_undef); + sv_setsv(sv,&PL_sv_undef); return; } #endif /* explicit renamed to avoid C++ conflict -- kja */ bool -#ifndef CAN_PROTOTYPE -do_close(gv,not_implicit) -GV *gv; -bool not_implicit; -#else -do_close(GV *gv, bool not_implicit) -#endif /* CAN_PROTOTYPE */ +Perl_do_close(pTHX_ GV *gv, bool not_implicit) { bool retval; IO *io; if (!gv) - gv = argvgv; + gv = PL_argvgv; if (!gv || SvTYPE(gv) != SVt_PVGV) { - SETERRNO(EBADF,SS$_IVCHAN); + if (not_implicit) + SETERRNO(EBADF,SS$_IVCHAN); return FALSE; } io = GvIO(gv); if (!io) { /* never opened */ - if (dowarn && not_implicit) - warn("Close on unopened file <%s>",GvENAME(gv)); + if (not_implicit) { + dTHR; + if (ckWARN(WARN_UNOPENED)) + Perl_warner(aTHX_ WARN_UNOPENED, + "Close on unopened file <%s>",GvENAME(gv)); + SETERRNO(EBADF,SS$_IVCHAN); + } return FALSE; } retval = io_close(io); @@ -575,15 +686,14 @@ do_close(GV *gv, bool not_implicit) } bool -io_close(io) -IO* io; +Perl_io_close(pTHX_ IO *io) { bool retval = FALSE; int status; if (IoIFP(io)) { if (IoTYPE(io) == '|') { - status = my_pclose(IoIFP(io)); + status = PerlProc_pclose(IoIFP(io)); STATUS_NATIVE_SET(status); retval = (STATUS_POSIX == 0); } @@ -599,14 +709,17 @@ IO* io; } IoOFP(io) = IoIFP(io) = Nullfp; } + else { + SETERRNO(EBADF,SS$_IVCHAN); + } return retval; } bool -do_eof(gv) -GV *gv; +Perl_do_eof(pTHX_ GV *gv) { + dTHR; register IO *io; int ch; @@ -614,6 +727,15 @@ 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)) { @@ -631,8 +753,8 @@ 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 (!nextargv(argvgv)) /* get another fp handy */ + if (PL_op->op_flags & OPf_SPECIAL) { /* not necessarily a real EOF yet? */ + if (!nextargv(PL_argvgv)) /* get another fp handy */ return TRUE; } else @@ -641,60 +763,105 @@ GV *gv; return TRUE; } -long -do_tell(gv) -GV *gv; +Off_t +Perl_do_tell(pTHX_ GV *gv) { register IO *io; + register PerlIO *fp; - if (!gv) - goto phooey; - - io = GvIO(gv); - if (!io || !IoIFP(io)) - goto phooey; - + if (gv && (io = GvIO(gv)) && (fp = IoIFP(io))) { #ifdef ULTRIX_STDIO_BOTCH - if (PerlIO_eof(IoIFP(io))) - (void)PerlIO_seek (IoIFP(io), 0L, 2); /* ultrix 1.2 workaround */ + if (PerlIO_eof(fp)) + (void)PerlIO_seek(fp, 0L, 2); /* ultrix 1.2 workaround */ #endif - - return PerlIO_tell(IoIFP(io)); - -phooey: - if (dowarn) - warn("tell() on unopened file"); + return PerlIO_tell(fp); + } + { + 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, pos, whence) -GV *gv; -long pos; -int whence; +Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence) { register IO *io; + register PerlIO *fp; - if (!gv) - goto nuts; - - io = GvIO(gv); - if (!io || !IoIFP(io)) - goto nuts; - + if (gv && (io = GvIO(gv)) && (fp = IoIFP(io))) { #ifdef ULTRIX_STDIO_BOTCH - if (PerlIO_eof(IoIFP(io))) - (void)PerlIO_seek (IoIFP(io), 0L, 2); /* ultrix 1.2 workaround */ + if (PerlIO_eof(fp)) + (void)PerlIO_seek(fp, 0L, 2); /* ultrix 1.2 workaround */ #endif + return PerlIO_seek(fp, pos, whence) >= 0; + } + { + dTHR; + if (ckWARN(WARN_UNOPENED)) + Perl_warner(aTHX_ WARN_UNOPENED, "seek() on unopened file"); + } + SETERRNO(EBADF,RMS$_IFI); + return FALSE; +} - return PerlIO_seek(IoIFP(io), pos, whence) >= 0; +Off_t +Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence) +{ + register IO *io; + register PerlIO *fp; -nuts: - if (dowarn) - warn("seek() on unopened file"); + if (gv && (io = GvIO(gv)) && (fp = IoIFP(io))) + return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence); + { + dTHR; + if (ckWARN(WARN_UNOPENED)) + Perl_warner(aTHX_ WARN_UNOPENED, "sysseek() on unopened file"); + } SETERRNO(EBADF,RMS$_IFI); - return FALSE; + return -1L; +} + +int +Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int flag) +{ + if (flag != TRUE) + Perl_croak(aTHX_ "panic: unsetting binmode"); /* Not implemented yet */ +#ifdef DOSISH +#if defined(atarist) || defined(__MINT__) + if (!PerlIO_flush(fp) && (fp->_flag |= _IOBIN)) + return 1; + else + return 0; +#else + if (PerlLIO_setmode(PerlIO_fileno(fp), OP_BINARY) != -1) { +#if defined(WIN32) && defined(__BORLANDC__) + /* The translation mode of the stream is maintained independent + * of the translation mode of the fd in the Borland RTL (heavy + * digging through their runtime sources reveal). User has to + * set the mode explicitly for the stream (though they don't + * document this anywhere). GSAR 97-5-24 + */ + PerlIO_seek(fp,0L,0); + ((FILE*)fp)->flags |= _F_BIN; +#endif + return 1; + } + else + return 0; +#endif +#else +#if defined(USEMYBINMODE) + if (my_binmode(fp,iotype) != FALSE) + return 1; + else + return 0; +#else + return 1; +#endif +#endif } #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP) @@ -705,23 +872,22 @@ I32 my_chsize(fd, length) I32 fd; /* file descriptor */ Off_t length; /* length to set file to */ { - extern long lseek(); struct flock fl; struct stat filebuf; - if (Fstat(fd, &filebuf) < 0) + if (PerlLIO_fstat(fd, &filebuf) < 0) return -1; if (filebuf.st_size < length) { /* extend file length */ - if ((lseek(fd, (length - 1), 0)) < 0) + if ((PerlLIO_lseek(fd, (length - 1), 0)) < 0) return -1; /* write a "0" byte */ - if ((write(fd, "", 1)) != 1) + if ((PerlLIO_write(fd, "", 1)) != 1) return -1; } else { @@ -750,9 +916,7 @@ Off_t length; /* length to set file to */ #endif /* F_FREESP */ bool -do_print(sv,fp) -register SV *sv; -PerlIO *fp; +Perl_do_print(pTHX_ register SV *sv, PerlIO *fp) { register char *tmps; STRLEN len; @@ -760,29 +924,35 @@ PerlIO *fp; /* assuming fp is checked earlier */ if (!sv) return TRUE; - if (ofmt) { + if (PL_ofmt) { if (SvGMAGICAL(sv)) mg_get(sv); if (SvIOK(sv) && SvIVX(sv) != 0) { - PerlIO_printf(fp, ofmt, (double)SvIVX(sv)); + 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, ofmt, SvNVX(sv)); + PerlIO_printf(fp, PL_ofmt, SvNVX(sv)); return !PerlIO_error(fp); } } switch (SvTYPE(sv)) { case SVt_NULL: - if (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 */ @@ -796,37 +966,38 @@ PerlIO *fp; } I32 -my_stat(ARGS) -dARGS +Perl_my_stat(pTHX) { - dSP; + djSP; IO *io; GV* tmpgv; - if (op->op_flags & OPf_REF) { - EXTEND(sp,1); + if (PL_op->op_flags & OPf_REF) { + EXTEND(SP,1); tmpgv = cGVOP->op_gv; do_fstat: io = GvIO(tmpgv); if (io && IoIFP(io)) { - statgv = tmpgv; - sv_setpv(statname,""); - laststype = OP_STAT; - return (laststatval = Fstat(PerlIO_fileno(IoIFP(io)), &statcache)); + PL_statgv = tmpgv; + sv_setpv(PL_statname,""); + PL_laststype = OP_STAT; + return (PL_laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &PL_statcache)); } else { - if (tmpgv == defgv) - return laststatval; - if (dowarn) - warn("Stat on unopened file <%s>", + if (tmpgv == PL_defgv) + return PL_laststatval; + if (ckWARN(WARN_UNOPENED)) + Perl_warner(aTHX_ WARN_UNOPENED, "Stat on unopened file <%s>", GvENAME(tmpgv)); - statgv = Nullgv; - sv_setpv(statname,""); - return (laststatval = -1); + PL_statgv = Nullgv; + sv_setpv(PL_statname,""); + return (PL_laststatval = -1); } } else { SV* sv = POPs; + char *s; + STRLEN n_a; PUTBACK; if (SvTYPE(sv) == SVt_PVGV) { tmpgv = (GV*)sv; @@ -837,97 +1008,112 @@ dARGS goto do_fstat; } - statgv = Nullgv; - sv_setpv(statname,SvPV(sv, na)); - laststype = OP_STAT; - laststatval = Stat(SvPV(sv, na),&statcache); - if (laststatval < 0 && dowarn && strchr(SvPV(sv, na), '\n')) - warn(warn_nl, "stat"); - return laststatval; + 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 && ckWARN(WARN_NEWLINE) && strchr(s, '\n')) + Perl_warner(aTHX_ WARN_NEWLINE, PL_warn_nl, "stat"); + return PL_laststatval; } } I32 -my_lstat(ARGS) -dARGS +Perl_my_lstat(pTHX) { - dSP; + djSP; SV *sv; - if (op->op_flags & OPf_REF) { - EXTEND(sp,1); - if (cGVOP->op_gv == defgv) { - if (laststype != OP_LSTAT) - croak("The stat preceding -l _ wasn't an lstat"); - return laststatval; + STRLEN n_a; + if (PL_op->op_flags & OPf_REF) { + EXTEND(SP,1); + if (cGVOP->op_gv == PL_defgv) { + if (PL_laststype != OP_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"); } - laststype = OP_LSTAT; - statgv = Nullgv; + PL_laststype = OP_LSTAT; + PL_statgv = Nullgv; sv = POPs; PUTBACK; - sv_setpv(statname,SvPV(sv, na)); -#ifdef HAS_LSTAT - laststatval = lstat(SvPV(sv, na),&statcache); -#else - laststatval = Stat(SvPV(sv, na),&statcache); -#endif - if (laststatval < 0 && dowarn && strchr(SvPV(sv, na), '\n')) - warn(warn_nl, "lstat"); - return laststatval; + 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(really,mark,sp) -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) { - New(401,Argv, sp - mark + 1, char*); - a = Argv; + dTHR; + New(401,PL_Argv, sp - mark + 1, char*); + a = PL_Argv; while (++mark <= sp) { if (*mark) - *a++ = SvPVx(*mark, na); + *a++ = SvPVx(*mark, n_a); else *a++ = ""; } *a = Nullch; - if (*Argv[0] != '/') /* will execvp use PATH? */ + if (*PL_Argv[0] != '/') /* will execvp use PATH? */ TAINT_ENV(); /* testing IFS here is overkill, probably */ - if (really && *(tmps = SvPV(really, na))) - execvp(tmps,Argv); + if (really && *(tmps = SvPV(really, n_a))) + PerlProc_execvp(tmps,PL_Argv); else - execvp(Argv[0],Argv); - if (dowarn) - warn("Can't exec \"%s\": %s", Argv[0], Strerror(errno)); + PerlProc_execvp(PL_Argv[0],PL_Argv); + 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() +Perl_do_execfree(pTHX) { - if (Argv) { - Safefree(Argv); - Argv = Null(char **); + if (PL_Argv) { + Safefree(PL_Argv); + PL_Argv = Null(char **); } - if (Cmd) { - Safefree(Cmd); - Cmd = Nullch; + if (PL_Cmd) { + Safefree(PL_Cmd); + PL_Cmd = Nullch; } } -#ifndef OS2 +#if !defined(OS2) && !defined(WIN32) && !defined(DJGPP) && !defined(EPOC) + +bool +Perl_do_exec(pTHX_ char *cmd) +{ + return do_exec3(cmd,0,0); +} bool -do_exec(cmd) -char *cmd; +Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report) { register char **a; register char *s; @@ -939,9 +1125,9 @@ char *cmd; /* save an extra exec if possible */ #ifdef CSH - if (strnEQ(cmd,cshname,cshlen) && strnEQ(cmd+cshlen," -c",3)) { + if (strnEQ(cmd,PL_cshname,PL_cshlen) && strnEQ(cmd+PL_cshlen," -c",3)) { strcpy(flags,"-c"); - s = cmd+cshlen+3; + s = cmd+PL_cshlen+3; if (*s == 'f') { s++; strcat(flags,"f"); @@ -957,7 +1143,7 @@ char *cmd; *--s = '\0'; if (s[-1] == '\'') { *--s = '\0'; - execl(cshname,"csh", flags,ncmd,(char*)0); + PerlProc_execl(PL_cshname,"csh", flags,ncmd,(char*)0); *s = '\''; return FALSE; } @@ -983,16 +1169,30 @@ 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: - execl(sh_path, "sh", "-c", cmd, (char*)0); + PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char*)0); return FALSE; } } - New(402,Argv, (s - cmd) / 2 + 2, char*); - Cmd = savepvn(cmd, s-cmd); - a = Argv; - for (s = Cmd; *s;) { + New(402,PL_Argv, (s - cmd) / 2 + 2, char*); + PL_Cmd = savepvn(cmd, s-cmd); + a = PL_Argv; + for (s = PL_Cmd; *s;) { while (*s && isSPACE(*s)) s++; if (*s) *(a++) = s; @@ -1001,34 +1201,50 @@ char *cmd; *s++ = '\0'; } *a = Nullch; - if (Argv[0]) { - execvp(Argv[0],Argv); + if (PL_Argv[0]) { + PerlProc_execvp(PL_Argv[0],PL_Argv); if (errno == ENOEXEC) { /* for system V NIH syndrome */ do_execfree(); goto doshell; } - if (dowarn) - warn("Can't exec \"%s\": %s", 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; } -#endif /* OS2 */ +#endif /* OS2 || WIN32 */ I32 -apply(type,mark,sp) -I32 type; -register SV **mark; -register SV **sp; +Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp) { + dTHR; register I32 val; register I32 val2; register I32 tot = 0; + char *what; char *s; SV **oldmark = mark; + STRLEN n_a; + +#define APPLY_TAINT_PROPER() \ + STMT_START { \ + if (PL_tainted) { TAINT_PROPER(what); } \ + } STMT_END - if (tainting) { + /* This is a first heuristic; it doesn't catch tainting magic. */ + if (PL_tainting) { while (++mark <= sp) { if (SvTAINTED(*mark)) { TAINT; @@ -1039,45 +1255,61 @@ register SV **sp; } switch (type) { case OP_CHMOD: - TAINT_PROPER("chmod"); + what = "chmod"; + APPLY_TAINT_PROPER(); if (++mark <= sp) { - tot = sp - mark; val = SvIVx(*mark); + APPLY_TAINT_PROPER(); + tot = sp - mark; while (++mark <= sp) { - if (chmod(SvPVx(*mark, na),val)) + char *name = SvPVx(*mark, n_a); + APPLY_TAINT_PROPER(); + if (PerlLIO_chmod(name, val)) tot--; } } break; #ifdef HAS_CHOWN case OP_CHOWN: - TAINT_PROPER("chown"); + what = "chown"; + APPLY_TAINT_PROPER(); if (sp - mark > 2) { val = SvIVx(*++mark); val2 = SvIVx(*++mark); + APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - if (chown(SvPVx(*mark, na),val,val2)) + char *name = SvPVx(*mark, n_a); + APPLY_TAINT_PROPER(); + if (PerlLIO_chown(name, val, val2)) tot--; } } break; #endif +/* +XXX Should we make lchown() directly available from perl? +For now, we'll let Configure test for HAS_LCHOWN, but do +nothing in the core. + --AD 5/1998 +*/ #ifdef HAS_KILL case OP_KILL: - TAINT_PROPER("kill"); + what = "kill"; + APPLY_TAINT_PROPER(); if (mark == sp) break; - s = SvPVx(*++mark, na); - tot = sp - mark; + 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); + APPLY_TAINT_PROPER(); + tot = sp - mark; #ifdef VMS /* kill() doesn't do process groups (job trees?) under VMS */ if (val < 0) val = -val; @@ -1090,6 +1322,7 @@ register SV **sp; while (++mark <= sp) { I32 proc = SvIVx(*mark); register unsigned long int __vmssts; + APPLY_TAINT_PROPER(); if (!((__vmssts = sys$delprc(&proc,0)) & 1)) { tot--; switch (__vmssts) { @@ -1112,37 +1345,38 @@ register SV **sp; val = -val; while (++mark <= sp) { I32 proc = SvIVx(*mark); + APPLY_TAINT_PROPER(); #ifdef HAS_KILLPG - if (killpg(proc,val)) /* BSD */ + if (PerlProc_killpg(proc,val)) /* BSD */ #else - if (kill(-proc,val)) /* SYSV */ + if (PerlProc_kill(-proc,val)) /* SYSV */ #endif tot--; } } else { while (++mark <= sp) { - if (kill(SvIVx(*mark),val)) + I32 proc = SvIVx(*mark); + APPLY_TAINT_PROPER(); + if (PerlProc_kill(proc, val)) tot--; } } break; #endif case OP_UNLINK: - TAINT_PROPER("unlink"); + what = "unlink"; + APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - s = SvPVx(*mark, na); - if (euid || unsafe) { + 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 (lstat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode)) -#else - if (Stat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode)) -#endif + if (PerlLIO_lstat(s,&PL_statbuf) < 0 || S_ISDIR(PL_statbuf.st_mode)) tot--; else { if (UNLINK(s)) @@ -1153,28 +1387,32 @@ register SV **sp; break; #ifdef HAS_UTIME case OP_UTIME: - TAINT_PROPER("utime"); + what = "utime"; + APPLY_TAINT_PROPER(); if (sp - mark > 2) { #if defined(I_UTIME) || defined(VMS) 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) { - if (utime(SvPVx(*mark, na),&utbuf)) + char *name = SvPVx(*mark, n_a); + APPLY_TAINT_PROPER(); + if (PerlLIO_utime(name, &utbuf)) tot--; } } @@ -1184,15 +1422,14 @@ register SV **sp; #endif } return tot; + +#undef APPLY_TAINT_PROPER } /* Do the permissions allow some operation? Assumes statcache already set. */ #ifndef VMS /* VMS' cando is in vms.c */ I32 -cando(bit, effective, statbufp) -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] @@ -1219,7 +1456,7 @@ register struct stat *statbufp; return (bit & statbufp->st_mode) ? TRUE : FALSE; #else /* ! DOSISH */ - if ((effective ? euid : uid) == 0) { /* root is special */ + if ((effective ? PL_euid : PL_uid) == 0) { /* root is special */ if (bit == S_IXUSR) { if (statbufp->st_mode & 0111 || S_ISDIR(statbufp->st_mode)) return TRUE; @@ -1228,7 +1465,7 @@ register struct stat *statbufp; return TRUE; /* root reads and writes anything */ return FALSE; } - if (statbufp->st_uid == (effective ? euid : uid) ) { + if (statbufp->st_uid == (effective ? PL_euid : PL_uid) ) { if (statbufp->st_mode & bit) return TRUE; /* ok as "user" */ } @@ -1244,11 +1481,9 @@ register struct stat *statbufp; #endif /* ! VMS */ I32 -ingroup(testgid,effective) -I32 testgid; -I32 effective; +Perl_ingroup(pTHX_ I32 testgid, I32 effective) { - if (testgid == (effective ? egid : gid)) + if (testgid == (effective ? PL_egid : PL_gid)) return TRUE; #ifdef HAS_GETGROUPS #ifndef NGROUPS @@ -1270,11 +1505,9 @@ I32 effective; #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) I32 -do_ipcget(optype, mark, sp) -I32 optype; -SV **mark; -SV **sp; +Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) { + dTHR; key_t key; I32 n, flags; @@ -1298,18 +1531,16 @@ 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(optype, mark, sp) -I32 optype; -SV **mark; -SV **sp; +Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) { + dTHR; SV *astr; char *a; I32 id, n, cmd, infosize, getinfo; @@ -1338,23 +1569,30 @@ 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) { struct semid_ds semds; - if (semctl(id, 0, IPC_STAT, &semds) == -1) - return -1; + union semun semun; + + semun.buf = &semds; getinfo = (cmd == GETALL); + if (Semctl(id, 0, IPC_STAT, semun) == -1) + return -1; infosize = semds.sem_nsems * sizeof(short); /* "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 } @@ -1370,8 +1608,10 @@ SV **sp; { a = SvPV(astr, len); if (len != infosize) - croak("Bad arg length for %s, is %d, should be %ld", - op_desc[optype], 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 @@ -1388,8 +1628,16 @@ SV **sp; break; #endif #ifdef HAS_SEM - case OP_SEMCTL: - ret = semctl(id, n, cmd, (struct semid_ds *)a); + 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 #ifdef HAS_SHM @@ -1407,11 +1655,10 @@ SV **sp; } I32 -do_msgsnd(mark, sp) -SV **mark; -SV **sp; +Perl_do_msgsnd(pTHX_ SV **mark, SV **sp) { #ifdef HAS_MSG + dTHR; SV *mstr; char *mbuf; I32 id, msize, flags; @@ -1422,20 +1669,19 @@ 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(mark, sp) -SV **mark; -SV **sp; +Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) { #ifdef HAS_MSG + dTHR; SV *mstr; char *mbuf; long mtype; @@ -1447,12 +1693,6 @@ 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); @@ -1464,16 +1704,15 @@ SV **sp; } return ret; #else - croak("msgrcv not implemented"); + Perl_croak(aTHX_ "msgrcv not implemented"); #endif } I32 -do_semop(mark, sp) -SV **mark; -SV **sp; +Perl_do_semop(pTHX_ SV **mark, SV **sp) { #ifdef HAS_SEM + dTHR; SV *opstr; char *opbuf; I32 id; @@ -1490,17 +1729,15 @@ 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(optype, mark, sp) -I32 optype; -SV **mark; -SV **sp; +Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) { #ifdef HAS_SHM + dTHR; SV *mstr; char *mbuf, *shm; I32 id, mpos, msize; @@ -1518,7 +1755,7 @@ SV **sp; SETERRNO(EFAULT,SS$_ACCVIO); /* can't do as caller requested */ return -1; } - shm = (Shmat_t)shmat(id, (char*)NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0); + shm = (char *)shmat(id, (char*)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) { @@ -1542,8 +1779,9 @@ SV **sp; } return shmdt(shm); #else - croak("shm I/O not implemented"); + Perl_croak(aTHX_ "shm I/O not implemented"); #endif } #endif /* SYSV IPC */ +