X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=doio.c;h=ff8384c33187e99a92172563cfa96e1f3599c11a;hb=d3cf3892100cfc5e4143b94111b619e8eb2b1937;hp=00e2e758859d919a5b2ef371caf7cc9c6e3769e1;hpb=8490252049bf42d3d2f75d89178a8682bf22ba74;p=p5sagit%2Fp5-mst-13.2.git diff --git a/doio.c b/doio.c index 00e2e75..ff8384c 100644 --- a/doio.c +++ b/doio.c @@ -34,18 +34,24 @@ #endif #ifdef I_UTIME -# ifdef _MSC_VER +# 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 @@ -76,13 +82,7 @@ #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; +do_open(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; @@ -92,6 +92,7 @@ PerlIO *supplied_fp; PerlIO *fp; int fd; int result; + bool was_fdopen = FALSE; forkprocess = 1; /* assume true if no fork */ @@ -106,7 +107,7 @@ PerlIO *supplied_fp; 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)); @@ -127,7 +128,7 @@ PerlIO *supplied_fp; result = rawmode & 3; IoTYPE(io) = "<>++"[result]; writing = (result > 0); - fd = open(name, rawmode, rawperm); + fd = PerlLIO_open3(name, rawmode, rawperm); if (fd == -1) fp = NULL; else { @@ -142,7 +143,7 @@ PerlIO *supplied_fp; fpmode = (result == 1) ? "w" : "r+"; fp = PerlIO_fdopen(fd, fpmode); if (!fp) - close(fd); + PerlLIO_close(fd); } } else { @@ -170,9 +171,12 @@ PerlIO *supplied_fp; 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] == '|') { + name[strlen(name)-1] = '\0' ; + if (dowarn) + warn("Can't do bidirectional pipe"); + } + fp = PerlProc_popen(name,"w"); writing = 1; } else if (*name == '>') { @@ -220,10 +224,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); } } } @@ -252,7 +258,7 @@ 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'; @@ -261,7 +267,7 @@ PerlIO *supplied_fp; if (strNE(name,"-")) TAINT_ENV(); TAINT_PROPER("piped open"); - fp = my_popen(name,"r"); + fp = PerlProc_popen(name,"r"); IoTYPE(io) = '|'; } else { @@ -283,7 +289,8 @@ PerlIO *supplied_fp; } if (IoTYPE(io) && IoTYPE(io) != '|' && IoTYPE(io) != '-') { - if (Fstat(PerlIO_fileno(fp),&statbuf) < 0) { + dTHR; + if (PerlLIO_fstat(PerlIO_fileno(fp),&statbuf) < 0) { (void)PerlIO_close(fp); goto say_false; } @@ -297,8 +304,9 @@ PerlIO *supplied_fp; !statbuf.st_mode #endif ) { - Sock_size_t buflen = sizeof tokenbuf; - if (getsockname(PerlIO_fileno(fp), (struct sockaddr *)tokenbuf, + 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 */ @@ -320,7 +328,7 @@ PerlIO *supplied_fp; int pid; SV *sv; - dup2(PerlIO_fileno(fp), fd); + PerlLIO_dup2(PerlIO_fileno(fp), fd); sv = *av_fetch(fdpid,PerlIO_fileno(fp),TRUE); (void)SvUPGRADE(sv, SVt_IV); pid = SvIVX(sv); @@ -328,7 +336,8 @@ PerlIO *supplied_fp; sv = *av_fetch(fdpid,fd,TRUE); (void)SvUPGRADE(sv, SVt_IV); SvIVX(sv) = pid; - PerlIO_close(fp); + if (!was_fdopen) + PerlIO_close(fp); } fp = saveifp; @@ -340,6 +349,7 @@ PerlIO *supplied_fp; #endif IoIFP(io) = fp; if (writing) { + dTHR; if (IoTYPE(io) == 's' || (IoTYPE(io) == '>' && S_ISCHR(statbuf.st_mode)) ) { if (!(IoOFP(io) = PerlIO_fdopen(PerlIO_fileno(fp),"w"))) { @@ -361,8 +371,7 @@ say_false: } PerlIO * -nextargv(gv) -register GV *gv; +nextargv(register GV *gv) { register SV *sv; #ifndef FLEXFILENAMES @@ -379,21 +388,22 @@ register GV *gv; #ifdef HAS_FCHMOD (void)fchmod(lastfd,filemode); #else - (void)chmod(oldname,filemode); + (void)PerlLIO_chmod(oldname,filemode); #endif } 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)) { + oldname = SvPVx(GvSV(gv), oldlen); + if (do_open(gv,oldname,oldlen,inplace!=0,0,0,Nullfp)) { if (inplace) { TAINT_PROPER("inplace open"); - if (strEQ(oldname,"-")) { + if (oldlen == 1 && *oldname == '-') { setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO)); return IoIFP(GvIOp(gv)); } @@ -417,10 +427,14 @@ register GV *gv; sv_catpv(sv,inplace); #endif #ifndef FLEXFILENAMES - if (Stat(SvPVX(sv),&statbuf) >= 0 + if (PerlLIO_stat(SvPVX(sv),&statbuf) >= 0 && statbuf.st_dev == filedev - && statbuf.st_ino == fileino ) { - warn("Can't do inplace edit: %s > 14 characters", + && 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) ); do_close(gv,FALSE); continue; @@ -428,7 +442,7 @@ register GV *gv; #endif #ifdef HAS_RENAME #ifndef DOSISH - if (rename(oldname,SvPVX(sv)) < 0) { + if (PerlLIO_rename(oldname,SvPVX(sv)) < 0) { warn("Can't rename %s to %s: %s, skipping file", oldname, SvPVX(sv), Strerror(errno) ); do_close(gv,FALSE); @@ -436,9 +450,9 @@ register GV *gv; } #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(oldname,SvPVX(sv)); + do_open(gv,SvPVX(sv),SvCUR(sv),inplace!=0,0,0,Nullfp); #endif /* DOSISH */ #else (void)UNLINK(SvPVX(sv)); @@ -455,8 +469,8 @@ register GV *gv; #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) ); + warn("Can't remove %s: %s, skipping file", + oldname, Strerror(errno) ); do_close(gv,FALSE); continue; } @@ -466,10 +480,11 @@ register GV *gv; #endif } - sv_setpvn(sv,">",1); - sv_catpv(sv,oldname); + sv_setpvn(sv,">",!inplace); + sv_catpvn(sv,oldname,oldlen); SETERRNO(0,0); /* in case sprintf set errno */ - if (!do_open(argvoutgv,SvPVX(sv),SvCUR(sv),FALSE,0,0,Nullfp)) { + if (!do_open(argvoutgv,SvPVX(sv),SvCUR(sv),inplace!=0, + O_WRONLY|O_CREAT|OPEN_EXCL,0666,Nullfp)) { warn("Can't do inplace edit on %s: %s", oldname, Strerror(errno) ); do_close(gv,FALSE); @@ -477,13 +492,13 @@ register GV *gv; } setdefout(argvoutgv); lastfd = PerlIO_fileno(IoIFP(GvIOp(argvoutgv))); - (void)Fstat(lastfd,&statbuf); + (void)PerlLIO_fstat(lastfd,&statbuf); #ifdef HAS_FCHMOD (void)fchmod(lastfd,filemode); #else # if !(defined(WIN32) && defined(__BORLANDC__)) /* Borland runtime creates a readonly file! */ - (void)chmod(oldname,filemode); + (void)PerlLIO_chmod(oldname,filemode); # endif #endif if (fileuid != statbuf.st_uid || filegid != statbuf.st_gid) { @@ -491,7 +506,7 @@ register GV *gv; (void)fchown(lastfd,fileuid,filegid); #else #ifdef HAS_CHOWN - (void)chown(oldname,fileuid,filegid); + (void)PerlLIO_chown(oldname,fileuid,filegid); #endif #endif } @@ -499,7 +514,8 @@ register GV *gv; return IoIFP(GvIOp(gv)); } else - PerlIO_printf(PerlIO_stderr(), "Can't open %s: %s\n",SvPV(sv, na), Strerror(errno)); + PerlIO_printf(PerlIO_stderr(), "Can't open %s: %s\n", + SvPV(sv, na), Strerror(errno)); } if (inplace) { (void)do_close(argvoutgv,FALSE); @@ -510,10 +526,7 @@ register GV *gv; #ifdef HAS_PIPE void -do_pipe(sv, rgv, wgv) -SV *sv; -GV *rgv; -GV *wgv; +do_pipe(SV *sv, GV *rgv, GV *wgv) { register IO *rstio; register IO *wstio; @@ -532,7 +545,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"); @@ -541,9 +554,9 @@ 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; } @@ -558,13 +571,7 @@ badexit: /* 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 */ { bool retval; IO *io; @@ -572,13 +579,17 @@ do_close(GV *gv, bool not_implicit) if (!gv) gv = 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) { + if (dowarn) + warn("Close on unopened file <%s>",GvENAME(gv)); + SETERRNO(EBADF,SS$_IVCHAN); + } return FALSE; } retval = io_close(io); @@ -592,15 +603,14 @@ do_close(GV *gv, bool not_implicit) } bool -io_close(io) -IO* io; +io_close(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); } @@ -616,14 +626,17 @@ IO* io; } IoOFP(io) = IoIFP(io) = Nullfp; } + else { + SETERRNO(EBADF,SS$_IVCHAN); + } return retval; } bool -do_eof(gv) -GV *gv; +do_eof(GV *gv) { + dTHR; register IO *io; int ch; @@ -659,8 +672,7 @@ GV *gv; } long -do_tell(gv) -GV *gv; +do_tell(GV *gv) { register IO *io; register PerlIO *fp; @@ -679,10 +691,7 @@ GV *gv; } bool -do_seek(gv, pos, whence) -GV *gv; -long pos; -int whence; +do_seek(GV *gv, long int pos, int whence) { register IO *io; register PerlIO *fp; @@ -701,22 +710,59 @@ int whence; } long -do_sysseek(gv, pos, whence) -GV *gv; -long pos; -int whence; +do_sysseek(GV *gv, long int pos, int whence) { register IO *io; register PerlIO *fp; if (gv && (io = GvIO(gv)) && (fp = IoIFP(io))) - return lseek(PerlIO_fileno(fp), pos, whence); + return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence); if (dowarn) warn("sysseek() on unopened file"); SETERRNO(EBADF,RMS$_IFI); return -1L; } +int +do_binmode(PerlIO *fp, int iotype, int flag) +{ + if (flag != TRUE) + croak("panic: unsetting binmode"); /* Not implemented yet */ +#ifdef DOSISH +#ifdef atarist + 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) != NULL) + return 1; + else + return 0; +#else + return 1; +#endif +#endif +} + #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP) /* code courtesy of William Kucharski */ #define HAS_CHSIZE @@ -728,19 +774,19 @@ Off_t length; /* length to set file to */ 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 { @@ -769,9 +815,7 @@ Off_t length; /* length to set file to */ #endif /* F_FREESP */ bool -do_print(sv,fp) -register SV *sv; -PerlIO *fp; +do_print(register SV *sv, PerlIO *fp) { register char *tmps; STRLEN len; @@ -815,15 +859,14 @@ PerlIO *fp; } I32 -my_stat(ARGS) -dARGS +my_stat(ARGSproto) { - dSP; + djSP; IO *io; GV* tmpgv; if (op->op_flags & OPf_REF) { - EXTEND(sp,1); + EXTEND(SP,1); tmpgv = cGVOP->op_gv; do_fstat: io = GvIO(tmpgv); @@ -831,7 +874,7 @@ dARGS statgv = tmpgv; sv_setpv(statname,""); laststype = OP_STAT; - return (laststatval = Fstat(PerlIO_fileno(IoIFP(io)), &statcache)); + return (laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &statcache)); } else { if (tmpgv == defgv) @@ -846,6 +889,7 @@ dARGS } else { SV* sv = POPs; + char *s; PUTBACK; if (SvTYPE(sv) == SVt_PVGV) { tmpgv = (GV*)sv; @@ -856,24 +900,24 @@ dARGS goto do_fstat; } + s = SvPV(sv, na); statgv = Nullgv; - sv_setpv(statname,SvPV(sv, na)); + sv_setpv(statname, s); laststype = OP_STAT; - laststatval = Stat(SvPV(sv, na),&statcache); - if (laststatval < 0 && dowarn && strchr(SvPV(sv, na), '\n')) + laststatval = PerlLIO_stat(s, &statcache); + if (laststatval < 0 && dowarn && strchr(s, '\n')) warn(warn_nl, "stat"); return laststatval; } } I32 -my_lstat(ARGS) -dARGS +my_lstat(ARGSproto) { - dSP; + djSP; SV *sv; if (op->op_flags & OPf_REF) { - EXTEND(sp,1); + EXTEND(SP,1); if (cGVOP->op_gv == defgv) { if (laststype != OP_LSTAT) croak("The stat preceding -l _ wasn't an lstat"); @@ -888,9 +932,9 @@ dARGS PUTBACK; sv_setpv(statname,SvPV(sv, na)); #ifdef HAS_LSTAT - laststatval = lstat(SvPV(sv, na),&statcache); + laststatval = PerlLIO_lstat(SvPV(sv, na),&statcache); #else - laststatval = Stat(SvPV(sv, na),&statcache); + laststatval = PerlLIO_stat(SvPV(sv, na),&statcache); #endif if (laststatval < 0 && dowarn && strchr(SvPV(sv, na), '\n')) warn(warn_nl, "lstat"); @@ -898,15 +942,13 @@ dARGS } bool -do_aexec(really,mark,sp) -SV *really; -register SV **mark; -register SV **sp; +do_aexec(SV *really, register SV **mark, register SV **sp) { register char **a; char *tmps; if (sp > mark) { + dTHR; New(401,Argv, sp - mark + 1, char*); a = Argv; while (++mark <= sp) { @@ -919,9 +961,9 @@ register SV **sp; if (*Argv[0] != '/') /* will execvp use PATH? */ TAINT_ENV(); /* testing IFS here is overkill, probably */ if (really && *(tmps = SvPV(really, na))) - execvp(tmps,Argv); + PerlProc_execvp(tmps,Argv); else - execvp(Argv[0],Argv); + PerlProc_execvp(Argv[0],Argv); if (dowarn) warn("Can't exec \"%s\": %s", Argv[0], Strerror(errno)); } @@ -930,7 +972,7 @@ register SV **sp; } void -do_execfree() +do_execfree(void) { if (Argv) { Safefree(Argv); @@ -942,11 +984,10 @@ do_execfree() } } -#if !defined(OS2) && !defined(WIN32) +#if !defined(OS2) && !defined(WIN32) && !defined(DJGPP) bool -do_exec(cmd) -char *cmd; +do_exec(char *cmd) { register char **a; register char *s; @@ -976,7 +1017,7 @@ char *cmd; *--s = '\0'; if (s[-1] == '\'') { *--s = '\0'; - execl(cshname,"csh", flags,ncmd,(char*)0); + PerlProc_execl(cshname,"csh", flags,ncmd,(char*)0); *s = '\''; return FALSE; } @@ -1003,7 +1044,7 @@ char *cmd; break; } doshell: - execl(sh_path, "sh", "-c", cmd, (char*)0); + PerlProc_execl(sh_path, "sh", "-c", cmd, (char*)0); return FALSE; } } @@ -1021,7 +1062,7 @@ char *cmd; } *a = Nullch; if (Argv[0]) { - execvp(Argv[0],Argv); + PerlProc_execvp(Argv[0],Argv); if (errno == ENOEXEC) { /* for system V NIH syndrome */ do_execfree(); goto doshell; @@ -1036,17 +1077,22 @@ char *cmd; #endif /* OS2 || WIN32 */ I32 -apply(type,mark,sp) -I32 type; -register SV **mark; -register SV **sp; +apply(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; +#define APPLY_TAINT_PROPER() \ + STMT_START { \ + if (tainting && tainted) { goto taint_proper_label; } \ + } STMT_END + + /* This is a first heuristic; it doesn't catch tainting magic. */ if (tainting) { while (++mark <= sp) { if (SvTAINTED(*mark)) { @@ -1058,37 +1104,51 @@ 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, na); + 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, na); + 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; if (isUPPER(*s)) { if (*s == 'S' && s[1] == 'I' && s[2] == 'G') s += 3; @@ -1097,6 +1157,8 @@ register SV **sp; } 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; @@ -1109,6 +1171,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) { @@ -1131,36 +1194,41 @@ 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); + APPLY_TAINT_PROPER(); if (euid || 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)) + if (PerlLIO_lstat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode)) #else - if (Stat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode)) + if (PerlLIO_stat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode)) #endif tot--; else { @@ -1172,7 +1240,8 @@ 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; @@ -1191,9 +1260,12 @@ register SV **sp; utbuf.actime = SvIVx(*++mark); /* time accessed */ utbuf.modtime = SvIVx(*++mark); /* time modified */ #endif + APPLY_TAINT_PROPER(); tot = sp - mark; while (++mark <= sp) { - if (utime(SvPVx(*mark, na),&utbuf)) + char *name = SvPVx(*mark, na); + APPLY_TAINT_PROPER(); + if (PerlLIO_utime(name, &utbuf)) tot--; } } @@ -1203,15 +1275,18 @@ register SV **sp; #endif } 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(bit, effective, statbufp) -I32 bit; -I32 effective; -register struct stat *statbufp; +cando(I32 bit, I32 effective, register struct stat *statbufp) { #ifdef DOSISH /* [Comments and code from Len Reed] @@ -1263,9 +1338,7 @@ register struct stat *statbufp; #endif /* ! VMS */ I32 -ingroup(testgid,effective) -I32 testgid; -I32 effective; +ingroup(I32 testgid, I32 effective) { if (testgid == (effective ? egid : gid)) return TRUE; @@ -1289,11 +1362,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; +do_ipcget(I32 optype, SV **mark, SV **sp) { + dTHR; key_t key; I32 n, flags; @@ -1324,18 +1395,13 @@ SV **sp; } I32 -do_ipcctl(optype, mark, sp) -I32 optype; -SV **mark; -SV **sp; +do_ipcctl(I32 optype, SV **mark, SV **sp) { + dTHR; SV *astr; char *a; I32 id, n, cmd, infosize, getinfo; I32 ret = -1; -#ifdef __linux__ /* XXX Need metaconfig test */ - union semun unsemds; -#endif id = SvIVx(*++mark); n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0; @@ -1365,23 +1431,12 @@ SV **sp; else if (cmd == GETALL || cmd == SETALL) { struct semid_ds semds; -#ifdef __linux__ /* XXX Need metaconfig test */ -/* linux (and Solaris2?) uses : - int semctl (int semid, int semnum, int cmd, union semun arg) - union semun { - int val; - struct semid_ds *buf; - ushort *array; - }; -*/ - union semun semun; + union semun semun; + semun.buf = &semds; - if (semctl(id, 0, IPC_STAT, semun) == -1) -#else - if (semctl(id, 0, IPC_STAT, &semds) == -1) -#endif - return -1; 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)? */ @@ -1424,13 +1479,12 @@ SV **sp; break; #endif #ifdef HAS_SEM - case OP_SEMCTL: -#ifdef __linux__ /* XXX Need metaconfig test */ - unsemds.buf = (struct semid_ds *)a; - ret = semctl(id, n, cmd, unsemds); -#else - ret = semctl(id, n, cmd, (struct semid_ds *)a); -#endif + case OP_SEMCTL: { + union semun unsemds; + + unsemds.buf = (struct semid_ds *)a; + ret = Semctl(id, n, cmd, unsemds); + } break; #endif #ifdef HAS_SHM @@ -1448,11 +1502,10 @@ SV **sp; } I32 -do_msgsnd(mark, sp) -SV **mark; -SV **sp; +do_msgsnd(SV **mark, SV **sp) { #ifdef HAS_MSG + dTHR; SV *mstr; char *mbuf; I32 id, msize, flags; @@ -1472,11 +1525,10 @@ SV **sp; } I32 -do_msgrcv(mark, sp) -SV **mark; -SV **sp; +do_msgrcv(SV **mark, SV **sp) { #ifdef HAS_MSG + dTHR; SV *mstr; char *mbuf; long mtype; @@ -1510,11 +1562,10 @@ SV **sp; } I32 -do_semop(mark, sp) -SV **mark; -SV **sp; +do_semop(SV **mark, SV **sp) { #ifdef HAS_SEM + dTHR; SV *opstr; char *opbuf; I32 id; @@ -1536,12 +1587,10 @@ SV **sp; } I32 -do_shmio(optype, mark, sp) -I32 optype; -SV **mark; -SV **sp; +do_shmio(I32 optype, SV **mark, SV **sp) { #ifdef HAS_SHM + dTHR; SV *mstr; char *mbuf, *shm; I32 id, mpos, msize; @@ -1559,7 +1608,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) { @@ -1588,3 +1637,4 @@ SV **sp; } #endif /* SYSV IPC */ +