X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sys.c;h=fe75220d38ea9f5efd5a4b26ed1664cc01416653;hb=b83ac84c2fbc01a334f3e39ae42527298ccd0b11;hp=1aabab82b846e9f582d13d1780c55e54d6ff939c;hpb=8ac853655d9b744749adcb9687c13d99cdd6e9fb;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pp_sys.c b/pp_sys.c index 1aabab8..fe75220 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -38,7 +38,9 @@ extern "C" int syscall(unsigned long,...); #if defined(HAS_SOCKET) && !defined(VMS) /* VMS handles sockets via vmsish.h */ # include -# include +# ifdef I_NETDB +# include +# endif # ifndef ENOTSOCK # ifdef I_NET_ERRNO # include @@ -52,7 +54,11 @@ extern "C" int syscall(unsigned long,...); #endif #endif -#ifdef HOST_NOT_FOUND +/* XXX Configure test needed. + h_errno might not be a simple 'int', especially for multi-threaded + applications. HOST_NOT_FOUND is typically defined in . +*/ +#if defined(HOST_NOT_FOUND) && !defined(h_errno) extern int h_errno; #endif @@ -63,7 +69,9 @@ extern int h_errno; struct passwd *getpwnam _((char *)); struct passwd *getpwuid _((Uid_t)); # endif +# ifdef HAS_GETPWENT struct passwd *getpwent _((void)); +# endif #endif #ifdef HAS_GROUP @@ -73,11 +81,13 @@ extern int h_errno; struct group *getgrnam _((char *)); struct group *getgrgid _((Gid_t)); # endif +# ifdef HAS_GETGRENT struct group *getgrent _((void)); +# endif #endif #ifdef I_UTIME -# ifdef _MSC_VER +# if defined(_MSC_VER) || defined(__MINGW32__) # include # else # include @@ -112,7 +122,7 @@ static int dooneliner _((char *cmd, char *filename)); # ifdef my_chsize /* Probably #defined to Perl_my_chsize in embed.h */ # undef my_chsize # endif -# define my_chsize chsize +# define my_chsize PerlLIO_chsize #endif #ifdef HAS_FLOCK @@ -175,13 +185,13 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true"; PP(pp_backtick) { - dSP; dTARGET; + djSP; dTARGET; PerlIO *fp; char *tmps = POPp; I32 gimme = GIMME_V; TAINT_PROPER("``"); - fp = my_popen(tmps, "r"); + fp = PerlProc_popen(tmps, "r"); if (fp) { if (gimme == G_VOID) { char tmpbuf[256]; @@ -201,7 +211,7 @@ PP(pp_backtick) SV *sv; for (;;) { - sv = NEWSV(56, 80); + sv = NEWSV(56, 79); if (sv_gets(sv, fp, 0) == Nullch) { SvREFCNT_dec(sv); break; @@ -214,7 +224,7 @@ PP(pp_backtick) SvTAINTED_on(sv); } } - STATUS_NATIVE_SET(my_pclose(fp)); + STATUS_NATIVE_SET(PerlProc_pclose(fp)); TAINT; /* "I believe that this is not gratuitous!" */ } else { @@ -258,11 +268,13 @@ PP(pp_glob) return result; } +#if 0 /* XXX never used! */ PP(pp_indread) { last_in_gv = gv_fetchpv(SvPVx(GvSV((GV*)(*stack_sp--)), na), TRUE,SVt_PVIO); return do_readline(); } +#endif PP(pp_rcatline) { @@ -272,7 +284,7 @@ PP(pp_rcatline) PP(pp_warn) { - dSP; dMARK; + djSP; dMARK; char *tmps; if (SP - MARK != 1) { dTARGET; @@ -284,7 +296,7 @@ PP(pp_warn) tmps = SvPV(TOPs, na); } if (!tmps || !*tmps) { - SV *error = GvSV(errgv); + SV *error = ERRSV; (void)SvUPGRADE(error, SVt_PV); if (SvPOK(error) && SvCUR(error)) sv_catpv(error, "\t...caught"); @@ -298,8 +310,10 @@ PP(pp_warn) PP(pp_die) { - dSP; dMARK; + djSP; dMARK; char *tmps; + SV *tmpsv = Nullsv; + char *pat = "%s"; if (SP - MARK != 1) { dTARGET; do_join(TARG, &sv_no, MARK, SP); @@ -307,25 +321,50 @@ PP(pp_die) SP = MARK + 1; } else { - tmps = SvPV(TOPs, na); + tmpsv = TOPs; + tmps = SvROK(tmpsv) ? Nullch : SvPV(tmpsv, na); } if (!tmps || !*tmps) { - SV *error = GvSV(errgv); + SV *error = ERRSV; (void)SvUPGRADE(error, SVt_PV); - if (SvPOK(error) && SvCUR(error)) - sv_catpv(error, "\t...propagated"); - tmps = SvPV(error, na); + if(tmpsv ? SvROK(tmpsv) : SvROK(error)) { + if(tmpsv) + SvSetSV(error,tmpsv); + else if(sv_isobject(error)) { + HV *stash = SvSTASH(SvRV(error)); + GV *gv = gv_fetchmethod(stash, "PROPAGATE"); + if (gv) { + SV *file = sv_2mortal(newSVsv(GvSV(curcop->cop_filegv))); + SV *line = sv_2mortal(newSViv(curcop->cop_line)); + EXTEND(SP, 3); + PUSHMARK(SP); + PUSHs(error); + PUSHs(file); + PUSHs(line); + PUTBACK; + perl_call_sv((SV*)GvCV(gv), + G_SCALAR|G_EVAL|G_KEEPERR); + sv_setsv(error,*stack_sp--); + } + } + pat = Nullch; + } + else { + if (SvPOK(error) && SvCUR(error)) + sv_catpv(error, "\t...propagated"); + tmps = SvPV(error, na); + } } if (!tmps || !*tmps) tmps = "Died"; - DIE("%s", tmps); + DIE(pat, tmps); } /* I/O. */ PP(pp_open) { - dSP; dTARGET; + djSP; dTARGET; GV *gv; SV *sv; char *tmps; @@ -354,13 +393,25 @@ PP(pp_open) PP(pp_close) { - dSP; + djSP; GV *gv; + MAGIC *mg; if (MAXARG == 0) gv = defoutgv; else gv = (GV*)POPs; + + if (SvRMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { + PUSHMARK(SP); + XPUSHs(mg->mg_obj); + PUTBACK; + ENTER; + perl_call_method("CLOSE", G_SCALAR); + LEAVE; + SPAGAIN; + RETURN; + } EXTEND(SP, 1); PUSHs(boolSV(do_close(gv, TRUE))); RETURN; @@ -368,7 +419,7 @@ PP(pp_close) PP(pp_pipe_op) { - dSP; + djSP; #ifdef HAS_PIPE GV *rgv; GV *wgv; @@ -392,7 +443,7 @@ PP(pp_pipe_op) if (IoIFP(wstio)) do_close(wgv, FALSE); - if (pipe(fd) < 0) + if (PerlProc_pipe(fd) < 0) goto badexit; IoIFP(rstio) = PerlIO_fdopen(fd[0], "r"); @@ -403,9 +454,9 @@ PP(pp_pipe_op) if (!IoIFP(rstio) || !IoOFP(wstio)) { if (IoIFP(rstio)) PerlIO_close(IoIFP(rstio)); - else close(fd[0]); + else PerlLIO_close(fd[0]); if (IoOFP(wstio)) PerlIO_close(IoOFP(wstio)); - else close(fd[1]); + else PerlLIO_close(fd[1]); goto badexit; } @@ -420,7 +471,7 @@ badexit: PP(pp_fileno) { - dSP; dTARGET; + djSP; dTARGET; GV *gv; IO *io; PerlIO *fp; @@ -435,27 +486,32 @@ PP(pp_fileno) PP(pp_umask) { - dSP; dTARGET; + djSP; dTARGET; int anum; #ifdef HAS_UMASK if (MAXARG < 1) { - anum = umask(0); - (void)umask(anum); + anum = PerlLIO_umask(0); + (void)PerlLIO_umask(anum); } else - anum = umask(POPi); + anum = PerlLIO_umask(POPi); TAINT_PROPER("umask"); XPUSHi(anum); #else - DIE(no_func, "Unsupported function umask"); + /* Only DIE if trying to restrict permissions on `user' (self). + * 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"); + XPUSHs(&sv_undef); #endif RETURN; } PP(pp_binmode) { - dSP; + djSP; GV *gv; IO *io; PerlIO *fp; @@ -469,100 +525,79 @@ PP(pp_binmode) if (!(io = GvIO(gv)) || !(fp = IoIFP(io))) RETPUSHUNDEF; -#ifdef DOSISH -#ifdef atarist - if (!PerlIO_flush(fp) && (fp->_flag |= _IOBIN)) - RETPUSHYES; - else - RETPUSHUNDEF; -#else - if (setmode(PerlIO_fileno(fp), OP_BINARY) != -1) { -#if defined(WIN32) && defined(__BORLANDC__) - /* The translation mode of the stream is maintained independent - * of the translation mode of the fd in the Borland RTL (heavy - * digging through their runtime sources reveal). User has to - * set the mode explicitly for the stream (though they don't - * document this anywhere). GSAR 97-5-24 - */ - PerlIO_seek(fp,0L,0); - fp->flags |= _F_BIN; -#endif + if (do_binmode(fp,IoTYPE(io),TRUE)) RETPUSHYES; - } else RETPUSHUNDEF; -#endif -#else -#if defined(USEMYBINMODE) - if (my_binmode(fp,IoTYPE(io)) != NULL) - RETPUSHYES; - else - RETPUSHUNDEF; -#else - RETPUSHYES; -#endif -#endif - } + PP(pp_tie) { - dSP; + djSP; + dMARK; SV *varsv; HV* stash; GV *gv; - BINOP myop; SV *sv; - SV **mark = stack_base + ++*markstack_ptr; /* reuse in entersub */ - I32 markoff = mark - stack_base - 1; + I32 markoff = MARK - stack_base; char *methname; - bool oldcatch = CATCH_GET; - - varsv = mark[0]; - if (SvTYPE(varsv) == SVt_PVHV) - methname = "TIEHASH"; - else if (SvTYPE(varsv) == SVt_PVAV) - methname = "TIEARRAY"; - else if (SvTYPE(varsv) == SVt_PVGV) - methname = "TIEHANDLE"; - else - methname = "TIESCALAR"; - - stash = gv_stashsv(mark[1], FALSE); - if (!stash || !(gv = gv_fetchmethod(stash, methname))) - DIE("Can't locate object method \"%s\" via package \"%s\"", - methname, SvPV(mark[1],na)); - - Zero(&myop, 1, BINOP); - myop.op_last = (OP *) &myop; - myop.op_next = Nullop; - myop.op_flags = OPf_WANT_SCALAR | OPf_STACKED; - CATCH_SET(TRUE); + int how = 'P'; + U32 items; - ENTER; - SAVEOP(); - op = (OP *) &myop; - if (PERLDB_SUB && curstash != debstash) - op->op_private |= OPpENTERSUB_DB; - - XPUSHs((SV*)GvCV(gv)); - PUTBACK; - - if (op = pp_entersub(ARGS)) - runops(); + varsv = *++MARK; + switch(SvTYPE(varsv)) { + case SVt_PVHV: + methname = "TIEHASH"; + break; + case SVt_PVAV: + methname = "TIEARRAY"; + break; + case SVt_PVGV: + methname = "TIEHANDLE"; + how = 'q'; + break; + default: + methname = "TIESCALAR"; + how = 'q'; + break; + } + items = SP - MARK++; + if (sv_isobject(*MARK)) { + ENTER; + PUSHSTACKi(PERLSI_MAGIC); + PUSHMARK(SP); + EXTEND(SP,items); + while (items--) + PUSHs(*MARK++); + PUTBACK; + perl_call_method(methname, G_SCALAR); + } + else { + /* Not clear why we don't call perl_call_method here too. + * perhaps to get different error message ? + */ + stash = gv_stashsv(*MARK, FALSE); + if (!stash || !(gv = gv_fetchmethod(stash, methname))) { + DIE("Can't locate object method \"%s\" via package \"%s\"", + methname, SvPV(*MARK,na)); + } + ENTER; + PUSHSTACKi(PERLSI_MAGIC); + PUSHMARK(SP); + EXTEND(SP,items); + while (items--) + PUSHs(*MARK++); + PUTBACK; + perl_call_sv((SV*)GvCV(gv), G_SCALAR); + } SPAGAIN; - CATCH_SET(oldcatch); sv = TOPs; + POPSTACK; if (sv_isobject(sv)) { - if (SvTYPE(varsv) == SVt_PVHV || SvTYPE(varsv) == SVt_PVAV) { - sv_unmagic(varsv, 'P'); - sv_magic(varsv, sv, 'P', Nullch, 0); - } - else { - sv_unmagic(varsv, 'q'); - sv_magic(varsv, sv, 'q', Nullch, 0); - } + sv_unmagic(varsv, how); + sv_magic(varsv, sv, how, Nullch, 0); } LEAVE; SP = stack_base + markoff; @@ -572,7 +607,7 @@ PP(pp_tie) PP(pp_untie) { - dSP; + djSP; SV * sv ; sv = POPs; @@ -600,7 +635,7 @@ PP(pp_untie) PP(pp_tied) { - dSP; + djSP; SV * sv ; MAGIC * mg ; @@ -616,20 +651,17 @@ PP(pp_tied) RETURN ; } } - RETPUSHUNDEF; } PP(pp_dbmopen) { - dSP; + djSP; HV *hv; dPOPPOPssrl; HV* stash; GV *gv; - BINOP myop; SV *sv; - bool oldcatch = CATCH_GET; hv = (HV*)POPs; @@ -644,21 +676,10 @@ PP(pp_dbmopen) DIE("No dbm on this machine"); } - Zero(&myop, 1, BINOP); - myop.op_last = (OP *) &myop; - myop.op_next = Nullop; - myop.op_flags = OPf_WANT_SCALAR | OPf_STACKED; - CATCH_SET(TRUE); - ENTER; - SAVEOP(); - op = (OP *) &myop; - if (PERLDB_SUB && curstash != debstash) - op->op_private |= OPpENTERSUB_DB; - PUTBACK; - pp_pushmark(ARGS); + PUSHMARK(SP); - EXTEND(sp, 5); + EXTEND(SP, 5); PUSHs(sv); PUSHs(left); if (SvIV(right)) @@ -666,34 +687,26 @@ PP(pp_dbmopen) else PUSHs(sv_2mortal(newSViv(O_RDWR))); PUSHs(right); - PUSHs((SV*)GvCV(gv)); PUTBACK; - - if (op = pp_entersub(ARGS)) - runops(); + perl_call_sv((SV*)GvCV(gv), G_SCALAR); SPAGAIN; if (!sv_isobject(TOPs)) { - sp--; - op = (OP *) &myop; - PUTBACK; - pp_pushmark(ARGS); - + SP--; + PUSHMARK(SP); PUSHs(sv); PUSHs(left); PUSHs(sv_2mortal(newSViv(O_RDONLY))); PUSHs(right); - PUSHs((SV*)GvCV(gv)); PUTBACK; - - if (op = pp_entersub(ARGS)) - runops(); + perl_call_sv((SV*)GvCV(gv), G_SCALAR); SPAGAIN; } - CATCH_SET(oldcatch); - if (sv_isobject(TOPs)) + if (sv_isobject(TOPs)) { + sv_unmagic((SV *) hv, 'P'); sv_magic((SV*)hv, TOPs, 'P', Nullch, 0); + } LEAVE; RETURN; } @@ -705,7 +718,7 @@ PP(pp_dbmclose) PP(pp_sselect) { - dSP; dTARGET; + djSP; dTARGET; #ifdef HAS_SELECT register I32 i; register I32 j; @@ -803,7 +816,7 @@ PP(pp_sselect) #endif } - nfound = select( + nfound = PerlSock_select( maxlen * 8, (Select_fd_set_t) fd_sets[1], (Select_fd_set_t) fd_sets[2], @@ -850,7 +863,7 @@ setdefout(GV *gv) PP(pp_select) { - dSP; dTARGET; + djSP; dTARGET; GV *newdefout, *egv; HV *hv; @@ -884,7 +897,7 @@ PP(pp_select) PP(pp_getc) { - dSP; dTARGET; + djSP; dTARGET; GV *gv; MAGIC *mg; @@ -895,7 +908,7 @@ PP(pp_getc) if (!gv) gv = argvgv; - if (SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { + if (SvRMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { I32 gimme = GIMME_V; PUSHMARK(SP); XPUSHs(mg->mg_obj); @@ -922,11 +935,11 @@ PP(pp_read) return pp_sysread(ARGS); } -static OP * +STATIC OP * doform(CV *cv, GV *gv, OP *retop) { dTHR; - register CONTEXT *cx; + register PERL_CONTEXT *cx; I32 gimme = GIMME_V; AV* padlist = CvPADLIST(cv); SV** svp = AvARRAY(padlist); @@ -946,7 +959,7 @@ doform(CV *cv, GV *gv, OP *retop) PP(pp_enterwrite) { - dSP; + djSP; register GV *gv; register IO *io; GV *fgv; @@ -987,14 +1000,14 @@ PP(pp_enterwrite) PP(pp_leavewrite) { - dSP; + djSP; GV *gv = cxstack[cxstack_ix].blk_sub.gv; register IO *io = GvIOp(gv); PerlIO *ofp = IoOFP(io); PerlIO *fp; SV **newsp; I32 gimme; - register CONTEXT *cx; + register PERL_CONTEXT *cx; DEBUG_f(PerlIO_printf(Perl_debug_log, "left=%ld, todo=%ld\n", (long)IoLINES_LEFT(io), (long)FmLINES(formtarget))); @@ -1101,7 +1114,7 @@ PP(pp_leavewrite) PP(pp_prtf) { - dSP; dMARK; dORIGMARK; + djSP; dMARK; dORIGMARK; GV *gv; IO *io; PerlIO *fp; @@ -1113,9 +1126,9 @@ PP(pp_prtf) else gv = defoutgv; - if (SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { + if (SvRMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { if (MARK == ORIGMARK) { - EXTEND(SP, 1); + MEXTEND(SP, 1); ++MARK; Move(MARK, MARK + 1, (SP - MARK) + 1, SV*); ++SP; @@ -1182,7 +1195,7 @@ PP(pp_prtf) PP(pp_sysopen) { - dSP; + djSP; GV *gv; SV *sv; char *tmps; @@ -1210,7 +1223,7 @@ PP(pp_sysopen) PP(pp_sysread) { - dSP; dMARK; dORIGMARK; dTARGET; + djSP; dMARK; dORIGMARK; dTARGET; int offset; GV *gv; IO *io; @@ -1223,7 +1236,7 @@ PP(pp_sysread) gv = (GV*)*++MARK; if ((op->op_type == OP_READ || op->op_type == OP_SYSREAD) && - SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) + SvRMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { SV *sv; @@ -1259,14 +1272,14 @@ PP(pp_sysread) #ifdef HAS_SOCKET if (op->op_type == OP_RECV) { char namebuf[MAXPATHLEN]; -#if defined(VMS_DO_SOCKETS) && defined(DECCRTL_SOCKETS) +#if (defined(VMS_DO_SOCKETS) && defined(DECCRTL_SOCKETS)) || defined(MPE) bufsize = sizeof (struct sockaddr_in); #else bufsize = sizeof namebuf; #endif buffer = SvGROW(bufsv, length+1); /* 'offset' means 'flags' here */ - length = recvfrom(PerlIO_fileno(IoIFP(io)), buffer, length, offset, + length = PerlSock_recvfrom(PerlIO_fileno(IoIFP(io)), buffer, length, offset, (struct sockaddr *)namebuf, &bufsize); if (length < 0) RETPUSHUNDEF; @@ -1297,7 +1310,7 @@ PP(pp_sysread) Zero(buffer+bufsize, offset-bufsize, char); } if (op->op_type == OP_SYSREAD) { - length = read(PerlIO_fileno(IoIFP(io)), buffer+offset, length); + length = PerlLIO_read(PerlIO_fileno(IoIFP(io)), buffer+offset, length); } else #ifdef HAS_SOCKET__bad_code_maybe @@ -1308,12 +1321,17 @@ PP(pp_sysread) #else bufsize = sizeof namebuf; #endif - length = recvfrom(PerlIO_fileno(IoIFP(io)), buffer+offset, length, 0, + length = PerlSock_recvfrom(PerlIO_fileno(IoIFP(io)), buffer+offset, length, 0, (struct sockaddr *)namebuf, &bufsize); } else #endif + { length = PerlIO_read(IoIFP(io), buffer+offset, length); + /* fread() returns 0 on both error and EOF */ + if (PerlIO_error(IoIFP(io))) + length = -1; + } if (length < 0) goto say_undef; SvCUR_set(bufsv, length+offset); @@ -1339,7 +1357,7 @@ PP(pp_syswrite) PP(pp_send) { - dSP; dMARK; dORIGMARK; dTARGET; + djSP; dMARK; dORIGMARK; dTARGET; GV *gv; IO *io; int offset; @@ -1347,8 +1365,25 @@ PP(pp_send) char *buffer; int length; STRLEN blen; + MAGIC *mg; gv = (GV*)*++MARK; + if (op->op_type == OP_SYSWRITE && + SvRMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) + { + SV *sv; + + PUSHMARK(MARK-1); + *MARK = mg->mg_obj; + ENTER; + perl_call_method("WRITE", G_SCALAR); + LEAVE; + SPAGAIN; + sv = POPs; + SP = ORIGMARK; + PUSHs(sv); + RETURN; + } if (!gv) goto say_undef; bufsv = *++MARK; @@ -1380,18 +1415,18 @@ PP(pp_send) offset = 0; if (length > blen - offset) length = blen - offset; - length = write(PerlIO_fileno(IoIFP(io)), buffer+offset, length); + length = PerlLIO_write(PerlIO_fileno(IoIFP(io)), buffer+offset, length); } #ifdef HAS_SOCKET else if (SP > MARK) { char *sockbuf; STRLEN mlen; sockbuf = SvPVx(*++MARK, mlen); - length = sendto(PerlIO_fileno(IoIFP(io)), buffer, blen, length, + length = PerlSock_sendto(PerlIO_fileno(IoIFP(io)), buffer, blen, length, (struct sockaddr *)sockbuf, mlen); } else - length = send(PerlIO_fileno(IoIFP(io)), buffer, blen, length); + length = PerlSock_send(PerlIO_fileno(IoIFP(io)), buffer, blen, length); #else else @@ -1415,7 +1450,7 @@ PP(pp_recv) PP(pp_eof) { - dSP; + djSP; GV *gv; if (MAXARG <= 0) @@ -1428,7 +1463,7 @@ PP(pp_eof) PP(pp_tell) { - dSP; dTARGET; + djSP; dTARGET; GV *gv; if (MAXARG <= 0) @@ -1446,7 +1481,7 @@ PP(pp_seek) PP(pp_sysseek) { - dSP; + djSP; GV *gv; int whence = POPi; long offset = POPl; @@ -1465,7 +1500,7 @@ PP(pp_sysseek) PP(pp_truncate) { - dSP; + djSP; Off_t len = (Off_t)POPn; int result = 1; GV *tmpgv; @@ -1505,12 +1540,12 @@ PP(pp_truncate) #else { int tmpfd; - if ((tmpfd = open(name, O_RDWR)) < 0) + if ((tmpfd = PerlLIO_open(name, O_RDWR)) < 0) result = 0; else { if (my_chsize(tmpfd, len) < 0) result = 0; - close(tmpfd); + PerlLIO_close(tmpfd); } } #endif @@ -1533,7 +1568,7 @@ PP(pp_fcntl) PP(pp_ioctl) { - dSP; dTARGET; + djSP; dTARGET; SV *argsv = POPs; unsigned int func = U_I(POPn); int optype = op->op_type; @@ -1568,7 +1603,7 @@ PP(pp_ioctl) if (optype == OP_IOCTL) #ifdef HAS_IOCTL - retval = ioctl(PerlIO_fileno(IoIFP(io)), func, s); + retval = PerlLIO_ioctl(PerlIO_fileno(IoIFP(io)), func, s); #else DIE("ioctl is not implemented"); #endif @@ -1604,7 +1639,7 @@ PP(pp_ioctl) PP(pp_flock) { - dSP; dTARGET; + djSP; dTARGET; I32 value; int argtype; GV *gv; @@ -1622,7 +1657,7 @@ PP(pp_flock) fp = Nullfp; if (fp) { (void)PerlIO_flush(fp); - value = (I32)(FLOCK(PerlIO_fileno(fp), argtype) >= 0); + value = (I32)(PerlLIO_flock(PerlIO_fileno(fp), argtype) >= 0); } else value = 0; @@ -1637,7 +1672,7 @@ PP(pp_flock) PP(pp_socket) { - dSP; + djSP; #ifdef HAS_SOCKET GV *gv; register IO *io; @@ -1658,7 +1693,7 @@ PP(pp_socket) do_close(gv, FALSE); TAINT_PROPER("socket"); - fd = socket(domain, type, protocol); + fd = PerlSock_socket(domain, type, protocol); if (fd < 0) RETPUSHUNDEF; IoIFP(io) = PerlIO_fdopen(fd, "r"); /* stdio gets confused about sockets */ @@ -1667,7 +1702,7 @@ PP(pp_socket) if (!IoIFP(io) || !IoOFP(io)) { if (IoIFP(io)) PerlIO_close(IoIFP(io)); if (IoOFP(io)) PerlIO_close(IoOFP(io)); - if (!IoIFP(io) && !IoOFP(io)) close(fd); + if (!IoIFP(io) && !IoOFP(io)) PerlLIO_close(fd); RETPUSHUNDEF; } @@ -1679,7 +1714,7 @@ PP(pp_socket) PP(pp_sockpair) { - dSP; + djSP; #ifdef HAS_SOCKETPAIR GV *gv1; GV *gv2; @@ -1703,7 +1738,7 @@ PP(pp_sockpair) do_close(gv2, FALSE); TAINT_PROPER("socketpair"); - if (socketpair(domain, type, protocol, fd) < 0) + if (PerlSock_socketpair(domain, type, protocol, fd) < 0) RETPUSHUNDEF; IoIFP(io1) = PerlIO_fdopen(fd[0], "r"); IoOFP(io1) = PerlIO_fdopen(fd[0], "w"); @@ -1714,10 +1749,10 @@ PP(pp_sockpair) if (!IoIFP(io1) || !IoOFP(io1) || !IoIFP(io2) || !IoOFP(io2)) { if (IoIFP(io1)) PerlIO_close(IoIFP(io1)); if (IoOFP(io1)) PerlIO_close(IoOFP(io1)); - if (!IoIFP(io1) && !IoOFP(io1)) close(fd[0]); + if (!IoIFP(io1) && !IoOFP(io1)) PerlLIO_close(fd[0]); if (IoIFP(io2)) PerlIO_close(IoIFP(io2)); if (IoOFP(io2)) PerlIO_close(IoOFP(io2)); - if (!IoIFP(io2) && !IoOFP(io2)) close(fd[1]); + if (!IoIFP(io2) && !IoOFP(io2)) PerlLIO_close(fd[1]); RETPUSHUNDEF; } @@ -1729,20 +1764,49 @@ PP(pp_sockpair) PP(pp_bind) { - dSP; + djSP; #ifdef HAS_SOCKET +#ifdef MPE /* Requires PRIV mode to bind() to ports < 1024 */ + extern GETPRIVMODE(); + extern GETUSERMODE(); +#endif SV *addrsv = POPs; char *addr; GV *gv = (GV*)POPs; register IO *io = GvIOn(gv); STRLEN len; + int bind_ok = 0; +#ifdef MPE + int mpeprivmode = 0; +#endif if (!io || !IoIFP(io)) goto nuts; addr = SvPV(addrsv, len); TAINT_PROPER("bind"); - if (bind(PerlIO_fileno(IoIFP(io)), (struct sockaddr *)addr, len) >= 0) +#ifdef MPE /* Deal with MPE bind() peculiarities */ + if (((struct sockaddr *)addr)->sa_family == AF_INET) { + /* The address *MUST* stupidly be zero. */ + ((struct sockaddr_in *)addr)->sin_addr.s_addr = INADDR_ANY; + /* PRIV mode is required to bind() to ports < 1024. */ + if (((struct sockaddr_in *)addr)->sin_port < 1024 && + ((struct sockaddr_in *)addr)->sin_port > 0) { + GETPRIVMODE(); /* If this fails, we are aborted by MPE/iX. */ + mpeprivmode = 1; + } + } +#endif /* MPE */ + if (PerlSock_bind(PerlIO_fileno(IoIFP(io)), + (struct sockaddr *)addr, len) >= 0) + bind_ok = 1; + +#ifdef MPE /* Switch back to USER mode */ + if (mpeprivmode) + GETUSERMODE(); +#endif /* MPE */ + + if (bind_ok) RETPUSHYES; else RETPUSHUNDEF; @@ -1759,7 +1823,7 @@ nuts: PP(pp_connect) { - dSP; + djSP; #ifdef HAS_SOCKET SV *addrsv = POPs; char *addr; @@ -1772,7 +1836,7 @@ PP(pp_connect) addr = SvPV(addrsv, len); TAINT_PROPER("connect"); - if (connect(PerlIO_fileno(IoIFP(io)), (struct sockaddr *)addr, len) >= 0) + if (PerlSock_connect(PerlIO_fileno(IoIFP(io)), (struct sockaddr *)addr, len) >= 0) RETPUSHYES; else RETPUSHUNDEF; @@ -1789,7 +1853,7 @@ nuts: PP(pp_listen) { - dSP; + djSP; #ifdef HAS_SOCKET int backlog = POPi; GV *gv = (GV*)POPs; @@ -1798,7 +1862,7 @@ PP(pp_listen) if (!io || !IoIFP(io)) goto nuts; - if (listen(PerlIO_fileno(IoIFP(io)), backlog) >= 0) + if (PerlSock_listen(PerlIO_fileno(IoIFP(io)), backlog) >= 0) RETPUSHYES; else RETPUSHUNDEF; @@ -1815,7 +1879,7 @@ nuts: PP(pp_accept) { - dSP; dTARGET; + djSP; dTARGET; #ifdef HAS_SOCKET GV *ngv; GV *ggv; @@ -1841,7 +1905,7 @@ PP(pp_accept) if (IoIFP(nstio)) do_close(ngv, FALSE); - fd = accept(PerlIO_fileno(IoIFP(gstio)), (struct sockaddr *)&saddr, &len); + fd = PerlSock_accept(PerlIO_fileno(IoIFP(gstio)), (struct sockaddr *)&saddr, &len); if (fd < 0) goto badexit; IoIFP(nstio) = PerlIO_fdopen(fd, "r"); @@ -1850,7 +1914,7 @@ PP(pp_accept) if (!IoIFP(nstio) || !IoOFP(nstio)) { if (IoIFP(nstio)) PerlIO_close(IoIFP(nstio)); if (IoOFP(nstio)) PerlIO_close(IoOFP(nstio)); - if (!IoIFP(nstio) && !IoOFP(nstio)) close(fd); + if (!IoIFP(nstio) && !IoOFP(nstio)) PerlLIO_close(fd); goto badexit; } @@ -1872,7 +1936,7 @@ badexit: PP(pp_shutdown) { - dSP; dTARGET; + djSP; dTARGET; #ifdef HAS_SOCKET int how = POPi; GV *gv = (GV*)POPs; @@ -1881,7 +1945,7 @@ PP(pp_shutdown) if (!io || !IoIFP(io)) goto nuts; - PUSHi( shutdown(PerlIO_fileno(IoIFP(io)), how) >= 0 ); + PUSHi( PerlSock_shutdown(PerlIO_fileno(IoIFP(io)), how) >= 0 ); RETURN; nuts: @@ -1905,7 +1969,7 @@ PP(pp_gsockopt) PP(pp_ssockopt) { - dSP; + djSP; #ifdef HAS_SOCKET int optype = op->op_type; SV *sv; @@ -1936,7 +2000,7 @@ PP(pp_ssockopt) SvCUR_set(sv,256); *SvEND(sv) ='\0'; len = SvCUR(sv); - if (getsockopt(fd, lvl, optname, SvPVX(sv), &len) < 0) + if (PerlSock_getsockopt(fd, lvl, optname, SvPVX(sv), &len) < 0) goto nuts2; SvCUR_set(sv, len); *SvEND(sv) ='\0'; @@ -1949,12 +2013,12 @@ PP(pp_ssockopt) buf = SvPV(sv, na); len = na; } - else if (SvOK(sv)) { + else { aint = (int)SvIV(sv); buf = (char*)&aint; len = sizeof(int); } - if (setsockopt(fd, lvl, optname, buf, len) < 0) + if (PerlSock_setsockopt(fd, lvl, optname, buf, len) < 0) goto nuts2; PUSHs(&sv_yes); } @@ -1985,7 +2049,7 @@ PP(pp_getsockname) PP(pp_getpeername) { - dSP; + djSP; #ifdef HAS_SOCKET int optype = op->op_type; SV *sv; @@ -2005,11 +2069,11 @@ PP(pp_getpeername) fd = PerlIO_fileno(IoIFP(io)); switch (optype) { case OP_GETSOCKNAME: - if (getsockname(fd, (struct sockaddr *)SvPVX(sv), &len) < 0) + if (PerlSock_getsockname(fd, (struct sockaddr *)SvPVX(sv), &len) < 0) goto nuts2; break; case OP_GETPEERNAME: - if (getpeername(fd, (struct sockaddr *)SvPVX(sv), &len) < 0) + if (PerlSock_getpeername(fd, (struct sockaddr *)SvPVX(sv), &len) < 0) goto nuts2; #if defined(VMS_DO_SOCKETS) && defined (DECCRTL_SOCKETS) { @@ -2056,7 +2120,7 @@ PP(pp_lstat) PP(pp_stat) { - dSP; + djSP; GV *tmpgv; I32 gimme; I32 max = 13; @@ -2069,7 +2133,7 @@ PP(pp_stat) statgv = tmpgv; sv_setpv(statname, ""); laststatval = (GvIO(tmpgv) && IoIFP(GvIOp(tmpgv)) - ? Fstat(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), &statcache) : -1); + ? PerlLIO_fstat(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), &statcache) : -1); } if (laststatval < 0) max = 0; @@ -2089,10 +2153,10 @@ PP(pp_stat) #ifdef HAS_LSTAT laststype = op->op_type; if (op->op_type == OP_LSTAT) - laststatval = lstat(SvPV(statname, na), &statcache); + laststatval = PerlLIO_lstat(SvPV(statname, na), &statcache); else #endif - laststatval = Stat(SvPV(statname, na), &statcache); + laststatval = PerlLIO_stat(SvPV(statname, na), &statcache); if (laststatval < 0) { if (dowarn && strchr(SvPV(statname, na), '\n')) warn(warn_nl, "stat"); @@ -2144,7 +2208,7 @@ PP(pp_stat) PP(pp_ftrread) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (cando(S_IRUSR, 0, &statcache)) @@ -2155,7 +2219,7 @@ PP(pp_ftrread) PP(pp_ftrwrite) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (cando(S_IWUSR, 0, &statcache)) @@ -2166,7 +2230,7 @@ PP(pp_ftrwrite) PP(pp_ftrexec) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (cando(S_IXUSR, 0, &statcache)) @@ -2177,7 +2241,7 @@ PP(pp_ftrexec) PP(pp_fteread) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (cando(S_IRUSR, 1, &statcache)) @@ -2188,7 +2252,7 @@ PP(pp_fteread) PP(pp_ftewrite) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (cando(S_IWUSR, 1, &statcache)) @@ -2199,7 +2263,7 @@ PP(pp_ftewrite) PP(pp_fteexec) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (cando(S_IXUSR, 1, &statcache)) @@ -2210,7 +2274,7 @@ PP(pp_fteexec) PP(pp_ftis) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; RETPUSHYES; @@ -2224,7 +2288,7 @@ PP(pp_fteowned) PP(pp_ftrowned) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (statcache.st_uid == (op->op_type == OP_FTEOWNED ? euid : uid) ) @@ -2235,7 +2299,7 @@ PP(pp_ftrowned) PP(pp_ftzero) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (!statcache.st_size) @@ -2246,7 +2310,7 @@ PP(pp_ftzero) PP(pp_ftsize) { I32 result = my_stat(ARGS); - dSP; dTARGET; + djSP; dTARGET; if (result < 0) RETPUSHUNDEF; PUSHi(statcache.st_size); @@ -2256,7 +2320,7 @@ PP(pp_ftsize) PP(pp_ftmtime) { I32 result = my_stat(ARGS); - dSP; dTARGET; + djSP; dTARGET; if (result < 0) RETPUSHUNDEF; PUSHn( ((I32)basetime - (I32)statcache.st_mtime) / 86400.0 ); @@ -2266,7 +2330,7 @@ PP(pp_ftmtime) PP(pp_ftatime) { I32 result = my_stat(ARGS); - dSP; dTARGET; + djSP; dTARGET; if (result < 0) RETPUSHUNDEF; PUSHn( ((I32)basetime - (I32)statcache.st_atime) / 86400.0 ); @@ -2276,7 +2340,7 @@ PP(pp_ftatime) PP(pp_ftctime) { I32 result = my_stat(ARGS); - dSP; dTARGET; + djSP; dTARGET; if (result < 0) RETPUSHUNDEF; PUSHn( ((I32)basetime - (I32)statcache.st_ctime) / 86400.0 ); @@ -2286,7 +2350,7 @@ PP(pp_ftctime) PP(pp_ftsock) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (S_ISSOCK(statcache.st_mode)) @@ -2297,7 +2361,7 @@ PP(pp_ftsock) PP(pp_ftchr) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (S_ISCHR(statcache.st_mode)) @@ -2308,7 +2372,7 @@ PP(pp_ftchr) PP(pp_ftblk) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (S_ISBLK(statcache.st_mode)) @@ -2319,7 +2383,7 @@ PP(pp_ftblk) PP(pp_ftfile) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (S_ISREG(statcache.st_mode)) @@ -2330,7 +2394,7 @@ PP(pp_ftfile) PP(pp_ftdir) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (S_ISDIR(statcache.st_mode)) @@ -2341,7 +2405,7 @@ PP(pp_ftdir) PP(pp_ftpipe) { I32 result = my_stat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (S_ISFIFO(statcache.st_mode)) @@ -2352,7 +2416,7 @@ PP(pp_ftpipe) PP(pp_ftlink) { I32 result = my_lstat(ARGS); - dSP; + djSP; if (result < 0) RETPUSHUNDEF; if (S_ISLNK(statcache.st_mode)) @@ -2362,7 +2426,7 @@ PP(pp_ftlink) PP(pp_ftsuid) { - dSP; + djSP; #ifdef S_ISUID I32 result = my_stat(ARGS); SPAGAIN; @@ -2376,7 +2440,7 @@ PP(pp_ftsuid) PP(pp_ftsgid) { - dSP; + djSP; #ifdef S_ISGID I32 result = my_stat(ARGS); SPAGAIN; @@ -2390,7 +2454,7 @@ PP(pp_ftsgid) PP(pp_ftsvtx) { - dSP; + djSP; #ifdef S_ISVTX I32 result = my_stat(ARGS); SPAGAIN; @@ -2404,7 +2468,7 @@ PP(pp_ftsvtx) PP(pp_fttty) { - dSP; + djSP; int fd; GV *gv; char *tmps = Nullch; @@ -2424,7 +2488,7 @@ PP(pp_fttty) fd = atoi(tmps); else RETPUSHUNDEF; - if (isatty(fd)) + if (PerlLIO_isatty(fd)) RETPUSHYES; RETPUSHNO; } @@ -2439,7 +2503,7 @@ PP(pp_fttty) PP(pp_fttext) { - dSP; + djSP; I32 i; I32 len; I32 odd = 0; @@ -2477,7 +2541,7 @@ PP(pp_fttext) if (io && IoIFP(io)) { if (! PerlIO_has_base(IoIFP(io))) DIE("-T and -B not implemented on filehandles"); - laststatval = Fstat(PerlIO_fileno(IoIFP(io)), &statcache); + laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &statcache); if (laststatval < 0) RETPUSHUNDEF; if (S_ISDIR(statcache.st_mode)) /* handle NFS glitch */ @@ -2513,20 +2577,20 @@ PP(pp_fttext) laststatval = -1; sv_setpv(statname, SvPV(sv, na)); #ifdef HAS_OPEN3 - i = open(SvPV(sv, na), O_RDONLY, 0); + i = PerlLIO_open3(SvPV(sv, na), O_RDONLY, 0); #else - i = open(SvPV(sv, na), 0); + i = PerlLIO_open(SvPV(sv, na), 0); #endif if (i < 0) { if (dowarn && strchr(SvPV(sv, na), '\n')) warn(warn_nl, "open"); RETPUSHUNDEF; } - laststatval = Fstat(i, &statcache); + laststatval = PerlLIO_fstat(i, &statcache); if (laststatval < 0) RETPUSHUNDEF; - len = read(i, tbuf, 512); - (void)close(i); + len = PerlLIO_read(i, tbuf, 512); + (void)PerlLIO_close(i); if (len <= 0) { if (S_ISDIR(statcache.st_mode) && op->op_type == OP_FTTEXT) RETPUSHNO; /* special case NFS directories */ @@ -2566,7 +2630,7 @@ PP(pp_ftbinary) PP(pp_chdir) { - dSP; dTARGET; + djSP; dTARGET; char *tmps; SV **svp; @@ -2584,8 +2648,15 @@ PP(pp_chdir) if (svp) tmps = SvPV(*svp, na); } +#ifdef VMS + if (!tmps || !*tmps) { + svp = hv_fetch(GvHVn(envgv), "SYS$LOGIN", 9, FALSE); + if (svp) + tmps = SvPV(*svp, na); + } +#endif TAINT_PROPER("chdir"); - PUSHi( chdir(tmps) >= 0 ); + PUSHi( PerlDir_chdir(tmps) >= 0 ); #ifdef VMS /* Clear the DEFAULT element of ENV so we'll get the new value * in the future. */ @@ -2596,7 +2667,7 @@ PP(pp_chdir) PP(pp_chown) { - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; I32 value; #ifdef HAS_CHOWN value = (I32)apply(op->op_type, MARK, SP); @@ -2610,7 +2681,7 @@ PP(pp_chown) PP(pp_chroot) { - dSP; dTARGET; + djSP; dTARGET; char *tmps; #ifdef HAS_CHROOT tmps = POPp; @@ -2624,7 +2695,7 @@ PP(pp_chroot) PP(pp_unlink) { - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; I32 value; value = (I32)apply(op->op_type, MARK, SP); SP = MARK; @@ -2634,7 +2705,7 @@ PP(pp_unlink) PP(pp_chmod) { - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; I32 value; value = (I32)apply(op->op_type, MARK, SP); SP = MARK; @@ -2644,7 +2715,7 @@ PP(pp_chmod) PP(pp_utime) { - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; I32 value; value = (I32)apply(op->op_type, MARK, SP); SP = MARK; @@ -2654,20 +2725,20 @@ PP(pp_utime) PP(pp_rename) { - dSP; dTARGET; + djSP; dTARGET; int anum; char *tmps2 = POPp; char *tmps = SvPV(TOPs, na); TAINT_PROPER("rename"); #ifdef HAS_RENAME - anum = rename(tmps, tmps2); + anum = PerlLIO_rename(tmps, tmps2); #else - if (!(anum = Stat(tmps, &statbuf))) { + if (!(anum = PerlLIO_stat(tmps, &statbuf))) { if (same_dirent(tmps2, tmps)) /* can always rename to same name */ anum = 1; else { - if (euid || Stat(tmps2, &statbuf) < 0 || !S_ISDIR(statbuf.st_mode)) + if (euid || PerlLIO_stat(tmps2, &statbuf) < 0 || !S_ISDIR(statbuf.st_mode)) (void)UNLINK(tmps2); if (!(anum = link(tmps, tmps2))) anum = UNLINK(tmps); @@ -2680,7 +2751,7 @@ PP(pp_rename) PP(pp_link) { - dSP; dTARGET; + djSP; dTARGET; #ifdef HAS_LINK char *tmps2 = POPp; char *tmps = SvPV(TOPs, na); @@ -2694,7 +2765,7 @@ PP(pp_link) PP(pp_symlink) { - dSP; dTARGET; + djSP; dTARGET; #ifdef HAS_SYMLINK char *tmps2 = POPp; char *tmps = SvPV(TOPs, na); @@ -2708,7 +2779,7 @@ PP(pp_symlink) PP(pp_readlink) { - dSP; dTARGET; + djSP; dTARGET; #ifdef HAS_SYMLINK char *tmps; char buf[MAXPATHLEN]; @@ -2750,14 +2821,14 @@ char *filename; *s++ = *filename++; } strcpy(s, " 2>&1"); - myfp = my_popen(cmdline, "r"); + myfp = PerlProc_popen(cmdline, "r"); Safefree(cmdline); if (myfp) { SV *tmpsv = sv_newmortal(); /* Need to save/restore 'rs' ?? */ s = sv_gets(tmpsv, myfp, 0); - (void)my_pclose(myfp); + (void)PerlProc_pclose(myfp); if (s != Nullch) { int e; for (e = 1; @@ -2804,7 +2875,7 @@ char *filename; return 0; } else { /* some mkdirs return no failure indication */ - anum = (Stat(save_filename, &statbuf) >= 0); + anum = (PerlLIO_stat(save_filename, &statbuf) >= 0); if (op->op_type == OP_RMDIR) anum = !anum; if (anum) @@ -2821,7 +2892,7 @@ char *filename; PP(pp_mkdir) { - dSP; dTARGET; + djSP; dTARGET; int mode = POPi; #ifndef HAS_MKDIR int oldumask; @@ -2830,25 +2901,25 @@ PP(pp_mkdir) TAINT_PROPER("mkdir"); #ifdef HAS_MKDIR - SETi( Mkdir(tmps, mode) >= 0 ); + SETi( PerlDir_mkdir(tmps, mode) >= 0 ); #else SETi( dooneliner("mkdir", tmps) ); - oldumask = umask(0); - umask(oldumask); - chmod(tmps, (mode & ~oldumask) & 0777); + oldumask = PerlLIO_umask(0); + PerlLIO_umask(oldumask); + PerlLIO_chmod(tmps, (mode & ~oldumask) & 0777); #endif RETURN; } PP(pp_rmdir) { - dSP; dTARGET; + djSP; dTARGET; char *tmps; tmps = POPp; TAINT_PROPER("rmdir"); #ifdef HAS_RMDIR - XPUSHi( rmdir(tmps) >= 0 ); + XPUSHi( PerlDir_rmdir(tmps) >= 0 ); #else XPUSHi( dooneliner("rmdir", tmps) ); #endif @@ -2859,7 +2930,7 @@ PP(pp_rmdir) PP(pp_open_dir) { - dSP; + djSP; #if defined(Direntry_t) && defined(HAS_READDIR) char *dirname = POPp; GV *gv = (GV*)POPs; @@ -2869,8 +2940,8 @@ PP(pp_open_dir) goto nope; if (IoDIRP(io)) - closedir(IoDIRP(io)); - if (!(IoDIRP(io) = opendir(dirname))) + PerlDir_close(IoDIRP(io)); + if (!(IoDIRP(io) = PerlDir_open(dirname))) goto nope; RETPUSHYES; @@ -2885,7 +2956,7 @@ nope: PP(pp_readdir) { - dSP; + djSP; #if defined(Direntry_t) && defined(HAS_READDIR) #ifndef I_DIRENT Direntry_t *readdir _((DIR *)); @@ -2900,7 +2971,7 @@ PP(pp_readdir) if (GIMME == G_ARRAY) { /*SUPPRESS 560*/ - while (dp = (Direntry_t *)readdir(IoDIRP(io))) { + while (dp = (Direntry_t *)PerlDir_read(IoDIRP(io))) { #ifdef DIRNAMLEN sv = newSVpv(dp->d_name, dp->d_namlen); #else @@ -2913,7 +2984,7 @@ PP(pp_readdir) } } else { - if (!(dp = (Direntry_t *)readdir(IoDIRP(io)))) + if (!(dp = (Direntry_t *)PerlDir_read(IoDIRP(io)))) goto nope; #ifdef DIRNAMLEN sv = newSVpv(dp->d_name, dp->d_namlen); @@ -2941,18 +3012,18 @@ nope: PP(pp_telldir) { - dSP; dTARGET; + djSP; dTARGET; #if defined(HAS_TELLDIR) || defined(telldir) -#if !defined(telldir) && !defined(HAS_TELLDIR_PROTOTYPE) && !defined(DONT_DECLARE_STD) +# ifdef NEED_TELLDIR_PROTO /* XXX does _anyone_ need this? --AD 2/20/1998 */ long telldir _((DIR *)); -#endif +# endif GV *gv = (GV*)POPs; register IO *io = GvIOn(gv); if (!io || !IoDIRP(io)) goto nope; - PUSHi( telldir(IoDIRP(io)) ); + PUSHi( PerlDir_tell(IoDIRP(io)) ); RETURN; nope: if (!errno) @@ -2965,7 +3036,7 @@ nope: PP(pp_seekdir) { - dSP; + djSP; #if defined(HAS_SEEKDIR) || defined(seekdir) long along = POPl; GV *gv = (GV*)POPs; @@ -2974,7 +3045,7 @@ PP(pp_seekdir) if (!io || !IoDIRP(io)) goto nope; - (void)seekdir(IoDIRP(io), along); + (void)PerlDir_seek(IoDIRP(io), along); RETPUSHYES; nope: @@ -2988,7 +3059,7 @@ nope: PP(pp_rewinddir) { - dSP; + djSP; #if defined(HAS_REWINDDIR) || defined(rewinddir) GV *gv = (GV*)POPs; register IO *io = GvIOn(gv); @@ -2996,7 +3067,7 @@ PP(pp_rewinddir) if (!io || !IoDIRP(io)) goto nope; - (void)rewinddir(IoDIRP(io)); + (void)PerlDir_rewind(IoDIRP(io)); RETPUSHYES; nope: if (!errno) @@ -3009,7 +3080,7 @@ nope: PP(pp_closedir) { - dSP; + djSP; #if defined(Direntry_t) && defined(HAS_READDIR) GV *gv = (GV*)POPs; register IO *io = GvIOn(gv); @@ -3018,9 +3089,9 @@ PP(pp_closedir) goto nope; #ifdef VOID_CLOSEDIR - closedir(IoDIRP(io)); + PerlDir_close(IoDIRP(io)); #else - if (closedir(IoDIRP(io)) < 0) { + if (PerlDir_close(IoDIRP(io)) < 0) { IoDIRP(io) = 0; /* Don't try to close again--coredumps on SysV */ goto nope; } @@ -3042,7 +3113,7 @@ nope: PP(pp_fork) { #ifdef HAS_FORK - dSP; dTARGET; + djSP; dTARGET; int childpid; GV *tmpgv; @@ -3065,8 +3136,8 @@ PP(pp_fork) PP(pp_wait) { -#if !defined(DOSISH) || defined(OS2) - dSP; dTARGET; +#if !defined(DOSISH) || defined(OS2) || defined(WIN32) + djSP; dTARGET; int childpid; int argflags; @@ -3081,8 +3152,8 @@ PP(pp_wait) PP(pp_waitpid) { -#if !defined(DOSISH) || defined(OS2) - dSP; dTARGET; +#if !defined(DOSISH) || defined(OS2) || defined(WIN32) + djSP; dTARGET; int childpid; int optype; int argflags; @@ -3094,13 +3165,13 @@ PP(pp_waitpid) SETi(childpid); RETURN; #else - DIE(no_func, "Unsupported function wait"); + DIE(no_func, "Unsupported function waitpid"); #endif } PP(pp_system) { - dSP; dMARK; dORIGMARK; dTARGET; + djSP; dMARK; dORIGMARK; dTARGET; I32 value; int childpid; int result; @@ -3147,14 +3218,14 @@ PP(pp_system) else { value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), na)); } - _exit(-1); + PerlProc__exit(-1); #else /* ! FORK or VMS or OS/2 */ if (op->op_flags & OPf_STACKED) { SV *really = *++MARK; - value = (I32)do_aspawn(really, MARK, SP); + value = (I32)do_aspawn(really, (void **)MARK, (void **)SP); } else if (SP - MARK != 1) - value = (I32)do_aspawn(Nullsv, MARK, SP); + value = (I32)do_aspawn(Nullsv, (void **)MARK, (void **)SP); else { value = (I32)do_spawn(SvPVx(sv_mortalcopy(*SP), na)); } @@ -3168,7 +3239,7 @@ PP(pp_system) PP(pp_exec) { - dSP; dMARK; dORIGMARK; dTARGET; + djSP; dMARK; dORIGMARK; dTARGET; I32 value; if (op->op_flags & OPf_STACKED) { @@ -3200,7 +3271,7 @@ PP(pp_exec) PP(pp_kill) { - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; I32 value; #ifdef HAS_KILL value = (I32)apply(op->op_type, MARK, SP); @@ -3215,7 +3286,7 @@ PP(pp_kill) PP(pp_getppid) { #ifdef HAS_GETPPID - dSP; dTARGET; + djSP; dTARGET; XPUSHi( getppid() ); RETURN; #else @@ -3226,7 +3297,7 @@ PP(pp_getppid) PP(pp_getpgrp) { #ifdef HAS_GETPGRP - dSP; dTARGET; + djSP; dTARGET; int pid; I32 value; @@ -3251,7 +3322,7 @@ PP(pp_getpgrp) PP(pp_setpgrp) { #ifdef HAS_SETPGRP - dSP; dTARGET; + djSP; dTARGET; int pgrp; int pid; if (MAXARG < 2) { @@ -3279,7 +3350,7 @@ PP(pp_setpgrp) PP(pp_getpriority) { - dSP; dTARGET; + djSP; dTARGET; int which; int who; #ifdef HAS_GETPRIORITY @@ -3294,7 +3365,7 @@ PP(pp_getpriority) PP(pp_setpriority) { - dSP; dTARGET; + djSP; dTARGET; int which; int who; int niceval; @@ -3314,7 +3385,7 @@ PP(pp_setpriority) PP(pp_time) { - dSP; dTARGET; + djSP; dTARGET; #ifdef BIG_TIME XPUSHn( time(Null(Time_t*)) ); #else @@ -3341,7 +3412,7 @@ PP(pp_time) PP(pp_tms) { - dSP; + djSP; #ifndef HAS_TIMES DIE("times not implemented"); @@ -3349,11 +3420,11 @@ PP(pp_tms) EXTEND(SP, 4); #ifndef VMS - (void)times(×buf); + (void)PerlProc_times(×buf); #else - (void)times((tbuffer_t *)×buf); /* time.h uses different name for */ - /* struct tms, though same data */ - /* is returned. */ + (void)PerlProc_times((tbuffer_t *)×buf); /* time.h uses different name for */ + /* struct tms, though same data */ + /* is returned. */ #endif PUSHs(sv_2mortal(newSVnv(((double)timesbuf.tms_utime)/HZ))); @@ -3373,7 +3444,7 @@ PP(pp_localtime) PP(pp_gmtime) { - dSP; + djSP; Time_t when; struct tm *tmbuf; static char *dayname[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; @@ -3427,7 +3498,7 @@ PP(pp_gmtime) PP(pp_alarm) { - dSP; dTARGET; + djSP; dTARGET; int anum; #ifdef HAS_ALARM anum = POPi; @@ -3444,17 +3515,17 @@ PP(pp_alarm) PP(pp_sleep) { - dSP; dTARGET; + djSP; dTARGET; I32 duration; Time_t lasttime; Time_t when; (void)time(&lasttime); if (MAXARG < 1) - Pause(); + PerlProc_pause(); else { duration = POPi; - sleep((unsigned int)duration); + PerlProc_sleep((unsigned int)duration); } (void)time(&when); XPUSHi(when - lasttime); @@ -3481,7 +3552,7 @@ PP(pp_shmread) PP(pp_shmwrite) { #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; I32 value = (I32)(do_shmio(op->op_type, MARK, SP) >= 0); SP = MARK; PUSHi(value); @@ -3506,7 +3577,7 @@ PP(pp_msgctl) PP(pp_msgsnd) { #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; I32 value = (I32)(do_msgsnd(MARK, SP) >= 0); SP = MARK; PUSHi(value); @@ -3519,7 +3590,7 @@ PP(pp_msgsnd) PP(pp_msgrcv) { #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; I32 value = (I32)(do_msgrcv(MARK, SP) >= 0); SP = MARK; PUSHi(value); @@ -3534,7 +3605,7 @@ PP(pp_msgrcv) PP(pp_semget) { #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; int anum = do_ipcget(op->op_type, MARK, SP); SP = MARK; if (anum == -1) @@ -3549,7 +3620,7 @@ PP(pp_semget) PP(pp_semctl) { #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; int anum = do_ipcctl(op->op_type, MARK, SP); SP = MARK; if (anum == -1) @@ -3569,7 +3640,7 @@ PP(pp_semctl) PP(pp_semop) { #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) - dSP; dMARK; dTARGET; + djSP; dMARK; dTARGET; I32 value = (I32)(do_semop(MARK, SP) >= 0); SP = MARK; PUSHi(value); @@ -3583,7 +3654,7 @@ PP(pp_semop) PP(pp_ghbyname) { -#ifdef HAS_SOCKET +#ifdef HAS_GETHOSTBYNAME return pp_ghostent(ARGS); #else DIE(no_sock_func, "gethostbyname"); @@ -3592,7 +3663,7 @@ PP(pp_ghbyname) PP(pp_ghbyaddr) { -#ifdef HAS_SOCKET +#ifdef HAS_GETHOSTBYADDR return pp_ghostent(ARGS); #else DIE(no_sock_func, "gethostbyaddr"); @@ -3601,36 +3672,43 @@ PP(pp_ghbyaddr) PP(pp_ghostent) { - dSP; -#ifdef HAS_SOCKET + djSP; +#if defined(HAS_GETHOSTBYNAME) || defined(HAS_GETHOSTBYADDR) || defined(HAS_GETHOSTENT) I32 which = op->op_type; register char **elem; register SV *sv; -#if defined(HAS_GETHOSTENT) && !defined(DONT_DECLARE_STD) - struct hostent *gethostbyname(const char *); - struct hostent *gethostbyaddr(const char *, int, int); - struct hostent *gethostent(void); +#ifndef HAS_GETHOST_PROTOS /* XXX Do we need individual probes? */ + struct hostent *PerlSock_gethostbyaddr(Netdb_host_t, Netdb_hlen_t, int); + struct hostent *PerlSock_gethostbyname(Netdb_name_t); + struct hostent *PerlSock_gethostent(void); #endif struct hostent *hent; unsigned long len; EXTEND(SP, 10); - if (which == OP_GHBYNAME) { - hent = gethostbyname(POPp); - } + if (which == OP_GHBYNAME) +#ifdef HAS_GETHOSTBYNAME + hent = PerlSock_gethostbyname(POPp); +#else + DIE(no_sock_func, "gethostbyname"); +#endif else if (which == OP_GHBYADDR) { +#ifdef HAS_GETHOSTBYADDR int addrtype = POPi; SV *addrsv = POPs; STRLEN addrlen; - char *addr = SvPV(addrsv, addrlen); + Netdb_host_t addr = (Netdb_host_t) SvPV(addrsv, addrlen); - hent = gethostbyaddr(addr, addrlen, addrtype); + hent = PerlSock_gethostbyaddr(addr, (Netdb_hlen_t) addrlen, addrtype); +#else + DIE(no_sock_func, "gethostbyaddr"); +#endif } else #ifdef HAS_GETHOSTENT - hent = gethostent(); + hent = PerlSock_gethostent(); #else - DIE("gethostent not implemented"); + DIE(no_sock_func, "gethostent"); #endif #ifdef HOST_NOT_FOUND @@ -3684,7 +3762,7 @@ PP(pp_ghostent) PP(pp_gnbyname) { -#ifdef HAS_SOCKET +#ifdef HAS_GETNETBYNAME return pp_gnetent(ARGS); #else DIE(no_sock_func, "getnetbyname"); @@ -3693,7 +3771,7 @@ PP(pp_gnbyname) PP(pp_gnbyaddr) { -#ifdef HAS_SOCKET +#ifdef HAS_GETNETBYADDR return pp_gnetent(ARGS); #else DIE(no_sock_func, "getnetbyaddr"); @@ -3702,27 +3780,39 @@ PP(pp_gnbyaddr) PP(pp_gnetent) { - dSP; -#ifdef HAS_SOCKET + djSP; +#if defined(HAS_GETNETBYNAME) || defined(HAS_GETNETBYADDR) || defined(HAS_GETNETENT) I32 which = op->op_type; register char **elem; register SV *sv; -#ifndef DONT_DECLARE_STD - struct netent *getnetbyname(const char *); - struct netent *getnetbyaddr(long int, int); - struct netent *getnetent(void); +#ifndef HAS_GETNET_PROTOS /* XXX Do we need individual probes? */ + struct netent *PerlSock_getnetbyaddr(Netdb_net_t, int); + struct netent *PerlSock_getnetbyname(Netdb_name_t); + struct netent *PerlSock_getnetent(void); #endif struct netent *nent; if (which == OP_GNBYNAME) - nent = getnetbyname(POPp); +#ifdef HAS_GETNETBYNAME + nent = PerlSock_getnetbyname(POPp); +#else + DIE(no_sock_func, "getnetbyname"); +#endif else if (which == OP_GNBYADDR) { +#ifdef HAS_GETNETBYADDR int addrtype = POPi; - unsigned long addr = U_L(POPn); - nent = getnetbyaddr((long)addr, addrtype); + Netdb_net_t addr = (Netdb_net_t) U_L(POPn); + nent = PerlSock_getnetbyaddr(addr, addrtype); +#else + DIE(no_sock_func, "getnetbyaddr"); +#endif } else - nent = getnetent(); +#ifdef HAS_GETNETENT + nent = PerlSock_getnetent(); +#else + DIE(no_sock_func, "getnetent"); +#endif EXTEND(SP, 4); if (GIMME != G_ARRAY) { @@ -3759,7 +3849,7 @@ PP(pp_gnetent) PP(pp_gpbyname) { -#ifdef HAS_SOCKET +#ifdef HAS_GETPROTOBYNAME return pp_gprotoent(ARGS); #else DIE(no_sock_func, "getprotobyname"); @@ -3768,7 +3858,7 @@ PP(pp_gpbyname) PP(pp_gpbynumber) { -#ifdef HAS_SOCKET +#ifdef HAS_GETPROTOBYNUMBER return pp_gprotoent(ARGS); #else DIE(no_sock_func, "getprotobynumber"); @@ -3777,24 +3867,36 @@ PP(pp_gpbynumber) PP(pp_gprotoent) { - dSP; -#ifdef HAS_SOCKET + djSP; +#if defined(HAS_GETPROTOBYNAME) || defined(HAS_GETPROTOBYNUMBER) || defined(HAS_GETPROTOENT) I32 which = op->op_type; register char **elem; register SV *sv; -#ifndef DONT_DECLARE_STD - struct protoent *getprotobyname(const char *); - struct protoent *getprotobynumber(int); - struct protoent *getprotoent(void); +#ifndef HAS_GETPROTO_PROTOS /* XXX Do we need individual probes? */ + struct protoent *PerlSock_getprotobyname(Netdb_name_t); + struct protoent *PerlSock_getprotobynumber(int); + struct protoent *PerlSock_getprotoent(void); #endif struct protoent *pent; if (which == OP_GPBYNAME) - pent = getprotobyname(POPp); +#ifdef HAS_GETPROTOBYNAME + pent = PerlSock_getprotobyname(POPp); +#else + DIE(no_sock_func, "getprotobyname"); +#endif else if (which == OP_GPBYNUMBER) - pent = getprotobynumber(POPi); +#ifdef HAS_GETPROTOBYNUMBER + pent = PerlSock_getprotobynumber(POPi); +#else + DIE(no_sock_func, "getprotobynumber"); +#endif else - pent = getprotoent(); +#ifdef HAS_GETPROTOENT + pent = PerlSock_getprotoent(); +#else + DIE(no_sock_func, "getprotoent"); +#endif EXTEND(SP, 3); if (GIMME != G_ARRAY) { @@ -3829,7 +3931,7 @@ PP(pp_gprotoent) PP(pp_gsbyname) { -#ifdef HAS_SOCKET +#ifdef HAS_GETSERVBYNAME return pp_gservent(ARGS); #else DIE(no_sock_func, "getservbyname"); @@ -3838,7 +3940,7 @@ PP(pp_gsbyname) PP(pp_gsbyport) { -#ifdef HAS_SOCKET +#ifdef HAS_GETSERVBYPORT return pp_gservent(ARGS); #else DIE(no_sock_func, "getservbyport"); @@ -3847,38 +3949,50 @@ PP(pp_gsbyport) PP(pp_gservent) { - dSP; -#ifdef HAS_SOCKET + djSP; +#if defined(HAS_GETSERVBYNAME) || defined(HAS_GETSERVBYPORT) || defined(HAS_GETSERVENT) I32 which = op->op_type; register char **elem; register SV *sv; -#ifndef DONT_DECLARE_STD - struct servent *getservbyname(const char *, const char *); - struct servent *getservbynumber(); - struct servent *getservent(void); +#ifndef HAS_GETSERV_PROTOS /* XXX Do we need individual probes? */ + struct servent *PerlSock_getservbyname(Netdb_name_t, Netdb_name_t); + struct servent *PerlSock_getservbyport(int, Netdb_name_t); + struct servent *PerlSock_getservent(void); #endif struct servent *sent; if (which == OP_GSBYNAME) { +#ifdef HAS_GETSERVBYNAME char *proto = POPp; char *name = POPp; if (proto && !*proto) proto = Nullch; - sent = getservbyname(name, proto); + sent = PerlSock_getservbyname(name, proto); +#else + DIE(no_sock_func, "getservbyname"); +#endif } else if (which == OP_GSBYPORT) { +#ifdef HAS_GETSERVBYPORT char *proto = POPp; unsigned short port = POPu; #ifdef HAS_HTONS - port = htons(port); + port = PerlSock_htons(port); +#endif + sent = PerlSock_getservbyport(port, proto); +#else + DIE(no_sock_func, "getservbyport"); #endif - sent = getservbyport(port, proto); } else - sent = getservent(); +#ifdef HAS_GETSERVENT + sent = PerlSock_getservent(); +#else + DIE(no_sock_func, "getservent"); +#endif EXTEND(SP, 4); if (GIMME != G_ARRAY) { @@ -3886,7 +4000,7 @@ PP(pp_gservent) if (sent) { if (which == OP_GSBYNAME) { #ifdef HAS_NTOHS - sv_setiv(sv, (IV)ntohs(sent->s_port)); + sv_setiv(sv, (IV)PerlSock_ntohs(sent->s_port)); #else sv_setiv(sv, (IV)(sent->s_port)); #endif @@ -3908,7 +4022,7 @@ PP(pp_gservent) } PUSHs(sv = sv_mortalcopy(&sv_no)); #ifdef HAS_NTOHS - sv_setiv(sv, (IV)ntohs(sent->s_port)); + sv_setiv(sv, (IV)PerlSock_ntohs(sent->s_port)); #else sv_setiv(sv, (IV)(sent->s_port)); #endif @@ -3924,9 +4038,9 @@ PP(pp_gservent) PP(pp_shostent) { - dSP; -#ifdef HAS_SOCKET - sethostent(TOPi); + djSP; +#ifdef HAS_SETHOSTENT + PerlSock_sethostent(TOPi); RETSETYES; #else DIE(no_sock_func, "sethostent"); @@ -3935,9 +4049,9 @@ PP(pp_shostent) PP(pp_snetent) { - dSP; -#ifdef HAS_SOCKET - setnetent(TOPi); + djSP; +#ifdef HAS_SETNETENT + PerlSock_setnetent(TOPi); RETSETYES; #else DIE(no_sock_func, "setnetent"); @@ -3946,9 +4060,9 @@ PP(pp_snetent) PP(pp_sprotoent) { - dSP; -#ifdef HAS_SOCKET - setprotoent(TOPi); + djSP; +#ifdef HAS_SETPROTOENT + PerlSock_setprotoent(TOPi); RETSETYES; #else DIE(no_sock_func, "setprotoent"); @@ -3957,9 +4071,9 @@ PP(pp_sprotoent) PP(pp_sservent) { - dSP; -#ifdef HAS_SOCKET - setservent(TOPi); + djSP; +#ifdef HAS_SETSERVENT + PerlSock_setservent(TOPi); RETSETYES; #else DIE(no_sock_func, "setservent"); @@ -3968,10 +4082,10 @@ PP(pp_sservent) PP(pp_ehostent) { - dSP; -#ifdef HAS_SOCKET - endhostent(); - EXTEND(sp,1); + djSP; +#ifdef HAS_ENDHOSTENT + PerlSock_endhostent(); + EXTEND(SP,1); RETPUSHYES; #else DIE(no_sock_func, "endhostent"); @@ -3980,10 +4094,10 @@ PP(pp_ehostent) PP(pp_enetent) { - dSP; -#ifdef HAS_SOCKET - endnetent(); - EXTEND(sp,1); + djSP; +#ifdef HAS_ENDNETENT + PerlSock_endnetent(); + EXTEND(SP,1); RETPUSHYES; #else DIE(no_sock_func, "endnetent"); @@ -3992,10 +4106,10 @@ PP(pp_enetent) PP(pp_eprotoent) { - dSP; -#ifdef HAS_SOCKET - endprotoent(); - EXTEND(sp,1); + djSP; +#ifdef HAS_ENDPROTOENT + PerlSock_endprotoent(); + EXTEND(SP,1); RETPUSHYES; #else DIE(no_sock_func, "endprotoent"); @@ -4004,10 +4118,10 @@ PP(pp_eprotoent) PP(pp_eservent) { - dSP; -#ifdef HAS_SOCKET - endservent(); - EXTEND(sp,1); + djSP; +#ifdef HAS_ENDSERVENT + PerlSock_endservent(); + EXTEND(SP,1); RETPUSHYES; #else DIE(no_sock_func, "endservent"); @@ -4034,8 +4148,8 @@ PP(pp_gpwuid) PP(pp_gpwent) { - dSP; -#ifdef HAS_PASSWD + djSP; +#if defined(HAS_PASSWD) && defined(HAS_GETPWENT) I32 which = op->op_type; register SV *sv; struct passwd *pwent; @@ -4062,41 +4176,57 @@ PP(pp_gpwent) if (pwent) { PUSHs(sv = sv_mortalcopy(&sv_no)); sv_setpv(sv, pwent->pw_name); + PUSHs(sv = sv_mortalcopy(&sv_no)); +#ifdef PWPASSWD sv_setpv(sv, pwent->pw_passwd); +#endif + PUSHs(sv = sv_mortalcopy(&sv_no)); sv_setiv(sv, (IV)pwent->pw_uid); + PUSHs(sv = sv_mortalcopy(&sv_no)); sv_setiv(sv, (IV)pwent->pw_gid); + + /* pw_change, pw_quota, and pw_age are mutually exclusive. */ PUSHs(sv = sv_mortalcopy(&sv_no)); #ifdef PWCHANGE sv_setiv(sv, (IV)pwent->pw_change); #else -#ifdef PWQUOTA +# ifdef PWQUOTA sv_setiv(sv, (IV)pwent->pw_quota); -#else -#ifdef PWAGE +# else +# ifdef PWAGE sv_setpv(sv, pwent->pw_age); +# endif +# endif #endif -#endif -#endif + + /* pw_class and pw_comment are mutually exclusive. */ PUSHs(sv = sv_mortalcopy(&sv_no)); #ifdef PWCLASS sv_setpv(sv, pwent->pw_class); #else -#ifdef PWCOMMENT +# ifdef PWCOMMENT sv_setpv(sv, pwent->pw_comment); +# endif #endif -#endif + PUSHs(sv = sv_mortalcopy(&sv_no)); +#ifdef PWGECOS sv_setpv(sv, pwent->pw_gecos); +#endif #ifndef INCOMPLETE_TAINTS + /* pw_gecos is tainted because user himself can diddle with it. */ SvTAINTED_on(sv); #endif + PUSHs(sv = sv_mortalcopy(&sv_no)); sv_setpv(sv, pwent->pw_dir); + PUSHs(sv = sv_mortalcopy(&sv_no)); sv_setpv(sv, pwent->pw_shell); + #ifdef PWEXPIRE PUSHs(sv = sv_mortalcopy(&sv_no)); sv_setiv(sv, (IV)pwent->pw_expire); @@ -4110,8 +4240,8 @@ PP(pp_gpwent) PP(pp_spwent) { - dSP; -#if defined(HAS_PASSWD) && !defined(CYGWIN32) + djSP; +#if defined(HAS_PASSWD) && defined(HAS_SETPWENT) && !defined(CYGWIN32) setpwent(); RETPUSHYES; #else @@ -4121,8 +4251,8 @@ PP(pp_spwent) PP(pp_epwent) { - dSP; -#ifdef HAS_PASSWD + djSP; +#if defined(HAS_PASSWD) && defined(HAS_ENDPWENT) endpwent(); RETPUSHYES; #else @@ -4150,8 +4280,8 @@ PP(pp_ggrgid) PP(pp_ggrent) { - dSP; -#ifdef HAS_GROUP + djSP; +#if defined(HAS_GROUP) && defined(HAS_GETGRENT) I32 which = op->op_type; register char **elem; register SV *sv; @@ -4179,10 +4309,15 @@ PP(pp_ggrent) if (grent) { PUSHs(sv = sv_mortalcopy(&sv_no)); sv_setpv(sv, grent->gr_name); + PUSHs(sv = sv_mortalcopy(&sv_no)); +#ifdef GRPASSWD sv_setpv(sv, grent->gr_passwd); +#endif + PUSHs(sv = sv_mortalcopy(&sv_no)); sv_setiv(sv, (IV)grent->gr_gid); + PUSHs(sv = sv_mortalcopy(&sv_no)); for (elem = grent->gr_mem; elem && *elem; elem++) { sv_catpv(sv, *elem); @@ -4199,8 +4334,8 @@ PP(pp_ggrent) PP(pp_sgrent) { - dSP; -#ifdef HAS_GROUP + djSP; +#if defined(HAS_GROUP) && defined(HAS_SETGRENT) setgrent(); RETPUSHYES; #else @@ -4210,8 +4345,8 @@ PP(pp_sgrent) PP(pp_egrent) { - dSP; -#ifdef HAS_GROUP + djSP; +#if defined(HAS_GROUP) && defined(HAS_ENDGRENT) endgrent(); RETPUSHYES; #else @@ -4221,11 +4356,11 @@ PP(pp_egrent) PP(pp_getlogin) { - dSP; dTARGET; + djSP; dTARGET; #ifdef HAS_GETLOGIN char *tmps; EXTEND(SP, 1); - if (!(tmps = getlogin())) + if (!(tmps = PerlProc_getlogin())) RETPUSHUNDEF; PUSHp(tmps, strlen(tmps)); RETURN; @@ -4238,8 +4373,8 @@ PP(pp_getlogin) PP(pp_syscall) { -#ifdef HAS_SYSCALL - dSP; dMARK; dORIGMARK; dTARGET; +#ifdef HAS_SYSCALL + djSP; dMARK; dORIGMARK; dTARGET; register I32 items = SP - MARK; unsigned long a[20]; register I32 i = 0; @@ -4407,9 +4542,9 @@ int operation; /* flock locks entire file so for lockf we need to do the same */ save_errno = errno; - pos = lseek(fd, (Off_t)0, SEEK_CUR); /* get pos to restore later */ + pos = PerlLIO_lseek(fd, (Off_t)0, SEEK_CUR); /* get pos to restore later */ if (pos > 0) /* is seekable and needs to be repositioned */ - if (lseek(fd, (Off_t)0, SEEK_SET) < 0) + if (PerlLIO_lseek(fd, (Off_t)0, SEEK_SET) < 0) pos = -1; /* seek failed, so don't seek back afterwards */ errno = save_errno; @@ -4446,7 +4581,7 @@ int operation; } if (pos > 0) /* need to restore position of the handle */ - lseek(fd, pos, SEEK_SET); /* ignore error here */ + PerlLIO_lseek(fd, pos, SEEK_SET); /* ignore error here */ return (i); }