X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sys.c;h=271d0cae091ec6c52cfe40ff917a11250c7743f6;hb=54e82ce5cfd72fcdc60806373e0c4d6890b68a3c;hp=7ffc1c278749247c8872837518a1dad86113a3fa;hpb=864dbfa3ca8032ef66f7aa86961933b19b962357;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pp_sys.c b/pp_sys.c index 7ffc1c2..271d0ca 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -22,6 +22,11 @@ /* Shadow password support for solaris - pdo@cs.umd.edu * Not just Solaris: at least HP-UX, IRIX, Linux. * the API is from SysV. --jhi */ +#ifdef __hpux__ +/* There is a MAXINT coming from <- <- + * and another MAXINT from "perl.h" <- . */ +#undef MAXINT +#endif #include #endif @@ -46,6 +51,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 @@ -184,6 +192,10 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true"; # include #endif +#if defined(HAS_FCNTL) && defined(F_SETFD) && !defined(FD_CLOEXEC) +# define FD_CLOEXEC 1 /* NeXT needs this */ +#endif + #undef PERL_EFF_ACCESS_R_OK /* EFFective uid/gid ACCESS R_OK */ #undef PERL_EFF_ACCESS_W_OK #undef PERL_EFF_ACCESS_X_OK @@ -227,7 +239,7 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true"; || defined(HAS_SETREGID) || defined(HAS_SETRESGID)) /* The Hard Way. */ STATIC int -emulate_eaccess(pTHX_ const char* path, int mode) +S_emulate_eaccess(pTHX_ const char* path, Mode_t mode) { Uid_t ruid = getuid(); Uid_t euid = geteuid(); @@ -237,7 +249,7 @@ emulate_eaccess(pTHX_ 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)) @@ -246,11 +258,11 @@ emulate_eaccess(pTHX_ 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)) @@ -259,7 +271,7 @@ emulate_eaccess(pTHX_ 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); @@ -271,7 +283,7 @@ emulate_eaccess(pTHX_ 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)) @@ -280,7 +292,7 @@ emulate_eaccess(pTHX_ 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; @@ -292,9 +304,9 @@ emulate_eaccess(pTHX_ const char* path, int mode) #if !defined(PERL_EFF_ACCESS_R_OK) STATIC int -emulate_eaccess(pTHX_ const char* path, int mode) +S_emulate_eaccess(pTHX_ const char* path, Mode_t mode) { - croak("switching effective uid is not implemented"); + Perl_croak(aTHX_ "switching effective uid is not implemented"); /*NOTREACHED*/ return -1; } @@ -430,7 +442,7 @@ PP(pp_warn) if (!tmps || !len) tmpsv = sv_2mortal(newSVpvn("Warning: something's wrong", 26)); - warn("%_", tmpsv); + Perl_warn(aTHX_ "%_", tmpsv); RETSETYES; } @@ -476,7 +488,7 @@ PP(pp_die) sv_setsv(error,*PL_stack_sp--); } } - DIE(Nullch); + DIE(aTHX_ Nullch); } else { if (SvPOK(error) && SvCUR(error)) @@ -488,7 +500,7 @@ PP(pp_die) if (!tmps || !len) tmpsv = sv_2mortal(newSVpvn("Died", 4)); - DIE("%_", tmpsv); + DIE(aTHX_ "%_", tmpsv); } /* I/O. */ @@ -498,42 +510,34 @@ 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); @@ -543,7 +547,7 @@ PP(pp_open) } 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); @@ -595,7 +599,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); @@ -629,7 +633,7 @@ PP(pp_pipe_op) badexit: RETPUSHUNDEF; #else - DIE(PL_no_func, "pipe"); + DIE(aTHX_ PL_no_func, "pipe"); #endif } @@ -681,7 +685,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; @@ -770,7 +774,7 @@ PP(pp_tie) */ stash = gv_stashsv(*MARK, FALSE); if (!stash || !(gv = gv_fetchmethod(stash, methname))) { - DIE("Can't locate object method \"%s\" via package \"%s\"", + DIE(aTHX_ "Can't locate object method \"%s\" via package \"%s\"", methname, SvPV(*MARK,n_a)); } ENTER; @@ -806,9 +810,9 @@ PP(pp_untie) MAGIC * mg ; if (mg = SvTIED_mg(sv, how)) { if (mg && SvREFCNT(SvRV(mg->mg_obj)) > 1) - warner(WARN_UNTIE, - "untie attempted while %lu inner references still exist", - (unsigned long)SvREFCNT(SvRV(mg->mg_obj)) - 1 ) ; + Perl_warner(aTHX_ WARN_UNTIE, + "untie attempted while %"UVuf" inner references still exist", + (UV)SvREFCNT(SvRV(mg->mg_obj)) - 1 ) ; } } @@ -852,7 +856,7 @@ PP(pp_dbmopen) 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; @@ -892,7 +896,7 @@ PP(pp_dbmopen) PP(pp_dbmclose) { - return pp_untie(ARGS); + return pp_untie(); } PP(pp_sselect) @@ -903,7 +907,7 @@ PP(pp_sselect) register I32 j; register char *s; register SV *sv; - double value; + NV value; I32 maxlen = 0; I32 nfound; struct timeval timebuf; @@ -966,7 +970,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 @@ -1025,14 +1029,14 @@ 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 } @@ -1118,11 +1122,11 @@ PP(pp_getc) PP(pp_read) { - return pp_sysread(ARGS); + return pp_sysread(); } STATIC OP * -doform(pTHX_ CV *cv, GV *gv, OP *retop) +S_doform(pTHX_ CV *cv, GV *gv, OP *retop) { dTHR; register PERL_CONTEXT *cx; @@ -1173,9 +1177,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)); @@ -1209,7 +1213,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)) @@ -1249,12 +1253,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)); @@ -1269,17 +1273,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)) @@ -1336,32 +1345,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,n_a)); + 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,n_a)); + 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,n_a)); + 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; @@ -1451,7 +1456,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); @@ -1468,6 +1473,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, @@ -1488,11 +1501,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); @@ -1533,8 +1546,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()) && ckWARN(WARN_IO)) + { + 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); @@ -1562,7 +1584,7 @@ PP(pp_syswrite) PUSHs(sv); PUTBACK; } - return pp_send(ARGS); + return pp_send(); } PP(pp_send) @@ -1598,16 +1620,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) { @@ -1615,10 +1637,10 @@ 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) @@ -1631,6 +1653,7 @@ PP(pp_send) else #endif { + /* See the note at doio.c:do_print about filesize limits. --jhi */ length = PerlLIO_write(PerlIO_fileno(IoIFP(io)), buffer+offset, length); } @@ -1648,7 +1671,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; @@ -1663,7 +1686,7 @@ PP(pp_send) PP(pp_recv) { - return pp_sysread(ARGS); + return pp_sysread(); } PP(pp_eof) @@ -1720,7 +1743,7 @@ PP(pp_tell) PP(pp_seek) { - return pp_sysseek(ARGS); + return pp_sysseek(); } PP(pp_sysseek) @@ -1728,7 +1751,7 @@ PP(pp_sysseek) djSP; GV *gv; int whence = POPi; - Off_t offset = POPl; + Off_t offset = (Off_t)SvIVx(POPs); MAGIC *mg; gv = PL_last_in_gv = (GV*)POPs; @@ -1818,13 +1841,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) @@ -1857,7 +1880,7 @@ PP(pp_ioctl) } else { retval = SvIV(argsv); - s = (char*)retval; /* ouch */ + s = INT2PTR(char*,retval); /* ouch */ } TAINT_PROPER(optype == OP_IOCTL ? "ioctl" : "fcntl"); @@ -1866,7 +1889,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 @@ -1876,12 +1899,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 */ @@ -1925,7 +1948,7 @@ PP(pp_flock) PUSHi(value); RETURN; #else - DIE(PL_no_func, "flock()"); + DIE(aTHX_ PL_no_func, "flock()"); #endif } @@ -1969,7 +1992,7 @@ PP(pp_socket) RETPUSHYES; #else - DIE(PL_no_sock_func, "socket"); + DIE(aTHX_ PL_no_sock_func, "socket"); #endif } @@ -2019,7 +2042,7 @@ PP(pp_sockpair) RETPUSHYES; #else - DIE(PL_no_sock_func, "socketpair"); + DIE(aTHX_ PL_no_sock_func, "socketpair"); #endif } @@ -2074,11 +2097,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 } @@ -2104,11 +2127,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 } @@ -2130,11 +2153,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 } @@ -2184,14 +2207,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 } @@ -2211,20 +2234,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 } @@ -2290,22 +2313,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 } @@ -2363,13 +2386,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 } @@ -2377,7 +2400,7 @@ nuts2: PP(pp_lstat) { - return pp_stat(ARGS); + return pp_stat(); } PP(pp_stat) @@ -2422,7 +2445,7 @@ PP(pp_stat) PL_laststatval = PerlLIO_stat(SvPV(PL_statname, n_a), &PL_statcache); if (PL_laststatval < 0) { if (ckWARN(WARN_NEWLINE) && strchr(SvPV(PL_statname, n_a), '\n')) - warner(WARN_NEWLINE, PL_warn_nl, "stat"); + Perl_warner(aTHX_ WARN_NEWLINE, PL_warn_nl, "stat"); max = 0; } } @@ -2436,30 +2459,30 @@ PP(pp_stat) if (max) { EXTEND(SP, max); EXTEND_MORTAL(max); - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_dev))); - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_ino))); - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_mode))); - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_nlink))); - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_uid))); - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_gid))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_dev))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_ino))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_mode))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_nlink))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_uid))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_gid))); #ifdef USE_STAT_RDEV - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_rdev))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_rdev))); #else PUSHs(sv_2mortal(newSVpvn("", 0))); #endif - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_size))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_size))); #ifdef BIG_TIME - PUSHs(sv_2mortal(newSVnv((U32)PL_statcache.st_atime))); - PUSHs(sv_2mortal(newSVnv((U32)PL_statcache.st_mtime))); - PUSHs(sv_2mortal(newSVnv((U32)PL_statcache.st_ctime))); + PUSHs(sv_2mortal(newSVnv(PL_statcache.st_atime))); + PUSHs(sv_2mortal(newSVnv(PL_statcache.st_mtime))); + PUSHs(sv_2mortal(newSVnv(PL_statcache.st_ctime))); #else - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_atime))); - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_mtime))); - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_ctime))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_atime))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_mtime))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_ctime))); #endif #ifdef USE_STAT_BLOCKS - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_blksize))); - PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_blocks))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_blksize))); + PUSHs(sv_2mortal(newSViv(PL_statcache.st_blocks))); #else PUSHs(sv_2mortal(newSVpvn("", 0))); PUSHs(sv_2mortal(newSVpvn("", 0))); @@ -2483,9 +2506,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) @@ -2510,9 +2533,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) @@ -2537,9 +2560,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) @@ -2564,9 +2587,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) @@ -2591,9 +2614,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) @@ -2618,9 +2641,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) @@ -2632,7 +2655,7 @@ PP(pp_fteexec) PP(pp_ftis) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2641,12 +2664,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; @@ -2657,7 +2680,7 @@ PP(pp_ftrowned) PP(pp_ftzero) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2668,7 +2691,7 @@ PP(pp_ftzero) PP(pp_ftsize) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; dTARGET; if (result < 0) RETPUSHUNDEF; @@ -2678,37 +2701,37 @@ PP(pp_ftsize) PP(pp_ftmtime) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; dTARGET; if (result < 0) RETPUSHUNDEF; - PUSHn( ((I32)PL_basetime - (I32)PL_statcache.st_mtime) / 86400.0 ); + PUSHn( (PL_basetime - PL_statcache.st_mtime) / 86400.0 ); RETURN; } PP(pp_ftatime) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; dTARGET; if (result < 0) RETPUSHUNDEF; - PUSHn( ((I32)PL_basetime - (I32)PL_statcache.st_atime) / 86400.0 ); + PUSHn( (PL_basetime - PL_statcache.st_atime) / 86400.0 ); RETURN; } PP(pp_ftctime) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; dTARGET; if (result < 0) RETPUSHUNDEF; - PUSHn( ((I32)PL_basetime - (I32)PL_statcache.st_ctime) / 86400.0 ); + PUSHn( (PL_basetime - PL_statcache.st_ctime) / 86400.0 ); RETURN; } PP(pp_ftsock) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2719,7 +2742,7 @@ PP(pp_ftsock) PP(pp_ftchr) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2730,7 +2753,7 @@ PP(pp_ftchr) PP(pp_ftblk) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2741,7 +2764,7 @@ PP(pp_ftblk) PP(pp_ftfile) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2752,7 +2775,7 @@ PP(pp_ftfile) PP(pp_ftdir) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2763,7 +2786,7 @@ PP(pp_ftdir) PP(pp_ftpipe) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2774,7 +2797,7 @@ PP(pp_ftpipe) PP(pp_ftlink) { - I32 result = my_lstat(ARGS); + I32 result = my_lstat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2787,7 +2810,7 @@ PP(pp_ftsuid) { djSP; #ifdef S_ISUID - I32 result = my_stat(ARGS); + I32 result = my_stat(); SPAGAIN; if (result < 0) RETPUSHUNDEF; @@ -2801,7 +2824,7 @@ PP(pp_ftsgid) { djSP; #ifdef S_ISGID - I32 result = my_stat(ARGS); + I32 result = my_stat(); SPAGAIN; if (result < 0) RETPUSHUNDEF; @@ -2815,7 +2838,7 @@ PP(pp_ftsvtx) { djSP; #ifdef S_ISVTX - I32 result = my_stat(ARGS); + I32 result = my_stat(); SPAGAIN; if (result < 0) RETPUSHUNDEF; @@ -2901,7 +2924,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; @@ -2925,7 +2948,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; @@ -2944,7 +2967,7 @@ PP(pp_fttext) #endif if (i < 0) { if (ckWARN(WARN_NEWLINE) && strchr(SvPV(sv, n_a), '\n')) - warner(WARN_NEWLINE, PL_warn_nl, "open"); + Perl_warner(aTHX_ WARN_NEWLINE, PL_warn_nl, "open"); RETPUSHUNDEF; } PL_laststatval = PerlLIO_fstat(i, &PL_statcache); @@ -2989,7 +3012,7 @@ PP(pp_fttext) PP(pp_ftbinary) { - return pp_fttext(ARGS); + return pp_fttext(); } /* File calls. */ @@ -3042,7 +3065,7 @@ PP(pp_chown) PUSHi(value); RETURN; #else - DIE(PL_no_func, "Unsupported function chown"); + DIE(aTHX_ PL_no_func, "Unsupported function chown"); #endif } @@ -3057,7 +3080,7 @@ PP(pp_chroot) PUSHi( chroot(tmps) >= 0 ); RETURN; #else - DIE(PL_no_func, "chroot"); + DIE(aTHX_ PL_no_func, "chroot"); #endif } @@ -3128,7 +3151,7 @@ PP(pp_link) 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; } @@ -3144,7 +3167,7 @@ PP(pp_symlink) SETi( symlink(tmps, tmps2) >= 0 ); RETURN; #else - DIE(PL_no_func, "symlink"); + DIE(aTHX_ PL_no_func, "symlink"); #endif } @@ -3175,7 +3198,7 @@ PP(pp_readlink) #if !defined(HAS_MKDIR) || !defined(HAS_RMDIR) STATIC int -dooneliner(pTHX_ char *cmd, char *filename) +S_dooneliner(pTHX_ char *cmd, char *filename) { char *save_filename = filename; char *cmdline; @@ -3323,7 +3346,7 @@ nope: SETERRNO(EBADF,RMS$_DIR); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "opendir"); + DIE(aTHX_ PL_no_dir_func, "opendir"); #endif } @@ -3379,7 +3402,7 @@ nope: else RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "readdir"); + DIE(aTHX_ PL_no_dir_func, "readdir"); #endif } @@ -3407,7 +3430,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "telldir"); + DIE(aTHX_ PL_no_dir_func, "telldir"); #endif } @@ -3430,7 +3453,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "seekdir"); + DIE(aTHX_ PL_no_dir_func, "seekdir"); #endif } @@ -3451,7 +3474,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "rewinddir"); + DIE(aTHX_ PL_no_dir_func, "rewinddir"); #endif } @@ -3481,7 +3504,7 @@ nope: SETERRNO(EBADF,RMS$_IFI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "closedir"); + DIE(aTHX_ PL_no_dir_func, "closedir"); #endif } @@ -3508,13 +3531,13 @@ PP(pp_fork) PUSHi(childpid); RETURN; #else - DIE(PL_no_func, "Unsupported function fork"); + DIE(aTHX_ PL_no_func, "Unsupported function fork"); #endif } PP(pp_wait) { -#if !defined(DOSISH) || defined(OS2) || defined(WIN32) || defined(CYGWIN32) +#if !defined(DOSISH) || defined(OS2) || defined(WIN32) djSP; dTARGET; Pid_t childpid; int argflags; @@ -3524,13 +3547,13 @@ PP(pp_wait) XPUSHi(childpid); RETURN; #else - DIE(PL_no_func, "Unsupported function wait"); + DIE(aTHX_ PL_no_func, "Unsupported function wait"); #endif } PP(pp_waitpid) { -#if !defined(DOSISH) || defined(OS2) || defined(WIN32) || defined(CYGWIN32) +#if !defined(DOSISH) || defined(OS2) || defined(WIN32) djSP; dTARGET; Pid_t childpid; int optype; @@ -3543,7 +3566,7 @@ PP(pp_waitpid) SETi(childpid); RETURN; #else - DIE(PL_no_func, "Unsupported function waitpid"); + DIE(aTHX_ PL_no_func, "Unsupported function waitpid"); #endif } @@ -3556,6 +3579,8 @@ PP(pp_system) 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) { @@ -3566,16 +3591,24 @@ PP(pp_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 { @@ -3586,17 +3619,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)) + DIE(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), n_a)); + value = (I32)do_exec3(SvPVx(sv_mortalcopy(*SP), n_a), pp[1], did_pipes); } PerlProc__exit(-1); #else /* ! FORK or VMS or OS/2 */ @@ -3673,7 +3732,7 @@ PP(pp_kill) PUSHi(value); RETURN; #else - DIE(PL_no_func, "Unsupported function kill"); + DIE(aTHX_ PL_no_func, "Unsupported function kill"); #endif } @@ -3684,7 +3743,7 @@ PP(pp_getppid) XPUSHi( getppid() ); RETURN; #else - DIE(PL_no_func, "getppid"); + DIE(aTHX_ PL_no_func, "getppid"); #endif } @@ -3692,24 +3751,24 @@ PP(pp_getpgrp) { #ifdef HAS_GETPGRP djSP; dTARGET; - int pid; - I32 value; + Pid_t pid; + Pid_t pgrp; if (MAXARG < 1) pid = 0; else pid = SvIVx(POPs); #ifdef BSD_GETPGRP - value = (I32)BSD_GETPGRP(pid); + pgrp = (I32)BSD_GETPGRP(pid); #else if (pid != 0 && pid != getpid()) - DIE("POSIX getpgrp can't take an argument"); - value = (I32)getpgrp(); + DIE(aTHX_ "POSIX getpgrp can't take an argument"); + pgrp = getpgrp(); #endif - XPUSHi(value); + XPUSHi(pgrp); RETURN; #else - DIE(PL_no_func, "getpgrp()"); + DIE(aTHX_ PL_no_func, "getpgrp()"); #endif } @@ -3717,8 +3776,8 @@ PP(pp_setpgrp) { #ifdef HAS_SETPGRP djSP; dTARGET; - int pgrp; - int pid; + Pid_t pgrp; + Pid_t pid; if (MAXARG < 2) { pgrp = 0; pid = 0; @@ -3733,12 +3792,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_ "setpgrp can't take arguments"); SETi( setpgrp() >= 0 ); #endif /* USE_BSDPGRP */ RETURN; #else - DIE(PL_no_func, "setpgrp()"); + DIE(aTHX_ PL_no_func, "setpgrp()"); #endif } @@ -3753,7 +3812,7 @@ PP(pp_getpriority) SETi( getpriority(which, who) ); RETURN; #else - DIE(PL_no_func, "getpriority()"); + DIE(aTHX_ PL_no_func, "getpriority()"); #endif } @@ -3771,7 +3830,7 @@ PP(pp_setpriority) SETi( setpriority(which, who, niceval) >= 0 ); RETURN; #else - DIE(PL_no_func, "setpriority()"); + DIE(aTHX_ PL_no_func, "setpriority()"); #endif } @@ -3809,7 +3868,7 @@ PP(pp_tms) djSP; #ifndef HAS_TIMES - DIE("times not implemented"); + DIE(aTHX_ "times not implemented"); #else EXTEND(SP, 4); @@ -3821,11 +3880,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 */ @@ -3833,7 +3892,7 @@ PP(pp_tms) PP(pp_localtime) { - return pp_gmtime(ARGS); + return pp_gmtime(); } PP(pp_gmtime) @@ -3866,26 +3925,26 @@ PP(pp_gmtime) SV *tsv; if (!tmbuf) RETPUSHUNDEF; - tsv = newSVpvf("%s %s %2d %02d:%02d:%02d %d", - dayname[tmbuf->tm_wday], - monname[tmbuf->tm_mon], - tmbuf->tm_mday, - tmbuf->tm_hour, - tmbuf->tm_min, - tmbuf->tm_sec, - tmbuf->tm_year + 1900); + tsv = Perl_newSVpvf(aTHX_ "%s %s %2d %02d:%02d:%02d %d", + dayname[tmbuf->tm_wday], + monname[tmbuf->tm_mon], + tmbuf->tm_mday, + tmbuf->tm_hour, + tmbuf->tm_min, + tmbuf->tm_sec, + tmbuf->tm_year + 1900); PUSHs(sv_2mortal(tsv)); } else if (tmbuf) { - PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_sec))); - PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_min))); - PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_hour))); - PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_mday))); - PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_mon))); - PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_year))); - PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_wday))); - PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_yday))); - PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_isdst))); + PUSHs(sv_2mortal(newSViv(tmbuf->tm_sec))); + PUSHs(sv_2mortal(newSViv(tmbuf->tm_min))); + PUSHs(sv_2mortal(newSViv(tmbuf->tm_hour))); + PUSHs(sv_2mortal(newSViv(tmbuf->tm_mday))); + PUSHs(sv_2mortal(newSViv(tmbuf->tm_mon))); + PUSHs(sv_2mortal(newSViv(tmbuf->tm_year))); + PUSHs(sv_2mortal(newSViv(tmbuf->tm_wday))); + PUSHs(sv_2mortal(newSViv(tmbuf->tm_yday))); + PUSHs(sv_2mortal(newSViv(tmbuf->tm_isdst))); } RETURN; } @@ -3900,10 +3959,10 @@ PP(pp_alarm) EXTEND(SP, 1); if (anum < 0) RETPUSHUNDEF; - PUSHi((I32)anum); + PUSHi(anum); RETURN; #else - DIE(PL_no_func, "Unsupported function alarm"); + DIE(aTHX_ PL_no_func, "Unsupported function alarm"); #endif } @@ -3930,17 +3989,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) @@ -3952,7 +4011,7 @@ PP(pp_shmwrite) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -3960,12 +4019,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) @@ -3977,7 +4036,7 @@ PP(pp_msgsnd) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -3990,7 +4049,7 @@ PP(pp_msgrcv) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -4007,7 +4066,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 } @@ -4027,7 +4086,7 @@ PP(pp_semctl) } RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -4040,7 +4099,7 @@ PP(pp_semop) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -4049,18 +4108,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 } @@ -4085,7 +4144,7 @@ PP(pp_ghostent) #ifdef HAS_GETHOSTBYNAME 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 @@ -4096,14 +4155,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 @@ -4151,25 +4210,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 } @@ -4192,7 +4251,7 @@ PP(pp_gnetent) #ifdef HAS_GETNETBYNAME 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 @@ -4200,14 +4259,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); @@ -4239,25 +4298,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 } @@ -4280,19 +4339,19 @@ PP(pp_gprotoent) #ifdef HAS_GETPROTOBYNAME 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); @@ -4322,25 +4381,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 } @@ -4369,7 +4428,7 @@ PP(pp_gservent) 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) { @@ -4382,14 +4441,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); @@ -4430,7 +4489,7 @@ PP(pp_gservent) RETURN; #else - DIE(PL_no_sock_func, "getservent"); + DIE(aTHX_ PL_no_sock_func, "getservent"); #endif } @@ -4441,7 +4500,7 @@ PP(pp_shostent) PerlSock_sethostent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "sethostent"); + DIE(aTHX_ PL_no_sock_func, "sethostent"); #endif } @@ -4452,7 +4511,7 @@ PP(pp_snetent) PerlSock_setnetent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "setnetent"); + DIE(aTHX_ PL_no_sock_func, "setnetent"); #endif } @@ -4463,7 +4522,7 @@ PP(pp_sprotoent) PerlSock_setprotoent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "setprotoent"); + DIE(aTHX_ PL_no_sock_func, "setprotoent"); #endif } @@ -4474,7 +4533,7 @@ PP(pp_sservent) PerlSock_setservent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "setservent"); + DIE(aTHX_ PL_no_sock_func, "setservent"); #endif } @@ -4486,7 +4545,7 @@ PP(pp_ehostent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endhostent"); + DIE(aTHX_ PL_no_sock_func, "endhostent"); #endif } @@ -4498,7 +4557,7 @@ PP(pp_enetent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endnetent"); + DIE(aTHX_ PL_no_sock_func, "endnetent"); #endif } @@ -4510,7 +4569,7 @@ PP(pp_eprotoent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endprotoent"); + DIE(aTHX_ PL_no_sock_func, "endprotoent"); #endif } @@ -4522,25 +4581,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 } @@ -4552,7 +4611,7 @@ PP(pp_gpwent) register SV *sv; struct passwd *pwent; STRLEN n_a; -#ifdef HAS_GETSPENT +#if defined(HAS_GETSPENT) || defined(HAS_GETSPNAM) struct spwd *spwent = NULL; #endif @@ -4574,8 +4633,10 @@ PP(pp_gpwent) spwent = getspnam(pwent->pw_name); } # endif +# ifdef HAS_GETSPENT else spwent = (struct spwd *)getspent(); +# endif #endif EXTEND(SP, 10); @@ -4596,7 +4657,7 @@ PP(pp_gpwent) PUSHs(sv = sv_mortalcopy(&PL_sv_no)); #ifdef PWPASSWD -# ifdef HAS_GETSPENT +# if defined(HAS_GETSPENT) || defined(HAS_GETSPNAM) if (spwent) sv_setpv(sv, spwent->sp_pwdp); else @@ -4658,21 +4719,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) setpwent(); # ifdef HAS_SETSPENT setspent(); # endif RETPUSHYES; #else - DIE(PL_no_func, "setpwent"); + DIE(aTHX_ PL_no_func, "setpwent"); #endif } @@ -4686,25 +4747,25 @@ PP(pp_epwent) # 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 } @@ -4759,7 +4820,7 @@ PP(pp_ggrent) RETURN; #else - DIE(PL_no_func, "getgrent"); + DIE(aTHX_ PL_no_func, "getgrent"); #endif } @@ -4770,7 +4831,7 @@ PP(pp_sgrent) setgrent(); RETPUSHYES; #else - DIE(PL_no_func, "setgrent"); + DIE(aTHX_ PL_no_func, "setgrent"); #endif } @@ -4781,7 +4842,7 @@ PP(pp_egrent) endgrent(); RETPUSHYES; #else - DIE(PL_no_func, "endgrent"); + DIE(aTHX_ PL_no_func, "endgrent"); #endif } @@ -4796,7 +4857,7 @@ PP(pp_getlogin) PUSHp(tmps, strlen(tmps)); RETURN; #else - DIE(PL_no_func, "getlogin"); + DIE(aTHX_ PL_no_func, "getlogin"); #endif } @@ -4840,9 +4901,9 @@ PP(pp_syscall) } 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; @@ -4896,7 +4957,7 @@ PP(pp_syscall) PUSHi(retval); RETURN; #else - DIE(PL_no_func, "syscall"); + DIE(aTHX_ PL_no_func, "syscall"); #endif } @@ -4906,8 +4967,8 @@ PP(pp_syscall) What's really needed is a good file locking module. */ -STATIC int -fcntl_emulate_flock(pTHX_ int fd, int operation) +static int +fcntl_emulate_flock(int fd, int operation) { struct flock flock; @@ -4926,7 +4987,7 @@ fcntl_emulate_flock(pTHX_ int fd, int operation) return -1; } flock.l_whence = SEEK_SET; - flock.l_start = flock.l_len = 0L; + flock.l_start = flock.l_len = (Off_t)0; return fcntl(fd, (operation & LOCK_NB) ? F_SETLK : F_SETLKW, &flock); } @@ -4963,8 +5024,8 @@ fcntl_emulate_flock(pTHX_ int fd, int operation) # define F_TEST 3 /* Test a region for other processes locks */ # endif -STATIC int -lockf_emulate_flock(pTHX_ int fd, int operation) +static int +lockf_emulate_flock(int fd, int operation) { int i; int save_errno;