X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sys.c;h=e4694bcfb6d5119122e991c8a18fb5fc511dd8ce;hb=619ffc2be66f166b301c5b0d14a8bbba728675bc;hp=a410697e96aeec22c5cc59c3b7517d074eaf8e07;hpb=3280af22f58e7b37514ed104858e2c2fc55ceeeb;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pp_sys.c b/pp_sys.c index a410697..e4694bc 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -56,7 +56,10 @@ extern "C" int syscall(unsigned long,...); /* XXX Configure test needed. h_errno might not be a simple 'int', especially for multi-threaded - applications. HOST_NOT_FOUND is typically defined in . + 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; @@ -170,24 +173,133 @@ 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("``"); @@ -239,6 +351,8 @@ PP(pp_backtick) PP(pp_glob) { OP *result; + tryAMAGICunTARGET(iter, -1); + ENTER; #ifndef VMS @@ -248,7 +362,7 @@ PP(pp_glob) * so for security reasons we must assume the worst. */ TAINT; - taint_proper(no_security, "glob"); + taint_proper(PL_no_security, "glob"); } #endif /* !VMS */ @@ -259,7 +373,7 @@ PP(pp_glob) PL_rs = sv_2mortal(newSVpv("", 1)); #ifndef DOSISH #ifndef CSH - *SvPVX(rs) = '\n'; + *SvPVX(PL_rs) = '\n'; #endif /* !CSH */ #endif /* !DOSISH */ @@ -271,7 +385,8 @@ PP(pp_glob) #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 @@ -286,21 +401,22 @@ PP(pp_warn) { djSP; dMARK; char *tmps; + STRLEN n_a; if (SP - MARK != 1) { dTARGET; do_join(TARG, &PL_sv_no, MARK, SP); - tmps = SvPV(TARG, PL_na); + tmps = SvPV(TARG, n_a); SP = MARK + 1; } else { - tmps = SvPV(TOPs, PL_na); + tmps = SvPV(TOPs, n_a); } if (!tmps || !*tmps) { SV *error = ERRSV; (void)SvUPGRADE(error, SVt_PV); if (SvPOK(error) && SvCUR(error)) sv_catpv(error, "\t...caught"); - tmps = SvPV(error, PL_na); + tmps = SvPV(error, n_a); } if (!tmps || !*tmps) tmps = "Warning: something's wrong"; @@ -314,15 +430,16 @@ PP(pp_die) char *tmps; SV *tmpsv = Nullsv; char *pat = "%s"; + STRLEN n_a; if (SP - MARK != 1) { dTARGET; do_join(TARG, &PL_sv_no, MARK, SP); - tmps = SvPV(TARG, PL_na); + tmps = SvPV(TARG, n_a); SP = MARK + 1; } else { tmpsv = TOPs; - tmps = SvROK(tmpsv) ? Nullch : SvPV(tmpsv, PL_na); + tmps = SvROK(tmpsv) ? Nullch : SvPV(tmpsv, n_a); } if (!tmps || !*tmps) { SV *error = ERRSV; @@ -352,7 +469,7 @@ PP(pp_die) else { if (SvPOK(error) && SvCUR(error)) sv_catpv(error, "\t...propagated"); - tmps = SvPV(error, PL_na); + tmps = SvPV(error, n_a); } } if (!tmps || !*tmps) @@ -373,16 +490,16 @@ 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)) + 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); @@ -402,9 +519,9 @@ PP(pp_close) else gv = (GV*)POPs; - if (SvRMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { + if (mg = SvTIED_mg((SV*)gv, 'q')) { PUSHMARK(SP); - XPUSHs(mg->mg_obj); + XPUSHs(SvTIED_obj((SV*)gv, mg)); PUTBACK; ENTER; perl_call_method("CLOSE", G_SCALAR); @@ -434,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); @@ -459,13 +576,16 @@ PP(pp_pipe_op) else PerlLIO_close(fd[1]); goto badexit; } - +#if defined(HAS_FCNTL) && defined(F_SETFD) + fcntl(fd[0],F_SETFD,fd[0] > PL_maxsysfd); /* ensure close-on-exec */ + fcntl(fd[1],F_SETFD,fd[1] > PL_maxsysfd); /* ensure close-on-exec */ +#endif RETPUSHYES; badexit: RETPUSHUNDEF; #else - DIE(no_func, "pipe"); + DIE(PL_no_func, "pipe"); #endif } @@ -504,7 +624,7 @@ PP(pp_umask) * since 'group' and 'other' concepts probably don't exist here. */ if (MAXARG >= 1 && (POPi & 0700)) DIE("umask not implemented"); - XPUSHs(&sv_undef); + XPUSHs(&PL_sv_undef); #endif RETURN; } @@ -544,6 +664,7 @@ PP(pp_tie) char *methname; int how = 'P'; U32 items; + STRLEN n_a; varsv = *++MARK; switch(SvTYPE(varsv)) { @@ -580,7 +701,7 @@ PP(pp_tie) stash = gv_stashsv(*MARK, FALSE); if (!stash || !(gv = gv_fetchmethod(stash, methname))) { DIE("Can't locate object method \"%s\" via package \"%s\"", - methname, SvPV(*MARK,PL_na)); + methname, SvPV(*MARK,n_a)); } ENTER; PUSHSTACKi(PERLSI_MAGIC); @@ -596,8 +717,8 @@ PP(pp_tie) sv = TOPs; POPSTACK; if (sv_isobject(sv)) { - sv_unmagic(varsv, how); - sv_magic(varsv, sv, how, Nullch, 0); + sv_unmagic(varsv, how); + sv_magic(varsv, (SvRV(sv) == varsv ? Nullsv : sv), how, Nullch, 0); } LEAVE; SP = PL_stack_base + markoff; @@ -608,48 +729,36 @@ 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 (PL_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; } @@ -731,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; @@ -753,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 @@ -793,7 +909,7 @@ PP(pp_sselect) continue; } else if (!SvPOK(sv)) - SvPV_force(sv,PL_na); /* force string conversion */ + SvPV_force(sv,n_a); /* force string conversion */ j = SvLEN(sv); if (j < growsize) { Sv_Grow(sv, growsize); @@ -867,7 +983,7 @@ 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(PL_defoutgv); if (!egv) @@ -887,8 +1003,13 @@ PP(pp_select) } if (newdefout) { - if (!GvIO(newdefout)) - gv_IOadd(newdefout); + if (!GvIO(newdefout)) { + if (ckWARN(WARN_UNOPENED)) + warner(WARN_UNOPENED, "select() on unopened file"); + if (SvTYPE(newdefout) != SVt_PVGV) + RETURN; + gv_IOadd(newdefout); /* XXX probably bogus */ + } setdefout(newdefout); } @@ -908,10 +1029,10 @@ PP(pp_getc) if (!gv) gv = PL_argvgv; - if (SvRMAGICAL(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); @@ -995,7 +1116,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) @@ -1072,7 +1193,7 @@ 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: @@ -1082,18 +1203,18 @@ PP(pp_leavewrite) fp = IoOFP(io); if (!fp) { - if (PL_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(&PL_sv_no); } else { if ((IoLINES_LEFT(io) -= FmLINES(PL_formtarget)) < 0) { - if (PL_dowarn) - warn("page overflow"); + if (ckWARN(WARN_IO)) + warner(WARN_IO, "page overflow"); } if (!PerlIO_write(ofp, SvPVX(PL_formtarget), SvCUR(PL_formtarget)) || PerlIO_error(fp)) @@ -1120,13 +1241,14 @@ 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 = PL_defoutgv; - if (SvRMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) { + if (mg = SvTIED_mg((SV*)gv, 'q')) { if (MARK == ORIGMARK) { MEXTEND(SP, 1); ++MARK; @@ -1134,7 +1256,7 @@ PP(pp_prtf) ++SP; } PUSHMARK(MARK - 1); - *MARK = mg->mg_obj; + *MARK = SvTIED_obj((SV*)gv, mg); PUTBACK; ENTER; perl_call_method("PRINTF", G_SCALAR); @@ -1148,27 +1270,29 @@ PP(pp_prtf) sv = NEWSV(0,0); if (!(io = GvIO(gv))) { - if (PL_dowarn) { + if (ckWARN(WARN_UNOPENED)) { gv_fullname3(sv, gv, Nullch); - warn("Filehandle %s never opened", SvPV(sv,PL_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 (PL_dowarn) { + if (ckWARN2(WARN_CLOSED,WARN_IO)) { gv_fullname3(sv, gv, Nullch); if (IoIFP(io)) - warn("Filehandle %s opened only for input", SvPV(sv,PL_na)); - else - warn("printf on closed filehandle %s", SvPV(sv,PL_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(); @@ -1235,13 +1359,13 @@ PP(pp_sysread) MAGIC *mg; gv = (GV*)*++MARK; - if ((op->op_type == OP_READ || op->op_type == OP_SYSREAD) && - SvRMAGICAL(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; @@ -1270,7 +1394,7 @@ 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)) || defined(MPE) bufsize = sizeof (struct sockaddr_in); @@ -1296,8 +1420,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) @@ -1309,8 +1433,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 = PerlLIO_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 @@ -1352,6 +1486,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); } @@ -1368,13 +1511,11 @@ PP(pp_send) MAGIC *mg; gv = (GV*)*++MARK; - if (op->op_type == OP_SYSWRITE && - SvRMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) - { + if (PL_op->op_type == OP_SYSWRITE && (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("WRITE", G_SCALAR); LEAVE; @@ -1395,14 +1536,14 @@ PP(pp_send) io = GvIO(gv); if (!io || !IoIFP(io)) { length = -1; - if (PL_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) { @@ -1415,7 +1556,17 @@ PP(pp_send) offset = 0; if (length > blen - offset) length = blen - offset; - length = PerlLIO_write(PerlIO_fileno(IoIFP(io)), buffer+offset, length); +#ifdef PERL_SOCK_SYSWRITE_IS_SEND + if (IoTYPE(io) == 's') { + length = PerlSock_send(PerlIO_fileno(IoIFP(io)), + buffer+offset, length, 0); + } + else +#endif + { + length = PerlLIO_write(PerlIO_fileno(IoIFP(io)), + buffer+offset, length); + } } #ifdef HAS_SOCKET else if (SP > MARK) { @@ -1430,7 +1581,7 @@ PP(pp_send) #else else - DIE(no_sock_func, "send"); + DIE(PL_no_sock_func, "send"); #endif if (length < 0) goto say_undef; @@ -1484,13 +1635,13 @@ PP(pp_sysseek) djSP; GV *gv; int whence = POPi; - long offset = POPl; + Off_t offset = POPl; gv = PL_last_in_gv = (GV*)POPs; - if (op->op_type == OP_SEEK) + if (PL_op->op_type == OP_SEEK) PUSHs(boolSV(do_seek(gv, offset, whence))); else { - long n = do_sysseek(gv, offset, whence); + 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))); @@ -1504,11 +1655,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)) || @@ -1522,6 +1674,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 */ @@ -1532,7 +1685,7 @@ PP(pp_truncate) goto do_ftruncate; } - name = SvPV(sv, PL_na); + name = SvPV(sv, n_a); TAINT_PROPER("truncate"); #ifdef HAS_TRUNCATE if (truncate(name, len) < 0) @@ -1571,7 +1724,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; @@ -1621,7 +1774,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 */ } @@ -1664,7 +1817,7 @@ PP(pp_flock) PUSHi(value); RETURN; #else - DIE(no_func, "flock()"); + DIE(PL_no_func, "flock()"); #endif } @@ -1708,7 +1861,7 @@ PP(pp_socket) RETPUSHYES; #else - DIE(no_sock_func, "socket"); + DIE(PL_no_sock_func, "socket"); #endif } @@ -1758,7 +1911,7 @@ PP(pp_sockpair) RETPUSHYES; #else - DIE(no_sock_func, "socketpair"); + DIE(PL_no_sock_func, "socketpair"); #endif } @@ -1812,12 +1965,12 @@ PP(pp_bind) RETPUSHUNDEF; nuts: - if (PL_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 } @@ -1842,12 +1995,12 @@ PP(pp_connect) RETPUSHUNDEF; nuts: - if (PL_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 } @@ -1868,12 +2021,12 @@ PP(pp_listen) RETPUSHUNDEF; nuts: - if (PL_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 } @@ -1922,15 +2075,15 @@ PP(pp_accept) RETURN; nuts: - if (PL_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 } @@ -1949,12 +2102,12 @@ PP(pp_shutdown) RETURN; nuts: - if (PL_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 } @@ -1963,7 +2116,7 @@ PP(pp_gsockopt) #ifdef HAS_SOCKET return pp_ssockopt(ARGS); #else - DIE(no_sock_func, "getsockopt"); + DIE(PL_no_sock_func, "getsockopt"); #endif } @@ -1971,7 +2124,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; @@ -2010,8 +2163,9 @@ PP(pp_ssockopt) char *buf; int aint; if (SvPOKp(sv)) { - buf = SvPV(sv, PL_na); - len = PL_na; + STRLEN l; + buf = SvPV(sv, l); + len = l; } else { aint = (int)SvIV(sv); @@ -2027,14 +2181,14 @@ PP(pp_ssockopt) RETURN; nuts: - if (PL_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 } @@ -2043,7 +2197,7 @@ PP(pp_getsockname) #ifdef HAS_SOCKET return pp_getpeername(ARGS); #else - DIE(no_sock_func, "getsockname"); + DIE(PL_no_sock_func, "getsockname"); #endif } @@ -2051,7 +2205,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; @@ -2100,14 +2254,14 @@ PP(pp_getpeername) RETURN; nuts: - if (PL_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 } @@ -2124,8 +2278,9 @@ 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 != PL_defgv) { @@ -2148,18 +2303,18 @@ PP(pp_stat) tmpgv = (GV*)SvRV(sv); goto do_fstat; } - sv_setpv(PL_statname, SvPV(sv,PL_na)); + sv_setpv(PL_statname, SvPV(sv,n_a)); PL_statgv = Nullgv; #ifdef HAS_LSTAT - PL_laststype = op->op_type; - if (op->op_type == OP_LSTAT) - PL_laststatval = PerlLIO_lstat(SvPV(PL_statname, PL_na), &PL_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 - PL_laststatval = PerlLIO_stat(SvPV(PL_statname, PL_na), &PL_statcache); + PL_laststatval = PerlLIO_stat(SvPV(PL_statname, n_a), &PL_statcache); if (PL_laststatval < 0) { - if (PL_dowarn && strchr(SvPV(PL_statname, PL_na), '\n')) - warn(warn_nl, "stat"); + if (ckWARN(WARN_NEWLINE) && strchr(SvPV(PL_statname, n_a), '\n')) + warner(WARN_NEWLINE, PL_warn_nl, "stat"); max = 0; } } @@ -2186,9 +2341,9 @@ PP(pp_stat) #endif 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)PL_statcache.st_atime))); PUSHs(sv_2mortal(newSViv((I32)PL_statcache.st_mtime))); @@ -2207,8 +2362,24 @@ 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, &PL_statcache)) @@ -2218,8 +2389,24 @@ PP(pp_ftrread) 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, &PL_statcache)) @@ -2229,8 +2416,24 @@ PP(pp_ftrwrite) 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, &PL_statcache)) @@ -2240,8 +2443,24 @@ PP(pp_ftrexec) 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, &PL_statcache)) @@ -2251,8 +2470,24 @@ PP(pp_fteread) 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, &PL_statcache)) @@ -2262,8 +2497,24 @@ PP(pp_ftewrite) 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, &PL_statcache)) @@ -2291,7 +2542,7 @@ PP(pp_ftrowned) djSP; if (result < 0) RETPUSHUNDEF; - if (PL_statcache.st_uid == (op->op_type == OP_FTEOWNED ? PL_euid : PL_uid) ) + if (PL_statcache.st_uid == (PL_op->op_type == OP_FTEOWNED ? PL_euid : PL_uid) ) RETPUSHYES; RETPUSHNO; } @@ -2472,15 +2723,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))); @@ -2512,8 +2764,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; @@ -2545,7 +2798,7 @@ PP(pp_fttext) if (PL_laststatval < 0) RETPUSHUNDEF; if (S_ISDIR(PL_statcache.st_mode)) /* handle NFS glitch */ - if (op->op_type == OP_FTTEXT) + if (PL_op->op_type == OP_FTTEXT) RETPUSHNO; else RETPUSHYES; @@ -2563,8 +2816,8 @@ PP(pp_fttext) len = 512; } else { - if (PL_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; @@ -2575,15 +2828,15 @@ PP(pp_fttext) really_filename: PL_statgv = Nullgv; PL_laststatval = -1; - sv_setpv(PL_statname, SvPV(sv, PL_na)); + sv_setpv(PL_statname, SvPV(sv, n_a)); #ifdef HAS_OPEN3 - i = PerlLIO_open3(SvPV(sv, PL_na), O_RDONLY, 0); + i = PerlLIO_open3(SvPV(sv, n_a), O_RDONLY, 0); #else - i = PerlLIO_open(SvPV(sv, na), 0); + i = PerlLIO_open(SvPV(sv, n_a), 0); #endif if (i < 0) { - if (PL_dowarn && strchr(SvPV(sv, PL_na), '\n')) - warn(warn_nl, "open"); + if (ckWARN(WARN_NEWLINE) && strchr(SvPV(sv, n_a), '\n')) + warner(WARN_NEWLINE, PL_warn_nl, "open"); RETPUSHUNDEF; } PL_laststatval = PerlLIO_fstat(i, &PL_statcache); @@ -2592,7 +2845,7 @@ PP(pp_fttext) len = PerlLIO_read(i, tbuf, 512); (void)PerlLIO_close(i); if (len <= 0) { - if (S_ISDIR(PL_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 */ } @@ -2607,15 +2860,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; @@ -2633,26 +2891,27 @@ PP(pp_chdir) djSP; dTARGET; char *tmps; SV **svp; + STRLEN n_a; if (MAXARG < 1) tmps = Nullch; else - tmps = POPp; + tmps = POPpx; if (!tmps || !*tmps) { svp = hv_fetch(GvHVn(PL_envgv), "HOME", 4, FALSE); if (svp) - tmps = SvPV(*svp, PL_na); + tmps = SvPV(*svp, n_a); } if (!tmps || !*tmps) { svp = hv_fetch(GvHVn(PL_envgv), "LOGDIR", 6, FALSE); if (svp) - tmps = SvPV(*svp, PL_na); + tmps = SvPV(*svp, n_a); } #ifdef VMS if (!tmps || !*tmps) { - svp = hv_fetch(GvHVn(envgv), "SYS$LOGIN", 9, FALSE); + svp = hv_fetch(GvHVn(PL_envgv), "SYS$LOGIN", 9, FALSE); if (svp) - tmps = SvPV(*svp, na); + tmps = SvPV(*svp, n_a); } #endif TAINT_PROPER("chdir"); @@ -2660,7 +2919,7 @@ PP(pp_chdir) #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; } @@ -2670,12 +2929,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 } @@ -2684,12 +2943,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 } @@ -2697,7 +2957,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; @@ -2707,7 +2967,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; @@ -2717,7 +2977,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; @@ -2727,18 +2987,19 @@ PP(pp_rename) { djSP; dTARGET; int anum; + STRLEN n_a; - char *tmps2 = POPp; - char *tmps = SvPV(TOPs, PL_na); + char *tmps2 = POPpx; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("rename"); #ifdef HAS_RENAME anum = PerlLIO_rename(tmps, tmps2); #else - if (!(anum = PerlLIO_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 || PerlLIO_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); @@ -2753,12 +3014,13 @@ PP(pp_link) { djSP; dTARGET; #ifdef HAS_LINK - char *tmps2 = POPp; - char *tmps = SvPV(TOPs, PL_na); + STRLEN n_a; + char *tmps2 = POPpx; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("link"); SETi( link(tmps, tmps2) >= 0 ); #else - DIE(no_func, "Unsupported function link"); + DIE(PL_no_func, "Unsupported function link"); #endif RETURN; } @@ -2767,13 +3029,14 @@ PP(pp_symlink) { djSP; dTARGET; #ifdef HAS_SYMLINK - char *tmps2 = POPp; - char *tmps = SvPV(TOPs, PL_na); + STRLEN n_a; + char *tmps2 = POPpx; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("symlink"); SETi( symlink(tmps, tmps2) >= 0 ); RETURN; #else - DIE(no_func, "symlink"); + DIE(PL_no_func, "symlink"); #endif } @@ -2784,11 +3047,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) @@ -2826,7 +3090,7 @@ char *filename; if (myfp) { SV *tmpsv = sv_newmortal(); - /* Need to save/restore 'rs' ?? */ + /* Need to save/restore 'PL_rs' ?? */ s = sv_gets(tmpsv, myfp, 0); (void)PerlProc_pclose(myfp); if (s != Nullch) { @@ -2875,8 +3139,8 @@ char *filename; return 0; } else { /* some mkdirs return no failure indication */ - anum = (PerlLIO_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); @@ -2897,7 +3161,8 @@ PP(pp_mkdir) #ifndef HAS_MKDIR int oldumask; #endif - char *tmps = SvPV(TOPs, PL_na); + STRLEN n_a; + char *tmps = SvPV(TOPs, n_a); TAINT_PROPER("mkdir"); #ifdef HAS_MKDIR @@ -2915,8 +3180,9 @@ PP(pp_rmdir) { djSP; dTARGET; char *tmps; + STRLEN n_a; - tmps = POPp; + tmps = POPpx; TAINT_PROPER("rmdir"); #ifdef HAS_RMDIR XPUSHi( PerlDir_rmdir(tmps) >= 0 ); @@ -2932,7 +3198,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); @@ -2950,7 +3217,7 @@ nope: SETERRNO(EBADF,RMS$_DIR); RETPUSHUNDEF; #else - DIE(no_dir_func, "opendir"); + DIE(PL_no_dir_func, "opendir"); #endif } @@ -3006,7 +3273,7 @@ nope: else RETPUSHUNDEF; #else - DIE(no_dir_func, "readdir"); + DIE(PL_no_dir_func, "readdir"); #endif } @@ -3014,7 +3281,11 @@ PP(pp_telldir) { djSP; dTARGET; #if defined(HAS_TELLDIR) || defined(telldir) -# ifdef NEED_TELLDIR_PROTO /* XXX does _anyone_ need this? --AD 2/20/1998 */ + /* XXX does _anyone_ need this? --AD 2/20/1998 */ + /* XXX netbsd still seemed to. + XXX HAS_TELLDIR_PROTO is new style, NEED_TELLDIR_PROTO is old style. + --JHI 1999-Feb-02 */ +# if !defined(HAS_TELLDIR_PROTO) || defined(NEED_TELLDIR_PROTO) long telldir _((DIR *)); # endif GV *gv = (GV*)POPs; @@ -3030,7 +3301,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(no_dir_func, "telldir"); + DIE(PL_no_dir_func, "telldir"); #endif } @@ -3053,7 +3324,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(no_dir_func, "seekdir"); + DIE(PL_no_dir_func, "seekdir"); #endif } @@ -3074,7 +3345,7 @@ nope: SETERRNO(EBADF,RMS$_ISI); RETPUSHUNDEF; #else - DIE(no_dir_func, "rewinddir"); + DIE(PL_no_dir_func, "rewinddir"); #endif } @@ -3104,7 +3375,7 @@ nope: SETERRNO(EBADF,RMS$_IFI); RETPUSHUNDEF; #else - DIE(no_dir_func, "closedir"); + DIE(PL_no_dir_func, "closedir"); #endif } @@ -3130,7 +3401,7 @@ PP(pp_fork) PUSHi(childpid); RETURN; #else - DIE(no_func, "Unsupported function fork"); + DIE(PL_no_func, "Unsupported function fork"); #endif } @@ -3146,7 +3417,7 @@ PP(pp_wait) XPUSHi(childpid); RETURN; #else - DIE(no_func, "Unsupported function wait"); + DIE(PL_no_func, "Unsupported function wait"); #endif } @@ -3165,7 +3436,7 @@ PP(pp_waitpid) SETi(childpid); RETURN; #else - DIE(no_func, "Unsupported function waitpid"); + DIE(PL_no_func, "Unsupported function waitpid"); #endif } @@ -3177,10 +3448,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 (PL_tainting) { - char *junk = SvPV(TOPs, PL_na); + char *junk = SvPV(TOPs, n_a); TAINT_ENV(); TAINT_PROPER("system"); } @@ -3209,25 +3481,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), PL_na)); + value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), n_a)); } 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(); @@ -3241,8 +3513,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); } @@ -3250,18 +3523,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 (PL_tainting) { - char *junk = SvPV(*SP, PL_na); + char *junk = SvPV(*SP, n_a); TAINT_ENV(); TAINT_PROPER("exec"); } #ifdef VMS - value = (I32)vms_do_exec(SvPVx(sv_mortalcopy(*SP), na)); + value = (I32)vms_do_exec(SvPVx(sv_mortalcopy(*SP), n_a)); #else - value = (I32)do_exec(SvPVx(sv_mortalcopy(*SP), PL_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; @@ -3274,12 +3559,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 } @@ -3290,7 +3575,7 @@ PP(pp_getppid) XPUSHi( getppid() ); RETURN; #else - DIE(no_func, "getppid"); + DIE(PL_no_func, "getppid"); #endif } @@ -3315,7 +3600,7 @@ PP(pp_getpgrp) XPUSHi(value); RETURN; #else - DIE(no_func, "getpgrp()"); + DIE(PL_no_func, "getpgrp()"); #endif } @@ -3344,7 +3629,7 @@ PP(pp_setpgrp) #endif /* USE_BSDPGRP */ RETURN; #else - DIE(no_func, "setpgrp()"); + DIE(PL_no_func, "setpgrp()"); #endif } @@ -3359,7 +3644,7 @@ PP(pp_getpriority) SETi( getpriority(which, who) ); RETURN; #else - DIE(no_func, "getpriority()"); + DIE(PL_no_func, "getpriority()"); #endif } @@ -3377,7 +3662,7 @@ PP(pp_setpriority) SETi( setpriority(which, who, niceval) >= 0 ); RETURN; #else - DIE(no_func, "setpriority()"); + DIE(PL_no_func, "setpriority()"); #endif } @@ -3422,7 +3707,7 @@ PP(pp_tms) #ifndef VMS (void)PerlProc_times(&PL_timesbuf); #else - (void)PerlProc_times((tbuffer_t *)×buf); /* time.h uses different name for */ + (void)PerlProc_times((tbuffer_t *)&PL_timesbuf); /* time.h uses different name for */ /* struct tms, though same data */ /* is returned. */ #endif @@ -3460,7 +3745,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); @@ -3509,7 +3794,7 @@ PP(pp_alarm) PUSHi((I32)anum); RETURN; #else - DIE(no_func, "Unsupported function alarm"); + DIE(PL_no_func, "Unsupported function alarm"); #endif } @@ -3553,7 +3838,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; @@ -3606,7 +3891,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; @@ -3621,7 +3906,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; @@ -3657,7 +3942,7 @@ PP(pp_ghbyname) #ifdef HAS_GETHOSTBYNAME return pp_ghostent(ARGS); #else - DIE(no_sock_func, "gethostbyname"); + DIE(PL_no_sock_func, "gethostbyname"); #endif } @@ -3666,7 +3951,7 @@ PP(pp_ghbyaddr) #ifdef HAS_GETHOSTBYADDR return pp_ghostent(ARGS); #else - DIE(no_sock_func, "gethostbyaddr"); + DIE(PL_no_sock_func, "gethostbyaddr"); #endif } @@ -3674,7 +3959,7 @@ PP(pp_ghostent) { djSP; #if defined(HAS_GETHOSTBYNAME) || defined(HAS_GETHOSTBYADDR) || defined(HAS_GETHOSTENT) - I32 which = op->op_type; + I32 which = PL_op->op_type; register char **elem; register SV *sv; #ifndef HAS_GETHOST_PROTOS /* XXX Do we need individual probes? */ @@ -3684,13 +3969,14 @@ PP(pp_ghostent) #endif struct hostent *hent; unsigned long len; + STRLEN n_a; EXTEND(SP, 10); if (which == OP_GHBYNAME) #ifdef HAS_GETHOSTBYNAME - hent = PerlSock_gethostbyname(POPp); + hent = PerlSock_gethostbyname(POPpx); #else - DIE(no_sock_func, "gethostbyname"); + DIE(PL_no_sock_func, "gethostbyname"); #endif else if (which == OP_GHBYADDR) { #ifdef HAS_GETHOSTBYADDR @@ -3701,14 +3987,14 @@ PP(pp_ghostent) hent = PerlSock_gethostbyaddr(addr, (Netdb_hlen_t) addrlen, addrtype); #else - DIE(no_sock_func, "gethostbyaddr"); + DIE(PL_no_sock_func, "gethostbyaddr"); #endif } else #ifdef HAS_GETHOSTENT hent = PerlSock_gethostent(); #else - DIE(no_sock_func, "gethostent"); + DIE(PL_no_sock_func, "gethostent"); #endif #ifdef HOST_NOT_FOUND @@ -3749,14 +4035,14 @@ PP(pp_ghostent) 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 } @@ -3765,7 +4051,7 @@ PP(pp_gnbyname) #ifdef HAS_GETNETBYNAME return pp_gnetent(ARGS); #else - DIE(no_sock_func, "getnetbyname"); + DIE(PL_no_sock_func, "getnetbyname"); #endif } @@ -3774,7 +4060,7 @@ PP(pp_gnbyaddr) #ifdef HAS_GETNETBYADDR return pp_gnetent(ARGS); #else - DIE(no_sock_func, "getnetbyaddr"); + DIE(PL_no_sock_func, "getnetbyaddr"); #endif } @@ -3782,7 +4068,7 @@ PP(pp_gnetent) { djSP; #if defined(HAS_GETNETBYNAME) || defined(HAS_GETNETBYADDR) || defined(HAS_GETNETENT) - I32 which = op->op_type; + I32 which = PL_op->op_type; register char **elem; register SV *sv; #ifndef HAS_GETNET_PROTOS /* XXX Do we need individual probes? */ @@ -3791,12 +4077,13 @@ PP(pp_gnetent) struct netent *PerlSock_getnetent(void); #endif struct netent *nent; + STRLEN n_a; if (which == OP_GNBYNAME) #ifdef HAS_GETNETBYNAME - nent = PerlSock_getnetbyname(POPp); + nent = PerlSock_getnetbyname(POPpx); #else - DIE(no_sock_func, "getnetbyname"); + DIE(PL_no_sock_func, "getnetbyname"); #endif else if (which == OP_GNBYADDR) { #ifdef HAS_GETNETBYADDR @@ -3804,14 +4091,14 @@ PP(pp_gnetent) Netdb_net_t addr = (Netdb_net_t) U_L(POPn); nent = PerlSock_getnetbyaddr(addr, addrtype); #else - DIE(no_sock_func, "getnetbyaddr"); + DIE(PL_no_sock_func, "getnetbyaddr"); #endif } else #ifdef HAS_GETNETENT nent = PerlSock_getnetent(); #else - DIE(no_sock_func, "getnetent"); + DIE(PL_no_sock_func, "getnetent"); #endif EXTEND(SP, 4); @@ -3843,7 +4130,7 @@ PP(pp_gnetent) RETURN; #else - DIE(no_sock_func, "getnetent"); + DIE(PL_no_sock_func, "getnetent"); #endif } @@ -3852,7 +4139,7 @@ PP(pp_gpbyname) #ifdef HAS_GETPROTOBYNAME return pp_gprotoent(ARGS); #else - DIE(no_sock_func, "getprotobyname"); + DIE(PL_no_sock_func, "getprotobyname"); #endif } @@ -3861,7 +4148,7 @@ PP(pp_gpbynumber) #ifdef HAS_GETPROTOBYNUMBER return pp_gprotoent(ARGS); #else - DIE(no_sock_func, "getprotobynumber"); + DIE(PL_no_sock_func, "getprotobynumber"); #endif } @@ -3869,7 +4156,7 @@ PP(pp_gprotoent) { djSP; #if defined(HAS_GETPROTOBYNAME) || defined(HAS_GETPROTOBYNUMBER) || defined(HAS_GETPROTOENT) - I32 which = op->op_type; + I32 which = PL_op->op_type; register char **elem; register SV *sv; #ifndef HAS_GETPROTO_PROTOS /* XXX Do we need individual probes? */ @@ -3878,24 +4165,25 @@ PP(pp_gprotoent) struct protoent *PerlSock_getprotoent(void); #endif struct protoent *pent; + STRLEN n_a; if (which == OP_GPBYNAME) #ifdef HAS_GETPROTOBYNAME - pent = PerlSock_getprotobyname(POPp); + pent = PerlSock_getprotobyname(POPpx); #else - DIE(no_sock_func, "getprotobyname"); + DIE(PL_no_sock_func, "getprotobyname"); #endif else if (which == OP_GPBYNUMBER) #ifdef HAS_GETPROTOBYNUMBER pent = PerlSock_getprotobynumber(POPi); #else - DIE(no_sock_func, "getprotobynumber"); + DIE(PL_no_sock_func, "getprotobynumber"); #endif else #ifdef HAS_GETPROTOENT pent = PerlSock_getprotoent(); #else - DIE(no_sock_func, "getprotoent"); + DIE(PL_no_sock_func, "getprotoent"); #endif EXTEND(SP, 3); @@ -3925,7 +4213,7 @@ PP(pp_gprotoent) RETURN; #else - DIE(no_sock_func, "getprotoent"); + DIE(PL_no_sock_func, "getprotoent"); #endif } @@ -3934,7 +4222,7 @@ PP(pp_gsbyname) #ifdef HAS_GETSERVBYNAME return pp_gservent(ARGS); #else - DIE(no_sock_func, "getservbyname"); + DIE(PL_no_sock_func, "getservbyname"); #endif } @@ -3943,7 +4231,7 @@ PP(pp_gsbyport) #ifdef HAS_GETSERVBYPORT return pp_gservent(ARGS); #else - DIE(no_sock_func, "getservbyport"); + DIE(PL_no_sock_func, "getservbyport"); #endif } @@ -3951,7 +4239,7 @@ PP(pp_gservent) { djSP; #if defined(HAS_GETSERVBYNAME) || defined(HAS_GETSERVBYPORT) || defined(HAS_GETSERVENT) - I32 which = op->op_type; + I32 which = PL_op->op_type; register char **elem; register SV *sv; #ifndef HAS_GETSERV_PROTOS /* XXX Do we need individual probes? */ @@ -3960,23 +4248,24 @@ PP(pp_gservent) struct servent *PerlSock_getservent(void); #endif struct servent *sent; + STRLEN n_a; if (which == OP_GSBYNAME) { #ifdef HAS_GETSERVBYNAME - char *proto = POPp; - char *name = POPp; + char *proto = POPpx; + char *name = POPpx; if (proto && !*proto) proto = Nullch; sent = PerlSock_getservbyname(name, proto); #else - DIE(no_sock_func, "getservbyname"); + DIE(PL_no_sock_func, "getservbyname"); #endif } else if (which == OP_GSBYPORT) { #ifdef HAS_GETSERVBYPORT - char *proto = POPp; + char *proto = POPpx; unsigned short port = POPu; #ifdef HAS_HTONS @@ -3984,14 +4273,14 @@ PP(pp_gservent) #endif sent = PerlSock_getservbyport(port, proto); #else - DIE(no_sock_func, "getservbyport"); + DIE(PL_no_sock_func, "getservbyport"); #endif } else #ifdef HAS_GETSERVENT sent = PerlSock_getservent(); #else - DIE(no_sock_func, "getservent"); + DIE(PL_no_sock_func, "getservent"); #endif EXTEND(SP, 4); @@ -4032,7 +4321,7 @@ PP(pp_gservent) RETURN; #else - DIE(no_sock_func, "getservent"); + DIE(PL_no_sock_func, "getservent"); #endif } @@ -4043,7 +4332,7 @@ PP(pp_shostent) PerlSock_sethostent(TOPi); RETSETYES; #else - DIE(no_sock_func, "sethostent"); + DIE(PL_no_sock_func, "sethostent"); #endif } @@ -4054,7 +4343,7 @@ PP(pp_snetent) PerlSock_setnetent(TOPi); RETSETYES; #else - DIE(no_sock_func, "setnetent"); + DIE(PL_no_sock_func, "setnetent"); #endif } @@ -4065,7 +4354,7 @@ PP(pp_sprotoent) PerlSock_setprotoent(TOPi); RETSETYES; #else - DIE(no_sock_func, "setprotoent"); + DIE(PL_no_sock_func, "setprotoent"); #endif } @@ -4076,7 +4365,7 @@ PP(pp_sservent) PerlSock_setservent(TOPi); RETSETYES; #else - DIE(no_sock_func, "setservent"); + DIE(PL_no_sock_func, "setservent"); #endif } @@ -4088,7 +4377,7 @@ PP(pp_ehostent) EXTEND(SP,1); RETPUSHYES; #else - DIE(no_sock_func, "endhostent"); + DIE(PL_no_sock_func, "endhostent"); #endif } @@ -4100,7 +4389,7 @@ PP(pp_enetent) EXTEND(SP,1); RETPUSHYES; #else - DIE(no_sock_func, "endnetent"); + DIE(PL_no_sock_func, "endnetent"); #endif } @@ -4112,7 +4401,7 @@ PP(pp_eprotoent) EXTEND(SP,1); RETPUSHYES; #else - DIE(no_sock_func, "endprotoent"); + DIE(PL_no_sock_func, "endprotoent"); #endif } @@ -4124,7 +4413,7 @@ PP(pp_eservent) EXTEND(SP,1); RETPUSHYES; #else - DIE(no_sock_func, "endservent"); + DIE(PL_no_sock_func, "endservent"); #endif } @@ -4133,7 +4422,7 @@ PP(pp_gpwnam) #ifdef HAS_PASSWD return pp_gpwent(ARGS); #else - DIE(no_func, "getpwnam"); + DIE(PL_no_func, "getpwnam"); #endif } @@ -4142,7 +4431,7 @@ PP(pp_gpwuid) #ifdef HAS_PASSWD return pp_gpwent(ARGS); #else - DIE(no_func, "getpwuid"); + DIE(PL_no_func, "getpwuid"); #endif } @@ -4150,12 +4439,13 @@ PP(pp_gpwent) { djSP; #if defined(HAS_PASSWD) && defined(HAS_GETPWENT) - I32 which = op->op_type; + 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 @@ -4228,13 +4518,13 @@ PP(pp_gpwent) 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 } @@ -4245,7 +4535,7 @@ PP(pp_spwent) setpwent(); RETPUSHYES; #else - DIE(no_func, "setpwent"); + DIE(PL_no_func, "setpwent"); #endif } @@ -4256,7 +4546,7 @@ PP(pp_epwent) endpwent(); RETPUSHYES; #else - DIE(no_func, "endpwent"); + DIE(PL_no_func, "endpwent"); #endif } @@ -4265,7 +4555,7 @@ PP(pp_ggrnam) #ifdef HAS_GROUP return pp_ggrent(ARGS); #else - DIE(no_func, "getgrnam"); + DIE(PL_no_func, "getgrnam"); #endif } @@ -4274,7 +4564,7 @@ PP(pp_ggrgid) #ifdef HAS_GROUP return pp_ggrent(ARGS); #else - DIE(no_func, "getgrgid"); + DIE(PL_no_func, "getgrgid"); #endif } @@ -4282,13 +4572,14 @@ PP(pp_ggrent) { djSP; #if defined(HAS_GROUP) && defined(HAS_GETGRENT) - I32 which = op->op_type; + 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 @@ -4328,7 +4619,7 @@ PP(pp_ggrent) RETURN; #else - DIE(no_func, "getgrent"); + DIE(PL_no_func, "getgrent"); #endif } @@ -4339,7 +4630,7 @@ PP(pp_sgrent) setgrent(); RETPUSHYES; #else - DIE(no_func, "setgrent"); + DIE(PL_no_func, "setgrent"); #endif } @@ -4350,7 +4641,7 @@ PP(pp_egrent) endgrent(); RETPUSHYES; #else - DIE(no_func, "endgrent"); + DIE(PL_no_func, "endgrent"); #endif } @@ -4365,7 +4656,7 @@ PP(pp_getlogin) PUSHp(tmps, strlen(tmps)); RETURN; #else - DIE(no_func, "getlogin"); + DIE(PL_no_func, "getlogin"); #endif } @@ -4380,6 +4671,7 @@ PP(pp_syscall) register I32 i = 0; I32 retval = -1; MAGIC *mg; + STRLEN n_a; if (PL_tainting) { while (++MARK <= SP) { @@ -4402,7 +4694,7 @@ PP(pp_syscall) else if (*MARK == &PL_sv_undef) a[i++] = 0; else - a[i++] = (unsigned long)SvPV_force(*MARK, PL_na); + a[i++] = (unsigned long)SvPV_force(*MARK, n_a); if (i > 15) break; } @@ -4464,7 +4756,7 @@ PP(pp_syscall) PUSHi(retval); RETURN; #else - DIE(no_func, "syscall"); + DIE(PL_no_func, "syscall"); #endif }