X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/8c0bfa080e85353d7675b8b2fb1a04c6cc60cd5f..f556e5b971932902a6d49815d5094657f50eb262:/pp_sys.c diff --git a/pp_sys.c b/pp_sys.c index 1d1c849..ffe6af9 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -1,6 +1,6 @@ /* pp_sys.c * - * Copyright (c) 1991-1999, Larry Wall + * Copyright (c) 1991-2000, 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,10 +15,18 @@ */ #include "EXTERN.h" +#define PERL_IN_PP_SYS_C #include "perl.h" -#ifdef HAS_GETSPENT -/* Shadow password support for solaris - pdo@cs.umd.edu*/ +#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 */ +#ifdef __hpux__ +/* There is a MAXINT coming from <- <- + * and another MAXINT from "perl.h" <- . */ +#undef MAXINT +#endif #include #endif @@ -43,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 @@ -66,7 +77,7 @@ extern "C" int syscall(unsigned long,...); compiling multithreaded and singlethreaded ($ccflags et al). HOST_NOT_FOUND is typically defined in . */ -#if defined(HOST_NOT_FOUND) && !defined(h_errno) +#if defined(HOST_NOT_FOUND) && !defined(h_errno) && !defined(__CYGWIN__) extern int h_errno; #endif @@ -74,11 +85,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 @@ -86,11 +97,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 @@ -101,31 +112,12 @@ extern int h_errno; # include # endif #endif -#ifdef I_FCNTL -#include -#endif -#ifdef I_SYS_FILE -#include -#endif /* Put this after #includes because fork and vfork prototypes may conflict. */ #ifndef HAS_VFORK # define vfork fork #endif -/* Put this after #includes because defines _XOPEN_*. */ -#ifndef Sock_size_t -# if _XOPEN_VERSION >= 5 || defined(_XOPEN_SOURCE_EXTENDED) || defined(__GLIBC__) -# define Sock_size_t Size_t -# else -# define Sock_size_t int -# endif -#endif - -#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 @@ -156,7 +148,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 @@ -185,6 +177,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 @@ -228,16 +224,17 @@ 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, Mode_t mode) +{ Uid_t ruid = getuid(); Uid_t euid = geteuid(); Gid_t rgid = getgid(); Gid_t egid = getegid(); int res; - MUTEX_LOCK(&PL_cred_mutex); + LOCK_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 +243,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)) @@ -259,7 +256,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); @@ -271,7 +268,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)) @@ -280,8 +277,8 @@ emulate_eaccess (const char* path, int mode) { if (setresgid(rgid, egid, (Gid_t)-1)) #endif #endif - croak("leaving effective gid failed"); - MUTEX_UNLOCK(&PL_cred_mutex); + Perl_croak(aTHX_ "leaving effective gid failed"); + UNLOCK_CRED_MUTEX; return res; } @@ -292,8 +289,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, Mode_t mode) +{ + Perl_croak(aTHX_ "switching effective uid is not implemented"); /*NOTREACHED*/ return -1; } @@ -398,7 +396,7 @@ PP(pp_indread) PP(pp_rcatline) { - PL_last_in_gv = cGVOP->op_gv; + PL_last_in_gv = cGVOP_gv; return do_readline(); } @@ -429,7 +427,7 @@ PP(pp_warn) if (!tmps || !len) tmpsv = sv_2mortal(newSVpvn("Warning: something's wrong", 26)); - warn("%_", tmpsv); + Perl_warn(aTHX_ "%"SVf, tmpsv); RETSETYES; } @@ -462,20 +460,20 @@ PP(pp_die) HV *stash = SvSTASH(SvRV(error)); GV *gv = gv_fetchmethod(stash, "PROPAGATE"); if (gv) { - SV *file = sv_2mortal(newSVsv(GvSV(PL_curcop->cop_filegv))); - SV *line = sv_2mortal(newSViv(PL_curcop->cop_line)); + SV *file = sv_2mortal(newSVpv(CopFILE(PL_curcop),0)); + SV *line = sv_2mortal(newSViv(CopLINE(PL_curcop))); EXTEND(SP, 3); PUSHMARK(SP); PUSHs(error); 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--); } } - DIE(Nullch); + DIE(aTHX_ Nullch); } else { if (SvPOK(error) && SvCUR(error)) @@ -487,7 +485,7 @@ PP(pp_die) if (!tmps || !len) tmpsv = sv_2mortal(newSVpvn("Died", 4)); - DIE("%_", tmpsv); + DIE(aTHX_ "%"SVf, tmpsv); } /* I/O. */ @@ -497,52 +495,44 @@ 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; - perl_call_method("OPEN", G_SCALAR); + 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); @@ -567,7 +557,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; @@ -594,7 +584,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); @@ -628,7 +618,7 @@ PP(pp_pipe_op) badexit: RETPUSHUNDEF; #else - DIE(PL_no_func, "pipe"); + DIE(aTHX_ PL_no_func, "pipe"); #endif } @@ -649,7 +639,7 @@ PP(pp_fileno) XPUSHs(SvTIED_obj((SV*)gv, mg)); PUTBACK; ENTER; - perl_call_method("FILENO", G_SCALAR); + call_method("FILENO", G_SCALAR); LEAVE; SPAGAIN; RETURN; @@ -680,7 +670,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; @@ -704,7 +694,7 @@ PP(pp_binmode) XPUSHs(SvTIED_obj((SV*)gv, mg)); PUTBACK; ENTER; - perl_call_method("BINMODE", G_SCALAR); + call_method("BINMODE", G_SCALAR); LEAVE; SPAGAIN; RETURN; @@ -761,15 +751,15 @@ 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\"", + DIE(aTHX_ "Can't locate object method \"%s\" via package \"%s\"", methname, SvPV(*MARK,n_a)); } ENTER; @@ -779,7 +769,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; @@ -805,9 +795,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 ) ; } } @@ -848,10 +838,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; @@ -866,7 +856,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)) { @@ -877,7 +867,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; } @@ -891,7 +881,7 @@ PP(pp_dbmopen) PP(pp_dbmclose) { - return pp_untie(ARGS); + return pp_untie(); } PP(pp_sselect) @@ -902,7 +892,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; @@ -938,7 +928,7 @@ 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, Rhapsody) the smallest quantum select() operates + * UNIX, Solaris, NeXT, Darwin) 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 @@ -965,7 +955,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 @@ -1024,19 +1014,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) @@ -1090,8 +1080,6 @@ PP(pp_getc) gv = PL_stdingv; else gv = (GV*)POPs; - if (!gv) - gv = PL_argvgv; if (mg = SvTIED_mg((SV*)gv, 'q')) { I32 gimme = GIMME_V; @@ -1099,7 +1087,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) @@ -1117,11 +1105,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; @@ -1133,9 +1121,9 @@ doform(CV *cv, GV *gv, OP *retop) SAVETMPS; push_return(retop); - PUSHBLOCK(cx, CXt_SUB, PL_stack_sp); + PUSHBLOCK(cx, CXt_FORMAT, PL_stack_sp); PUSHFORMAT(cx); - SAVESPTR(PL_curpad); + SAVEVPTR(PL_curpad); PL_curpad = AvARRAY((AV*)svp[1]); setdefout(gv); /* locally select filehandle so $% et al work */ @@ -1172,9 +1160,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)); @@ -1208,7 +1196,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)) @@ -1248,12 +1236,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)); @@ -1268,17 +1256,22 @@ PP(pp_leavewrite) fp = IoOFP(io); if (!fp) { if (ckWARN2(WARN_CLOSED,WARN_IO)) { - if (IoIFP(io)) - warner(WARN_IO, "Filehandle only opened for input"); + if (IoIFP(io)) { + SV* sv = sv_newmortal(); + gv_efullname3(sv, gv, Nullch); + 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"); + report_closed_fh(gv, io, "write", "filehandle"); } 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)) @@ -1323,7 +1316,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; @@ -1335,32 +1328,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); - if (IoIFP(io)) - warner(WARN_IO, "Filehandle %s opened only for input", - SvPV(sv,n_a)); + if (IoIFP(io)) { + gv_efullname3(sv, gv, Nullch); + 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)); + report_closed_fh(gv, io, "printf", "filehandle"); } 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; @@ -1433,7 +1422,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; @@ -1450,7 +1439,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); @@ -1467,6 +1456,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, @@ -1487,11 +1484,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); @@ -1532,8 +1529,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); @@ -1561,7 +1567,7 @@ PP(pp_syswrite) PUSHs(sv); PUTBACK; } - return pp_send(ARGS); + return pp_send(); } PP(pp_send) @@ -1569,10 +1575,10 @@ PP(pp_send) djSP; dMARK; dORIGMARK; dTARGET; GV *gv; IO *io; - int offset; + Off_t offset; SV *bufsv; char *buffer; - int length; + Off_t length; STRLEN blen; MAGIC *mg; @@ -1583,7 +1589,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; @@ -1595,29 +1601,37 @@ PP(pp_send) goto say_undef; bufsv = *++MARK; buffer = SvPV(bufsv, blen); +#if Off_t_SIZE > IVSIZE + length = SvNVx(*++MARK); +#else length = SvIVx(*++MARK); +#endif 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"); + report_closed_fh(gv, io, "syswrite", "filehandle"); else - warner(WARN_CLOSED, "Send on closed socket"); + report_closed_fh(gv, io, "send", "socket"); } } else if (PL_op->op_type == OP_SYSWRITE) { if (MARK < SP) { +#if Off_t_SIZE > IVSIZE + offset = SvNVx(*++MARK); +#else offset = SvIVx(*++MARK); +#endif 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) @@ -1630,6 +1644,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); } @@ -1647,7 +1662,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; @@ -1662,7 +1677,7 @@ PP(pp_send) PP(pp_recv) { - return pp_sysread(ARGS); + return pp_sysread(); } PP(pp_eof) @@ -1671,17 +1686,35 @@ PP(pp_eof) GV *gv; MAGIC *mg; - if (MAXARG <= 0) - gv = PL_last_in_gv; + if (MAXARG <= 0) { + if (PL_op->op_flags & OPf_SPECIAL) { /* eof() */ + IO *io; + gv = PL_last_in_gv = PL_argvgv; + io = GvIO(gv); + if (io && !IoIFP(io)) { + if ((IoFLAGS(io) & IOf_START) && av_len(GvAVn(gv)) < 0) { + IoLINES(io) = 0; + IoFLAGS(io) &= ~IOf_START; + do_open(gv, "-", 1, FALSE, O_RDONLY, 0, Nullfp); + sv_setpvn(GvSV(gv), "-", 1); + SvSETMAGIC(GvSV(gv)); + } + else if (!nextargv(gv)) + RETPUSHYES; + } + } + else + gv = PL_last_in_gv; /* eof */ + } else - gv = PL_last_in_gv = (GV*)POPs; + gv = PL_last_in_gv = (GV*)POPs; /* eof(FH) */ if (gv && (mg = SvTIED_mg((SV*)gv, 'q'))) { PUSHMARK(SP); XPUSHs(SvTIED_obj((SV*)gv, mg)); PUTBACK; ENTER; - perl_call_method("EOF", G_SCALAR); + call_method("EOF", G_SCALAR); LEAVE; SPAGAIN; RETURN; @@ -1707,19 +1740,23 @@ PP(pp_tell) XPUSHs(SvTIED_obj((SV*)gv, mg)); PUTBACK; ENTER; - perl_call_method("TELL", G_SCALAR); + call_method("TELL", G_SCALAR); LEAVE; SPAGAIN; RETURN; } +#if LSEEKSIZE > IVSIZE + PUSHn( do_tell(gv) ); +#else PUSHi( do_tell(gv) ); +#endif RETURN; } PP(pp_seek) { - return pp_sysseek(ARGS); + return pp_sysseek(); } PP(pp_sysseek) @@ -1727,7 +1764,11 @@ PP(pp_sysseek) djSP; GV *gv; int whence = POPi; - Off_t offset = POPl; +#if LSEEKSIZE > IVSIZE + Off_t offset = (Off_t)SvNVx(POPs); +#else + Off_t offset = (Off_t)SvIVx(POPs); +#endif MAGIC *mg; gv = PL_last_in_gv = (GV*)POPs; @@ -1735,11 +1776,15 @@ PP(pp_sysseek) if (gv && (mg = SvTIED_mg((SV*)gv, 'q'))) { PUSHMARK(SP); XPUSHs(SvTIED_obj((SV*)gv, mg)); +#if LSEEKSIZE > IVSIZE + XPUSHs(sv_2mortal(newSVnv((NV) offset))); +#else XPUSHs(sv_2mortal(newSViv((IV) offset))); +#endif XPUSHs(sv_2mortal(newSViv((IV) whence))); PUTBACK; ENTER; - perl_call_method("SEEK", G_SCALAR); + call_method("SEEK", G_SCALAR); LEAVE; SPAGAIN; RETURN; @@ -1749,9 +1794,18 @@ PP(pp_sysseek) 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) - : newSVpvn(zero_but_true, ZBTLEN))); + if (n < 0) + PUSHs(&PL_sv_undef); + else { + SV* sv = n ? +#if LSEEKSIZE > IVSIZE + newSVnv((NV)n) +#else + newSViv((IV)n) +#endif + : newSVpvn(zero_but_true, ZBTLEN); + PUSHs(sv_2mortal(sv)); + } } RETURN; } @@ -1770,13 +1824,17 @@ PP(pp_truncate) tmpgv = gv_fetchpv(POPpx, FALSE, SVt_PVIO); do_ftruncate: TAINT_PROPER("truncate"); - if (!GvIO(tmpgv) || !IoIFP(GvIOp(tmpgv)) || + if (!GvIO(tmpgv) || !IoIFP(GvIOp(tmpgv))) + result = 0; + else { + PerlIO_flush(IoIFP(GvIOp(tmpgv))); #ifdef HAS_TRUNCATE - ftruncate(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), len) < 0) + if (ftruncate(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), len) < 0) #else - my_chsize(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), len) < 0) + if (my_chsize(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), len) < 0) #endif - result = 0; + result = 0; + } } else { SV *sv = POPs; @@ -1817,13 +1875,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) @@ -1856,7 +1914,7 @@ PP(pp_ioctl) } else { retval = SvIV(argsv); - s = (char*)retval; /* ouch */ + s = INT2PTR(char*,retval); /* ouch */ } TAINT_PROPER(optype == OP_IOCTL ? "ioctl" : "fcntl"); @@ -1865,7 +1923,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 @@ -1875,12 +1933,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 */ @@ -1919,12 +1977,16 @@ PP(pp_flock) (void)PerlIO_flush(fp); value = (I32)(PerlLIO_flock(PerlIO_fileno(fp), argtype) >= 0); } - else + else { value = 0; + SETERRNO(EBADF,RMS$_IFI); + if (ckWARN(WARN_CLOSED)) + report_closed_fh(gv, GvIO(gv), "flock", "filehandle"); + } PUSHi(value); RETURN; #else - DIE(PL_no_func, "flock()"); + DIE(aTHX_ PL_no_func, "flock()"); #endif } @@ -1965,10 +2027,13 @@ PP(pp_socket) if (!IoIFP(io) && !IoOFP(io)) PerlLIO_close(fd); RETPUSHUNDEF; } +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(fd, F_SETFD, fd > PL_maxsysfd); /* ensure close-on-exec */ +#endif RETPUSHYES; #else - DIE(PL_no_sock_func, "socket"); + DIE(aTHX_ PL_no_sock_func, "socket"); #endif } @@ -2015,10 +2080,14 @@ PP(pp_sockpair) if (!IoIFP(io2) && !IoOFP(io2)) PerlLIO_close(fd[1]); RETPUSHUNDEF; } +#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; #else - DIE(PL_no_sock_func, "socketpair"); + DIE(aTHX_ PL_no_sock_func, "socketpair"); #endif } @@ -2073,11 +2142,11 @@ PP(pp_bind) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "bind() on closed fd"); + report_closed_fh(gv, io, "bind", "socket"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "bind"); + DIE(aTHX_ PL_no_sock_func, "bind"); #endif } @@ -2103,11 +2172,11 @@ PP(pp_connect) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "connect() on closed fd"); + report_closed_fh(gv, io, "connect", "socket"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "connect"); + DIE(aTHX_ PL_no_sock_func, "connect"); #endif } @@ -2129,11 +2198,11 @@ PP(pp_listen) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "listen() on closed fd"); + report_closed_fh(gv, io, "listen", "socket"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "listen"); + DIE(aTHX_ PL_no_sock_func, "listen"); #endif } @@ -2177,20 +2246,23 @@ PP(pp_accept) if (!IoIFP(nstio) && !IoOFP(nstio)) PerlLIO_close(fd); goto badexit; } +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(fd, F_SETFD, fd > PL_maxsysfd); /* ensure close-on-exec */ +#endif PUSHp((char *)&saddr, len); RETURN; nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "accept() on closed fd"); + report_closed_fh(ggv, ggv ? GvIO(ggv) : 0, "accept", "socket"); SETERRNO(EBADF,SS$_IVCHAN); badexit: RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "accept"); + DIE(aTHX_ PL_no_sock_func, "accept"); #endif } @@ -2210,20 +2282,20 @@ PP(pp_shutdown) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "shutdown() on closed fd"); + report_closed_fh(gv, io, "shutdown", "socket"); 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 } @@ -2289,22 +2361,24 @@ PP(pp_ssockopt) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "[gs]etsockopt() on closed fd"); + report_closed_fh(gv, io, + optype == OP_GSOCKOPT ? "getsockopt" : "setsockopt", + "socket"); 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 } @@ -2362,13 +2436,16 @@ PP(pp_getpeername) nuts: if (ckWARN(WARN_CLOSED)) - warner(WARN_CLOSED, "get{sock, peer}name() on closed fd"); + report_closed_fh(gv, io, + optype == OP_GETSOCKNAME ? "getsockname" + : "getpeername", + "socket"); SETERRNO(EBADF,SS$_IVCHAN); nuts2: RETPUSHUNDEF; #else - DIE(PL_no_sock_func, "getpeername"); + DIE(aTHX_ PL_no_sock_func, "getpeername"); #endif } @@ -2376,7 +2453,7 @@ nuts2: PP(pp_lstat) { - return pp_stat(ARGS); + return pp_stat(); } PP(pp_stat) @@ -2388,7 +2465,7 @@ PP(pp_stat) STRLEN n_a; if (PL_op->op_flags & OPf_REF) { - tmpgv = cGVOP->op_gv; + tmpgv = cGVOP_gv; do_fstat: if (tmpgv != PL_defgv) { PL_laststype = OP_STAT; @@ -2421,7 +2498,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; } } @@ -2435,30 +2512,42 @@ 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))); +#if Uid_t_size > IVSIZE + PUSHs(sv_2mortal(newSVnv(PL_statcache.st_uid))); +#else + PUSHs(sv_2mortal(newSViv(PL_statcache.st_uid))); +#endif +#if Gid_t_size > IVSIZE + PUSHs(sv_2mortal(newSVnv(PL_statcache.st_gid))); +#else + PUSHs(sv_2mortal(newSViv(PL_statcache.st_gid))); +#endif #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))); +#if Off_t_size > IVSIZE + PUSHs(sv_2mortal(newSVnv(PL_statcache.st_size))); +#else + PUSHs(sv_2mortal(newSViv(PL_statcache.st_size))); +#endif #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))); @@ -2482,9 +2571,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) @@ -2509,9 +2598,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) @@ -2536,9 +2625,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) @@ -2563,9 +2652,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) @@ -2590,9 +2679,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) @@ -2617,9 +2706,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) @@ -2631,7 +2720,7 @@ PP(pp_fteexec) PP(pp_ftis) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2640,74 +2729,79 @@ 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; - if (PL_statcache.st_uid == (PL_op->op_type == OP_FTEOWNED ? PL_euid : PL_uid) ) + if (PL_statcache.st_uid == (PL_op->op_type == OP_FTEOWNED ? + PL_euid : PL_uid) ) RETPUSHYES; RETPUSHNO; } PP(pp_ftzero) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; - if (!PL_statcache.st_size) + if (PL_statcache.st_size == 0) RETPUSHYES; RETPUSHNO; } PP(pp_ftsize) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; dTARGET; if (result < 0) RETPUSHUNDEF; +#if Off_t_size > IVSIZE + PUSHn(PL_statcache.st_size); +#else PUSHi(PL_statcache.st_size); +#endif RETURN; } 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; @@ -2718,7 +2812,7 @@ PP(pp_ftsock) PP(pp_ftchr) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2729,7 +2823,7 @@ PP(pp_ftchr) PP(pp_ftblk) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2740,7 +2834,7 @@ PP(pp_ftblk) PP(pp_ftfile) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2751,7 +2845,7 @@ PP(pp_ftfile) PP(pp_ftdir) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2762,7 +2856,7 @@ PP(pp_ftdir) PP(pp_ftpipe) { - I32 result = my_stat(ARGS); + I32 result = my_stat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2773,7 +2867,7 @@ PP(pp_ftpipe) PP(pp_ftlink) { - I32 result = my_lstat(ARGS); + I32 result = my_lstat(); djSP; if (result < 0) RETPUSHUNDEF; @@ -2786,7 +2880,7 @@ PP(pp_ftsuid) { djSP; #ifdef S_ISUID - I32 result = my_stat(ARGS); + I32 result = my_stat(); SPAGAIN; if (result < 0) RETPUSHUNDEF; @@ -2800,7 +2894,7 @@ PP(pp_ftsgid) { djSP; #ifdef S_ISGID - I32 result = my_stat(ARGS); + I32 result = my_stat(); SPAGAIN; if (result < 0) RETPUSHUNDEF; @@ -2814,7 +2908,7 @@ PP(pp_ftsvtx) { djSP; #ifdef S_ISVTX - I32 result = my_stat(ARGS); + I32 result = my_stat(); SPAGAIN; if (result < 0) RETPUSHUNDEF; @@ -2833,7 +2927,7 @@ PP(pp_fttty) STRLEN n_a; if (PL_op->op_flags & OPf_REF) - gv = cGVOP->op_gv; + gv = cGVOP_gv; else if (isGV(TOPs)) gv = (GV*)POPs; else if (SvROK(TOPs) && isGV(SvRV(TOPs))) @@ -2872,9 +2966,10 @@ PP(pp_fttext) register SV *sv; GV *gv; STRLEN n_a; + PerlIO *fp; if (PL_op->op_flags & OPf_REF) - gv = cGVOP->op_gv; + gv = cGVOP_gv; else if (isGV(TOPs)) gv = (GV*)POPs; else if (SvROK(TOPs) && isGV(SvRV(TOPs))) @@ -2900,7 +2995,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; @@ -2923,9 +3018,11 @@ PP(pp_fttext) len = 512; } else { - if (ckWARN(WARN_UNOPENED)) - warner(WARN_UNOPENED, "Test on unopened file <%s>", - GvENAME(cGVOP->op_gv)); + if (ckWARN(WARN_UNOPENED)) { + gv = cGVOP_gv; + Perl_warner(aTHX_ WARN_UNOPENED, "Test on unopened file <%s>", + GvENAME(gv)); + } SETERRNO(EBADF,RMS$_IFI); RETPUSHUNDEF; } @@ -2936,21 +3033,19 @@ PP(pp_fttext) PL_statgv = Nullgv; PL_laststatval = -1; sv_setpv(PL_statname, SvPV(sv, n_a)); -#ifdef HAS_OPEN3 - i = PerlLIO_open3(SvPV(sv, n_a), O_RDONLY, 0); -#else - i = PerlLIO_open(SvPV(sv, n_a), 0); -#endif - if (i < 0) { + if (!(fp = PerlIO_open(SvPVX(PL_statname), "r"))) { 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); - if (PL_laststatval < 0) + PL_laststatval = PerlLIO_fstat(PerlIO_fileno(fp), &PL_statcache); + if (PL_laststatval < 0) { + (void)PerlIO_close(fp); RETPUSHUNDEF; - len = PerlLIO_read(i, tbuf, 512); - (void)PerlLIO_close(i); + } + do_binmode(fp, '<', TRUE); + len = PerlIO_read(fp, tbuf, sizeof(tbuf)); + (void)PerlIO_close(fp); if (len <= 0) { if (S_ISDIR(PL_statcache.st_mode) && PL_op->op_type == OP_FTTEXT) RETPUSHNO; /* special case NFS directories */ @@ -2962,6 +3057,12 @@ PP(pp_fttext) /* now scan s to look for textiness */ /* XXX ASCII dependent code */ +#if defined(DOSISH) || defined(USEMYBINMODE) + /* ignore trailing ^Z on short files */ + if (len && len < sizeof(tbuf) && tbuf[len-1] == 26) + --len; +#endif + for (i = 0; i < len; i++, s++) { if (!*s) { /* null never allowed in text */ odd += len; @@ -2971,8 +3072,12 @@ PP(pp_fttext) else if (!(isPRINT(*s) || isSPACE(*s))) odd++; #else - else if (*s & 128) - odd++; + else if (*s & 128) { +#ifdef USE_LOCALE + if (!(PL_op->op_private & OPpLOCALE) || !isALPHA_LC(*s)) +#endif + odd++; + } else if (*s < 32 && *s != '\n' && *s != '\r' && *s != '\b' && *s != '\t' && *s != '\f' && *s != 27) @@ -2988,7 +3093,7 @@ PP(pp_fttext) PP(pp_ftbinary) { - return pp_fttext(ARGS); + return pp_fttext(); } /* File calls. */ @@ -3041,7 +3146,7 @@ PP(pp_chown) PUSHi(value); RETURN; #else - DIE(PL_no_func, "Unsupported function chown"); + DIE(aTHX_ PL_no_func, "Unsupported function chown"); #endif } @@ -3056,7 +3161,7 @@ PP(pp_chroot) PUSHi( chroot(tmps) >= 0 ); RETURN; #else - DIE(PL_no_func, "chroot"); + DIE(aTHX_ PL_no_func, "chroot"); #endif } @@ -3125,9 +3230,9 @@ PP(pp_link) char *tmps2 = POPpx; char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("link"); - SETi( link(tmps, tmps2) >= 0 ); + SETi( PerlLIO_link(tmps, tmps2) >= 0 ); #else - DIE(PL_no_func, "Unsupported function link"); + DIE(aTHX_ PL_no_func, "Unsupported function link"); #endif RETURN; } @@ -3143,7 +3248,7 @@ PP(pp_symlink) SETi( symlink(tmps, tmps2) >= 0 ); RETURN; #else - DIE(PL_no_func, "symlink"); + DIE(aTHX_ PL_no_func, "symlink"); #endif } @@ -3173,10 +3278,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; @@ -3264,12 +3367,19 @@ char *filename; PP(pp_mkdir) { djSP; dTARGET; - int mode = POPi; + int mode; #ifndef HAS_MKDIR int oldumask; #endif STRLEN n_a; - char *tmps = SvPV(TOPs, n_a); + char *tmps; + + if (MAXARG > 1) + mode = POPi; + else + mode = 0777; + + tmps = SvPV(TOPs, n_a); TAINT_PROPER("mkdir"); #ifdef HAS_MKDIR @@ -3324,7 +3434,7 @@ nope: SETERRNO(EBADF,RMS$_DIR); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "opendir"); + DIE(aTHX_ PL_no_dir_func, "opendir"); #endif } @@ -3333,7 +3443,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; @@ -3380,7 +3490,7 @@ nope: else RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "readdir"); + DIE(aTHX_ PL_no_dir_func, "readdir"); #endif } @@ -3393,7 +3503,7 @@ PP(pp_telldir) 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 *)); + long telldir (DIR *); # endif GV *gv = (GV*)POPs; register IO *io = GvIOn(gv); @@ -3408,7 +3518,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "telldir"); + DIE(aTHX_ PL_no_dir_func, "telldir"); #endif } @@ -3431,7 +3541,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "seekdir"); + DIE(aTHX_ PL_no_dir_func, "seekdir"); #endif } @@ -3452,7 +3562,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "rewinddir"); + DIE(aTHX_ PL_no_dir_func, "rewinddir"); #endif } @@ -3482,7 +3592,7 @@ nope: SETERRNO(EBADF,RMS$_IFI); RETPUSHUNDEF; #else - DIE(PL_no_dir_func, "closedir"); + DIE(aTHX_ PL_no_dir_func, "closedir"); #endif } @@ -3503,19 +3613,30 @@ PP(pp_fork) if (!childpid) { /*SUPPRESS 560*/ if (tmpgv = gv_fetchpv("$", TRUE, SVt_PV)) - sv_setiv(GvSV(tmpgv), (IV)getpid()); + sv_setiv(GvSV(tmpgv), (IV)PerlProc_getpid()); hv_clear(PL_pidstatus); /* no kids, so don't wait for 'em */ } PUSHi(childpid); RETURN; #else - DIE(PL_no_func, "Unsupported function fork"); +# if defined(USE_ITHREADS) && defined(PERL_IMPLICIT_SYS) + djSP; dTARGET; + Pid_t childpid; + + EXTEND(SP, 1); + PERL_FLUSHALL_FOR_CHILD; + childpid = PerlProc_fork(); + PUSHi(childpid); + RETURN; +# else + DIE(aTHX_ PL_no_func, "Unsupported function fork"); +# endif #endif } PP(pp_wait) { -#if !defined(DOSISH) || defined(OS2) || defined(WIN32) || defined(CYGWIN32) +#if (!defined(DOSISH) || defined(OS2) || defined(WIN32)) && !defined(MACOS_TRADITIONAL) djSP; dTARGET; Pid_t childpid; int argflags; @@ -3525,13 +3646,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)) && !defined(MACOS_TRADITIONAL) djSP; dTARGET; Pid_t childpid; int optype; @@ -3544,7 +3665,7 @@ PP(pp_waitpid) SETi(childpid); RETURN; #else - DIE(PL_no_func, "Unsupported function waitpid"); + DIE(aTHX_ PL_no_func, "Unsupported function waitpid"); #endif } @@ -3557,6 +3678,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) { @@ -3567,16 +3690,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 { @@ -3587,17 +3718,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 */ @@ -3659,6 +3816,12 @@ PP(pp_exec) # endif #endif } + +#if !defined(HAS_FORK) && defined(USE_ITHREADS) && defined(PERL_IMPLICIT_SYS) + if (value >= 0) + my_exit(value); +#endif + SP = ORIGMARK; PUSHi(value); RETURN; @@ -3674,7 +3837,7 @@ PP(pp_kill) PUSHi(value); RETURN; #else - DIE(PL_no_func, "Unsupported function kill"); + DIE(aTHX_ PL_no_func, "Unsupported function kill"); #endif } @@ -3685,7 +3848,7 @@ PP(pp_getppid) XPUSHi( getppid() ); RETURN; #else - DIE(PL_no_func, "getppid"); + DIE(aTHX_ PL_no_func, "getppid"); #endif } @@ -3693,24 +3856,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(); + if (pid != 0 && pid != PerlProc_getpid()) + 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 } @@ -3718,8 +3881,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,13 +3896,16 @@ PP(pp_setpgrp) #ifdef BSD_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"); + if ((pgrp != 0 && pgrp != PerlProc_getpid()) + || (pid != 0 && pid != PerlProc_getpid())) + { + 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 } @@ -3754,7 +3920,7 @@ PP(pp_getpriority) SETi( getpriority(which, who) ); RETURN; #else - DIE(PL_no_func, "getpriority()"); + DIE(aTHX_ PL_no_func, "getpriority()"); #endif } @@ -3772,7 +3938,7 @@ PP(pp_setpriority) SETi( setpriority(which, who, niceval) >= 0 ); RETURN; #else - DIE(PL_no_func, "setpriority()"); + DIE(aTHX_ PL_no_func, "setpriority()"); #endif } @@ -3810,7 +3976,7 @@ PP(pp_tms) djSP; #ifndef HAS_TIMES - DIE("times not implemented"); + DIE(aTHX_ "times not implemented"); #else EXTEND(SP, 4); @@ -3822,11 +3988,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 */ @@ -3834,7 +4000,7 @@ PP(pp_tms) PP(pp_localtime) { - return pp_gmtime(ARGS); + return pp_gmtime(); } PP(pp_gmtime) @@ -3867,26 +4033,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; } @@ -3901,10 +4067,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 } @@ -3931,17 +4097,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) @@ -3953,7 +4119,7 @@ PP(pp_shmwrite) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -3961,12 +4127,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) @@ -3978,7 +4144,7 @@ PP(pp_msgsnd) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -3991,7 +4157,7 @@ PP(pp_msgrcv) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -4008,7 +4174,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 } @@ -4028,7 +4194,7 @@ PP(pp_semctl) } RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -4041,7 +4207,7 @@ PP(pp_semop) PUSHi(value); RETURN; #else - return pp_semget(ARGS); + return pp_semget(); #endif } @@ -4050,18 +4216,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 } @@ -4086,7 +4252,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 @@ -4097,14 +4263,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 @@ -4152,25 +4318,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 } @@ -4193,7 +4359,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 @@ -4201,14 +4367,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); @@ -4240,25 +4406,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 } @@ -4281,19 +4447,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); @@ -4323,25 +4489,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 } @@ -4370,7 +4536,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) { @@ -4383,14 +4549,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); @@ -4431,7 +4597,7 @@ PP(pp_gservent) RETURN; #else - DIE(PL_no_sock_func, "getservent"); + DIE(aTHX_ PL_no_sock_func, "getservent"); #endif } @@ -4442,7 +4608,7 @@ PP(pp_shostent) PerlSock_sethostent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "sethostent"); + DIE(aTHX_ PL_no_sock_func, "sethostent"); #endif } @@ -4453,7 +4619,7 @@ PP(pp_snetent) PerlSock_setnetent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "setnetent"); + DIE(aTHX_ PL_no_sock_func, "setnetent"); #endif } @@ -4464,7 +4630,7 @@ PP(pp_sprotoent) PerlSock_setprotoent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "setprotoent"); + DIE(aTHX_ PL_no_sock_func, "setprotoent"); #endif } @@ -4475,7 +4641,7 @@ PP(pp_sservent) PerlSock_setservent(TOPi); RETSETYES; #else - DIE(PL_no_sock_func, "setservent"); + DIE(aTHX_ PL_no_sock_func, "setservent"); #endif } @@ -4487,7 +4653,7 @@ PP(pp_ehostent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endhostent"); + DIE(aTHX_ PL_no_sock_func, "endhostent"); #endif } @@ -4499,7 +4665,7 @@ PP(pp_enetent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endnetent"); + DIE(aTHX_ PL_no_sock_func, "endnetent"); #endif } @@ -4511,7 +4677,7 @@ PP(pp_eprotoent) EXTEND(SP,1); RETPUSHYES; #else - DIE(PL_no_sock_func, "endprotoent"); + DIE(aTHX_ PL_no_sock_func, "endprotoent"); #endif } @@ -4523,38 +4689,38 @@ 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 } PP(pp_gpwent) { djSP; -#if defined(HAS_PASSWD) && defined(HAS_GETPWENT) +#ifdef HAS_PASSWD I32 which = PL_op->op_type; register SV *sv; struct passwd *pwent; STRLEN n_a; -#ifdef HAS_GETSPENT - struct spwd *spwent; +#if defined(HAS_GETSPENT) || defined(HAS_GETSPNAM) + struct spwd *spwent = NULL; #endif if (which == OP_GPWNAM) @@ -4562,15 +4728,27 @@ PP(pp_gpwent) else if (which == OP_GPWUID) pwent = getpwuid(POPi); else +#ifdef HAS_GETPWENT pwent = (struct passwd *)getpwent(); +#else + DIE(aTHX_ PL_no_func, "getpwent"); +#endif -#ifdef HAS_GETSPENT - if (which == OP_GPWNAM) - spwent = getspnam(pwent->pw_name); - else if (which == OP_GPWUID) - spwent = getspnam(pwent->pw_name); - else - spwent = (struct spwd *)getspent(); +#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); @@ -4591,14 +4769,14 @@ 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 sv_setpv(sv, pwent->pw_passwd); -#else +# else sv_setpv(sv, pwent->pw_passwd); -#endif +# endif #endif PUSHs(sv = sv_mortalcopy(&PL_sv_no)); @@ -4653,21 +4831,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_GETSPENT +# ifdef HAS_SETSPENT setspent(); -#endif +# endif RETPUSHYES; #else - DIE(PL_no_func, "setpwent"); + DIE(aTHX_ PL_no_func, "setpwent"); #endif } @@ -4676,37 +4854,37 @@ PP(pp_epwent) djSP; #if defined(HAS_PASSWD) && defined(HAS_ENDPWENT) endpwent(); -#ifdef HAS_GETSPENT +# ifdef HAS_ENDSPENT endspent(); -#endif +# 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 } PP(pp_ggrent) { djSP; -#if defined(HAS_GROUP) && defined(HAS_GETGRENT) +#ifdef HAS_GROUP I32 which = PL_op->op_type; register char **elem; register SV *sv; @@ -4718,7 +4896,11 @@ PP(pp_ggrent) else if (which == OP_GGRGID) grent = (struct group *)getgrgid(POPi); else +#ifdef HAS_GETGRENT grent = (struct group *)getgrent(); +#else + DIE(aTHX_ PL_no_func, "getgrent"); +#endif EXTEND(SP, 4); if (GIMME != G_ARRAY) { @@ -4754,7 +4936,7 @@ PP(pp_ggrent) RETURN; #else - DIE(PL_no_func, "getgrent"); + DIE(aTHX_ PL_no_func, "getgrent"); #endif } @@ -4765,7 +4947,7 @@ PP(pp_sgrent) setgrent(); RETPUSHYES; #else - DIE(PL_no_func, "setgrent"); + DIE(aTHX_ PL_no_func, "setgrent"); #endif } @@ -4776,7 +4958,7 @@ PP(pp_egrent) endgrent(); RETPUSHYES; #else - DIE(PL_no_func, "endgrent"); + DIE(aTHX_ PL_no_func, "endgrent"); #endif } @@ -4791,7 +4973,7 @@ PP(pp_getlogin) PUSHp(tmps, strlen(tmps)); RETURN; #else - DIE(PL_no_func, "getlogin"); + DIE(aTHX_ PL_no_func, "getlogin"); #endif } @@ -4835,9 +5017,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; @@ -4891,7 +5073,7 @@ PP(pp_syscall) PUSHi(retval); RETURN; #else - DIE(PL_no_func, "syscall"); + DIE(aTHX_ PL_no_func, "syscall"); #endif } @@ -4921,7 +5103,7 @@ fcntl_emulate_flock(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); } @@ -4959,9 +5141,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;