X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sys.c;h=916c7859ed0204589b4174fa5b01f61fe295834b;hb=4eb8286e4c6ac94fdae21a64c54a936bc836983e;hp=041539c44132a21d5293eaf633fa88ba85cd0c67;hpb=c09156bb55f832ab6700e99026187942841f0ae4;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pp_sys.c b/pp_sys.c index 041539c..916c785 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -1,6 +1,6 @@ /* pp_sys.c * - * Copyright (c) 1991-1997, Larry Wall + * Copyright (c) 1991-1999, Larry Wall * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -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,14 @@ 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, see "extern int errno in perl.h". Creating such + a test requires taking into account the differences between + compiling multithreaded and singlethreaded ($ccflags et al). + HOST_NOT_FOUND is typically defined in . +*/ +#if defined(HOST_NOT_FOUND) && !defined(h_errno) extern int h_errno; #endif @@ -63,7 +72,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 +84,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 +125,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 @@ -160,28 +173,137 @@ static int dooneliner _((char *cmd, char *filename)); #endif /* no flock() */ -#ifndef MAXPATHLEN -# ifdef PATH_MAX -# define MAXPATHLEN PATH_MAX -# else -# define MAXPATHLEN 1024 -# endif -#endif - #define ZBTLEN 10 static char zero_but_true[ZBTLEN + 1] = "0 but true"; -/* Pushy I/O. */ +#if defined(I_SYS_ACCESS) && !defined(R_OK) +# include +#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 + +/* F_OK unused: if stat() cannot find it... */ + +#if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESS) && defined(EFF_ONLY_OK) && !defined(NO_EFF_ONLY_OK) + /* Digital UNIX (when the EFF_ONLY_OK gets fixed), UnixWare */ +# define PERL_EFF_ACCESS_R_OK(p) (access((p), R_OK | EFF_ONLY_OK)) +# define PERL_EFF_ACCESS_W_OK(p) (access((p), W_OK | EFF_ONLY_OK)) +# define PERL_EFF_ACCESS_X_OK(p) (access((p), X_OK | EFF_ONLY_OK)) +#endif + +#if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_EACCESS) +# if defined(I_SYS_SECURITY) +# include +# endif + /* XXX Configure test needed for eaccess */ +# ifdef ACC_SELF + /* HP SecureWare */ +# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF)) +# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF)) +# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF)) +# else + /* SCO */ +# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK)) +# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK)) +# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK)) +# endif +#endif + +#if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESSX) && defined(ACC_SELF) + /* AIX */ +# define PERL_EFF_ACCESS_R_OK(p) (accessx((p), R_OK, ACC_SELF)) +# define PERL_EFF_ACCESS_W_OK(p) (accessx((p), W_OK, ACC_SELF)) +# define PERL_EFF_ACCESS_X_OK(p) (accessx((p), X_OK, ACC_SELF)) +#endif + +#if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESS) \ + && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) \ + || defined(HAS_SETREGID) || defined(HAS_SETRESGID)) +/* The Hard Way. */ +STATIC int +emulate_eaccess (const char* path, int mode) { + Uid_t ruid = getuid(); + Uid_t euid = geteuid(); + Gid_t rgid = getgid(); + Gid_t egid = getegid(); + int res; + + MUTEX_LOCK(&PL_cred_mutex); +#if !defined(HAS_SETREUID) && !defined(HAS_SETRESUID) + croak("switching effective uid is not implemented"); +#else +#ifdef HAS_SETREUID + if (setreuid(euid, ruid)) +#else +#ifdef HAS_SETRESUID + if (setresuid(euid, ruid, (Uid_t)-1)) +#endif +#endif + croak("entering effective uid failed"); +#endif + +#if !defined(HAS_SETREGID) && !defined(HAS_SETRESGID) + croak("switching effective gid is not implemented"); +#else +#ifdef HAS_SETREGID + if (setregid(egid, rgid)) +#else +#ifdef HAS_SETRESGID + if (setresgid(egid, rgid, (Gid_t)-1)) +#endif +#endif + croak("entering effective gid failed"); +#endif + + res = access(path, mode); + +#ifdef HAS_SETREUID + if (setreuid(ruid, euid)) +#else +#ifdef HAS_SETRESUID + if (setresuid(ruid, euid, (Uid_t)-1)) +#endif +#endif + croak("leaving effective uid failed"); + +#ifdef HAS_SETREGID + if (setregid(rgid, egid)) +#else +#ifdef HAS_SETRESGID + if (setresgid(rgid, egid, (Gid_t)-1)) +#endif +#endif + croak("leaving effective gid failed"); + MUTEX_UNLOCK(&PL_cred_mutex); + + return res; +} +# define PERL_EFF_ACCESS_R_OK(p) (emulate_eaccess((p), R_OK)) +# define PERL_EFF_ACCESS_W_OK(p) (emulate_eaccess((p), W_OK)) +# define PERL_EFF_ACCESS_X_OK(p) (emulate_eaccess((p), X_OK)) +#endif + +#if !defined(PERL_EFF_ACCESS_R_OK) +STATIC int +emulate_eaccess (const char* path, int mode) { + croak("switching effective uid is not implemented"); + /*NOTREACHED*/ + return -1; +} +#endif PP(pp_backtick) { djSP; dTARGET; PerlIO *fp; - char *tmps = POPp; + STRLEN n_a; + char *tmps = POPpx; 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 +323,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 +336,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 { @@ -229,27 +351,29 @@ PP(pp_backtick) PP(pp_glob) { OP *result; + tryAMAGICunTARGET(iter, -1); + ENTER; #ifndef VMS - if (tainting) { + if (PL_tainting) { /* * The external globbing program may use things we can't control, * so for security reasons we must assume the worst. */ TAINT; - taint_proper(no_security, "glob"); + taint_proper(PL_no_security, "glob"); } #endif /* !VMS */ - SAVESPTR(last_in_gv); /* We don't want this to be permanent. */ - last_in_gv = (GV*)*stack_sp--; + SAVESPTR(PL_last_in_gv); /* We don't want this to be permanent. */ + PL_last_in_gv = (GV*)*PL_stack_sp--; - SAVESPTR(rs); /* This is not permanent, either. */ - rs = sv_2mortal(newSVpv("", 1)); + SAVESPTR(PL_rs); /* This is not permanent, either. */ + PL_rs = sv_2mortal(newSVpv("", 1)); #ifndef DOSISH #ifndef CSH - *SvPVX(rs) = '\n'; + *SvPVX(PL_rs) = '\n'; #endif /* !CSH */ #endif /* !DOSISH */ @@ -258,15 +382,18 @@ 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); + STRLEN n_a; + PL_last_in_gv = gv_fetchpv(SvPVx(GvSV((GV*)(*PL_stack_sp--)), n_a), TRUE,SVt_PVIO); return do_readline(); } +#endif PP(pp_rcatline) { - last_in_gv = cGVOP->op_gv; + PL_last_in_gv = cGVOP->op_gv; return do_readline(); } @@ -274,20 +401,22 @@ PP(pp_warn) { djSP; dMARK; char *tmps; + STRLEN n_a; if (SP - MARK != 1) { dTARGET; - do_join(TARG, &sv_no, MARK, SP); - tmps = SvPV(TARG, na); + do_join(TARG, &PL_sv_no, MARK, SP); + tmps = SvPV(TARG, n_a); SP = MARK + 1; } else { - tmps = SvPV(TOPs, na); + tmps = SvPV(TOPs, n_a); } if (!tmps || !*tmps) { - (void)SvUPGRADE(ERRSV, SVt_PV); - if (SvPOK(ERRSV) && SvCUR(ERRSV)) - sv_catpv(ERRSV, "\t...caught"); - tmps = SvPV(ERRSV, na); + SV *error = ERRSV; + (void)SvUPGRADE(error, SVt_PV); + if (SvPOK(error) && SvCUR(error)) + sv_catpv(error, "\t...caught"); + tmps = SvPV(error, n_a); } if (!tmps || !*tmps) tmps = "Warning: something's wrong"; @@ -299,24 +428,53 @@ PP(pp_die) { djSP; dMARK; char *tmps; + SV *tmpsv = Nullsv; + char *pat = "%s"; + STRLEN n_a; if (SP - MARK != 1) { dTARGET; - do_join(TARG, &sv_no, MARK, SP); - tmps = SvPV(TARG, na); + do_join(TARG, &PL_sv_no, MARK, SP); + tmps = SvPV(TARG, n_a); SP = MARK + 1; } else { - tmps = SvPV(TOPs, na); + tmpsv = TOPs; + tmps = SvROK(tmpsv) ? Nullch : SvPV(tmpsv, n_a); } if (!tmps || !*tmps) { - (void)SvUPGRADE(ERRSV, SVt_PV); - if (SvPOK(ERRSV) && SvCUR(ERRSV)) - sv_catpv(ERRSV, "\t...propagated"); - tmps = SvPV(ERRSV, na); + SV *error = ERRSV; + (void)SvUPGRADE(error, SVt_PV); + 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(PL_curcop->cop_filegv))); + SV *line = sv_2mortal(newSViv(PL_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,*PL_stack_sp--); + } + } + pat = Nullch; + } + else { + if (SvPOK(error) && SvCUR(error)) + sv_catpv(error, "\t...propagated"); + tmps = SvPV(error, n_a); + } } if (!tmps || !*tmps) tmps = "Died"; - DIE("%s", tmps); + DIE(pat, tmps); } /* I/O. */ @@ -332,18 +490,18 @@ PP(pp_open) if (MAXARG > 1) sv = POPs; if (!isGV(TOPs)) - DIE(no_usym, "filehandle"); + DIE(PL_no_usym, "filehandle"); if (MAXARG <= 1) sv = GvSV(TOPs); gv = (GV*)POPs; if (!isGV(gv)) - DIE(no_usym, "filehandle"); + DIE(PL_no_usym, "filehandle"); if (GvIOp(gv)) IoFLAGS(GvIOp(gv)) &= ~IOf_UNTAINT; tmps = SvPV(sv, len); - if (do_open(gv, tmps, len, FALSE, 0, 0, Nullfp)) - PUSHi( (I32)forkprocess ); - else if (forkprocess == 0) /* we are a new child */ + if (do_open(gv, tmps, len, FALSE, O_RDONLY, 0, Nullfp)) + PUSHi( (I32)PL_forkprocess ); + else if (PL_forkprocess == 0) /* we are a new child */ PUSHi(0); else RETPUSHUNDEF; @@ -354,11 +512,23 @@ PP(pp_close) { djSP; GV *gv; + MAGIC *mg; if (MAXARG == 0) - gv = defoutgv; + gv = PL_defoutgv; else gv = (GV*)POPs; + + if (mg = SvTIED_mg((SV*)gv, 'q')) { + PUSHMARK(SP); + XPUSHs(SvTIED_obj((SV*)gv, mg)); + PUTBACK; + ENTER; + perl_call_method("CLOSE", G_SCALAR); + LEAVE; + SPAGAIN; + RETURN; + } EXTEND(SP, 1); PUSHs(boolSV(do_close(gv, TRUE))); RETURN; @@ -381,7 +551,7 @@ PP(pp_pipe_op) goto badexit; if (SvTYPE(rgv) != SVt_PVGV || SvTYPE(wgv) != SVt_PVGV) - DIE(no_usym, "filehandle"); + DIE(PL_no_usym, "filehandle"); rstio = GvIOn(rgv); wstio = GvIOn(wgv); @@ -390,7 +560,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"); @@ -401,18 +571,21 @@ 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; } - +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(fd[0],F_SETFD,fd[0] > PL_maxsysfd); /* ensure close-on-exec */ + fcntl(fd[1],F_SETFD,fd[1] > PL_maxsysfd); /* ensure close-on-exec */ +#endif RETPUSHYES; badexit: RETPUSHUNDEF; #else - DIE(no_func, "pipe"); + DIE(PL_no_func, "pipe"); #endif } @@ -438,15 +611,20 @@ PP(pp_umask) #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(&PL_sv_undef); #endif RETURN; } @@ -467,112 +645,83 @@ 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) { djSP; + dMARK; SV *varsv; HV* stash; GV *gv; SV *sv; - SV **mark = stack_base + ++*markstack_ptr; /* reuse in entersub */ - I32 markoff = mark - stack_base - 1; + I32 markoff = MARK - PL_stack_base; char *methname; -#ifdef ORIGINAL_TIE - BINOP myop; - bool oldcatch = CATCH_GET; -#endif - - 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)); - -#ifdef ORIGINAL_TIE - 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; - - XPUSHs((SV*)GvCV(gv)); - PUTBACK; - - if (op = pp_entersub(ARGS)) - runops(); + int how = 'P'; + U32 items; + STRLEN n_a; + + 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,n_a)); + } + 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); -#else - ENTER; - perl_call_sv((SV*)GvCV(gv), G_SCALAR); - SPAGAIN; -#endif 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, (SvRV(sv) == varsv ? Nullsv : sv), how, Nullch, 0); } LEAVE; - SP = stack_base + markoff; + SP = PL_stack_base + markoff; PUSHs(sv); RETURN; } @@ -580,50 +729,37 @@ PP(pp_tie) PP(pp_untie) { djSP; - SV * sv ; + SV *sv = POPs; + char how = (SvTYPE(sv) == SVt_PVHV || SvTYPE(sv) == SVt_PVAV) ? 'P' : 'q'; - sv = POPs; - - if (dowarn) { + if (ckWARN(WARN_UNTIE)) { MAGIC * mg ; - if (SvMAGICAL(sv)) { - if (SvTYPE(sv) == SVt_PVHV || SvTYPE(sv) == SVt_PVAV) - mg = mg_find(sv, 'P') ; - else - mg = mg_find(sv, 'q') ; - + if (mg = SvTIED_mg(sv, how)) { if (mg && SvREFCNT(SvRV(mg->mg_obj)) > 1) - warn("untie attempted while %lu inner references still exist", - (unsigned long)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 ) ; } } - if (SvTYPE(sv) == SVt_PVHV || SvTYPE(sv) == SVt_PVAV) - sv_unmagic(sv, 'P'); - else - sv_unmagic(sv, 'q'); + sv_unmagic(sv, how); RETPUSHYES; } PP(pp_tied) { djSP; - SV * sv ; - MAGIC * mg ; + SV *sv = POPs; + char how = (SvTYPE(sv) == SVt_PVHV || SvTYPE(sv) == SVt_PVAV) ? 'P' : 'q'; + MAGIC *mg; - sv = POPs; - if (SvMAGICAL(sv)) { - if (SvTYPE(sv) == SVt_PVHV || SvTYPE(sv) == SVt_PVAV) - mg = mg_find(sv, 'P') ; - else - mg = mg_find(sv, 'q') ; - - if (mg) { - PUSHs(sv_2mortal(newSVsv(mg->mg_obj))) ; - RETURN ; - } + if (mg = SvTIED_mg(sv, how)) { + SV *osv = SvTIED_obj(sv, mg); + if (osv == mg->mg_obj) + osv = sv_mortalcopy(osv); + PUSHs(osv); + RETURN; } - RETPUSHUNDEF; } @@ -635,14 +771,10 @@ PP(pp_dbmopen) HV* stash; GV *gv; SV *sv; -#ifdef ORIGINAL_TIE - BINOP myop; - bool oldcatch = CATCH_GET; -#endif hv = (HV*)POPs; - sv = sv_mortalcopy(&sv_no); + sv = sv_mortalcopy(&PL_sv_no); sv_setpv(sv, "AnyDBM_File"); stash = gv_stashsv(sv, FALSE); if (!stash || !(gv = gv_fetchmethod(stash, "TIEHASH"))) { @@ -653,25 +785,10 @@ PP(pp_dbmopen) DIE("No dbm on this machine"); } -#ifdef ORIGINAL_TIE - 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); -#else - ENTER; - PUSHMARK(sp); -#endif - EXTEND(sp, 5); + PUSHMARK(SP); + + EXTEND(SP, 5); PUSHs(sv); PUSHs(left); if (SvIV(right)) @@ -679,51 +796,26 @@ PP(pp_dbmopen) else PUSHs(sv_2mortal(newSViv(O_RDWR))); PUSHs(right); -#ifdef ORIGINAL_TIE - PUSHs((SV*)GvCV(gv)); - PUTBACK; - - if (op = pp_entersub(ARGS)) - runops(); -#else PUTBACK; perl_call_sv((SV*)GvCV(gv), G_SCALAR); -#endif SPAGAIN; if (!sv_isobject(TOPs)) { - sp--; -#ifdef ORIGINAL_TIE - op = (OP *) &myop; - PUTBACK; - pp_pushmark(ARGS); -#else - PUSHMARK(sp); -#endif - + SP--; + PUSHMARK(SP); PUSHs(sv); PUSHs(left); PUSHs(sv_2mortal(newSViv(O_RDONLY))); PUSHs(right); -#ifdef ORIGINAL_TIE - PUSHs((SV*)GvCV(gv)); -#endif PUTBACK; - -#ifdef ORIGINAL_TIE - if (op = pp_entersub(ARGS)) - runops(); -#else perl_call_sv((SV*)GvCV(gv), G_SCALAR); -#endif SPAGAIN; } -#ifdef ORIGINAL_TIE - CATCH_SET(oldcatch); -#endif - if (sv_isobject(TOPs)) + if (sv_isobject(TOPs)) { + sv_unmagic((SV *) hv, 'P'); sv_magic((SV*)hv, TOPs, 'P', Nullch, 0); + } LEAVE; RETURN; } @@ -748,6 +840,7 @@ PP(pp_sselect) struct timeval *tbuf = &timebuf; I32 growsize; char *fd_sets[4]; + STRLEN n_a; #if BYTEORDER != 0x1234 && BYTEORDER != 0x12345678 I32 masksize; I32 offset; @@ -770,23 +863,29 @@ PP(pp_sselect) maxlen = j; } +/* little endians can use vecs directly */ #if BYTEORDER == 0x1234 || BYTEORDER == 0x12345678 -#if defined(__linux__) || defined(OS2) +# if SELECT_MIN_BITS > 1 + /* If SELECT_MIN_BITS is greater than one we most probably will want + * to align the sizes with SELECT_MIN_BITS/8 because for example + * in many little-endian (Intel, Alpha) systems (Linux, OS/2, Digital + * UNIX, Solaris, NeXT) the smallest quantum select() operates on + * (sets bit) is 32 bits. */ + growsize = maxlen + (SELECT_MIN_BITS/8 - (maxlen % (SELECT_MIN_BITS/8))); +# else growsize = sizeof(fd_set); -#else - growsize = maxlen; /* little endians can use vecs directly */ -#endif -#else -#ifdef NFDBITS +# endif +# else +# ifdef NFDBITS -#ifndef NBBY -#define NBBY 8 -#endif +# ifndef NBBY +# define NBBY 8 +# endif masksize = NFDBITS / NBBY; -#else +# else masksize = sizeof(long); /* documented int, everyone seems to use long */ -#endif +# endif growsize = maxlen + (masksize - (maxlen % masksize)); Zero(&fd_sets[0], 4, char*); #endif @@ -810,7 +909,7 @@ PP(pp_sselect) continue; } else if (!SvPOK(sv)) - SvPV_force(sv,na); /* force string conversion */ + SvPV_force(sv,n_a); /* force string conversion */ j = SvLEN(sv); if (j < growsize) { Sv_Grow(sv, growsize); @@ -833,7 +932,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], @@ -858,7 +957,7 @@ PP(pp_sselect) if (GIMME == G_ARRAY && tbuf) { value = (double)(timebuf.tv_sec) + (double)(timebuf.tv_usec) / 1000000.0; - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setnv(sv, value); } RETURN; @@ -873,9 +972,9 @@ setdefout(GV *gv) dTHR; if (gv) (void)SvREFCNT_inc(gv); - if (defoutgv) - SvREFCNT_dec(defoutgv); - defoutgv = gv; + if (PL_defoutgv) + SvREFCNT_dec(PL_defoutgv); + PL_defoutgv = gv; } PP(pp_select) @@ -884,18 +983,18 @@ PP(pp_select) GV *newdefout, *egv; HV *hv; - newdefout = (op->op_private > 0) ? ((GV *) POPs) : (GV *) NULL; + newdefout = (PL_op->op_private > 0) ? ((GV *) POPs) : (GV *) NULL; - egv = GvEGV(defoutgv); + egv = GvEGV(PL_defoutgv); if (!egv) - egv = defoutgv; + egv = PL_defoutgv; hv = GvSTASH(egv); if (! hv) - XPUSHs(&sv_undef); + XPUSHs(&PL_sv_undef); else { GV **gvp = (GV**)hv_fetch(hv, GvNAME(egv), GvNAMELEN(egv), FALSE); if (gvp && *gvp == egv) { - gv_efullname3(TARG, defoutgv, Nullch); + gv_efullname3(TARG, PL_defoutgv, Nullch); XPUSHTARG; } else { @@ -919,16 +1018,16 @@ PP(pp_getc) MAGIC *mg; if (MAXARG <= 0) - gv = stdingv; + gv = PL_stdingv; else gv = (GV*)POPs; if (!gv) - gv = argvgv; + gv = PL_argvgv; - if (SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { + if (mg = SvTIED_mg((SV*)gv, 'q')) { I32 gimme = GIMME_V; PUSHMARK(SP); - XPUSHs(mg->mg_obj); + XPUSHs(SvTIED_obj((SV*)gv, mg)); PUTBACK; ENTER; perl_call_method("GETC", gimme); @@ -952,7 +1051,7 @@ PP(pp_read) return pp_sysread(ARGS); } -static OP * +STATIC OP * doform(CV *cv, GV *gv, OP *retop) { dTHR; @@ -965,10 +1064,10 @@ doform(CV *cv, GV *gv, OP *retop) SAVETMPS; push_return(retop); - PUSHBLOCK(cx, CXt_SUB, stack_sp); + PUSHBLOCK(cx, CXt_SUB, PL_stack_sp); PUSHFORMAT(cx); - SAVESPTR(curpad); - curpad = AvARRAY((AV*)svp[1]); + SAVESPTR(PL_curpad); + PL_curpad = AvARRAY((AV*)svp[1]); setdefout(gv); /* locally select filehandle so $% et al work */ return CvSTART(cv); @@ -983,11 +1082,11 @@ PP(pp_enterwrite) CV *cv; if (MAXARG == 0) - gv = defoutgv; + gv = PL_defoutgv; else { gv = (GV*)POPs; if (!gv) - gv = defoutgv; + gv = PL_defoutgv; } EXTEND(SP, 1); io = GvIO(gv); @@ -1012,7 +1111,7 @@ PP(pp_enterwrite) cv = (CV*)sv_2mortal((SV*)cv_clone(cv)); IoFLAGS(io) &= ~IOf_DIDTOP; - return doform(cv,gv,op->op_next); + return doform(cv,gv,PL_op->op_next); } PP(pp_leavewrite) @@ -1027,9 +1126,9 @@ PP(pp_leavewrite) register PERL_CONTEXT *cx; DEBUG_f(PerlIO_printf(Perl_debug_log, "left=%ld, todo=%ld\n", - (long)IoLINES_LEFT(io), (long)FmLINES(formtarget))); - if (IoLINES_LEFT(io) < FmLINES(formtarget) && - formtarget != toptarget) + (long)IoLINES_LEFT(io), (long)FmLINES(PL_formtarget))); + if (IoLINES_LEFT(io) < FmLINES(PL_formtarget) && + PL_formtarget != PL_toptarget) { GV *fgv; CV *cv; @@ -1057,7 +1156,7 @@ PP(pp_leavewrite) } if (IoFLAGS(io) & IOf_DIDTOP) { /* Oh dear. It still doesn't fit. */ I32 lines = IoLINES_LEFT(io); - char *s = SvPVX(formtarget); + char *s = SvPVX(PL_formtarget); if (lines <= 0) /* Yow, header didn't even fit!!! */ goto forget_top; while (lines-- > 0) { @@ -1067,16 +1166,16 @@ PP(pp_leavewrite) s++; } if (s) { - PerlIO_write(ofp, SvPVX(formtarget), s - SvPVX(formtarget)); - sv_chop(formtarget, s); - FmLINES(formtarget) -= IoLINES_LEFT(io); + PerlIO_write(ofp, SvPVX(PL_formtarget), s - SvPVX(PL_formtarget)); + sv_chop(PL_formtarget, s); + FmLINES(PL_formtarget) -= IoLINES_LEFT(io); } } if (IoLINES_LEFT(io) >= 0 && IoPAGE(io) > 0) - PerlIO_write(ofp, SvPVX(formfeed), SvCUR(formfeed)); + PerlIO_write(ofp, SvPVX(PL_formfeed), SvCUR(PL_formfeed)); IoLINES_LEFT(io) = IoPAGE_LEN(io); IoPAGE(io)++; - formtarget = toptarget; + PL_formtarget = PL_toptarget; IoFLAGS(io) |= IOf_DIDTOP; fgv = IoTOP_GV(io); if (!fgv) @@ -1089,42 +1188,42 @@ PP(pp_leavewrite) } if (CvCLONE(cv)) cv = (CV*)sv_2mortal((SV*)cv_clone(cv)); - return doform(cv,gv,op); + return doform(cv,gv,PL_op); } forget_top: - POPBLOCK(cx,curpm); + POPBLOCK(cx,PL_curpm); POPFORMAT(cx); LEAVE; fp = IoOFP(io); if (!fp) { - if (dowarn) { + if (ckWARN2(WARN_CLOSED,WARN_IO)) { if (IoIFP(io)) - warn("Filehandle only opened for input"); - else - warn("Write on closed filehandle"); + warner(WARN_IO, "Filehandle only opened for input"); + else if (ckWARN(WARN_CLOSED)) + warner(WARN_CLOSED, "Write on closed filehandle"); } - PUSHs(&sv_no); + PUSHs(&PL_sv_no); } else { - if ((IoLINES_LEFT(io) -= FmLINES(formtarget)) < 0) { - if (dowarn) - warn("page overflow"); + if ((IoLINES_LEFT(io) -= FmLINES(PL_formtarget)) < 0) { + if (ckWARN(WARN_IO)) + warner(WARN_IO, "page overflow"); } - if (!PerlIO_write(ofp, SvPVX(formtarget), SvCUR(formtarget)) || + if (!PerlIO_write(ofp, SvPVX(PL_formtarget), SvCUR(PL_formtarget)) || PerlIO_error(fp)) - PUSHs(&sv_no); + PUSHs(&PL_sv_no); else { - FmLINES(formtarget) = 0; - SvCUR_set(formtarget, 0); - *SvEND(formtarget) = '\0'; + FmLINES(PL_formtarget) = 0; + SvCUR_set(PL_formtarget, 0); + *SvEND(PL_formtarget) = '\0'; if (IoFLAGS(io) & IOf_FLUSH) (void)PerlIO_flush(fp); - PUSHs(&sv_yes); + PUSHs(&PL_sv_yes); } } - formtarget = bodytarget; + PL_formtarget = PL_bodytarget; PUTBACK; return pop_return(); } @@ -1137,21 +1236,22 @@ PP(pp_prtf) PerlIO *fp; SV *sv; MAGIC *mg; + STRLEN n_a; - if (op->op_flags & OPf_STACKED) + if (PL_op->op_flags & OPf_STACKED) gv = (GV*)*++MARK; else - gv = defoutgv; + gv = PL_defoutgv; - if (SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { + if (mg = SvTIED_mg((SV*)gv, 'q')) { if (MARK == ORIGMARK) { - EXTEND(SP, 1); + MEXTEND(SP, 1); ++MARK; Move(MARK, MARK + 1, (SP - MARK) + 1, SV*); ++SP; } PUSHMARK(MARK - 1); - *MARK = mg->mg_obj; + *MARK = SvTIED_obj((SV*)gv, mg); PUTBACK; ENTER; perl_call_method("PRINTF", G_SCALAR); @@ -1165,27 +1265,29 @@ PP(pp_prtf) sv = NEWSV(0,0); if (!(io = GvIO(gv))) { - if (dowarn) { + if (ckWARN(WARN_UNOPENED)) { gv_fullname3(sv, gv, Nullch); - warn("Filehandle %s never opened", SvPV(sv,na)); + warner(WARN_UNOPENED, "Filehandle %s never opened", SvPV(sv,n_a)); } SETERRNO(EBADF,RMS$_IFI); goto just_say_no; } else if (!(fp = IoOFP(io))) { - if (dowarn) { + if (ckWARN2(WARN_CLOSED,WARN_IO)) { gv_fullname3(sv, gv, Nullch); if (IoIFP(io)) - warn("Filehandle %s opened only for input", SvPV(sv,na)); - else - warn("printf on closed filehandle %s", SvPV(sv,na)); + warner(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)); } SETERRNO(EBADF,IoIFP(io)?RMS$_FAC:RMS$_IFI); goto just_say_no; } else { #ifdef USE_LOCALE_NUMERIC - if (op->op_private & OPpLOCALE) + if (PL_op->op_private & OPpLOCALE) SET_NUMERIC_LOCAL(); else SET_NUMERIC_STANDARD(); @@ -1200,13 +1302,13 @@ PP(pp_prtf) } SvREFCNT_dec(sv); SP = ORIGMARK; - PUSHs(&sv_yes); + PUSHs(&PL_sv_yes); RETURN; just_say_no: SvREFCNT_dec(sv); SP = ORIGMARK; - PUSHs(&sv_undef); + PUSHs(&PL_sv_undef); RETURN; } @@ -1230,10 +1332,10 @@ PP(pp_sysopen) tmps = SvPV(sv, len); if (do_open(gv, tmps, len, TRUE, mode, perm, Nullfp)) { IoLINES(GvIOp(gv)) = 0; - PUSHs(&sv_yes); + PUSHs(&PL_sv_yes); } else { - PUSHs(&sv_undef); + PUSHs(&PL_sv_undef); } RETURN; } @@ -1252,13 +1354,13 @@ PP(pp_sysread) MAGIC *mg; gv = (GV*)*++MARK; - if ((op->op_type == OP_READ || op->op_type == OP_SYSREAD) && - SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) + if ((PL_op->op_type == OP_READ || PL_op->op_type == OP_SYSREAD) && + (mg = SvTIED_mg((SV*)gv, 'q'))) { SV *sv; PUSHMARK(MARK-1); - *MARK = mg->mg_obj; + *MARK = SvTIED_obj((SV*)gv, mg); ENTER; perl_call_method("READ", G_SCALAR); LEAVE; @@ -1287,16 +1389,16 @@ PP(pp_sysread) if (!io || !IoIFP(io)) goto say_undef; #ifdef HAS_SOCKET - if (op->op_type == OP_RECV) { + if (PL_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; @@ -1313,8 +1415,8 @@ PP(pp_sysread) RETURN; } #else - if (op->op_type == OP_RECV) - DIE(no_sock_func, "recv"); + if (PL_op->op_type == OP_RECV) + DIE(PL_no_sock_func, "recv"); #endif if (offset < 0) { if (-offset > blen) @@ -1326,8 +1428,18 @@ PP(pp_sysread) if (offset > bufsize) { /* Zero any newly allocated space */ Zero(buffer+bufsize, offset-bufsize, char); } - if (op->op_type == OP_SYSREAD) { - length = read(PerlIO_fileno(IoIFP(io)), buffer+offset, length); + if (PL_op->op_type == OP_SYSREAD) { +#ifdef PERL_SOCK_SYSREAD_IS_RECV + if (IoTYPE(io) == 's') { + length = PerlSock_recv(PerlIO_fileno(IoIFP(io)), + buffer+offset, length, 0); + } + else +#endif + { + length = PerlLIO_read(PerlIO_fileno(IoIFP(io)), + buffer+offset, length); + } } else #ifdef HAS_SOCKET__bad_code_maybe @@ -1338,12 +1450,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 (length == 0 && PerlIO_error(IoIFP(io))) + length = -1; + } if (length < 0) goto say_undef; SvCUR_set(bufsv, length+offset); @@ -1364,6 +1481,15 @@ PP(pp_sysread) PP(pp_syswrite) { + djSP; + int items = (SP - PL_stack_base) - TOPMARK; + if (items == 2) { + SV *sv; + EXTEND(SP, 1); + sv = sv_2mortal(newSViv(sv_len(*SP))); + PUSHs(sv); + PUTBACK; + } return pp_send(ARGS); } @@ -1377,8 +1503,23 @@ PP(pp_send) char *buffer; int length; STRLEN blen; + MAGIC *mg; gv = (GV*)*++MARK; + if (PL_op->op_type == OP_SYSWRITE && (mg = SvTIED_mg((SV*)gv, 'q'))) { + SV *sv; + + PUSHMARK(MARK-1); + *MARK = SvTIED_obj((SV*)gv, mg); + ENTER; + perl_call_method("WRITE", G_SCALAR); + LEAVE; + SPAGAIN; + sv = POPs; + SP = ORIGMARK; + PUSHs(sv); + RETURN; + } if (!gv) goto say_undef; bufsv = *++MARK; @@ -1390,14 +1531,14 @@ PP(pp_send) io = GvIO(gv); if (!io || !IoIFP(io)) { length = -1; - if (dowarn) { - if (op->op_type == OP_SYSWRITE) - warn("Syswrite on closed filehandle"); + if (ckWARN(WARN_CLOSED)) { + if (PL_op->op_type == OP_SYSWRITE) + warner(WARN_CLOSED, "Syswrite on closed filehandle"); else - warn("Send on closed socket"); + warner(WARN_CLOSED, "Send on closed socket"); } } - else if (op->op_type == OP_SYSWRITE) { + else if (PL_op->op_type == OP_SYSWRITE) { if (MARK < SP) { offset = SvIVx(*++MARK); if (offset < 0) { @@ -1410,22 +1551,32 @@ PP(pp_send) offset = 0; if (length > blen - offset) length = blen - offset; - length = write(PerlIO_fileno(IoIFP(io)), buffer+offset, length); +#ifdef PERL_SOCK_SYSWRITE_IS_SEND + if (IoTYPE(io) == 's') { + length = PerlSock_send(PerlIO_fileno(IoIFP(io)), + buffer+offset, length, 0); + } + else +#endif + { + length = PerlLIO_write(PerlIO_fileno(IoIFP(io)), + buffer+offset, length); + } } #ifdef HAS_SOCKET else if (SP > MARK) { 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 - DIE(no_sock_func, "send"); + DIE(PL_no_sock_func, "send"); #endif if (length < 0) goto say_undef; @@ -1449,9 +1600,9 @@ PP(pp_eof) GV *gv; if (MAXARG <= 0) - gv = last_in_gv; + gv = PL_last_in_gv; else - gv = last_in_gv = (GV*)POPs; + gv = PL_last_in_gv = (GV*)POPs; PUSHs(boolSV(!gv || do_eof(gv))); RETURN; } @@ -1462,9 +1613,9 @@ PP(pp_tell) GV *gv; if (MAXARG <= 0) - gv = last_in_gv; + gv = PL_last_in_gv; else - gv = last_in_gv = (GV*)POPs; + gv = PL_last_in_gv = (GV*)POPs; PUSHi( do_tell(gv) ); RETURN; } @@ -1479,14 +1630,14 @@ PP(pp_sysseek) djSP; GV *gv; int whence = POPi; - long offset = POPl; + Off_t offset = POPl; - gv = last_in_gv = (GV*)POPs; - if (op->op_type == OP_SEEK) + gv = PL_last_in_gv = (GV*)POPs; + if (PL_op->op_type == OP_SEEK) PUSHs(boolSV(do_seek(gv, offset, whence))); else { - long n = do_sysseek(gv, offset, whence); - PUSHs((n < 0) ? &sv_undef + Off_t n = do_sysseek(gv, offset, whence); + PUSHs((n < 0) ? &PL_sv_undef : sv_2mortal(n ? newSViv((IV)n) : newSVpv(zero_but_true, ZBTLEN))); } @@ -1499,11 +1650,12 @@ PP(pp_truncate) Off_t len = (Off_t)POPn; int result = 1; GV *tmpgv; + STRLEN n_a; SETERRNO(0,0); #if defined(HAS_TRUNCATE) || defined(HAS_CHSIZE) || defined(F_FREESP) - if (op->op_flags & OPf_SPECIAL) { - tmpgv = gv_fetchpv(POPp, FALSE, SVt_PVIO); + if (PL_op->op_flags & OPf_SPECIAL) { + tmpgv = gv_fetchpv(POPpx, FALSE, SVt_PVIO); do_ftruncate: TAINT_PROPER("truncate"); if (!GvIO(tmpgv) || !IoIFP(GvIOp(tmpgv)) || @@ -1517,6 +1669,7 @@ PP(pp_truncate) else { SV *sv = POPs; char *name; + STRLEN n_a; if (SvTYPE(sv) == SVt_PVGV) { tmpgv = (GV*)sv; /* *main::FRED for example */ @@ -1527,7 +1680,7 @@ PP(pp_truncate) goto do_ftruncate; } - name = SvPV(sv, na); + name = SvPV(sv, n_a); TAINT_PROPER("truncate"); #ifdef HAS_TRUNCATE if (truncate(name, len) < 0) @@ -1535,12 +1688,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 @@ -1566,7 +1719,7 @@ PP(pp_ioctl) djSP; dTARGET; SV *argsv = POPs; unsigned int func = U_I(POPn); - int optype = op->op_type; + int optype = PL_op->op_type; char *s; IV retval; GV *gv = (GV*)POPs; @@ -1598,7 +1751,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 @@ -1616,7 +1769,7 @@ PP(pp_ioctl) if (SvPOK(argsv)) { if (s[SvCUR(argsv)] != 17) DIE("Possible memory corruption: %s overflowed 3rd argument", - op_name[optype]); + PL_op_name[optype]); s[SvCUR(argsv)] = 0; /* put our null back */ SvSETMAGIC(argsv); /* Assume it has changed */ } @@ -1643,7 +1796,7 @@ PP(pp_flock) #ifdef FLOCK argtype = POPi; if (MAXARG <= 0) - gv = last_in_gv; + gv = PL_last_in_gv; else gv = (GV*)POPs; if (gv && GvIO(gv)) @@ -1652,14 +1805,14 @@ 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; PUSHi(value); RETURN; #else - DIE(no_func, "flock()"); + DIE(PL_no_func, "flock()"); #endif } @@ -1688,7 +1841,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 */ @@ -1697,13 +1850,13 @@ 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; } RETPUSHYES; #else - DIE(no_sock_func, "socket"); + DIE(PL_no_sock_func, "socket"); #endif } @@ -1733,7 +1886,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"); @@ -1744,16 +1897,16 @@ 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; } RETPUSHYES; #else - DIE(no_sock_func, "socketpair"); + DIE(PL_no_sock_func, "socketpair"); #endif } @@ -1761,29 +1914,58 @@ PP(pp_bind) { 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; nuts: - if (dowarn) - warn("bind() on closed fd"); + if (ckWARN(WARN_CLOSED)) + warner(WARN_CLOSED, "bind() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(no_sock_func, "bind"); + DIE(PL_no_sock_func, "bind"); #endif } @@ -1802,18 +1984,18 @@ 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; nuts: - if (dowarn) - warn("connect() on closed fd"); + if (ckWARN(WARN_CLOSED)) + warner(WARN_CLOSED, "connect() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(no_sock_func, "connect"); + DIE(PL_no_sock_func, "connect"); #endif } @@ -1828,18 +2010,18 @@ 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; nuts: - if (dowarn) - warn("listen() on closed fd"); + if (ckWARN(WARN_CLOSED)) + warner(WARN_CLOSED, "listen() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(no_sock_func, "listen"); + DIE(PL_no_sock_func, "listen"); #endif } @@ -1871,7 +2053,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"); @@ -1880,7 +2062,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; } @@ -1888,15 +2070,15 @@ PP(pp_accept) RETURN; nuts: - if (dowarn) - warn("accept() on closed fd"); + if (ckWARN(WARN_CLOSED)) + warner(WARN_CLOSED, "accept() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); badexit: RETPUSHUNDEF; #else - DIE(no_sock_func, "accept"); + DIE(PL_no_sock_func, "accept"); #endif } @@ -1911,16 +2093,16 @@ 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: - if (dowarn) - warn("shutdown() on closed fd"); + if (ckWARN(WARN_CLOSED)) + warner(WARN_CLOSED, "shutdown() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); RETPUSHUNDEF; #else - DIE(no_sock_func, "shutdown"); + DIE(PL_no_sock_func, "shutdown"); #endif } @@ -1929,7 +2111,7 @@ PP(pp_gsockopt) #ifdef HAS_SOCKET return pp_ssockopt(ARGS); #else - DIE(no_sock_func, "getsockopt"); + DIE(PL_no_sock_func, "getsockopt"); #endif } @@ -1937,7 +2119,7 @@ PP(pp_ssockopt) { djSP; #ifdef HAS_SOCKET - int optype = op->op_type; + int optype = PL_op->op_type; SV *sv; int fd; unsigned int optname; @@ -1966,7 +2148,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'; @@ -1976,31 +2158,32 @@ PP(pp_ssockopt) char *buf; int aint; if (SvPOKp(sv)) { - buf = SvPV(sv, na); - len = na; + STRLEN l; + buf = SvPV(sv, l); + len = l; } - 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); + PUSHs(&PL_sv_yes); } break; } RETURN; nuts: - if (dowarn) - warn("[gs]etsockopt() on closed fd"); + if (ckWARN(WARN_CLOSED)) + warner(WARN_CLOSED, "[gs]etsockopt() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); nuts2: RETPUSHUNDEF; #else - DIE(no_sock_func, "setsockopt"); + DIE(PL_no_sock_func, "setsockopt"); #endif } @@ -2009,7 +2192,7 @@ PP(pp_getsockname) #ifdef HAS_SOCKET return pp_getpeername(ARGS); #else - DIE(no_sock_func, "getsockname"); + DIE(PL_no_sock_func, "getsockname"); #endif } @@ -2017,7 +2200,7 @@ PP(pp_getpeername) { djSP; #ifdef HAS_SOCKET - int optype = op->op_type; + int optype = PL_op->op_type; SV *sv; int fd; GV *gv = (GV*)POPs; @@ -2035,11 +2218,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) { @@ -2066,14 +2249,14 @@ PP(pp_getpeername) RETURN; nuts: - if (dowarn) - warn("get{sock, peer}name() on closed fd"); + if (ckWARN(WARN_CLOSED)) + warner(WARN_CLOSED, "get{sock, peer}name() on closed fd"); SETERRNO(EBADF,SS$_IVCHAN); nuts2: RETPUSHUNDEF; #else - DIE(no_sock_func, "getpeername"); + DIE(PL_no_sock_func, "getpeername"); #endif } @@ -2090,18 +2273,19 @@ PP(pp_stat) GV *tmpgv; I32 gimme; I32 max = 13; + STRLEN n_a; - if (op->op_flags & OPf_REF) { + if (PL_op->op_flags & OPf_REF) { tmpgv = cGVOP->op_gv; do_fstat: - if (tmpgv != defgv) { - laststype = OP_STAT; - statgv = tmpgv; - sv_setpv(statname, ""); - laststatval = (GvIO(tmpgv) && IoIFP(GvIOp(tmpgv)) - ? Fstat(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), &statcache) : -1); + if (tmpgv != PL_defgv) { + PL_laststype = OP_STAT; + PL_statgv = tmpgv; + sv_setpv(PL_statname, ""); + PL_laststatval = (GvIO(tmpgv) && IoIFP(GvIOp(tmpgv)) + ? PerlLIO_fstat(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), &PL_statcache) : -1); } - if (laststatval < 0) + if (PL_laststatval < 0) max = 0; } else { @@ -2114,18 +2298,18 @@ PP(pp_stat) tmpgv = (GV*)SvRV(sv); goto do_fstat; } - sv_setpv(statname, SvPV(sv,na)); - statgv = Nullgv; + sv_setpv(PL_statname, SvPV(sv,n_a)); + PL_statgv = Nullgv; #ifdef HAS_LSTAT - laststype = op->op_type; - if (op->op_type == OP_LSTAT) - laststatval = lstat(SvPV(statname, na), &statcache); + PL_laststype = PL_op->op_type; + if (PL_op->op_type == OP_LSTAT) + PL_laststatval = PerlLIO_lstat(SvPV(PL_statname, n_a), &PL_statcache); else #endif - laststatval = Stat(SvPV(statname, na), &statcache); - if (laststatval < 0) { - if (dowarn && strchr(SvPV(statname, na), '\n')) - warn(warn_nl, "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"); max = 0; } } @@ -2139,30 +2323,30 @@ PP(pp_stat) if (max) { EXTEND(SP, max); EXTEND_MORTAL(max); - PUSHs(sv_2mortal(newSViv((I32)statcache.st_dev))); - PUSHs(sv_2mortal(newSViv((I32)statcache.st_ino))); - PUSHs(sv_2mortal(newSViv((I32)statcache.st_mode))); - PUSHs(sv_2mortal(newSViv((I32)statcache.st_nlink))); - PUSHs(sv_2mortal(newSViv((I32)statcache.st_uid))); - PUSHs(sv_2mortal(newSViv((I32)statcache.st_gid))); + 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))); #ifdef USE_STAT_RDEV - PUSHs(sv_2mortal(newSViv((I32)statcache.st_rdev))); + PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_rdev))); #else PUSHs(sv_2mortal(newSVpv("", 0))); #endif - PUSHs(sv_2mortal(newSViv((I32)statcache.st_size))); + PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_size))); #ifdef BIG_TIME - PUSHs(sv_2mortal(newSVnv((U32)statcache.st_atime))); - PUSHs(sv_2mortal(newSVnv((U32)statcache.st_mtime))); - PUSHs(sv_2mortal(newSVnv((U32)statcache.st_ctime))); + 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))); #else - PUSHs(sv_2mortal(newSViv((I32)statcache.st_atime))); - PUSHs(sv_2mortal(newSViv((I32)statcache.st_mtime))); - PUSHs(sv_2mortal(newSViv((I32)statcache.st_ctime))); + 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))); #endif #ifdef USE_STAT_BLOCKS - PUSHs(sv_2mortal(newSViv((I32)statcache.st_blksize))); - PUSHs(sv_2mortal(newSViv((I32)statcache.st_blocks))); + PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_blksize))); + PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_blocks))); #else PUSHs(sv_2mortal(newSVpv("", 0))); PUSHs(sv_2mortal(newSVpv("", 0))); @@ -2173,66 +2357,162 @@ PP(pp_stat) PP(pp_ftrread) { - I32 result = my_stat(ARGS); + I32 result; djSP; +#if defined(HAS_ACCESS) && defined(R_OK) + STRLEN n_a; + if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { + result = access(TOPpx, R_OK); + if (result == 0) + RETPUSHYES; + if (result < 0) + RETPUSHUNDEF; + RETPUSHNO; + } + else + result = my_stat(ARGS); +#else + result = my_stat(ARGS); +#endif + SPAGAIN; if (result < 0) RETPUSHUNDEF; - if (cando(S_IRUSR, 0, &statcache)) + if (cando(S_IRUSR, 0, &PL_statcache)) RETPUSHYES; RETPUSHNO; } PP(pp_ftrwrite) { - I32 result = my_stat(ARGS); + I32 result; djSP; +#if defined(HAS_ACCESS) && defined(W_OK) + STRLEN n_a; + if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { + result = access(TOPpx, W_OK); + if (result == 0) + RETPUSHYES; + if (result < 0) + RETPUSHUNDEF; + RETPUSHNO; + } + else + result = my_stat(ARGS); +#else + result = my_stat(ARGS); +#endif + SPAGAIN; if (result < 0) RETPUSHUNDEF; - if (cando(S_IWUSR, 0, &statcache)) + if (cando(S_IWUSR, 0, &PL_statcache)) RETPUSHYES; RETPUSHNO; } PP(pp_ftrexec) { - I32 result = my_stat(ARGS); + I32 result; djSP; +#if defined(HAS_ACCESS) && defined(X_OK) + STRLEN n_a; + if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { + result = access(TOPpx, X_OK); + if (result == 0) + RETPUSHYES; + if (result < 0) + RETPUSHUNDEF; + RETPUSHNO; + } + else + result = my_stat(ARGS); +#else + result = my_stat(ARGS); +#endif + SPAGAIN; if (result < 0) RETPUSHUNDEF; - if (cando(S_IXUSR, 0, &statcache)) + if (cando(S_IXUSR, 0, &PL_statcache)) RETPUSHYES; RETPUSHNO; } PP(pp_fteread) { - I32 result = my_stat(ARGS); + I32 result; djSP; +#ifdef PERL_EFF_ACCESS_R_OK + STRLEN n_a; + if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { + result = PERL_EFF_ACCESS_R_OK(TOPpx); + if (result == 0) + RETPUSHYES; + if (result < 0) + RETPUSHUNDEF; + RETPUSHNO; + } + else + result = my_stat(ARGS); +#else + result = my_stat(ARGS); +#endif + SPAGAIN; if (result < 0) RETPUSHUNDEF; - if (cando(S_IRUSR, 1, &statcache)) + if (cando(S_IRUSR, 1, &PL_statcache)) RETPUSHYES; RETPUSHNO; } PP(pp_ftewrite) { - I32 result = my_stat(ARGS); + I32 result; djSP; +#ifdef PERL_EFF_ACCESS_W_OK + STRLEN n_a; + if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { + result = PERL_EFF_ACCESS_W_OK(TOPpx); + if (result == 0) + RETPUSHYES; + if (result < 0) + RETPUSHUNDEF; + RETPUSHNO; + } + else + result = my_stat(ARGS); +#else + result = my_stat(ARGS); +#endif + SPAGAIN; if (result < 0) RETPUSHUNDEF; - if (cando(S_IWUSR, 1, &statcache)) + if (cando(S_IWUSR, 1, &PL_statcache)) RETPUSHYES; RETPUSHNO; } PP(pp_fteexec) { - I32 result = my_stat(ARGS); + I32 result; djSP; +#ifdef PERL_EFF_ACCESS_X_OK + STRLEN n_a; + if ((PL_hints & HINT_FILETEST_ACCESS) && SvPOK(TOPs)) { + result = PERL_EFF_ACCESS_X_OK(TOPpx); + if (result == 0) + RETPUSHYES; + if (result < 0) + RETPUSHUNDEF; + RETPUSHNO; + } + else + result = my_stat(ARGS); +#else + result = my_stat(ARGS); +#endif + SPAGAIN; if (result < 0) RETPUSHUNDEF; - if (cando(S_IXUSR, 1, &statcache)) + if (cando(S_IXUSR, 1, &PL_statcache)) RETPUSHYES; RETPUSHNO; } @@ -2257,7 +2537,7 @@ PP(pp_ftrowned) djSP; if (result < 0) RETPUSHUNDEF; - if (statcache.st_uid == (op->op_type == OP_FTEOWNED ? euid : uid) ) + if (PL_statcache.st_uid == (PL_op->op_type == OP_FTEOWNED ? PL_euid : PL_uid) ) RETPUSHYES; RETPUSHNO; } @@ -2268,7 +2548,7 @@ PP(pp_ftzero) djSP; if (result < 0) RETPUSHUNDEF; - if (!statcache.st_size) + if (!PL_statcache.st_size) RETPUSHYES; RETPUSHNO; } @@ -2279,7 +2559,7 @@ PP(pp_ftsize) djSP; dTARGET; if (result < 0) RETPUSHUNDEF; - PUSHi(statcache.st_size); + PUSHi(PL_statcache.st_size); RETURN; } @@ -2289,7 +2569,7 @@ PP(pp_ftmtime) djSP; dTARGET; if (result < 0) RETPUSHUNDEF; - PUSHn( ((I32)basetime - (I32)statcache.st_mtime) / 86400.0 ); + PUSHn( ((I32)PL_basetime - (I32)PL_statcache.st_mtime) / 86400.0 ); RETURN; } @@ -2299,7 +2579,7 @@ PP(pp_ftatime) djSP; dTARGET; if (result < 0) RETPUSHUNDEF; - PUSHn( ((I32)basetime - (I32)statcache.st_atime) / 86400.0 ); + PUSHn( ((I32)PL_basetime - (I32)PL_statcache.st_atime) / 86400.0 ); RETURN; } @@ -2309,7 +2589,7 @@ PP(pp_ftctime) djSP; dTARGET; if (result < 0) RETPUSHUNDEF; - PUSHn( ((I32)basetime - (I32)statcache.st_ctime) / 86400.0 ); + PUSHn( ((I32)PL_basetime - (I32)PL_statcache.st_ctime) / 86400.0 ); RETURN; } @@ -2319,7 +2599,7 @@ PP(pp_ftsock) djSP; if (result < 0) RETPUSHUNDEF; - if (S_ISSOCK(statcache.st_mode)) + if (S_ISSOCK(PL_statcache.st_mode)) RETPUSHYES; RETPUSHNO; } @@ -2330,7 +2610,7 @@ PP(pp_ftchr) djSP; if (result < 0) RETPUSHUNDEF; - if (S_ISCHR(statcache.st_mode)) + if (S_ISCHR(PL_statcache.st_mode)) RETPUSHYES; RETPUSHNO; } @@ -2341,7 +2621,7 @@ PP(pp_ftblk) djSP; if (result < 0) RETPUSHUNDEF; - if (S_ISBLK(statcache.st_mode)) + if (S_ISBLK(PL_statcache.st_mode)) RETPUSHYES; RETPUSHNO; } @@ -2352,7 +2632,7 @@ PP(pp_ftfile) djSP; if (result < 0) RETPUSHUNDEF; - if (S_ISREG(statcache.st_mode)) + if (S_ISREG(PL_statcache.st_mode)) RETPUSHYES; RETPUSHNO; } @@ -2363,7 +2643,7 @@ PP(pp_ftdir) djSP; if (result < 0) RETPUSHUNDEF; - if (S_ISDIR(statcache.st_mode)) + if (S_ISDIR(PL_statcache.st_mode)) RETPUSHYES; RETPUSHNO; } @@ -2374,7 +2654,7 @@ PP(pp_ftpipe) djSP; if (result < 0) RETPUSHUNDEF; - if (S_ISFIFO(statcache.st_mode)) + if (S_ISFIFO(PL_statcache.st_mode)) RETPUSHYES; RETPUSHNO; } @@ -2385,7 +2665,7 @@ PP(pp_ftlink) djSP; if (result < 0) RETPUSHUNDEF; - if (S_ISLNK(statcache.st_mode)) + if (S_ISLNK(PL_statcache.st_mode)) RETPUSHYES; RETPUSHNO; } @@ -2398,7 +2678,7 @@ PP(pp_ftsuid) SPAGAIN; if (result < 0) RETPUSHUNDEF; - if (statcache.st_mode & S_ISUID) + if (PL_statcache.st_mode & S_ISUID) RETPUSHYES; #endif RETPUSHNO; @@ -2412,7 +2692,7 @@ PP(pp_ftsgid) SPAGAIN; if (result < 0) RETPUSHUNDEF; - if (statcache.st_mode & S_ISGID) + if (PL_statcache.st_mode & S_ISGID) RETPUSHYES; #endif RETPUSHNO; @@ -2426,7 +2706,7 @@ PP(pp_ftsvtx) SPAGAIN; if (result < 0) RETPUSHUNDEF; - if (statcache.st_mode & S_ISVTX) + if (PL_statcache.st_mode & S_ISVTX) RETPUSHYES; #endif RETPUSHNO; @@ -2438,15 +2718,16 @@ PP(pp_fttty) int fd; GV *gv; char *tmps = Nullch; + STRLEN n_a; - if (op->op_flags & OPf_REF) + if (PL_op->op_flags & OPf_REF) gv = cGVOP->op_gv; else if (isGV(TOPs)) gv = (GV*)POPs; else if (SvROK(TOPs) && isGV(SvRV(TOPs))) gv = (GV*)SvRV(POPs); else - gv = gv_fetchpv(tmps = POPp, FALSE, SVt_PVIO); + gv = gv_fetchpv(tmps = POPpx, FALSE, SVt_PVIO); if (GvIO(gv) && IoIFP(GvIOp(gv))) fd = PerlIO_fileno(IoIFP(GvIOp(gv))); @@ -2454,7 +2735,7 @@ PP(pp_fttty) fd = atoi(tmps); else RETPUSHUNDEF; - if (isatty(fd)) + if (PerlLIO_isatty(fd)) RETPUSHYES; RETPUSHNO; } @@ -2478,8 +2759,9 @@ PP(pp_fttext) register IO *io; register SV *sv; GV *gv; + STRLEN n_a; - if (op->op_flags & OPf_REF) + if (PL_op->op_flags & OPf_REF) gv = cGVOP->op_gv; else if (isGV(TOPs)) gv = (GV*)POPs; @@ -2490,28 +2772,28 @@ PP(pp_fttext) if (gv) { EXTEND(SP, 1); - if (gv == defgv) { - if (statgv) - io = GvIO(statgv); + if (gv == PL_defgv) { + if (PL_statgv) + io = GvIO(PL_statgv); else { - sv = statname; + sv = PL_statname; goto really_filename; } } else { - statgv = gv; - laststatval = -1; - sv_setpv(statname, ""); - io = GvIO(statgv); + PL_statgv = gv; + PL_laststatval = -1; + sv_setpv(PL_statname, ""); + io = GvIO(PL_statgv); } 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); - if (laststatval < 0) + PL_laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &PL_statcache); + if (PL_laststatval < 0) RETPUSHUNDEF; - if (S_ISDIR(statcache.st_mode)) /* handle NFS glitch */ - if (op->op_type == OP_FTTEXT) + if (S_ISDIR(PL_statcache.st_mode)) /* handle NFS glitch */ + if (PL_op->op_type == OP_FTTEXT) RETPUSHNO; else RETPUSHYES; @@ -2529,8 +2811,8 @@ PP(pp_fttext) len = 512; } else { - if (dowarn) - warn("Test on unopened file <%s>", + if (ckWARN(WARN_UNOPENED)) + warner(WARN_UNOPENED, "Test on unopened file <%s>", GvENAME(cGVOP->op_gv)); SETERRNO(EBADF,RMS$_IFI); RETPUSHUNDEF; @@ -2539,26 +2821,26 @@ PP(pp_fttext) else { sv = POPs; really_filename: - statgv = Nullgv; - laststatval = -1; - sv_setpv(statname, SvPV(sv, na)); + PL_statgv = Nullgv; + PL_laststatval = -1; + sv_setpv(PL_statname, SvPV(sv, n_a)); #ifdef HAS_OPEN3 - i = open(SvPV(sv, na), O_RDONLY, 0); + i = PerlLIO_open3(SvPV(sv, n_a), O_RDONLY, 0); #else - i = open(SvPV(sv, na), 0); + i = PerlLIO_open(SvPV(sv, n_a), 0); #endif if (i < 0) { - if (dowarn && strchr(SvPV(sv, na), '\n')) - warn(warn_nl, "open"); + if (ckWARN(WARN_NEWLINE) && strchr(SvPV(sv, n_a), '\n')) + warner(WARN_NEWLINE, PL_warn_nl, "open"); RETPUSHUNDEF; } - laststatval = Fstat(i, &statcache); - if (laststatval < 0) + PL_laststatval = PerlLIO_fstat(i, &PL_statcache); + if (PL_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) + if (S_ISDIR(PL_statcache.st_mode) && PL_op->op_type == OP_FTTEXT) RETPUSHNO; /* special case NFS directories */ RETPUSHYES; /* null file is anything */ } @@ -2573,15 +2855,20 @@ PP(pp_fttext) odd += len; break; } +#ifdef EBCDIC + else if (!(isPRINT(*s) || isSPACE(*s))) + odd++; +#else else if (*s & 128) odd++; else if (*s < 32 && *s != '\n' && *s != '\r' && *s != '\b' && *s != '\t' && *s != '\f' && *s != 27) odd++; +#endif } - if ((odd * 3 > len) == (op->op_type == OP_FTTEXT)) /* allow 1/3 odd */ + if ((odd * 3 > len) == (PL_op->op_type == OP_FTTEXT)) /* allow 1/3 odd */ RETPUSHNO; else RETPUSHYES; @@ -2599,27 +2886,35 @@ PP(pp_chdir) djSP; dTARGET; char *tmps; SV **svp; + STRLEN n_a; if (MAXARG < 1) tmps = Nullch; else - tmps = POPp; + tmps = POPpx; if (!tmps || !*tmps) { - svp = hv_fetch(GvHVn(envgv), "HOME", 4, FALSE); + svp = hv_fetch(GvHVn(PL_envgv), "HOME", 4, FALSE); if (svp) - tmps = SvPV(*svp, na); + tmps = SvPV(*svp, n_a); } if (!tmps || !*tmps) { - svp = hv_fetch(GvHVn(envgv), "LOGDIR", 6, FALSE); + svp = hv_fetch(GvHVn(PL_envgv), "LOGDIR", 6, FALSE); if (svp) - tmps = SvPV(*svp, na); + tmps = SvPV(*svp, n_a); + } +#ifdef VMS + if (!tmps || !*tmps) { + svp = hv_fetch(GvHVn(PL_envgv), "SYS$LOGIN", 9, FALSE); + if (svp) + tmps = SvPV(*svp, n_a); } +#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. */ - hv_delete(GvHVn(envgv),"DEFAULT",7,G_DISCARD); + hv_delete(GvHVn(PL_envgv),"DEFAULT",7,G_DISCARD); #endif RETURN; } @@ -2629,12 +2924,12 @@ PP(pp_chown) djSP; dMARK; dTARGET; I32 value; #ifdef HAS_CHOWN - value = (I32)apply(op->op_type, MARK, SP); + value = (I32)apply(PL_op->op_type, MARK, SP); SP = MARK; PUSHi(value); RETURN; #else - DIE(no_func, "Unsupported function chown"); + DIE(PL_no_func, "Unsupported function chown"); #endif } @@ -2643,12 +2938,13 @@ PP(pp_chroot) djSP; dTARGET; char *tmps; #ifdef HAS_CHROOT - tmps = POPp; + STRLEN n_a; + tmps = POPpx; TAINT_PROPER("chroot"); PUSHi( chroot(tmps) >= 0 ); RETURN; #else - DIE(no_func, "chroot"); + DIE(PL_no_func, "chroot"); #endif } @@ -2656,7 +2952,7 @@ PP(pp_unlink) { djSP; dMARK; dTARGET; I32 value; - value = (I32)apply(op->op_type, MARK, SP); + value = (I32)apply(PL_op->op_type, MARK, SP); SP = MARK; PUSHi(value); RETURN; @@ -2666,7 +2962,7 @@ PP(pp_chmod) { djSP; dMARK; dTARGET; I32 value; - value = (I32)apply(op->op_type, MARK, SP); + value = (I32)apply(PL_op->op_type, MARK, SP); SP = MARK; PUSHi(value); RETURN; @@ -2676,7 +2972,7 @@ PP(pp_utime) { djSP; dMARK; dTARGET; I32 value; - value = (I32)apply(op->op_type, MARK, SP); + value = (I32)apply(PL_op->op_type, MARK, SP); SP = MARK; PUSHi(value); RETURN; @@ -2686,18 +2982,19 @@ PP(pp_rename) { djSP; dTARGET; int anum; + STRLEN n_a; - char *tmps2 = POPp; - char *tmps = SvPV(TOPs, na); + char *tmps2 = POPpx; + char *tmps = SvPV(TOPs, n_a); 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, &PL_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 (PL_euid || PerlLIO_stat(tmps2, &PL_statbuf) < 0 || !S_ISDIR(PL_statbuf.st_mode)) (void)UNLINK(tmps2); if (!(anum = link(tmps, tmps2))) anum = UNLINK(tmps); @@ -2712,12 +3009,13 @@ PP(pp_link) { djSP; dTARGET; #ifdef HAS_LINK - char *tmps2 = POPp; - char *tmps = SvPV(TOPs, na); + STRLEN n_a; + char *tmps2 = POPpx; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("link"); SETi( link(tmps, tmps2) >= 0 ); #else - DIE(no_func, "Unsupported function link"); + DIE(PL_no_func, "Unsupported function link"); #endif RETURN; } @@ -2726,13 +3024,14 @@ PP(pp_symlink) { djSP; dTARGET; #ifdef HAS_SYMLINK - char *tmps2 = POPp; - char *tmps = SvPV(TOPs, na); + STRLEN n_a; + char *tmps2 = POPpx; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("symlink"); SETi( symlink(tmps, tmps2) >= 0 ); RETURN; #else - DIE(no_func, "symlink"); + DIE(PL_no_func, "symlink"); #endif } @@ -2743,11 +3042,12 @@ PP(pp_readlink) char *tmps; char buf[MAXPATHLEN]; int len; + STRLEN n_a; #ifndef INCOMPLETE_TAINTS TAINT; #endif - tmps = POPp; + tmps = POPpx; len = readlink(tmps, buf, sizeof buf); EXTEND(SP, 1); if (len < 0) @@ -2780,14 +3080,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' ?? */ + /* Need to save/restore 'PL_rs' ?? */ s = sv_gets(tmpsv, myfp, 0); - (void)my_pclose(myfp); + (void)PerlProc_pclose(myfp); if (s != Nullch) { int e; for (e = 1; @@ -2834,8 +3134,8 @@ char *filename; return 0; } else { /* some mkdirs return no failure indication */ - anum = (Stat(save_filename, &statbuf) >= 0); - if (op->op_type == OP_RMDIR) + anum = (PerlLIO_stat(save_filename, &PL_statbuf) >= 0); + if (PL_op->op_type == OP_RMDIR) anum = !anum; if (anum) SETERRNO(0,0); @@ -2856,16 +3156,17 @@ PP(pp_mkdir) #ifndef HAS_MKDIR int oldumask; #endif - char *tmps = SvPV(TOPs, na); + STRLEN n_a; + char *tmps = SvPV(TOPs, n_a); 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; } @@ -2874,11 +3175,12 @@ PP(pp_rmdir) { djSP; dTARGET; char *tmps; + STRLEN n_a; - tmps = POPp; + tmps = POPpx; TAINT_PROPER("rmdir"); #ifdef HAS_RMDIR - XPUSHi( rmdir(tmps) >= 0 ); + XPUSHi( PerlDir_rmdir(tmps) >= 0 ); #else XPUSHi( dooneliner("rmdir", tmps) ); #endif @@ -2891,7 +3193,8 @@ PP(pp_open_dir) { djSP; #if defined(Direntry_t) && defined(HAS_READDIR) - char *dirname = POPp; + STRLEN n_a; + char *dirname = POPpx; GV *gv = (GV*)POPs; register IO *io = GvIOn(gv); @@ -2899,8 +3202,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; @@ -2909,7 +3212,7 @@ nope: SETERRNO(EBADF,RMS$_DIR); RETPUSHUNDEF; #else - DIE(no_dir_func, "opendir"); + DIE(PL_no_dir_func, "opendir"); #endif } @@ -2930,7 +3233,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 @@ -2943,7 +3246,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); @@ -2965,7 +3268,7 @@ nope: else RETPUSHUNDEF; #else - DIE(no_dir_func, "readdir"); + DIE(PL_no_dir_func, "readdir"); #endif } @@ -2973,23 +3276,27 @@ PP(pp_telldir) { djSP; dTARGET; #if defined(HAS_TELLDIR) || defined(telldir) -#if !defined(telldir) && !defined(HAS_TELLDIR_PROTOTYPE) && !defined(DONT_DECLARE_STD) + /* XXX does _anyone_ need this? --AD 2/20/1998 */ + /* XXX netbsd still seemed to. + XXX HAS_TELLDIR_PROTO is new style, NEED_TELLDIR_PROTO is old style. + --JHI 1999-Feb-02 */ +# if !defined(HAS_TELLDIR_PROTO) || defined(NEED_TELLDIR_PROTO) long telldir _((DIR *)); -#endif +# 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) SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(no_dir_func, "telldir"); + DIE(PL_no_dir_func, "telldir"); #endif } @@ -3004,7 +3311,7 @@ PP(pp_seekdir) if (!io || !IoDIRP(io)) goto nope; - (void)seekdir(IoDIRP(io), along); + (void)PerlDir_seek(IoDIRP(io), along); RETPUSHYES; nope: @@ -3012,7 +3319,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(no_dir_func, "seekdir"); + DIE(PL_no_dir_func, "seekdir"); #endif } @@ -3026,14 +3333,14 @@ PP(pp_rewinddir) if (!io || !IoDIRP(io)) goto nope; - (void)rewinddir(IoDIRP(io)); + (void)PerlDir_rewind(IoDIRP(io)); RETPUSHYES; nope: if (!errno) SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(no_dir_func, "rewinddir"); + DIE(PL_no_dir_func, "rewinddir"); #endif } @@ -3048,9 +3355,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; } @@ -3063,7 +3370,7 @@ nope: SETERRNO(EBADF,RMS$_IFI); RETPUSHUNDEF; #else - DIE(no_dir_func, "closedir"); + DIE(PL_no_dir_func, "closedir"); #endif } @@ -3084,18 +3391,18 @@ PP(pp_fork) /*SUPPRESS 560*/ if (tmpgv = gv_fetchpv("$", TRUE, SVt_PV)) sv_setiv(GvSV(tmpgv), (IV)getpid()); - hv_clear(pidstatus); /* no kids, so don't wait for 'em */ + hv_clear(PL_pidstatus); /* no kids, so don't wait for 'em */ } PUSHi(childpid); RETURN; #else - DIE(no_func, "Unsupported function fork"); + DIE(PL_no_func, "Unsupported function fork"); #endif } PP(pp_wait) { -#if !defined(DOSISH) || defined(OS2) +#if !defined(DOSISH) || defined(OS2) || defined(WIN32) djSP; dTARGET; int childpid; int argflags; @@ -3105,13 +3412,13 @@ PP(pp_wait) XPUSHi(childpid); RETURN; #else - DIE(no_func, "Unsupported function wait"); + DIE(PL_no_func, "Unsupported function wait"); #endif } PP(pp_waitpid) { -#if !defined(DOSISH) || defined(OS2) +#if !defined(DOSISH) || defined(OS2) || defined(WIN32) djSP; dTARGET; int childpid; int optype; @@ -3124,7 +3431,7 @@ PP(pp_waitpid) SETi(childpid); RETURN; #else - DIE(no_func, "Unsupported function wait"); + DIE(PL_no_func, "Unsupported function waitpid"); #endif } @@ -3136,10 +3443,11 @@ PP(pp_system) int result; int status; Sigsave_t ihand,qhand; /* place to save signals during system() */ + STRLEN n_a; if (SP - MARK == 1) { - if (tainting) { - char *junk = SvPV(TOPs, na); + if (PL_tainting) { + char *junk = SvPV(TOPs, n_a); TAINT_ENV(); TAINT_PROPER("system"); } @@ -3168,25 +3476,25 @@ PP(pp_system) PUSHi(STATUS_CURRENT); RETURN; } - if (op->op_flags & OPf_STACKED) { + if (PL_op->op_flags & OPf_STACKED) { SV *really = *++MARK; value = (I32)do_aexec(really, MARK, SP); } else if (SP - MARK != 1) value = (I32)do_aexec(Nullsv, MARK, SP); else { - value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), na)); + value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), n_a)); } - _exit(-1); + PerlProc__exit(-1); #else /* ! FORK or VMS or OS/2 */ - if (op->op_flags & OPf_STACKED) { + if (PL_op->op_flags & OPf_STACKED) { SV *really = *++MARK; value = (I32)do_aspawn(really, (void **)MARK, (void **)SP); } else if (SP - MARK != 1) value = (I32)do_aspawn(Nullsv, (void **)MARK, (void **)SP); else { - value = (I32)do_spawn(SvPVx(sv_mortalcopy(*SP), na)); + value = (I32)do_spawn(SvPVx(sv_mortalcopy(*SP), n_a)); } STATUS_NATIVE_SET(value); do_execfree(); @@ -3200,8 +3508,9 @@ PP(pp_exec) { djSP; dMARK; dORIGMARK; dTARGET; I32 value; + STRLEN n_a; - if (op->op_flags & OPf_STACKED) { + if (PL_op->op_flags & OPf_STACKED) { SV *really = *++MARK; value = (I32)do_aexec(really, MARK, SP); } @@ -3209,18 +3518,30 @@ PP(pp_exec) #ifdef VMS value = (I32)vms_do_aexec(Nullsv, MARK, SP); #else +# ifdef __OPEN_VM + { + (void ) do_aspawn(Nullsv, MARK, SP); + value = 0; + } +# else value = (I32)do_aexec(Nullsv, MARK, SP); +# endif #endif else { - if (tainting) { - char *junk = SvPV(*SP, na); + if (PL_tainting) { + char *junk = SvPV(*SP, n_a); TAINT_ENV(); TAINT_PROPER("exec"); } #ifdef VMS - value = (I32)vms_do_exec(SvPVx(sv_mortalcopy(*SP), na)); + value = (I32)vms_do_exec(SvPVx(sv_mortalcopy(*SP), n_a)); #else - value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), na)); +# ifdef __OPEN_VM + (void) do_spawn(SvPVx(sv_mortalcopy(*SP), n_a)); + value = 0; +# else + value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), n_a)); +# endif #endif } SP = ORIGMARK; @@ -3233,12 +3554,12 @@ PP(pp_kill) djSP; dMARK; dTARGET; I32 value; #ifdef HAS_KILL - value = (I32)apply(op->op_type, MARK, SP); + value = (I32)apply(PL_op->op_type, MARK, SP); SP = MARK; PUSHi(value); RETURN; #else - DIE(no_func, "Unsupported function kill"); + DIE(PL_no_func, "Unsupported function kill"); #endif } @@ -3249,7 +3570,7 @@ PP(pp_getppid) XPUSHi( getppid() ); RETURN; #else - DIE(no_func, "getppid"); + DIE(PL_no_func, "getppid"); #endif } @@ -3274,7 +3595,7 @@ PP(pp_getpgrp) XPUSHi(value); RETURN; #else - DIE(no_func, "getpgrp()"); + DIE(PL_no_func, "getpgrp()"); #endif } @@ -3303,7 +3624,7 @@ PP(pp_setpgrp) #endif /* USE_BSDPGRP */ RETURN; #else - DIE(no_func, "setpgrp()"); + DIE(PL_no_func, "setpgrp()"); #endif } @@ -3318,7 +3639,7 @@ PP(pp_getpriority) SETi( getpriority(which, who) ); RETURN; #else - DIE(no_func, "getpriority()"); + DIE(PL_no_func, "getpriority()"); #endif } @@ -3336,7 +3657,7 @@ PP(pp_setpriority) SETi( setpriority(which, who, niceval) >= 0 ); RETURN; #else - DIE(no_func, "setpriority()"); + DIE(PL_no_func, "setpriority()"); #endif } @@ -3379,18 +3700,18 @@ PP(pp_tms) EXTEND(SP, 4); #ifndef VMS - (void)times(×buf); + (void)PerlProc_times(&PL_timesbuf); #else - (void)times((tbuffer_t *)×buf); /* time.h uses different name for */ - /* struct tms, though same data */ - /* is returned. */ + (void)PerlProc_times((tbuffer_t *)&PL_timesbuf); /* time.h uses different name for */ + /* struct tms, though same data */ + /* is returned. */ #endif - PUSHs(sv_2mortal(newSVnv(((double)timesbuf.tms_utime)/HZ))); + PUSHs(sv_2mortal(newSVnv(((double)PL_timesbuf.tms_utime)/HZ))); if (GIMME == G_ARRAY) { - PUSHs(sv_2mortal(newSVnv(((double)timesbuf.tms_stime)/HZ))); - PUSHs(sv_2mortal(newSVnv(((double)timesbuf.tms_cutime)/HZ))); - PUSHs(sv_2mortal(newSVnv(((double)timesbuf.tms_cstime)/HZ))); + 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))); } RETURN; #endif /* HAS_TIMES */ @@ -3419,7 +3740,7 @@ PP(pp_gmtime) when = (Time_t)SvIVx(POPs); #endif - if (op->op_type == OP_LOCALTIME) + if (PL_op->op_type == OP_LOCALTIME) tmbuf = localtime(&when); else tmbuf = gmtime(&when); @@ -3468,7 +3789,7 @@ PP(pp_alarm) PUSHi((I32)anum); RETURN; #else - DIE(no_func, "Unsupported function alarm"); + DIE(PL_no_func, "Unsupported function alarm"); #endif } @@ -3481,10 +3802,10 @@ PP(pp_sleep) (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); @@ -3512,7 +3833,7 @@ PP(pp_shmwrite) { #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) djSP; dMARK; dTARGET; - I32 value = (I32)(do_shmio(op->op_type, MARK, SP) >= 0); + I32 value = (I32)(do_shmio(PL_op->op_type, MARK, SP) >= 0); SP = MARK; PUSHi(value); RETURN; @@ -3565,7 +3886,7 @@ PP(pp_semget) { #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) djSP; dMARK; dTARGET; - int anum = do_ipcget(op->op_type, MARK, SP); + int anum = do_ipcget(PL_op->op_type, MARK, SP); SP = MARK; if (anum == -1) RETPUSHUNDEF; @@ -3580,7 +3901,7 @@ PP(pp_semctl) { #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) djSP; dMARK; dTARGET; - int anum = do_ipcctl(op->op_type, MARK, SP); + int anum = do_ipcctl(PL_op->op_type, MARK, SP); SP = MARK; if (anum == -1) RETSETUNDEF; @@ -3613,54 +3934,62 @@ PP(pp_semop) PP(pp_ghbyname) { -#ifdef HAS_SOCKET +#ifdef HAS_GETHOSTBYNAME return pp_ghostent(ARGS); #else - DIE(no_sock_func, "gethostbyname"); + DIE(PL_no_sock_func, "gethostbyname"); #endif } PP(pp_ghbyaddr) { -#ifdef HAS_SOCKET +#ifdef HAS_GETHOSTBYADDR return pp_ghostent(ARGS); #else - DIE(no_sock_func, "gethostbyaddr"); + DIE(PL_no_sock_func, "gethostbyaddr"); #endif } PP(pp_ghostent) { djSP; -#ifdef HAS_SOCKET - I32 which = op->op_type; +#if defined(HAS_GETHOSTBYNAME) || defined(HAS_GETHOSTBYADDR) || defined(HAS_GETHOSTENT) + I32 which = PL_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; + STRLEN n_a; EXTEND(SP, 10); - if (which == OP_GHBYNAME) { - hent = gethostbyname(POPp); - } + if (which == OP_GHBYNAME) +#ifdef HAS_GETHOSTBYNAME + hent = PerlSock_gethostbyname(POPpx); +#else + DIE(PL_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(PL_no_sock_func, "gethostbyaddr"); +#endif } else #ifdef HAS_GETHOSTENT - hent = gethostent(); + hent = PerlSock_gethostent(); #else - DIE("gethostent not implemented"); + DIE(PL_no_sock_func, "gethostent"); #endif #ifdef HOST_NOT_FOUND @@ -3682,81 +4011,90 @@ PP(pp_ghostent) } if (hent) { - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpv(sv, (char*)hent->h_name); - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); for (elem = hent->h_aliases; elem && *elem; elem++) { sv_catpv(sv, *elem); if (elem[1]) sv_catpvn(sv, " ", 1); } - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setiv(sv, (IV)hent->h_addrtype); - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); len = hent->h_length; sv_setiv(sv, (IV)len); #ifdef h_addr for (elem = hent->h_addr_list; elem && *elem; elem++) { - XPUSHs(sv = sv_mortalcopy(&sv_no)); + XPUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpvn(sv, *elem, len); } #else - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); if (hent->h_addr) sv_setpvn(sv, hent->h_addr, len); #endif /* h_addr */ } RETURN; #else - DIE(no_sock_func, "gethostent"); + DIE(PL_no_sock_func, "gethostent"); #endif } PP(pp_gnbyname) { -#ifdef HAS_SOCKET +#ifdef HAS_GETNETBYNAME return pp_gnetent(ARGS); #else - DIE(no_sock_func, "getnetbyname"); + DIE(PL_no_sock_func, "getnetbyname"); #endif } PP(pp_gnbyaddr) { -#ifdef HAS_SOCKET +#ifdef HAS_GETNETBYADDR return pp_gnetent(ARGS); #else - DIE(no_sock_func, "getnetbyaddr"); + DIE(PL_no_sock_func, "getnetbyaddr"); #endif } PP(pp_gnetent) { djSP; -#ifdef HAS_SOCKET - I32 which = op->op_type; +#if defined(HAS_GETNETBYNAME) || defined(HAS_GETNETBYADDR) || defined(HAS_GETNETENT) + I32 which = PL_op->op_type; register char **elem; register SV *sv; -#ifdef NETDB_H_OMITS_GETNET - struct netent *getnetbyname(const char *); - /* - * long is wrong for getnetbyadddr (e.g. on Alpha). POSIX.1g says - * in_addr_t but then such systems don't have broken netdb.h anyway. - */ - 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; + STRLEN n_a; if (which == OP_GNBYNAME) - nent = getnetbyname(POPp); +#ifdef HAS_GETNETBYNAME + nent = PerlSock_getnetbyname(POPpx); +#else + DIE(PL_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(PL_no_sock_func, "getnetbyaddr"); +#endif } else - nent = getnetent(); +#ifdef HAS_GETNETENT + nent = PerlSock_getnetent(); +#else + DIE(PL_no_sock_func, "getnetent"); +#endif EXTEND(SP, 4); if (GIMME != G_ARRAY) { @@ -3771,64 +4109,77 @@ PP(pp_gnetent) } if (nent) { - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpv(sv, nent->n_name); - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); for (elem = nent->n_aliases; elem && *elem; elem++) { sv_catpv(sv, *elem); if (elem[1]) sv_catpvn(sv, " ", 1); } - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setiv(sv, (IV)nent->n_addrtype); - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setiv(sv, (IV)nent->n_net); } RETURN; #else - DIE(no_sock_func, "getnetent"); + DIE(PL_no_sock_func, "getnetent"); #endif } PP(pp_gpbyname) { -#ifdef HAS_SOCKET +#ifdef HAS_GETPROTOBYNAME return pp_gprotoent(ARGS); #else - DIE(no_sock_func, "getprotobyname"); + DIE(PL_no_sock_func, "getprotobyname"); #endif } PP(pp_gpbynumber) { -#ifdef HAS_SOCKET +#ifdef HAS_GETPROTOBYNUMBER return pp_gprotoent(ARGS); #else - DIE(no_sock_func, "getprotobynumber"); + DIE(PL_no_sock_func, "getprotobynumber"); #endif } PP(pp_gprotoent) { djSP; -#ifdef HAS_SOCKET - I32 which = op->op_type; +#if defined(HAS_GETPROTOBYNAME) || defined(HAS_GETPROTOBYNUMBER) || defined(HAS_GETPROTOENT) + I32 which = PL_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; + STRLEN n_a; if (which == OP_GPBYNAME) - pent = getprotobyname(POPp); +#ifdef HAS_GETPROTOBYNAME + pent = PerlSock_getprotobyname(POPpx); +#else + DIE(PL_no_sock_func, "getprotobyname"); +#endif else if (which == OP_GPBYNUMBER) - pent = getprotobynumber(POPi); +#ifdef HAS_GETPROTOBYNUMBER + pent = PerlSock_getprotobynumber(POPi); +#else + DIE(PL_no_sock_func, "getprotobynumber"); +#endif else - pent = getprotoent(); +#ifdef HAS_GETPROTOENT + pent = PerlSock_getprotoent(); +#else + DIE(PL_no_sock_func, "getprotoent"); +#endif EXTEND(SP, 3); if (GIMME != G_ARRAY) { @@ -3843,76 +4194,89 @@ PP(pp_gprotoent) } if (pent) { - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpv(sv, pent->p_name); - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); for (elem = pent->p_aliases; elem && *elem; elem++) { sv_catpv(sv, *elem); if (elem[1]) sv_catpvn(sv, " ", 1); } - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setiv(sv, (IV)pent->p_proto); } RETURN; #else - DIE(no_sock_func, "getprotoent"); + DIE(PL_no_sock_func, "getprotoent"); #endif } PP(pp_gsbyname) { -#ifdef HAS_SOCKET +#ifdef HAS_GETSERVBYNAME return pp_gservent(ARGS); #else - DIE(no_sock_func, "getservbyname"); + DIE(PL_no_sock_func, "getservbyname"); #endif } PP(pp_gsbyport) { -#ifdef HAS_SOCKET +#ifdef HAS_GETSERVBYPORT return pp_gservent(ARGS); #else - DIE(no_sock_func, "getservbyport"); + DIE(PL_no_sock_func, "getservbyport"); #endif } PP(pp_gservent) { djSP; -#ifdef HAS_SOCKET - I32 which = op->op_type; +#if defined(HAS_GETSERVBYNAME) || defined(HAS_GETSERVBYPORT) || defined(HAS_GETSERVENT) + I32 which = PL_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; + STRLEN n_a; if (which == OP_GSBYNAME) { - char *proto = POPp; - char *name = POPp; +#ifdef HAS_GETSERVBYNAME + char *proto = POPpx; + char *name = POPpx; if (proto && !*proto) proto = Nullch; - sent = getservbyname(name, proto); + sent = PerlSock_getservbyname(name, proto); +#else + DIE(PL_no_sock_func, "getservbyname"); +#endif } else if (which == OP_GSBYPORT) { - char *proto = POPp; +#ifdef HAS_GETSERVBYPORT + char *proto = POPpx; unsigned short port = POPu; #ifdef HAS_HTONS - port = htons(port); + port = PerlSock_htons(port); +#endif + sent = PerlSock_getservbyport(port, proto); +#else + DIE(PL_no_sock_func, "getservbyport"); #endif - sent = getservbyport(port, proto); } else - sent = getservent(); +#ifdef HAS_GETSERVENT + sent = PerlSock_getservent(); +#else + DIE(PL_no_sock_func, "getservent"); +#endif EXTEND(SP, 4); if (GIMME != G_ARRAY) { @@ -3920,7 +4284,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 @@ -3932,119 +4296,119 @@ PP(pp_gservent) } if (sent) { - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpv(sv, sent->s_name); - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); for (elem = sent->s_aliases; elem && *elem; elem++) { sv_catpv(sv, *elem); if (elem[1]) sv_catpvn(sv, " ", 1); } - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_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 - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpv(sv, sent->s_proto); } RETURN; #else - DIE(no_sock_func, "getservent"); + DIE(PL_no_sock_func, "getservent"); #endif } PP(pp_shostent) { djSP; -#ifdef HAS_SOCKET - sethostent(TOPi); +#ifdef HAS_SETHOSTENT + PerlSock_sethostent(TOPi); RETSETYES; #else - DIE(no_sock_func, "sethostent"); + DIE(PL_no_sock_func, "sethostent"); #endif } PP(pp_snetent) { djSP; -#ifdef HAS_SOCKET - setnetent(TOPi); +#ifdef HAS_SETNETENT + PerlSock_setnetent(TOPi); RETSETYES; #else - DIE(no_sock_func, "setnetent"); + DIE(PL_no_sock_func, "setnetent"); #endif } PP(pp_sprotoent) { djSP; -#ifdef HAS_SOCKET - setprotoent(TOPi); +#ifdef HAS_SETPROTOENT + PerlSock_setprotoent(TOPi); RETSETYES; #else - DIE(no_sock_func, "setprotoent"); + DIE(PL_no_sock_func, "setprotoent"); #endif } PP(pp_sservent) { djSP; -#ifdef HAS_SOCKET - setservent(TOPi); +#ifdef HAS_SETSERVENT + PerlSock_setservent(TOPi); RETSETYES; #else - DIE(no_sock_func, "setservent"); + DIE(PL_no_sock_func, "setservent"); #endif } PP(pp_ehostent) { djSP; -#ifdef HAS_SOCKET - endhostent(); - EXTEND(sp,1); +#ifdef HAS_ENDHOSTENT + PerlSock_endhostent(); + EXTEND(SP,1); RETPUSHYES; #else - DIE(no_sock_func, "endhostent"); + DIE(PL_no_sock_func, "endhostent"); #endif } PP(pp_enetent) { djSP; -#ifdef HAS_SOCKET - endnetent(); - EXTEND(sp,1); +#ifdef HAS_ENDNETENT + PerlSock_endnetent(); + EXTEND(SP,1); RETPUSHYES; #else - DIE(no_sock_func, "endnetent"); + DIE(PL_no_sock_func, "endnetent"); #endif } PP(pp_eprotoent) { djSP; -#ifdef HAS_SOCKET - endprotoent(); - EXTEND(sp,1); +#ifdef HAS_ENDPROTOENT + PerlSock_endprotoent(); + EXTEND(SP,1); RETPUSHYES; #else - DIE(no_sock_func, "endprotoent"); + DIE(PL_no_sock_func, "endprotoent"); #endif } PP(pp_eservent) { djSP; -#ifdef HAS_SOCKET - endservent(); - EXTEND(sp,1); +#ifdef HAS_ENDSERVENT + PerlSock_endservent(); + EXTEND(SP,1); RETPUSHYES; #else - DIE(no_sock_func, "endservent"); + DIE(PL_no_sock_func, "endservent"); #endif } @@ -4053,7 +4417,7 @@ PP(pp_gpwnam) #ifdef HAS_PASSWD return pp_gpwent(ARGS); #else - DIE(no_func, "getpwnam"); + DIE(PL_no_func, "getpwnam"); #endif } @@ -4062,20 +4426,21 @@ PP(pp_gpwuid) #ifdef HAS_PASSWD return pp_gpwent(ARGS); #else - DIE(no_func, "getpwuid"); + DIE(PL_no_func, "getpwuid"); #endif } PP(pp_gpwent) { djSP; -#ifdef HAS_PASSWD - I32 which = op->op_type; +#if defined(HAS_PASSWD) && defined(HAS_GETPWENT) + I32 which = PL_op->op_type; register SV *sv; struct passwd *pwent; + STRLEN n_a; if (which == OP_GPWNAM) - pwent = getpwnam(POPp); + pwent = getpwnam(POPpx); else if (which == OP_GPWUID) pwent = getpwuid(POPi); else @@ -4094,73 +4459,89 @@ PP(pp_gpwent) } if (pwent) { - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpv(sv, pwent->pw_name); - PUSHs(sv = sv_mortalcopy(&sv_no)); + + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); +#ifdef PWPASSWD sv_setpv(sv, pwent->pw_passwd); - PUSHs(sv = sv_mortalcopy(&sv_no)); +#endif + + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setiv(sv, (IV)pwent->pw_uid); - PUSHs(sv = sv_mortalcopy(&sv_no)); + + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setiv(sv, (IV)pwent->pw_gid); - PUSHs(sv = sv_mortalcopy(&sv_no)); + + /* pw_change, pw_quota, and pw_age are mutually exclusive. */ + PUSHs(sv = sv_mortalcopy(&PL_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 - PUSHs(sv = sv_mortalcopy(&sv_no)); + + /* pw_class and pw_comment are mutually exclusive. */ + PUSHs(sv = sv_mortalcopy(&PL_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)); + + PUSHs(sv = sv_mortalcopy(&PL_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)); + + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpv(sv, pwent->pw_dir); - PUSHs(sv = sv_mortalcopy(&sv_no)); + + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpv(sv, pwent->pw_shell); + #ifdef PWEXPIRE - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setiv(sv, (IV)pwent->pw_expire); #endif } RETURN; #else - DIE(no_func, "getpwent"); + DIE(PL_no_func, "getpwent"); #endif } PP(pp_spwent) { djSP; -#if defined(HAS_PASSWD) && !defined(CYGWIN32) +#if defined(HAS_PASSWD) && defined(HAS_SETPWENT) && !defined(CYGWIN32) setpwent(); RETPUSHYES; #else - DIE(no_func, "setpwent"); + DIE(PL_no_func, "setpwent"); #endif } PP(pp_epwent) { djSP; -#ifdef HAS_PASSWD +#if defined(HAS_PASSWD) && defined(HAS_ENDPWENT) endpwent(); RETPUSHYES; #else - DIE(no_func, "endpwent"); + DIE(PL_no_func, "endpwent"); #endif } @@ -4169,7 +4550,7 @@ PP(pp_ggrnam) #ifdef HAS_GROUP return pp_ggrent(ARGS); #else - DIE(no_func, "getgrnam"); + DIE(PL_no_func, "getgrnam"); #endif } @@ -4178,21 +4559,22 @@ PP(pp_ggrgid) #ifdef HAS_GROUP return pp_ggrent(ARGS); #else - DIE(no_func, "getgrgid"); + DIE(PL_no_func, "getgrgid"); #endif } PP(pp_ggrent) { djSP; -#ifdef HAS_GROUP - I32 which = op->op_type; +#if defined(HAS_GROUP) && defined(HAS_GETGRENT) + I32 which = PL_op->op_type; register char **elem; register SV *sv; struct group *grent; + STRLEN n_a; if (which == OP_GGRNAM) - grent = (struct group *)getgrnam(POPp); + grent = (struct group *)getgrnam(POPpx); else if (which == OP_GGRGID) grent = (struct group *)getgrgid(POPi); else @@ -4211,13 +4593,18 @@ PP(pp_ggrent) } if (grent) { - PUSHs(sv = sv_mortalcopy(&sv_no)); + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setpv(sv, grent->gr_name); - PUSHs(sv = sv_mortalcopy(&sv_no)); + + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); +#ifdef GRPASSWD sv_setpv(sv, grent->gr_passwd); - PUSHs(sv = sv_mortalcopy(&sv_no)); +#endif + + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); sv_setiv(sv, (IV)grent->gr_gid); - PUSHs(sv = sv_mortalcopy(&sv_no)); + + PUSHs(sv = sv_mortalcopy(&PL_sv_no)); for (elem = grent->gr_mem; elem && *elem; elem++) { sv_catpv(sv, *elem); if (elem[1]) @@ -4227,29 +4614,29 @@ PP(pp_ggrent) RETURN; #else - DIE(no_func, "getgrent"); + DIE(PL_no_func, "getgrent"); #endif } PP(pp_sgrent) { djSP; -#ifdef HAS_GROUP +#if defined(HAS_GROUP) && defined(HAS_SETGRENT) setgrent(); RETPUSHYES; #else - DIE(no_func, "setgrent"); + DIE(PL_no_func, "setgrent"); #endif } PP(pp_egrent) { djSP; -#ifdef HAS_GROUP +#if defined(HAS_GROUP) && defined(HAS_ENDGRENT) endgrent(); RETPUSHYES; #else - DIE(no_func, "endgrent"); + DIE(PL_no_func, "endgrent"); #endif } @@ -4259,12 +4646,12 @@ PP(pp_getlogin) #ifdef HAS_GETLOGIN char *tmps; EXTEND(SP, 1); - if (!(tmps = getlogin())) + if (!(tmps = PerlProc_getlogin())) RETPUSHUNDEF; PUSHp(tmps, strlen(tmps)); RETURN; #else - DIE(no_func, "getlogin"); + DIE(PL_no_func, "getlogin"); #endif } @@ -4272,15 +4659,16 @@ PP(pp_getlogin) PP(pp_syscall) { -#ifdef HAS_SYSCALL +#ifdef HAS_SYSCALL djSP; dMARK; dORIGMARK; dTARGET; register I32 items = SP - MARK; unsigned long a[20]; register I32 i = 0; I32 retval = -1; MAGIC *mg; + STRLEN n_a; - if (tainting) { + if (PL_tainting) { while (++MARK <= SP) { if (SvTAINTED(*MARK)) { TAINT; @@ -4298,10 +4686,10 @@ PP(pp_syscall) while (++MARK <= SP) { if (SvNIOK(*MARK) || !i) a[i++] = SvIV(*MARK); - else if (*MARK == &sv_undef) + else if (*MARK == &PL_sv_undef) a[i++] = 0; else - a[i++] = (unsigned long)SvPV_force(*MARK, na); + a[i++] = (unsigned long)SvPV_force(*MARK, n_a); if (i > 15) break; } @@ -4363,7 +4751,7 @@ PP(pp_syscall) PUSHi(retval); RETURN; #else - DIE(no_func, "syscall"); + DIE(PL_no_func, "syscall"); #endif } @@ -4441,9 +4829,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; @@ -4480,10 +4868,9 @@ 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); } #endif /* LOCKF_EMULATE_FLOCK */ -