X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sys.c;h=b63101d6d8741b6c05cdba95d6af776895ff95d8;hb=6dce6b70b85ef184fc8b4432d2436d1be5f0b117;hp=6ab33d41f875c800699c9f766ce8f425d45634b7;hpb=22c35a8c2392967a5ba6b5370695be464bd7012c;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pp_sys.c b/pp_sys.c index 6ab33d4..b63101d 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -1,6 +1,6 @@ /* pp_sys.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,8 +15,16 @@ */ #include "EXTERN.h" +#define PERL_IN_PP_SYS_C #include "perl.h" +#ifdef I_SHADOW +/* Shadow password support for solaris - pdo@cs.umd.edu + * Not just Solaris: at least HP-UX, IRIX, Linux. + * the API is from SysV. --jhi */ +#include +#endif + /* XXX If this causes problems, set i_unistd=undef in the hint file. */ #ifdef I_UNISTD # include @@ -38,6 +46,9 @@ extern "C" int syscall(unsigned long,...); #if defined(HAS_SOCKET) && !defined(VMS) /* VMS handles sockets via vmsish.h */ # include +# if defined(USE_SOCKS) && defined(I_SOCKS) +# include +# endif # ifdef I_NETDB # include # endif @@ -69,11 +80,11 @@ extern int h_errno; # ifdef I_PWD # include # else - struct passwd *getpwnam _((char *)); - struct passwd *getpwuid _((Uid_t)); + struct passwd *getpwnam (char *); + struct passwd *getpwuid (Uid_t); # endif # ifdef HAS_GETPWENT - struct passwd *getpwent _((void)); + struct passwd *getpwent (void); # endif #endif @@ -81,11 +92,11 @@ extern int h_errno; # ifdef I_GRP # include # else - struct group *getgrnam _((char *)); - struct group *getgrgid _((Gid_t)); + struct group *getgrnam (char *); + struct group *getgrgid (Gid_t); # endif # ifdef HAS_GETGRENT - struct group *getgrent _((void)); + struct group *getgrent (void); # endif #endif @@ -117,10 +128,6 @@ extern int h_errno; # endif #endif -#if !defined(HAS_MKDIR) || !defined(HAS_RMDIR) -static int dooneliner _((char *cmd, char *filename)); -#endif - #ifdef HAS_CHSIZE # ifdef my_chsize /* Probably #defined to Perl_my_chsize in embed.h */ # undef my_chsize @@ -151,7 +158,7 @@ static int dooneliner _((char *cmd, char *filename)); # endif /* no flock() or fcntl(F_SETLK,...) */ # ifdef FLOCK - static int FLOCK _((int, int)); + static int FLOCK (int, int); /* * These are the flock() constants. Since this sytems doesn't have @@ -173,14 +180,6 @@ static int dooneliner _((char *cmd, char *filename)); #endif /* no flock() */ -#ifndef MAXPATHLEN -# ifdef PATH_MAX -# define MAXPATHLEN PATH_MAX -# else -# define MAXPATHLEN 1024 -# endif -#endif - #define ZBTLEN 10 static char zero_but_true[ZBTLEN + 1] = "0 but true"; @@ -195,24 +194,32 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true"; /* F_OK unused: if stat() cannot find it... */ #if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESS) && defined(EFF_ONLY_OK) && !defined(NO_EFF_ONLY_OK) -/* Digital UNIX (when the EFF_ONLY_OK gets fixed), UnixWare */ + /* Digital UNIX (when the EFF_ONLY_OK gets fixed), UnixWare */ # define PERL_EFF_ACCESS_R_OK(p) (access((p), R_OK | EFF_ONLY_OK)) # define PERL_EFF_ACCESS_W_OK(p) (access((p), W_OK | EFF_ONLY_OK)) # define PERL_EFF_ACCESS_X_OK(p) (access((p), X_OK | EFF_ONLY_OK)) #endif #if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_EACCESS) -/* HP SecureWare */ # if defined(I_SYS_SECURITY) # include # endif -# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF)) -# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF)) -# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF)) + /* XXX Configure test needed for eaccess */ +# ifdef ACC_SELF + /* HP SecureWare */ +# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF)) +# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF)) +# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF)) +# else + /* SCO */ +# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK)) +# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK)) +# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK)) +# endif #endif #if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESSX) && defined(ACC_SELF) -/* AIX */ + /* AIX */ # define PERL_EFF_ACCESS_R_OK(p) (accessx((p), R_OK, ACC_SELF)) # define PERL_EFF_ACCESS_W_OK(p) (accessx((p), W_OK, ACC_SELF)) # define PERL_EFF_ACCESS_X_OK(p) (accessx((p), X_OK, ACC_SELF)) @@ -223,7 +230,8 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true"; || defined(HAS_SETREGID) || defined(HAS_SETRESGID)) /* The Hard Way. */ STATIC int -emulate_eaccess (const char* path, int mode) { +S_emulate_eaccess(pTHX_ const char* path, int mode) +{ Uid_t ruid = getuid(); Uid_t euid = geteuid(); Gid_t rgid = getgid(); @@ -232,7 +240,7 @@ emulate_eaccess (const char* path, int mode) { MUTEX_LOCK(&PL_cred_mutex); #if !defined(HAS_SETREUID) && !defined(HAS_SETRESUID) - croak("switching effective uid is not implemented"); + Perl_croak(aTHX_ "switching effective uid is not implemented"); #else #ifdef HAS_SETREUID if (setreuid(euid, ruid)) @@ -241,11 +249,11 @@ emulate_eaccess (const char* path, int mode) { if (setresuid(euid, ruid, (Uid_t)-1)) #endif #endif - croak("entering effective uid failed"); + Perl_croak(aTHX_ "entering effective uid failed"); #endif #if !defined(HAS_SETREGID) && !defined(HAS_SETRESGID) - croak("switching effective gid is not implemented"); + Perl_croak(aTHX_ "switching effective gid is not implemented"); #else #ifdef HAS_SETREGID if (setregid(egid, rgid)) @@ -254,7 +262,7 @@ emulate_eaccess (const char* path, int mode) { if (setresgid(egid, rgid, (Gid_t)-1)) #endif #endif - croak("entering effective gid failed"); + Perl_croak(aTHX_ "entering effective gid failed"); #endif res = access(path, mode); @@ -266,7 +274,7 @@ emulate_eaccess (const char* path, int mode) { if (setresuid(ruid, euid, (Uid_t)-1)) #endif #endif - croak("leaving effective uid failed"); + Perl_croak(aTHX_ "leaving effective uid failed"); #ifdef HAS_SETREGID if (setregid(rgid, egid)) @@ -275,7 +283,7 @@ emulate_eaccess (const char* path, int mode) { if (setresgid(rgid, egid, (Gid_t)-1)) #endif #endif - croak("leaving effective gid failed"); + Perl_croak(aTHX_ "leaving effective gid failed"); MUTEX_UNLOCK(&PL_cred_mutex); return res; @@ -287,8 +295,9 @@ emulate_eaccess (const char* path, int mode) { #if !defined(PERL_EFF_ACCESS_R_OK) STATIC int -emulate_eaccess (const char* path, int mode) { - croak("switching effective uid is not implemented"); +S_emulate_eaccess(pTHX_ const char* path, int mode) +{ + Perl_croak(aTHX_ "switching effective uid is not implemented"); /*NOTREACHED*/ return -1; } @@ -298,7 +307,8 @@ PP(pp_backtick) { djSP; dTARGET; PerlIO *fp; - char *tmps = POPp; + STRLEN n_a; + char *tmps = POPpx; I32 gimme = GIMME_V; TAINT_PROPER("``"); @@ -350,6 +360,8 @@ PP(pp_backtick) PP(pp_glob) { OP *result; + tryAMAGICunTARGET(iter, -1); + ENTER; #ifndef VMS @@ -367,7 +379,7 @@ PP(pp_glob) PL_last_in_gv = (GV*)*PL_stack_sp--; SAVESPTR(PL_rs); /* This is not permanent, either. */ - PL_rs = sv_2mortal(newSVpv("", 1)); + PL_rs = sv_2mortal(newSVpvn("\000", 1)); #ifndef DOSISH #ifndef CSH *SvPVX(PL_rs) = '\n'; @@ -382,7 +394,8 @@ PP(pp_glob) #if 0 /* XXX never used! */ PP(pp_indread) { - PL_last_in_gv = gv_fetchpv(SvPVx(GvSV((GV*)(*PL_stack_sp--)), PL_na), TRUE,SVt_PVIO); + STRLEN n_a; + PL_last_in_gv = gv_fetchpv(SvPVx(GvSV((GV*)(*PL_stack_sp--)), n_a), TRUE,SVt_PVIO); return do_readline(); } #endif @@ -396,26 +409,31 @@ PP(pp_rcatline) PP(pp_warn) { djSP; dMARK; + SV *tmpsv; char *tmps; + STRLEN len; if (SP - MARK != 1) { dTARGET; do_join(TARG, &PL_sv_no, MARK, SP); - tmps = SvPV(TARG, PL_na); + tmpsv = TARG; SP = MARK + 1; } else { - tmps = SvPV(TOPs, PL_na); + tmpsv = TOPs; } - if (!tmps || !*tmps) { + tmps = SvPV(tmpsv, len); + if (!tmps || !len) { SV *error = ERRSV; (void)SvUPGRADE(error, SVt_PV); if (SvPOK(error) && SvCUR(error)) sv_catpv(error, "\t...caught"); - tmps = SvPV(error, PL_na); + tmpsv = error; + tmps = SvPV(tmpsv, len); } - if (!tmps || !*tmps) - tmps = "Warning: something's wrong"; - warn("%s", tmps); + if (!tmps || !len) + tmpsv = sv_2mortal(newSVpvn("Warning: something's wrong", 26)); + + Perl_warn(aTHX_ "%_", tmpsv); RETSETYES; } @@ -423,25 +441,28 @@ PP(pp_die) { djSP; dMARK; char *tmps; - SV *tmpsv = Nullsv; - char *pat = "%s"; + SV *tmpsv; + STRLEN len; + bool multiarg = 0; if (SP - MARK != 1) { dTARGET; do_join(TARG, &PL_sv_no, MARK, SP); - tmps = SvPV(TARG, PL_na); + tmpsv = TARG; + tmps = SvPV(tmpsv, len); + multiarg = 1; SP = MARK + 1; } else { tmpsv = TOPs; - tmps = SvROK(tmpsv) ? Nullch : SvPV(tmpsv, PL_na); + tmps = SvROK(tmpsv) ? Nullch : SvPV(tmpsv, len); } - if (!tmps || !*tmps) { + if (!tmps || !len) { SV *error = ERRSV; (void)SvUPGRADE(error, SVt_PV); - if(tmpsv ? SvROK(tmpsv) : SvROK(error)) { - if(tmpsv) + if (multiarg ? SvROK(error) : SvROK(tmpsv)) { + if (!multiarg) SvSetSV(error,tmpsv); - else if(sv_isobject(error)) { + else if (sv_isobject(error)) { HV *stash = SvSTASH(SvRV(error)); GV *gv = gv_fetchmethod(stash, "PROPAGATE"); if (gv) { @@ -453,22 +474,24 @@ PP(pp_die) PUSHs(file); PUSHs(line); PUTBACK; - perl_call_sv((SV*)GvCV(gv), - G_SCALAR|G_EVAL|G_KEEPERR); + call_sv((SV*)GvCV(gv), + G_SCALAR|G_EVAL|G_KEEPERR); sv_setsv(error,*PL_stack_sp--); } } - pat = Nullch; + DIE(aTHX_ Nullch); } else { if (SvPOK(error) && SvCUR(error)) sv_catpv(error, "\t...propagated"); - tmps = SvPV(error, PL_na); + tmpsv = error; + tmps = SvPV(tmpsv, len); } } - if (!tmps || !*tmps) - tmps = "Died"; - DIE(pat, tmps); + if (!tmps || !len) + tmpsv = sv_2mortal(newSVpvn("Died", 4)); + + DIE(aTHX_ "%_", tmpsv); } /* I/O. */ @@ -478,22 +501,60 @@ PP(pp_open) djSP; dTARGET; GV *gv; SV *sv; + SV *name; + I32 have_name = 0; char *tmps; STRLEN len; + MAGIC *mg; + if (MAXARG > 2) { + name = POPs; + have_name = 1; + } if (MAXARG > 1) sv = POPs; if (!isGV(TOPs)) - DIE(PL_no_usym, "filehandle"); + DIE(aTHX_ PL_no_usym, "filehandle"); if (MAXARG <= 1) sv = GvSV(TOPs); gv = (GV*)POPs; if (!isGV(gv)) - DIE(PL_no_usym, "filehandle"); + DIE(aTHX_ PL_no_usym, "filehandle"); if (GvIOp(gv)) IoFLAGS(GvIOp(gv)) &= ~IOf_UNTAINT; + +#if 0 /* no undef means tmpfile() yet */ + if (sv == &PL_sv_undef) { +#ifdef PerlIO + PerlIO *fp = PerlIO_tmpfile(); +#else + PerlIO *fp = tmpfile(); +#endif + if (fp != Nullfp && do_open(gv, "+>&", 3, FALSE, 0, 0, fp)) + PUSHi( (I32)PL_forkprocess ); + else + RETPUSHUNDEF; + RETURN; + } +#endif /* no undef means tmpfile() yet */ + + + if (mg = SvTIED_mg((SV*)gv, 'q')) { + PUSHMARK(SP); + XPUSHs(SvTIED_obj((SV*)gv, mg)); + XPUSHs(sv); + if (have_name) + XPUSHs(name); + PUTBACK; + ENTER; + call_method("OPEN", G_SCALAR); + LEAVE; + SPAGAIN; + RETURN; + } + tmps = SvPV(sv, len); - if (do_open(gv, tmps, len, FALSE, O_RDONLY, 0, Nullfp)) + if (do_open9(gv, tmps, len, FALSE, O_RDONLY, 0, Nullfp, name, have_name)) PUSHi( (I32)PL_forkprocess ); else if (PL_forkprocess == 0) /* we are a new child */ PUSHi(0); @@ -518,7 +579,7 @@ PP(pp_close) XPUSHs(SvTIED_obj((SV*)gv, mg)); PUTBACK; ENTER; - perl_call_method("CLOSE", G_SCALAR); + call_method("CLOSE", G_SCALAR); LEAVE; SPAGAIN; RETURN; @@ -545,7 +606,7 @@ PP(pp_pipe_op) goto badexit; if (SvTYPE(rgv) != SVt_PVGV || SvTYPE(wgv) != SVt_PVGV) - DIE(PL_no_usym, "filehandle"); + DIE(aTHX_ PL_no_usym, "filehandle"); rstio = GvIOn(rgv); wstio = GvIOn(wgv); @@ -570,13 +631,16 @@ PP(pp_pipe_op) else PerlLIO_close(fd[1]); goto badexit; } - +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(fd[0],F_SETFD,fd[0] > PL_maxsysfd); /* ensure close-on-exec */ + fcntl(fd[1],F_SETFD,fd[1] > PL_maxsysfd); /* ensure close-on-exec */ +#endif RETPUSHYES; badexit: RETPUSHUNDEF; #else - DIE(PL_no_func, "pipe"); + DIE(aTHX_ PL_no_func, "pipe"); #endif } @@ -586,9 +650,23 @@ PP(pp_fileno) GV *gv; IO *io; PerlIO *fp; + MAGIC *mg; + if (MAXARG < 1) RETPUSHUNDEF; gv = (GV*)POPs; + + if (gv && (mg = SvTIED_mg((SV*)gv, 'q'))) { + PUSHMARK(SP); + XPUSHs(SvTIED_obj((SV*)gv, mg)); + PUTBACK; + ENTER; + call_method("FILENO", G_SCALAR); + LEAVE; + SPAGAIN; + RETURN; + } + if (!gv || !(io = GvIO(gv)) || !(fp = IoIFP(io))) RETPUSHUNDEF; PUSHi(PerlIO_fileno(fp)); @@ -598,7 +676,7 @@ PP(pp_fileno) PP(pp_umask) { djSP; dTARGET; - int anum; + Mode_t anum; #ifdef HAS_UMASK if (MAXARG < 1) { @@ -614,7 +692,7 @@ PP(pp_umask) * Otherwise it's harmless and more useful to just return undef * since 'group' and 'other' concepts probably don't exist here. */ if (MAXARG >= 1 && (POPi & 0700)) - DIE("umask not implemented"); + DIE(aTHX_ "umask not implemented"); XPUSHs(&PL_sv_undef); #endif RETURN; @@ -626,11 +704,23 @@ PP(pp_binmode) GV *gv; IO *io; PerlIO *fp; + MAGIC *mg; if (MAXARG < 1) RETPUSHUNDEF; - gv = (GV*)POPs; + gv = (GV*)POPs; + + if (gv && (mg = SvTIED_mg((SV*)gv, 'q'))) { + PUSHMARK(SP); + XPUSHs(SvTIED_obj((SV*)gv, mg)); + PUTBACK; + ENTER; + call_method("BINMODE", G_SCALAR); + LEAVE; + SPAGAIN; + RETURN; + } EXTEND(SP, 1); if (!(io = GvIO(gv)) || !(fp = IoIFP(io))) @@ -655,6 +745,7 @@ PP(pp_tie) char *methname; int how = 'P'; U32 items; + STRLEN n_a; varsv = *++MARK; switch(SvTYPE(varsv)) { @@ -682,16 +773,16 @@ PP(pp_tie) while (items--) PUSHs(*MARK++); PUTBACK; - perl_call_method(methname, G_SCALAR); + call_method(methname, G_SCALAR); } else { - /* Not clear why we don't call perl_call_method here too. + /* Not clear why we don't call call_method here too. * perhaps to get different error message ? */ stash = gv_stashsv(*MARK, FALSE); if (!stash || !(gv = gv_fetchmethod(stash, methname))) { - DIE("Can't locate object method \"%s\" via package \"%s\"", - methname, SvPV(*MARK,PL_na)); + DIE(aTHX_ "Can't locate object method \"%s\" via package \"%s\"", + methname, SvPV(*MARK,n_a)); } ENTER; PUSHSTACKi(PERLSI_MAGIC); @@ -700,7 +791,7 @@ PP(pp_tie) while (items--) PUSHs(*MARK++); PUTBACK; - perl_call_sv((SV*)GvCV(gv), G_SCALAR); + call_sv((SV*)GvCV(gv), G_SCALAR); } SPAGAIN; @@ -726,7 +817,7 @@ PP(pp_untie) MAGIC * mg ; if (mg = SvTIED_mg(sv, how)) { if (mg && SvREFCNT(SvRV(mg->mg_obj)) > 1) - warner(WARN_UNTIE, + Perl_warner(aTHX_ WARN_UNTIE, "untie attempted while %lu inner references still exist", (unsigned long)SvREFCNT(SvRV(mg->mg_obj)) - 1 ) ; } @@ -769,10 +860,10 @@ PP(pp_dbmopen) stash = gv_stashsv(sv, FALSE); if (!stash || !(gv = gv_fetchmethod(stash, "TIEHASH"))) { PUTBACK; - perl_require_pv("AnyDBM_File.pm"); + require_pv("AnyDBM_File.pm"); SPAGAIN; if (!(gv = gv_fetchmethod(stash, "TIEHASH"))) - DIE("No dbm on this machine"); + DIE(aTHX_ "No dbm on this machine"); } ENTER; @@ -787,7 +878,7 @@ PP(pp_dbmopen) PUSHs(sv_2mortal(newSViv(O_RDWR))); PUSHs(right); PUTBACK; - perl_call_sv((SV*)GvCV(gv), G_SCALAR); + call_sv((SV*)GvCV(gv), G_SCALAR); SPAGAIN; if (!sv_isobject(TOPs)) { @@ -798,7 +889,7 @@ PP(pp_dbmopen) PUSHs(sv_2mortal(newSViv(O_RDONLY))); PUSHs(right); PUTBACK; - perl_call_sv((SV*)GvCV(gv), G_SCALAR); + call_sv((SV*)GvCV(gv), G_SCALAR); SPAGAIN; } @@ -812,7 +903,7 @@ PP(pp_dbmopen) PP(pp_dbmclose) { - return pp_untie(ARGS); + return pp_untie(); } PP(pp_sselect) @@ -823,13 +914,14 @@ PP(pp_sselect) register I32 j; register char *s; register SV *sv; - double value; + NV value; I32 maxlen = 0; I32 nfound; struct timeval timebuf; struct timeval *tbuf = &timebuf; I32 growsize; char *fd_sets[4]; + STRLEN n_a; #if BYTEORDER != 0x1234 && BYTEORDER != 0x12345678 I32 masksize; I32 offset; @@ -858,8 +950,8 @@ PP(pp_sselect) /* If SELECT_MIN_BITS is greater than one we most probably will want * to align the sizes with SELECT_MIN_BITS/8 because for example * in many little-endian (Intel, Alpha) systems (Linux, OS/2, Digital - * UNIX, Solaris, NeXT) the smallest quantum select() operates on - * (sets bit) is 32 bits. */ + * UNIX, Solaris, NeXT, Rhapsody) the smallest quantum select() operates + * on (sets/tests/clears bits) is 32 bits. */ growsize = maxlen + (SELECT_MIN_BITS/8 - (maxlen % (SELECT_MIN_BITS/8))); # else growsize = sizeof(fd_set); @@ -885,7 +977,7 @@ PP(pp_sselect) if (value < 0.0) value = 0.0; timebuf.tv_sec = (long)value; - value -= (double)timebuf.tv_sec; + value -= (NV)timebuf.tv_sec; timebuf.tv_usec = (long)(value * 1000000.0); } else @@ -898,7 +990,7 @@ PP(pp_sselect) continue; } else if (!SvPOK(sv)) - SvPV_force(sv,PL_na); /* force string conversion */ + SvPV_force(sv,n_a); /* force string conversion */ j = SvLEN(sv); if (j < growsize) { Sv_Grow(sv, growsize); @@ -944,19 +1036,19 @@ PP(pp_sselect) PUSHi(nfound); if (GIMME == G_ARRAY && tbuf) { - value = (double)(timebuf.tv_sec) + - (double)(timebuf.tv_usec) / 1000000.0; + value = (NV)(timebuf.tv_sec) + + (NV)(timebuf.tv_usec) / 1000000.0; PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setnv(sv, value); } RETURN; #else - DIE("select not implemented"); + DIE(aTHX_ "select not implemented"); #endif } void -setdefout(GV *gv) +Perl_setdefout(pTHX_ GV *gv) { dTHR; if (gv) @@ -1019,7 +1111,7 @@ PP(pp_getc) XPUSHs(SvTIED_obj((SV*)gv, mg)); PUTBACK; ENTER; - perl_call_method("GETC", gimme); + call_method("GETC", gimme); LEAVE; SPAGAIN; if (gimme == G_SCALAR) @@ -1037,11 +1129,11 @@ PP(pp_getc) PP(pp_read) { - return pp_sysread(ARGS); + return pp_sysread(); } STATIC OP * -doform(CV *cv, GV *gv, OP *retop) +S_doform(pTHX_ CV *cv, GV *gv, OP *retop) { dTHR; register PERL_CONTEXT *cx; @@ -1092,9 +1184,9 @@ PP(pp_enterwrite) if (fgv) { SV *tmpsv = sv_newmortal(); gv_efullname3(tmpsv, fgv, Nullch); - DIE("Undefined format \"%s\" called",SvPVX(tmpsv)); + DIE(aTHX_ "Undefined format \"%s\" called",SvPVX(tmpsv)); } - DIE("Not a format reference"); + DIE(aTHX_ "Not a format reference"); } if (CvCLONE(cv)) cv = (CV*)sv_2mortal((SV*)cv_clone(cv)); @@ -1128,7 +1220,7 @@ PP(pp_leavewrite) if (!IoTOP_NAME(io)) { if (!IoFMT_NAME(io)) IoFMT_NAME(io) = savepv(GvNAME(gv)); - topname = sv_2mortal(newSVpvf("%s_TOP", IoFMT_NAME(io))); + topname = sv_2mortal(Perl_newSVpvf(aTHX_ "%s_TOP", IoFMT_NAME(io))); topgv = gv_fetchpv(SvPVX(topname), FALSE, SVt_PVFM); if ((topgv && GvFORM(topgv)) || !gv_fetchpv("top",FALSE,SVt_PVFM)) @@ -1168,12 +1260,12 @@ PP(pp_leavewrite) IoFLAGS(io) |= IOf_DIDTOP; fgv = IoTOP_GV(io); if (!fgv) - DIE("bad top format reference"); + DIE(aTHX_ "bad top format reference"); cv = GvFORM(fgv); if (!cv) { SV *tmpsv = sv_newmortal(); gv_efullname3(tmpsv, fgv, Nullch); - DIE("Undefined top format \"%s\" called",SvPVX(tmpsv)); + DIE(aTHX_ "Undefined top format \"%s\" called",SvPVX(tmpsv)); } if (CvCLONE(cv)) cv = (CV*)sv_2mortal((SV*)cv_clone(cv)); @@ -1188,17 +1280,22 @@ PP(pp_leavewrite) fp = IoOFP(io); if (!fp) { if (ckWARN2(WARN_CLOSED,WARN_IO)) { + SV* sv = sv_newmortal(); + gv_efullname3(sv, gv, Nullch); if (IoIFP(io)) - warner(WARN_IO, "Filehandle only opened for input"); + Perl_warner(aTHX_ WARN_IO, + "Filehandle %s opened only for input", + SvPV_nolen(sv)); else if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "Write on closed filehandle"); + Perl_warner(aTHX_ WARN_CLOSED, + "Write on closed filehandle %s", SvPV_nolen(sv)); } PUSHs(&PL_sv_no); } else { if ((IoLINES_LEFT(io) -= FmLINES(PL_formtarget)) < 0) { if (ckWARN(WARN_IO)) - warner(WARN_IO, "page overflow"); + Perl_warner(aTHX_ WARN_IO, "page overflow"); } if (!PerlIO_write(ofp, SvPVX(PL_formtarget), SvCUR(PL_formtarget)) || PerlIO_error(fp)) @@ -1225,6 +1322,7 @@ PP(pp_prtf) PerlIO *fp; SV *sv; MAGIC *mg; + STRLEN n_a; if (PL_op->op_flags & OPf_STACKED) gv = (GV*)*++MARK; @@ -1242,7 +1340,7 @@ PP(pp_prtf) *MARK = SvTIED_obj((SV*)gv, mg); PUTBACK; ENTER; - perl_call_method("PRINTF", G_SCALAR); + call_method("PRINTF", G_SCALAR); LEAVE; SPAGAIN; MARK = ORIGMARK + 1; @@ -1254,32 +1352,28 @@ PP(pp_prtf) sv = NEWSV(0,0); if (!(io = GvIO(gv))) { if (ckWARN(WARN_UNOPENED)) { - gv_fullname3(sv, gv, Nullch); - warner(WARN_UNOPENED, "Filehandle %s never opened", SvPV(sv,PL_na)); + gv_efullname3(sv, gv, Nullch); + Perl_warner(aTHX_ WARN_UNOPENED, + "Filehandle %s never opened", SvPV(sv,n_a)); } SETERRNO(EBADF,RMS$_IFI); goto just_say_no; } else if (!(fp = IoOFP(io))) { if (ckWARN2(WARN_CLOSED,WARN_IO)) { - gv_fullname3(sv, gv, Nullch); + gv_efullname3(sv, gv, Nullch); if (IoIFP(io)) - warner(WARN_IO, "Filehandle %s opened only for input", - SvPV(sv,PL_na)); + Perl_warner(aTHX_ WARN_IO, + "Filehandle %s opened only for input", + SvPV(sv,n_a)); else if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "printf on closed filehandle %s", - SvPV(sv,PL_na)); + Perl_warner(aTHX_ WARN_CLOSED, + "printf on closed filehandle %s", SvPV(sv,n_a)); } SETERRNO(EBADF,IoIFP(io)?RMS$_FAC:RMS$_IFI); goto just_say_no; } else { -#ifdef USE_LOCALE_NUMERIC - if (PL_op->op_private & OPpLOCALE) - SET_NUMERIC_LOCAL(); - else - SET_NUMERIC_STANDARD(); -#endif do_sprintf(sv, SP - MARK, MARK + 1); if (!do_print(sv, fp)) goto just_say_no; @@ -1317,6 +1411,8 @@ PP(pp_sysopen) sv = POPs; gv = (GV *)POPs; + /* Need TIEHANDLE method ? */ + tmps = SvPV(sv, len); if (do_open(gv, tmps, len, TRUE, mode, perm, Nullfp)) { IoLINES(GvIOp(gv)) = 0; @@ -1350,7 +1446,7 @@ PP(pp_sysread) PUSHMARK(MARK-1); *MARK = SvTIED_obj((SV*)gv, mg); ENTER; - perl_call_method("READ", G_SCALAR); + call_method("READ", G_SCALAR); LEAVE; SPAGAIN; sv = POPs; @@ -1367,7 +1463,7 @@ PP(pp_sysread) buffer = SvPV_force(bufsv, blen); length = SvIVx(*++MARK); if (length < 0) - DIE("Negative length"); + DIE(aTHX_ "Negative length"); SETERRNO(0,0); if (MARK < SP) offset = SvIVx(*++MARK); @@ -1384,6 +1480,14 @@ PP(pp_sysread) #else bufsize = sizeof namebuf; #endif +#ifdef OS2 /* At least Warp3+IAK: only the first byte of bufsize set */ + if (bufsize >= 256) + bufsize = 255; +#endif +#ifdef OS2 /* At least Warp3+IAK: only the first byte of bufsize set */ + if (bufsize >= 256) + bufsize = 255; +#endif buffer = SvGROW(bufsv, length+1); /* 'offset' means 'flags' here */ length = PerlSock_recvfrom(PerlIO_fileno(IoIFP(io)), buffer, length, offset, @@ -1404,11 +1508,11 @@ PP(pp_sysread) } #else if (PL_op->op_type == OP_RECV) - DIE(PL_no_sock_func, "recv"); + DIE(aTHX_ PL_no_sock_func, "recv"); #endif if (offset < 0) { if (-offset > blen) - DIE("Offset outside string"); + DIE(aTHX_ "Offset outside string"); offset += blen; } bufsize = SvCUR(bufsv); @@ -1417,7 +1521,17 @@ PP(pp_sysread) Zero(buffer+bufsize, offset-bufsize, char); } if (PL_op->op_type == OP_SYSREAD) { - length = PerlLIO_read(PerlIO_fileno(IoIFP(io)), buffer+offset, length); +#ifdef PERL_SOCK_SYSREAD_IS_RECV + if (IoTYPE(io) == 's') { + length = PerlSock_recv(PerlIO_fileno(IoIFP(io)), + buffer+offset, length, 0); + } + else +#endif + { + length = PerlLIO_read(PerlIO_fileno(IoIFP(io)), + buffer+offset, length); + } } else #ifdef HAS_SOCKET__bad_code_maybe @@ -1439,8 +1553,17 @@ PP(pp_sysread) if (length == 0 && PerlIO_error(IoIFP(io))) length = -1; } - if (length < 0) + if (length < 0) { + if (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)); + } goto say_undef; + } SvCUR_set(bufsv, length+offset); *SvEND(bufsv) = '\0'; (void)SvPOK_only(bufsv); @@ -1462,11 +1585,13 @@ PP(pp_syswrite) djSP; int items = (SP - PL_stack_base) - TOPMARK; if (items == 2) { + SV *sv; EXTEND(SP, 1); - PUSHs(sv_2mortal(newSViv(sv_len(*SP)))); + sv = sv_2mortal(newSViv(sv_len(*SP))); + PUSHs(sv); PUTBACK; } - return pp_send(ARGS); + return pp_send(); } PP(pp_send) @@ -1488,7 +1613,7 @@ PP(pp_send) PUSHMARK(MARK-1); *MARK = SvTIED_obj((SV*)gv, mg); ENTER; - perl_call_method("WRITE", G_SCALAR); + call_method("WRITE", G_SCALAR); LEAVE; SPAGAIN; sv = POPs; @@ -1502,16 +1627,16 @@ PP(pp_send) buffer = SvPV(bufsv, blen); length = SvIVx(*++MARK); if (length < 0) - DIE("Negative length"); + DIE(aTHX_ "Negative length"); SETERRNO(0,0); io = GvIO(gv); if (!io || !IoIFP(io)) { length = -1; if (ckWARN(WARN_CLOSED)) { if (PL_op->op_type == OP_SYSWRITE) - warner(WARN_CLOSED, "Syswrite on closed filehandle"); + Perl_warner(aTHX_ WARN_CLOSED, "Syswrite on closed filehandle"); else - warner(WARN_CLOSED, "Send on closed socket"); + Perl_warner(aTHX_ WARN_CLOSED, "Send on closed socket"); } } else if (PL_op->op_type == OP_SYSWRITE) { @@ -1519,15 +1644,25 @@ PP(pp_send) offset = SvIVx(*++MARK); if (offset < 0) { if (-offset > blen) - DIE("Offset outside string"); + DIE(aTHX_ "Offset outside string"); offset += blen; } else if (offset >= blen && blen > 0) - DIE("Offset outside string"); + DIE(aTHX_ "Offset outside string"); } else offset = 0; if (length > blen - offset) length = blen - offset; - length = PerlLIO_write(PerlIO_fileno(IoIFP(io)), buffer+offset, length); +#ifdef PERL_SOCK_SYSWRITE_IS_SEND + if (IoTYPE(io) == 's') { + length = PerlSock_send(PerlIO_fileno(IoIFP(io)), + buffer+offset, length, 0); + } + else +#endif + { + length = PerlLIO_write(PerlIO_fileno(IoIFP(io)), + buffer+offset, length); + } } #ifdef HAS_SOCKET else if (SP > MARK) { @@ -1542,7 +1677,7 @@ PP(pp_send) #else else - DIE(PL_no_sock_func, "send"); + DIE(aTHX_ PL_no_sock_func, "send"); #endif if (length < 0) goto say_undef; @@ -1557,18 +1692,31 @@ PP(pp_send) PP(pp_recv) { - return pp_sysread(ARGS); + return pp_sysread(); } PP(pp_eof) { djSP; GV *gv; + MAGIC *mg; if (MAXARG <= 0) gv = PL_last_in_gv; else gv = PL_last_in_gv = (GV*)POPs; + + if (gv && (mg = SvTIED_mg((SV*)gv, 'q'))) { + PUSHMARK(SP); + XPUSHs(SvTIED_obj((SV*)gv, mg)); + PUTBACK; + ENTER; + call_method("EOF", G_SCALAR); + LEAVE; + SPAGAIN; + RETURN; + } + PUSHs(boolSV(!gv || do_eof(gv))); RETURN; } @@ -1576,19 +1724,32 @@ PP(pp_eof) PP(pp_tell) { djSP; dTARGET; - GV *gv; + GV *gv; + MAGIC *mg; if (MAXARG <= 0) gv = PL_last_in_gv; else gv = PL_last_in_gv = (GV*)POPs; + + if (gv && (mg = SvTIED_mg((SV*)gv, 'q'))) { + PUSHMARK(SP); + XPUSHs(SvTIED_obj((SV*)gv, mg)); + PUTBACK; + ENTER; + call_method("TELL", G_SCALAR); + LEAVE; + SPAGAIN; + RETURN; + } + PUSHi( do_tell(gv) ); RETURN; } PP(pp_seek) { - return pp_sysseek(ARGS); + return pp_sysseek(); } PP(pp_sysseek) @@ -1597,15 +1758,30 @@ PP(pp_sysseek) GV *gv; int whence = POPi; Off_t offset = POPl; + MAGIC *mg; gv = PL_last_in_gv = (GV*)POPs; + + if (gv && (mg = SvTIED_mg((SV*)gv, 'q'))) { + PUSHMARK(SP); + XPUSHs(SvTIED_obj((SV*)gv, mg)); + XPUSHs(sv_2mortal(newSViv((IV) offset))); + XPUSHs(sv_2mortal(newSViv((IV) whence))); + PUTBACK; + ENTER; + call_method("SEEK", G_SCALAR); + LEAVE; + SPAGAIN; + RETURN; + } + if (PL_op->op_type == OP_SEEK) PUSHs(boolSV(do_seek(gv, offset, whence))); else { Off_t n = do_sysseek(gv, offset, whence); PUSHs((n < 0) ? &PL_sv_undef : sv_2mortal(n ? newSViv((IV)n) - : newSVpv(zero_but_true, ZBTLEN))); + : newSVpvn(zero_but_true, ZBTLEN))); } RETURN; } @@ -1616,11 +1792,12 @@ PP(pp_truncate) Off_t len = (Off_t)POPn; int result = 1; GV *tmpgv; + STRLEN n_a; SETERRNO(0,0); #if defined(HAS_TRUNCATE) || defined(HAS_CHSIZE) || defined(F_FREESP) if (PL_op->op_flags & OPf_SPECIAL) { - tmpgv = gv_fetchpv(POPp, FALSE, SVt_PVIO); + tmpgv = gv_fetchpv(POPpx, FALSE, SVt_PVIO); do_ftruncate: TAINT_PROPER("truncate"); if (!GvIO(tmpgv) || !IoIFP(GvIOp(tmpgv)) || @@ -1634,6 +1811,7 @@ PP(pp_truncate) else { SV *sv = POPs; char *name; + STRLEN n_a; if (SvTYPE(sv) == SVt_PVGV) { tmpgv = (GV*)sv; /* *main::FRED for example */ @@ -1644,7 +1822,7 @@ PP(pp_truncate) goto do_ftruncate; } - name = SvPV(sv, PL_na); + name = SvPV(sv, n_a); TAINT_PROPER("truncate"); #ifdef HAS_TRUNCATE if (truncate(name, len) < 0) @@ -1669,13 +1847,13 @@ PP(pp_truncate) SETERRNO(EBADF,RMS$_IFI); RETPUSHUNDEF; #else - DIE("truncate not implemented"); + DIE(aTHX_ "truncate not implemented"); #endif } PP(pp_fcntl) { - return pp_ioctl(ARGS); + return pp_ioctl(); } PP(pp_ioctl) @@ -1717,7 +1895,7 @@ PP(pp_ioctl) #ifdef HAS_IOCTL retval = PerlLIO_ioctl(PerlIO_fileno(IoIFP(io)), func, s); #else - DIE("ioctl is not implemented"); + DIE(aTHX_ "ioctl is not implemented"); #endif else #ifdef HAS_FCNTL @@ -1727,12 +1905,12 @@ PP(pp_ioctl) retval = fcntl(PerlIO_fileno(IoIFP(io)), func, s); #endif #else - DIE("fcntl is not implemented"); + DIE(aTHX_ "fcntl is not implemented"); #endif if (SvPOK(argsv)) { if (s[SvCUR(argsv)] != 17) - DIE("Possible memory corruption: %s overflowed 3rd argument", + DIE(aTHX_ "Possible memory corruption: %s overflowed 3rd argument", PL_op_name[optype]); s[SvCUR(argsv)] = 0; /* put our null back */ SvSETMAGIC(argsv); /* Assume it has changed */ @@ -1776,7 +1954,7 @@ PP(pp_flock) PUSHi(value); RETURN; #else - DIE(PL_no_func, "flock()"); + DIE(aTHX_ PL_no_func, "flock()"); #endif } @@ -1820,7 +1998,7 @@ PP(pp_socket) RETPUSHYES; #else - DIE(PL_no_sock_func, "socket"); + DIE(aTHX_ PL_no_sock_func, "socket"); #endif } @@ -1870,7 +2048,7 @@ PP(pp_sockpair) RETPUSHYES; #else - DIE(PL_no_sock_func, "socketpair"); + DIE(aTHX_ PL_no_sock_func, "socketpair"); #endif } @@ -1925,11 +2103,11 @@ PP(pp_bind) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "bind() on closed fd"); + Perl_warner(aTHX_ WARN_CLOSED, "bind() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "bind"); + DIE(aTHX_ PL_no_sock_func, "bind"); #endif } @@ -1955,11 +2133,11 @@ PP(pp_connect) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "connect() on closed fd"); + Perl_warner(aTHX_ WARN_CLOSED, "connect() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "connect"); + DIE(aTHX_ PL_no_sock_func, "connect"); #endif } @@ -1981,11 +2159,11 @@ PP(pp_listen) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "listen() on closed fd"); + Perl_warner(aTHX_ WARN_CLOSED, "listen() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "listen"); + DIE(aTHX_ PL_no_sock_func, "listen"); #endif } @@ -2035,14 +2213,14 @@ PP(pp_accept) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "accept() on closed fd"); + Perl_warner(aTHX_ WARN_CLOSED, "accept() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); badexit: RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "accept"); + DIE(aTHX_ PL_no_sock_func, "accept"); #endif } @@ -2062,20 +2240,20 @@ PP(pp_shutdown) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "shutdown() on closed fd"); + Perl_warner(aTHX_ WARN_CLOSED, "shutdown() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "shutdown"); + DIE(aTHX_ PL_no_sock_func, "shutdown"); #endif } PP(pp_gsockopt) { #ifdef HAS_SOCKET - return pp_ssockopt(ARGS); + return pp_ssockopt(); #else - DIE(PL_no_sock_func, "getsockopt"); + DIE(aTHX_ PL_no_sock_func, "getsockopt"); #endif } @@ -2122,8 +2300,9 @@ PP(pp_ssockopt) char *buf; int aint; if (SvPOKp(sv)) { - buf = SvPV(sv, PL_na); - len = PL_na; + STRLEN l; + buf = SvPV(sv, l); + len = l; } else { aint = (int)SvIV(sv); @@ -2140,22 +2319,22 @@ PP(pp_ssockopt) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "[gs]etsockopt() on closed fd"); + Perl_warner(aTHX_ WARN_CLOSED, "[gs]etsockopt() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); nuts2: RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "setsockopt"); + DIE(aTHX_ PL_no_sock_func, "setsockopt"); #endif } PP(pp_getsockname) { #ifdef HAS_SOCKET - return pp_getpeername(ARGS); + return pp_getpeername(); #else - DIE(PL_no_sock_func, "getsockname"); + DIE(aTHX_ PL_no_sock_func, "getsockname"); #endif } @@ -2213,13 +2392,13 @@ PP(pp_getpeername) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "get{sock, peer}name() on closed fd"); + Perl_warner(aTHX_ WARN_CLOSED, "get{sock, peer}name() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); nuts2: RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "getpeername"); + DIE(aTHX_ PL_no_sock_func, "getpeername"); #endif } @@ -2227,7 +2406,7 @@ nuts2: PP(pp_lstat) { - return pp_stat(ARGS); + return pp_stat(); } PP(pp_stat) @@ -2236,6 +2415,7 @@ PP(pp_stat) GV *tmpgv; I32 gimme; I32 max = 13; + STRLEN n_a; if (PL_op->op_flags & OPf_REF) { tmpgv = cGVOP->op_gv; @@ -2260,18 +2440,18 @@ PP(pp_stat) tmpgv = (GV*)SvRV(sv); goto do_fstat; } - sv_setpv(PL_statname, SvPV(sv,PL_na)); + sv_setpv(PL_statname, SvPV(sv,n_a)); PL_statgv = Nullgv; #ifdef HAS_LSTAT PL_laststype = PL_op->op_type; if (PL_op->op_type == OP_LSTAT) - PL_laststatval = PerlLIO_lstat(SvPV(PL_statname, PL_na), &PL_statcache); + PL_laststatval = PerlLIO_lstat(SvPV(PL_statname, n_a), &PL_statcache); else #endif - PL_laststatval = PerlLIO_stat(SvPV(PL_statname, PL_na), &PL_statcache); + PL_laststatval = PerlLIO_stat(SvPV(PL_statname, n_a), &PL_statcache); if (PL_laststatval < 0) { - if (ckWARN(WARN_NEWLINE) && strchr(SvPV(PL_statname, PL_na), '\n')) - warner(WARN_NEWLINE, PL_warn_nl, "stat"); + if (ckWARN(WARN_NEWLINE) && strchr(SvPV(PL_statname, n_a), '\n')) + Perl_warner(aTHX_ WARN_NEWLINE, PL_warn_nl, "stat"); max = 0; } } @@ -2294,7 +2474,7 @@ PP(pp_stat) #ifdef USE_STAT_RDEV PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_rdev))); #else - PUSHs(sv_2mortal(newSVpv("", 0))); + PUSHs(sv_2mortal(newSVpvn("", 0))); #endif PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_size))); #ifdef BIG_TIME @@ -2310,8 +2490,8 @@ PP(pp_stat) PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_blksize))); PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_blocks))); #else - PUSHs(sv_2mortal(newSVpv("", 0))); - PUSHs(sv_2mortal(newSVpv("", 0))); + PUSHs(sv_2mortal(newSVpvn("", 0))); + PUSHs(sv_2mortal(newSVpvn("", 0))); #endif } RETURN; @@ -2322,8 +2502,9 @@ PP(pp_ftrread) I32 result; djSP; #if defined(HAS_ACCESS) && defined(R_OK) + STRLEN n_a; if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { - result = access(TOPp, R_OK); + result = access(TOPpx, R_OK); if (result == 0) RETPUSHYES; if (result < 0) @@ -2331,9 +2512,9 @@ PP(pp_ftrread) RETPUSHNO; } else - result = my_stat(ARGS); + result = my_stat(); #else - result = my_stat(ARGS); + result = my_stat(); #endif SPAGAIN; if (result < 0) @@ -2348,8 +2529,9 @@ PP(pp_ftrwrite) I32 result; djSP; #if defined(HAS_ACCESS) && defined(W_OK) + STRLEN n_a; if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { - result = access(TOPp, W_OK); + result = access(TOPpx, W_OK); if (result == 0) RETPUSHYES; if (result < 0) @@ -2357,9 +2539,9 @@ PP(pp_ftrwrite) RETPUSHNO; } else - result = my_stat(ARGS); + result = my_stat(); #else - result = my_stat(ARGS); + result = my_stat(); #endif SPAGAIN; if (result < 0) @@ -2374,8 +2556,9 @@ PP(pp_ftrexec) I32 result; djSP; #if defined(HAS_ACCESS) && defined(X_OK) + STRLEN n_a; if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { - result = access(TOPp, X_OK); + result = access(TOPpx, X_OK); if (result == 0) RETPUSHYES; if (result < 0) @@ -2383,9 +2566,9 @@ PP(pp_ftrexec) RETPUSHNO; } else - result = my_stat(ARGS); + result = my_stat(); #else - result = my_stat(ARGS); + result = my_stat(); #endif SPAGAIN; if (result < 0) @@ -2400,8 +2583,9 @@ PP(pp_fteread) I32 result; djSP; #ifdef PERL_EFF_ACCESS_R_OK + STRLEN n_a; if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { - result = PERL_EFF_ACCESS_R_OK(TOPp); + result = PERL_EFF_ACCESS_R_OK(TOPpx); if (result == 0) RETPUSHYES; if (result < 0) @@ -2409,9 +2593,9 @@ PP(pp_fteread) RETPUSHNO; } else - result = my_stat(ARGS); + result = my_stat(); #else - result = my_stat(ARGS); + result = my_stat(); #endif SPAGAIN; if (result < 0) @@ -2426,8 +2610,9 @@ PP(pp_ftewrite) I32 result; djSP; #ifdef PERL_EFF_ACCESS_W_OK + STRLEN n_a; if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { - result = PERL_EFF_ACCESS_W_OK(TOPp); + result = PERL_EFF_ACCESS_W_OK(TOPpx); if (result == 0) RETPUSHYES; if (result < 0) @@ -2435,9 +2620,9 @@ PP(pp_ftewrite) RETPUSHNO; } else - result = my_stat(ARGS); + result = my_stat(); #else - result = my_stat(ARGS); + result = my_stat(); #endif SPAGAIN; if (result < 0) @@ -2452,8 +2637,9 @@ PP(pp_fteexec) I32 result; djSP; #ifdef PERL_EFF_ACCESS_X_OK + STRLEN n_a; if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { - result = PERL_EFF_ACCESS_X_OK(TOPp); + result = PERL_EFF_ACCESS_X_OK(TOPpx); if (result == 0) RETPUSHYES; if (result < 0) @@ -2461,9 +2647,9 @@ PP(pp_fteexec) RETPUSHNO; } else - result = my_stat(ARGS); + result = my_stat(); #else - result = my_stat(ARGS); + result = my_stat(); #endif SPAGAIN; if (result < 0) @@ -2475,7 +2661,7 @@ PP(pp_fteexec) PP(pp_ftis) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2484,12 +2670,12 @@ PP(pp_ftis) PP(pp_fteowned) { - return pp_ftrowned(ARGS); + return pp_ftrowned(); } PP(pp_ftrowned) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2500,7 +2686,7 @@ PP(pp_ftrowned) PP(pp_ftzero) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2511,7 +2697,7 @@ PP(pp_ftzero) PP(pp_ftsize) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; dTARGET; if (result < 0) RETPUSHUNDEF; @@ -2521,7 +2707,7 @@ PP(pp_ftsize) PP(pp_ftmtime) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; dTARGET; if (result < 0) RETPUSHUNDEF; @@ -2531,7 +2717,7 @@ PP(pp_ftmtime) PP(pp_ftatime) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; dTARGET; if (result < 0) RETPUSHUNDEF; @@ -2541,7 +2727,7 @@ PP(pp_ftatime) PP(pp_ftctime) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; dTARGET; if (result < 0) RETPUSHUNDEF; @@ -2551,7 +2737,7 @@ PP(pp_ftctime) PP(pp_ftsock) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2562,7 +2748,7 @@ PP(pp_ftsock) PP(pp_ftchr) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2573,7 +2759,7 @@ PP(pp_ftchr) PP(pp_ftblk) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2584,7 +2770,7 @@ PP(pp_ftblk) PP(pp_ftfile) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2595,7 +2781,7 @@ PP(pp_ftfile) PP(pp_ftdir) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2606,7 +2792,7 @@ PP(pp_ftdir) PP(pp_ftpipe) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2617,7 +2803,7 @@ PP(pp_ftpipe) PP(pp_ftlink) { - I32 result = my_lstat(ARGS); + I32 result = my_lstat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2630,7 +2816,7 @@ PP(pp_ftsuid) { djSP; #ifdef S_ISUID - I32 result = my_stat(ARGS); + I32 result = my_stat(); SPAGAIN; if (result < 0) RETPUSHUNDEF; @@ -2644,7 +2830,7 @@ PP(pp_ftsgid) { djSP; #ifdef S_ISGID - I32 result = my_stat(ARGS); + I32 result = my_stat(); SPAGAIN; if (result < 0) RETPUSHUNDEF; @@ -2658,7 +2844,7 @@ PP(pp_ftsvtx) { djSP; #ifdef S_ISVTX - I32 result = my_stat(ARGS); + I32 result = my_stat(); SPAGAIN; if (result < 0) RETPUSHUNDEF; @@ -2674,6 +2860,7 @@ PP(pp_fttty) int fd; GV *gv; char *tmps = Nullch; + STRLEN n_a; if (PL_op->op_flags & OPf_REF) gv = cGVOP->op_gv; @@ -2682,7 +2869,7 @@ PP(pp_fttty) else if (SvROK(TOPs) && isGV(SvRV(TOPs))) gv = (GV*)SvRV(POPs); else - gv = gv_fetchpv(tmps = POPp, FALSE, SVt_PVIO); + gv = gv_fetchpv(tmps = POPpx, FALSE, SVt_PVIO); if (GvIO(gv) && IoIFP(GvIOp(gv))) fd = PerlIO_fileno(IoIFP(GvIOp(gv))); @@ -2714,6 +2901,7 @@ PP(pp_fttext) register IO *io; register SV *sv; GV *gv; + STRLEN n_a; if (PL_op->op_flags & OPf_REF) gv = cGVOP->op_gv; @@ -2742,7 +2930,7 @@ PP(pp_fttext) } if (io && IoIFP(io)) { if (! PerlIO_has_base(IoIFP(io))) - DIE("-T and -B not implemented on filehandles"); + DIE(aTHX_ "-T and -B not implemented on filehandles"); PL_laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &PL_statcache); if (PL_laststatval < 0) RETPUSHUNDEF; @@ -2766,7 +2954,7 @@ PP(pp_fttext) } else { if (ckWARN(WARN_UNOPENED)) - warner(WARN_UNOPENED, "Test on unopened file <%s>", + Perl_warner(aTHX_ WARN_UNOPENED, "Test on unopened file <%s>", GvENAME(cGVOP->op_gv)); SETERRNO(EBADF,RMS$_IFI); RETPUSHUNDEF; @@ -2777,15 +2965,15 @@ PP(pp_fttext) really_filename: PL_statgv = Nullgv; PL_laststatval = -1; - sv_setpv(PL_statname, SvPV(sv, PL_na)); + sv_setpv(PL_statname, SvPV(sv, n_a)); #ifdef HAS_OPEN3 - i = PerlLIO_open3(SvPV(sv, PL_na), O_RDONLY, 0); + i = PerlLIO_open3(SvPV(sv, n_a), O_RDONLY, 0); #else - i = PerlLIO_open(SvPV(sv, PL_na), 0); + i = PerlLIO_open(SvPV(sv, n_a), 0); #endif if (i < 0) { - if (ckWARN(WARN_NEWLINE) && strchr(SvPV(sv, PL_na), '\n')) - warner(WARN_NEWLINE, PL_warn_nl, "open"); + if (ckWARN(WARN_NEWLINE) && strchr(SvPV(sv, n_a), '\n')) + Perl_warner(aTHX_ WARN_NEWLINE, PL_warn_nl, "open"); RETPUSHUNDEF; } PL_laststatval = PerlLIO_fstat(i, &PL_statcache); @@ -2830,7 +3018,7 @@ PP(pp_fttext) PP(pp_ftbinary) { - return pp_fttext(ARGS); + return pp_fttext(); } /* File calls. */ @@ -2840,26 +3028,27 @@ PP(pp_chdir) djSP; dTARGET; char *tmps; SV **svp; + STRLEN n_a; if (MAXARG < 1) tmps = Nullch; else - tmps = POPp; + tmps = POPpx; if (!tmps || !*tmps) { svp = hv_fetch(GvHVn(PL_envgv), "HOME", 4, FALSE); if (svp) - tmps = SvPV(*svp, PL_na); + tmps = SvPV(*svp, n_a); } if (!tmps || !*tmps) { svp = hv_fetch(GvHVn(PL_envgv), "LOGDIR", 6, FALSE); if (svp) - tmps = SvPV(*svp, PL_na); + tmps = SvPV(*svp, n_a); } #ifdef VMS if (!tmps || !*tmps) { svp = hv_fetch(GvHVn(PL_envgv), "SYS$LOGIN", 9, FALSE); if (svp) - tmps = SvPV(*svp, PL_na); + tmps = SvPV(*svp, n_a); } #endif TAINT_PROPER("chdir"); @@ -2882,7 +3071,7 @@ PP(pp_chown) PUSHi(value); RETURN; #else - DIE(PL_no_func, "Unsupported function chown"); + DIE(aTHX_ PL_no_func, "Unsupported function chown"); #endif } @@ -2891,12 +3080,13 @@ PP(pp_chroot) djSP; dTARGET; char *tmps; #ifdef HAS_CHROOT - tmps = POPp; + STRLEN n_a; + tmps = POPpx; TAINT_PROPER("chroot"); PUSHi( chroot(tmps) >= 0 ); RETURN; #else - DIE(PL_no_func, "chroot"); + DIE(aTHX_ PL_no_func, "chroot"); #endif } @@ -2934,9 +3124,10 @@ PP(pp_rename) { djSP; dTARGET; int anum; + STRLEN n_a; - char *tmps2 = POPp; - char *tmps = SvPV(TOPs, PL_na); + char *tmps2 = POPpx; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("rename"); #ifdef HAS_RENAME anum = PerlLIO_rename(tmps, tmps2); @@ -2960,12 +3151,13 @@ PP(pp_link) { djSP; dTARGET; #ifdef HAS_LINK - char *tmps2 = POPp; - char *tmps = SvPV(TOPs, PL_na); + STRLEN n_a; + char *tmps2 = POPpx; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("link"); SETi( link(tmps, tmps2) >= 0 ); #else - DIE(PL_no_func, "Unsupported function link"); + DIE(aTHX_ PL_no_func, "Unsupported function link"); #endif RETURN; } @@ -2974,13 +3166,14 @@ PP(pp_symlink) { djSP; dTARGET; #ifdef HAS_SYMLINK - char *tmps2 = POPp; - char *tmps = SvPV(TOPs, PL_na); + STRLEN n_a; + char *tmps2 = POPpx; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("symlink"); SETi( symlink(tmps, tmps2) >= 0 ); RETURN; #else - DIE(PL_no_func, "symlink"); + DIE(aTHX_ PL_no_func, "symlink"); #endif } @@ -2991,11 +3184,12 @@ PP(pp_readlink) char *tmps; char buf[MAXPATHLEN]; int len; + STRLEN n_a; #ifndef INCOMPLETE_TAINTS TAINT; #endif - tmps = POPp; + tmps = POPpx; len = readlink(tmps, buf, sizeof buf); EXTEND(SP, 1); if (len < 0) @@ -3009,10 +3203,8 @@ PP(pp_readlink) } #if !defined(HAS_MKDIR) || !defined(HAS_RMDIR) -static int -dooneliner(cmd, filename) -char *cmd; -char *filename; +STATIC int +S_dooneliner(pTHX_ char *cmd, char *filename) { char *save_filename = filename; char *cmdline; @@ -3104,7 +3296,8 @@ PP(pp_mkdir) #ifndef HAS_MKDIR int oldumask; #endif - char *tmps = SvPV(TOPs, PL_na); + STRLEN n_a; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("mkdir"); #ifdef HAS_MKDIR @@ -3122,8 +3315,9 @@ PP(pp_rmdir) { djSP; dTARGET; char *tmps; + STRLEN n_a; - tmps = POPp; + tmps = POPpx; TAINT_PROPER("rmdir"); #ifdef HAS_RMDIR XPUSHi( PerlDir_rmdir(tmps) >= 0 ); @@ -3139,7 +3333,8 @@ PP(pp_open_dir) { djSP; #if defined(Direntry_t) && defined(HAS_READDIR) - char *dirname = POPp; + STRLEN n_a; + char *dirname = POPpx; GV *gv = (GV*)POPs; register IO *io = GvIOn(gv); @@ -3157,7 +3352,7 @@ nope: SETERRNO(EBADF,RMS$_DIR); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "opendir"); + DIE(aTHX_ PL_no_dir_func, "opendir"); #endif } @@ -3166,7 +3361,7 @@ PP(pp_readdir) djSP; #if defined(Direntry_t) && defined(HAS_READDIR) #ifndef I_DIRENT - Direntry_t *readdir _((DIR *)); + Direntry_t *readdir (DIR *); #endif register Direntry_t *dp; GV *gv = (GV*)POPs; @@ -3180,7 +3375,7 @@ PP(pp_readdir) /*SUPPRESS 560*/ while (dp = (Direntry_t *)PerlDir_read(IoDIRP(io))) { #ifdef DIRNAMLEN - sv = newSVpv(dp->d_name, dp->d_namlen); + sv = newSVpvn(dp->d_name, dp->d_namlen); #else sv = newSVpv(dp->d_name, 0); #endif @@ -3194,7 +3389,7 @@ PP(pp_readdir) if (!(dp = (Direntry_t *)PerlDir_read(IoDIRP(io)))) goto nope; #ifdef DIRNAMLEN - sv = newSVpv(dp->d_name, dp->d_namlen); + sv = newSVpvn(dp->d_name, dp->d_namlen); #else sv = newSVpv(dp->d_name, 0); #endif @@ -3213,7 +3408,7 @@ nope: else RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "readdir"); + DIE(aTHX_ PL_no_dir_func, "readdir"); #endif } @@ -3221,8 +3416,12 @@ PP(pp_telldir) { djSP; dTARGET; #if defined(HAS_TELLDIR) || defined(telldir) -# ifdef NEED_TELLDIR_PROTO /* XXX does _anyone_ need this? --AD 2/20/1998 */ - long telldir _((DIR *)); + /* XXX does _anyone_ need this? --AD 2/20/1998 */ + /* XXX netbsd still seemed to. + XXX HAS_TELLDIR_PROTO is new style, NEED_TELLDIR_PROTO is old style. + --JHI 1999-Feb-02 */ +# if !defined(HAS_TELLDIR_PROTO) || defined(NEED_TELLDIR_PROTO) + long telldir (DIR *); # endif GV *gv = (GV*)POPs; register IO *io = GvIOn(gv); @@ -3237,7 +3436,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "telldir"); + DIE(aTHX_ PL_no_dir_func, "telldir"); #endif } @@ -3260,7 +3459,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "seekdir"); + DIE(aTHX_ PL_no_dir_func, "seekdir"); #endif } @@ -3281,7 +3480,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "rewinddir"); + DIE(aTHX_ PL_no_dir_func, "rewinddir"); #endif } @@ -3311,7 +3510,7 @@ nope: SETERRNO(EBADF,RMS$_IFI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "closedir"); + DIE(aTHX_ PL_no_dir_func, "closedir"); #endif } @@ -3321,10 +3520,11 @@ PP(pp_fork) { #ifdef HAS_FORK djSP; dTARGET; - int childpid; + Pid_t childpid; GV *tmpgv; EXTEND(SP, 1); + PERL_FLUSHALL_FOR_CHILD; childpid = fork(); if (childpid < 0) RETSETUNDEF; @@ -3337,7 +3537,7 @@ PP(pp_fork) PUSHi(childpid); RETURN; #else - DIE(PL_no_func, "Unsupported function fork"); + DIE(aTHX_ PL_no_func, "Unsupported function fork"); #endif } @@ -3345,7 +3545,7 @@ PP(pp_wait) { #if !defined(DOSISH) || defined(OS2) || defined(WIN32) djSP; dTARGET; - int childpid; + Pid_t childpid; int argflags; childpid = wait4pid(-1, &argflags, 0); @@ -3353,7 +3553,7 @@ PP(pp_wait) XPUSHi(childpid); RETURN; #else - DIE(PL_no_func, "Unsupported function wait"); + DIE(aTHX_ PL_no_func, "Unsupported function wait"); #endif } @@ -3361,7 +3561,7 @@ PP(pp_waitpid) { #if !defined(DOSISH) || defined(OS2) || defined(WIN32) djSP; dTARGET; - int childpid; + Pid_t childpid; int optype; int argflags; @@ -3372,7 +3572,7 @@ PP(pp_waitpid) SETi(childpid); RETURN; #else - DIE(PL_no_func, "Unsupported function waitpid"); + DIE(aTHX_ PL_no_func, "Unsupported function waitpid"); #endif } @@ -3380,29 +3580,41 @@ PP(pp_system) { djSP; dMARK; dORIGMARK; dTARGET; I32 value; - int childpid; + Pid_t childpid; int result; int status; Sigsave_t ihand,qhand; /* place to save signals during system() */ + STRLEN n_a; + I32 did_pipes = 0; + int pp[2]; if (SP - MARK == 1) { if (PL_tainting) { - char *junk = SvPV(TOPs, PL_na); + char *junk = SvPV(TOPs, n_a); TAINT_ENV(); TAINT_PROPER("system"); } } + PERL_FLUSHALL_FOR_CHILD; #if (defined(HAS_FORK) || defined(AMIGAOS)) && !defined(VMS) && !defined(OS2) + if (PerlProc_pipe(pp) >= 0) + did_pipes = 1; while ((childpid = vfork()) == -1) { if (errno != EAGAIN) { value = -1; SP = ORIGMARK; PUSHi(value); + if (did_pipes) { + PerlLIO_close(pp[0]); + PerlLIO_close(pp[1]); + } RETURN; } sleep(5); } if (childpid > 0) { + if (did_pipes) + PerlLIO_close(pp[1]); rsignal_save(SIGINT, SIG_IGN, &ihand); rsignal_save(SIGQUIT, SIG_IGN, &qhand); do { @@ -3413,17 +3625,43 @@ PP(pp_system) STATUS_NATIVE_SET(result == -1 ? -1 : status); do_execfree(); /* free any memory child malloced on vfork */ SP = ORIGMARK; + if (did_pipes) { + int errkid; + int n = 0, n1; + + while (n < sizeof(int)) { + n1 = PerlLIO_read(pp[0], + (void*)(((char*)&errkid)+n), + (sizeof(int)) - n); + if (n1 <= 0) + break; + n += n1; + } + PerlLIO_close(pp[0]); + if (n) { /* Error */ + if (n != sizeof(int)) + Perl_croak(aTHX_ "panic: kid popen errno read"); + errno = errkid; /* Propagate errno from kid */ + STATUS_CURRENT = -1; + } + } PUSHi(STATUS_CURRENT); RETURN; } + if (did_pipes) { + PerlLIO_close(pp[0]); +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(pp[1], F_SETFD, FD_CLOEXEC); +#endif + } if (PL_op->op_flags & OPf_STACKED) { SV *really = *++MARK; - value = (I32)do_aexec(really, MARK, SP); + value = (I32)do_aexec5(really, MARK, SP, pp[1], did_pipes); } else if (SP - MARK != 1) - value = (I32)do_aexec(Nullsv, MARK, SP); + value = (I32)do_aexec5(Nullsv, MARK, SP, pp[1], did_pipes); else { - value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), PL_na)); + value = (I32)do_exec3(SvPVx(sv_mortalcopy(*SP), n_a), pp[1], did_pipes); } PerlProc__exit(-1); #else /* ! FORK or VMS or OS/2 */ @@ -3434,7 +3672,7 @@ PP(pp_system) else if (SP - MARK != 1) value = (I32)do_aspawn(Nullsv, (void **)MARK, (void **)SP); else { - value = (I32)do_spawn(SvPVx(sv_mortalcopy(*SP), PL_na)); + value = (I32)do_spawn(SvPVx(sv_mortalcopy(*SP), n_a)); } STATUS_NATIVE_SET(value); do_execfree(); @@ -3448,7 +3686,9 @@ PP(pp_exec) { djSP; dMARK; dORIGMARK; dTARGET; I32 value; + STRLEN n_a; + PERL_FLUSHALL_FOR_CHILD; if (PL_op->op_flags & OPf_STACKED) { SV *really = *++MARK; value = (I32)do_aexec(really, MARK, SP); @@ -3468,18 +3708,18 @@ PP(pp_exec) #endif else { if (PL_tainting) { - char *junk = SvPV(*SP, PL_na); + char *junk = SvPV(*SP, n_a); TAINT_ENV(); TAINT_PROPER("exec"); } #ifdef VMS - value = (I32)vms_do_exec(SvPVx(sv_mortalcopy(*SP), PL_na)); + value = (I32)vms_do_exec(SvPVx(sv_mortalcopy(*SP), n_a)); #else # ifdef __OPEN_VM - (void) do_spawn(SvPVx(sv_mortalcopy(*SP), PL_na)); + (void) do_spawn(SvPVx(sv_mortalcopy(*SP), n_a)); value = 0; # else - value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), PL_na)); + value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), n_a)); # endif #endif } @@ -3498,7 +3738,7 @@ PP(pp_kill) PUSHi(value); RETURN; #else - DIE(PL_no_func, "Unsupported function kill"); + DIE(aTHX_ PL_no_func, "Unsupported function kill"); #endif } @@ -3509,7 +3749,7 @@ PP(pp_getppid) XPUSHi( getppid() ); RETURN; #else - DIE(PL_no_func, "getppid"); + DIE(aTHX_ PL_no_func, "getppid"); #endif } @@ -3528,13 +3768,13 @@ PP(pp_getpgrp) value = (I32)BSD_GETPGRP(pid); #else if (pid != 0 && pid != getpid()) - DIE("POSIX getpgrp can't take an argument"); + DIE(aTHX_ "POSIX getpgrp can't take an argument"); value = (I32)getpgrp(); #endif XPUSHi(value); RETURN; #else - DIE(PL_no_func, "getpgrp()"); + DIE(aTHX_ PL_no_func, "getpgrp()"); #endif } @@ -3558,12 +3798,12 @@ PP(pp_setpgrp) SETi( BSD_SETPGRP(pid, pgrp) >= 0 ); #else if ((pgrp != 0 && pgrp != getpid()) || (pid != 0 && pid != getpid())) - DIE("POSIX setpgrp can't take an argument"); + DIE(aTHX_ "POSIX setpgrp can't take an argument"); SETi( setpgrp() >= 0 ); #endif /* USE_BSDPGRP */ RETURN; #else - DIE(PL_no_func, "setpgrp()"); + DIE(aTHX_ PL_no_func, "setpgrp()"); #endif } @@ -3578,7 +3818,7 @@ PP(pp_getpriority) SETi( getpriority(which, who) ); RETURN; #else - DIE(PL_no_func, "getpriority()"); + DIE(aTHX_ PL_no_func, "getpriority()"); #endif } @@ -3596,7 +3836,7 @@ PP(pp_setpriority) SETi( setpriority(which, who, niceval) >= 0 ); RETURN; #else - DIE(PL_no_func, "setpriority()"); + DIE(aTHX_ PL_no_func, "setpriority()"); #endif } @@ -3634,7 +3874,7 @@ PP(pp_tms) djSP; #ifndef HAS_TIMES - DIE("times not implemented"); + DIE(aTHX_ "times not implemented"); #else EXTEND(SP, 4); @@ -3646,11 +3886,11 @@ PP(pp_tms) /* is returned. */ #endif - PUSHs(sv_2mortal(newSVnv(((double)PL_timesbuf.tms_utime)/HZ))); + PUSHs(sv_2mortal(newSVnv(((NV)PL_timesbuf.tms_utime)/HZ))); if (GIMME == G_ARRAY) { - PUSHs(sv_2mortal(newSVnv(((double)PL_timesbuf.tms_stime)/HZ))); - PUSHs(sv_2mortal(newSVnv(((double)PL_timesbuf.tms_cutime)/HZ))); - PUSHs(sv_2mortal(newSVnv(((double)PL_timesbuf.tms_cstime)/HZ))); + PUSHs(sv_2mortal(newSVnv(((NV)PL_timesbuf.tms_stime)/HZ))); + PUSHs(sv_2mortal(newSVnv(((NV)PL_timesbuf.tms_cutime)/HZ))); + PUSHs(sv_2mortal(newSVnv(((NV)PL_timesbuf.tms_cstime)/HZ))); } RETURN; #endif /* HAS_TIMES */ @@ -3658,7 +3898,7 @@ PP(pp_tms) PP(pp_localtime) { - return pp_gmtime(ARGS); + return pp_gmtime(); } PP(pp_gmtime) @@ -3691,7 +3931,7 @@ PP(pp_gmtime) SV *tsv; if (!tmbuf) RETPUSHUNDEF; - tsv = newSVpvf("%s %s %2d %02d:%02d:%02d %d", + tsv = Perl_newSVpvf(aTHX_ "%s %s %2d %02d:%02d:%02d %d", dayname[tmbuf->tm_wday], monname[tmbuf->tm_mon], tmbuf->tm_mday, @@ -3728,7 +3968,7 @@ PP(pp_alarm) PUSHi((I32)anum); RETURN; #else - DIE(PL_no_func, "Unsupported function alarm"); + DIE(aTHX_ PL_no_func, "Unsupported function alarm"); #endif } @@ -3755,17 +3995,17 @@ PP(pp_sleep) PP(pp_shmget) { - return pp_semget(ARGS); + return pp_semget(); } PP(pp_shmctl) { - return pp_semctl(ARGS); + return pp_semctl(); } PP(pp_shmread) { - return pp_shmwrite(ARGS); + return pp_shmwrite(); } PP(pp_shmwrite) @@ -3777,7 +4017,7 @@ PP(pp_shmwrite) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -3785,12 +4025,12 @@ PP(pp_shmwrite) PP(pp_msgget) { - return pp_semget(ARGS); + return pp_semget(); } PP(pp_msgctl) { - return pp_semctl(ARGS); + return pp_semctl(); } PP(pp_msgsnd) @@ -3802,7 +4042,7 @@ PP(pp_msgsnd) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -3815,7 +4055,7 @@ PP(pp_msgrcv) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -3832,7 +4072,7 @@ PP(pp_semget) PUSHi(anum); RETURN; #else - DIE("System V IPC is not implemented on this machine"); + DIE(aTHX_ "System V IPC is not implemented on this machine"); #endif } @@ -3852,7 +4092,7 @@ PP(pp_semctl) } RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -3865,7 +4105,7 @@ PP(pp_semop) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -3874,18 +4114,18 @@ PP(pp_semop) PP(pp_ghbyname) { #ifdef HAS_GETHOSTBYNAME - return pp_ghostent(ARGS); + return pp_ghostent(); #else - DIE(PL_no_sock_func, "gethostbyname"); + DIE(aTHX_ PL_no_sock_func, "gethostbyname"); #endif } PP(pp_ghbyaddr) { #ifdef HAS_GETHOSTBYADDR - return pp_ghostent(ARGS); + return pp_ghostent(); #else - DIE(PL_no_sock_func, "gethostbyaddr"); + DIE(aTHX_ PL_no_sock_func, "gethostbyaddr"); #endif } @@ -3903,13 +4143,14 @@ PP(pp_ghostent) #endif struct hostent *hent; unsigned long len; + STRLEN n_a; EXTEND(SP, 10); if (which == OP_GHBYNAME) #ifdef HAS_GETHOSTBYNAME - hent = PerlSock_gethostbyname(POPp); + hent = PerlSock_gethostbyname(POPpx); #else - DIE(PL_no_sock_func, "gethostbyname"); + DIE(aTHX_ PL_no_sock_func, "gethostbyname"); #endif else if (which == OP_GHBYADDR) { #ifdef HAS_GETHOSTBYADDR @@ -3920,14 +4161,14 @@ PP(pp_ghostent) hent = PerlSock_gethostbyaddr(addr, (Netdb_hlen_t) addrlen, addrtype); #else - DIE(PL_no_sock_func, "gethostbyaddr"); + DIE(aTHX_ PL_no_sock_func, "gethostbyaddr"); #endif } else #ifdef HAS_GETHOSTENT hent = PerlSock_gethostent(); #else - DIE(PL_no_sock_func, "gethostent"); + DIE(aTHX_ PL_no_sock_func, "gethostent"); #endif #ifdef HOST_NOT_FOUND @@ -3975,25 +4216,25 @@ PP(pp_ghostent) } RETURN; #else - DIE(PL_no_sock_func, "gethostent"); + DIE(aTHX_ PL_no_sock_func, "gethostent"); #endif } PP(pp_gnbyname) { #ifdef HAS_GETNETBYNAME - return pp_gnetent(ARGS); + return pp_gnetent(); #else - DIE(PL_no_sock_func, "getnetbyname"); + DIE(aTHX_ PL_no_sock_func, "getnetbyname"); #endif } PP(pp_gnbyaddr) { #ifdef HAS_GETNETBYADDR - return pp_gnetent(ARGS); + return pp_gnetent(); #else - DIE(PL_no_sock_func, "getnetbyaddr"); + DIE(aTHX_ PL_no_sock_func, "getnetbyaddr"); #endif } @@ -4010,12 +4251,13 @@ PP(pp_gnetent) struct netent *PerlSock_getnetent(void); #endif struct netent *nent; + STRLEN n_a; if (which == OP_GNBYNAME) #ifdef HAS_GETNETBYNAME - nent = PerlSock_getnetbyname(POPp); + nent = PerlSock_getnetbyname(POPpx); #else - DIE(PL_no_sock_func, "getnetbyname"); + DIE(aTHX_ PL_no_sock_func, "getnetbyname"); #endif else if (which == OP_GNBYADDR) { #ifdef HAS_GETNETBYADDR @@ -4023,14 +4265,14 @@ PP(pp_gnetent) Netdb_net_t addr = (Netdb_net_t) U_L(POPn); nent = PerlSock_getnetbyaddr(addr, addrtype); #else - DIE(PL_no_sock_func, "getnetbyaddr"); + DIE(aTHX_ PL_no_sock_func, "getnetbyaddr"); #endif } else #ifdef HAS_GETNETENT nent = PerlSock_getnetent(); #else - DIE(PL_no_sock_func, "getnetent"); + DIE(aTHX_ PL_no_sock_func, "getnetent"); #endif EXTEND(SP, 4); @@ -4062,25 +4304,25 @@ PP(pp_gnetent) RETURN; #else - DIE(PL_no_sock_func, "getnetent"); + DIE(aTHX_ PL_no_sock_func, "getnetent"); #endif } PP(pp_gpbyname) { #ifdef HAS_GETPROTOBYNAME - return pp_gprotoent(ARGS); + return pp_gprotoent(); #else - DIE(PL_no_sock_func, "getprotobyname"); + DIE(aTHX_ PL_no_sock_func, "getprotobyname"); #endif } PP(pp_gpbynumber) { #ifdef HAS_GETPROTOBYNUMBER - return pp_gprotoent(ARGS); + return pp_gprotoent(); #else - DIE(PL_no_sock_func, "getprotobynumber"); + DIE(aTHX_ PL_no_sock_func, "getprotobynumber"); #endif } @@ -4097,24 +4339,25 @@ PP(pp_gprotoent) struct protoent *PerlSock_getprotoent(void); #endif struct protoent *pent; + STRLEN n_a; if (which == OP_GPBYNAME) #ifdef HAS_GETPROTOBYNAME - pent = PerlSock_getprotobyname(POPp); + pent = PerlSock_getprotobyname(POPpx); #else - DIE(PL_no_sock_func, "getprotobyname"); + DIE(aTHX_ PL_no_sock_func, "getprotobyname"); #endif else if (which == OP_GPBYNUMBER) #ifdef HAS_GETPROTOBYNUMBER pent = PerlSock_getprotobynumber(POPi); #else - DIE(PL_no_sock_func, "getprotobynumber"); + DIE(aTHX_ PL_no_sock_func, "getprotobynumber"); #endif else #ifdef HAS_GETPROTOENT pent = PerlSock_getprotoent(); #else - DIE(PL_no_sock_func, "getprotoent"); + DIE(aTHX_ PL_no_sock_func, "getprotoent"); #endif EXTEND(SP, 3); @@ -4144,25 +4387,25 @@ PP(pp_gprotoent) RETURN; #else - DIE(PL_no_sock_func, "getprotoent"); + DIE(aTHX_ PL_no_sock_func, "getprotoent"); #endif } PP(pp_gsbyname) { #ifdef HAS_GETSERVBYNAME - return pp_gservent(ARGS); + return pp_gservent(); #else - DIE(PL_no_sock_func, "getservbyname"); + DIE(aTHX_ PL_no_sock_func, "getservbyname"); #endif } PP(pp_gsbyport) { #ifdef HAS_GETSERVBYPORT - return pp_gservent(ARGS); + return pp_gservent(); #else - DIE(PL_no_sock_func, "getservbyport"); + DIE(aTHX_ PL_no_sock_func, "getservbyport"); #endif } @@ -4179,23 +4422,24 @@ PP(pp_gservent) struct servent *PerlSock_getservent(void); #endif struct servent *sent; + STRLEN n_a; if (which == OP_GSBYNAME) { #ifdef HAS_GETSERVBYNAME - char *proto = POPp; - char *name = POPp; + char *proto = POPpx; + char *name = POPpx; if (proto && !*proto) proto = Nullch; sent = PerlSock_getservbyname(name, proto); #else - DIE(PL_no_sock_func, "getservbyname"); + DIE(aTHX_ PL_no_sock_func, "getservbyname"); #endif } else if (which == OP_GSBYPORT) { #ifdef HAS_GETSERVBYPORT - char *proto = POPp; + char *proto = POPpx; unsigned short port = POPu; #ifdef HAS_HTONS @@ -4203,14 +4447,14 @@ PP(pp_gservent) #endif sent = PerlSock_getservbyport(port, proto); #else - DIE(PL_no_sock_func, "getservbyport"); + DIE(aTHX_ PL_no_sock_func, "getservbyport"); #endif } else #ifdef HAS_GETSERVENT sent = PerlSock_getservent(); #else - DIE(PL_no_sock_func, "getservent"); + DIE(aTHX_ PL_no_sock_func, "getservent"); #endif EXTEND(SP, 4); @@ -4251,7 +4495,7 @@ PP(pp_gservent) RETURN; #else - DIE(PL_no_sock_func, "getservent"); + DIE(aTHX_ PL_no_sock_func, "getservent"); #endif } @@ -4262,7 +4506,7 @@ PP(pp_shostent) PerlSock_sethostent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "sethostent"); + DIE(aTHX_ PL_no_sock_func, "sethostent"); #endif } @@ -4273,7 +4517,7 @@ PP(pp_snetent) PerlSock_setnetent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "setnetent"); + DIE(aTHX_ PL_no_sock_func, "setnetent"); #endif } @@ -4284,7 +4528,7 @@ PP(pp_sprotoent) PerlSock_setprotoent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "setprotoent"); + DIE(aTHX_ PL_no_sock_func, "setprotoent"); #endif } @@ -4295,7 +4539,7 @@ PP(pp_sservent) PerlSock_setservent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "setservent"); + DIE(aTHX_ PL_no_sock_func, "setservent"); #endif } @@ -4307,7 +4551,7 @@ PP(pp_ehostent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endhostent"); + DIE(aTHX_ PL_no_sock_func, "endhostent"); #endif } @@ -4319,7 +4563,7 @@ PP(pp_enetent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endnetent"); + DIE(aTHX_ PL_no_sock_func, "endnetent"); #endif } @@ -4331,7 +4575,7 @@ PP(pp_eprotoent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endprotoent"); + DIE(aTHX_ PL_no_sock_func, "endprotoent"); #endif } @@ -4343,25 +4587,25 @@ PP(pp_eservent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endservent"); + DIE(aTHX_ PL_no_sock_func, "endservent"); #endif } PP(pp_gpwnam) { #ifdef HAS_PASSWD - return pp_gpwent(ARGS); + return pp_gpwent(); #else - DIE(PL_no_func, "getpwnam"); + DIE(aTHX_ PL_no_func, "getpwnam"); #endif } PP(pp_gpwuid) { #ifdef HAS_PASSWD - return pp_gpwent(ARGS); + return pp_gpwent(); #else - DIE(PL_no_func, "getpwuid"); + DIE(aTHX_ PL_no_func, "getpwuid"); #endif } @@ -4372,14 +4616,35 @@ PP(pp_gpwent) I32 which = PL_op->op_type; register SV *sv; struct passwd *pwent; + STRLEN n_a; +#if defined(HAS_GETSPENT) || defined(HAS_GETSPNAM) + struct spwd *spwent = NULL; +#endif if (which == OP_GPWNAM) - pwent = getpwnam(POPp); + pwent = getpwnam(POPpx); else if (which == OP_GPWUID) pwent = getpwuid(POPi); else pwent = (struct passwd *)getpwent(); +#ifdef HAS_GETSPNAM + if (which == OP_GPWNAM) { + if (pwent) + spwent = getspnam(pwent->pw_name); + } +# ifdef HAS_GETSPUID /* AFAIK there isn't any anywhere. --jhi */ + else if (which == OP_GPWUID) { + if (pwent) + spwent = getspnam(pwent->pw_name); + } +# endif +# ifdef HAS_GETSPENT + else + spwent = (struct spwd *)getspent(); +# endif +#endif + EXTEND(SP, 10); if (GIMME != G_ARRAY) { PUSHs(sv = sv_newmortal()); @@ -4398,7 +4663,14 @@ PP(pp_gpwent) PUSHs(sv = sv_mortalcopy(&PL_sv_no)); #ifdef PWPASSWD +# if defined(HAS_GETSPENT) || defined(HAS_GETSPNAM) + if (spwent) + sv_setpv(sv, spwent->sp_pwdp); + else + sv_setpv(sv, pwent->pw_passwd); +# else sv_setpv(sv, pwent->pw_passwd); +# endif #endif PUSHs(sv = sv_mortalcopy(&PL_sv_no)); @@ -4453,18 +4725,21 @@ PP(pp_gpwent) } RETURN; #else - DIE(PL_no_func, "getpwent"); + DIE(aTHX_ PL_no_func, "getpwent"); #endif } PP(pp_spwent) { djSP; -#if defined(HAS_PASSWD) && defined(HAS_SETPWENT) && !defined(CYGWIN32) +#if defined(HAS_PASSWD) && defined(HAS_SETPWENT) && !defined(CYGWIN) setpwent(); +# ifdef HAS_SETSPENT + setspent(); +# endif RETPUSHYES; #else - DIE(PL_no_func, "setpwent"); + DIE(aTHX_ PL_no_func, "setpwent"); #endif } @@ -4473,27 +4748,30 @@ PP(pp_epwent) djSP; #if defined(HAS_PASSWD) && defined(HAS_ENDPWENT) endpwent(); +# ifdef HAS_ENDSPENT + endspent(); +# endif RETPUSHYES; #else - DIE(PL_no_func, "endpwent"); + DIE(aTHX_ PL_no_func, "endpwent"); #endif } PP(pp_ggrnam) { #ifdef HAS_GROUP - return pp_ggrent(ARGS); + return pp_ggrent(); #else - DIE(PL_no_func, "getgrnam"); + DIE(aTHX_ PL_no_func, "getgrnam"); #endif } PP(pp_ggrgid) { #ifdef HAS_GROUP - return pp_ggrent(ARGS); + return pp_ggrent(); #else - DIE(PL_no_func, "getgrgid"); + DIE(aTHX_ PL_no_func, "getgrgid"); #endif } @@ -4505,9 +4783,10 @@ PP(pp_ggrent) register char **elem; register SV *sv; struct group *grent; + STRLEN n_a; if (which == OP_GGRNAM) - grent = (struct group *)getgrnam(POPp); + grent = (struct group *)getgrnam(POPpx); else if (which == OP_GGRGID) grent = (struct group *)getgrgid(POPi); else @@ -4547,7 +4826,7 @@ PP(pp_ggrent) RETURN; #else - DIE(PL_no_func, "getgrent"); + DIE(aTHX_ PL_no_func, "getgrent"); #endif } @@ -4558,7 +4837,7 @@ PP(pp_sgrent) setgrent(); RETPUSHYES; #else - DIE(PL_no_func, "setgrent"); + DIE(aTHX_ PL_no_func, "setgrent"); #endif } @@ -4569,7 +4848,7 @@ PP(pp_egrent) endgrent(); RETPUSHYES; #else - DIE(PL_no_func, "endgrent"); + DIE(aTHX_ PL_no_func, "endgrent"); #endif } @@ -4584,7 +4863,7 @@ PP(pp_getlogin) PUSHp(tmps, strlen(tmps)); RETURN; #else - DIE(PL_no_func, "getlogin"); + DIE(aTHX_ PL_no_func, "getlogin"); #endif } @@ -4599,6 +4878,7 @@ PP(pp_syscall) register I32 i = 0; I32 retval = -1; MAGIC *mg; + STRLEN n_a; if (PL_tainting) { while (++MARK <= SP) { @@ -4621,15 +4901,15 @@ PP(pp_syscall) else if (*MARK == &PL_sv_undef) a[i++] = 0; else - a[i++] = (unsigned long)SvPV_force(*MARK, PL_na); + a[i++] = (unsigned long)SvPV_force(*MARK, n_a); if (i > 15) break; } switch (items) { default: - DIE("Too many args to syscall"); + DIE(aTHX_ "Too many args to syscall"); case 0: - DIE("Too few args to syscall"); + DIE(aTHX_ "Too few args to syscall"); case 1: retval = syscall(a[0]); break; @@ -4683,7 +4963,7 @@ PP(pp_syscall) PUSHi(retval); RETURN; #else - DIE(PL_no_func, "syscall"); + DIE(aTHX_ PL_no_func, "syscall"); #endif } @@ -4751,9 +5031,7 @@ fcntl_emulate_flock(int fd, int operation) # endif static int -lockf_emulate_flock (fd, operation) -int fd; -int operation; +lockf_emulate_flock(int fd, int operation) { int i; int save_errno;