This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More explicit Solaris instructions
[perl5.git]
/
pp_sys.c
diff --git
a/pp_sys.c
b/pp_sys.c
index
8af0072
..
ef769a5
100644
(file)
--- a/
pp_sys.c
+++ b/
pp_sys.c
@@
-1,6
+1,6
@@
/* pp_sys.c
*
/* pp_sys.c
*
- * Copyright (c) 1991-199
4
, Larry Wall
+ * Copyright (c) 1991-199
7
, 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.
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
@@
-30,13
+30,6
@@
# include <sys/resource.h>
#endif
# include <sys/resource.h>
#endif
-/* Put this after #includes because fork and vfork prototypes may
- conflict.
-*/
-#ifndef HAS_VFORK
-# define vfork fork
-#endif
-
#if defined(HAS_SOCKET) && !defined(VMS) /* VMS handles sockets via vmsish.h */
# include <sys/socket.h>
# include <netdb.h>
#if defined(HAS_SOCKET) && !defined(VMS) /* VMS handles sockets via vmsish.h */
# include <sys/socket.h>
# include <netdb.h>
@@
-78,7
+71,11
@@
extern int h_errno;
#endif
#ifdef I_UTIME
#endif
#ifdef I_UTIME
-#include <utime.h>
+# ifdef WIN32
+# include <sys/utime.h>
+# else
+# include <utime.h>
+# endif
#endif
#ifdef I_FCNTL
#include <fcntl.h>
#endif
#ifdef I_FCNTL
#include <fcntl.h>
@@
-87,6
+84,20
@@
extern int h_errno;
#include <sys/file.h>
#endif
#include <sys/file.h>
#endif
+/* Put this after #includes because fork and vfork prototypes may conflict. */
+#ifndef HAS_VFORK
+# define vfork fork
+#endif
+
+/* Put this after #includes because <unistd.h> defines _XOPEN_*. */
+#ifndef Sock_size_t
+# if _XOPEN_VERSION >= 5 || defined(_XOPEN_SOURCE_EXTENDED) || defined(__GLIBC__)
+# define Sock_size_t Size_t
+# else
+# define Sock_size_t int
+# endif
+#endif
+
#if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
static int dooneliner _((char *cmd, char *filename));
#endif
#if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
static int dooneliner _((char *cmd, char *filename));
#endif
@@
-102,6
+113,14
@@
static int dooneliner _((char *cmd, char *filename));
# define FLOCK flock
#else /* no flock() */
# define FLOCK flock
#else /* no flock() */
+ /* fcntl.h might not have been included, even if it exists, because
+ the current Configure only sets I_FCNTL if it's needed to pick up
+ the *_OK constants. Make sure it has been included before testing
+ the fcntl() locking constants. */
+# if defined(HAS_FCNTL) && !defined(I_FCNTL)
+# include <fcntl.h>
+# endif
+
# if defined(HAS_FCNTL) && defined(F_SETLK) && defined (F_SETLKW)
# define FLOCK fcntl_emulate_flock
# define FCNTL_EMULATE_FLOCK
# if defined(HAS_FCNTL) && defined(F_SETLK) && defined (F_SETLKW)
# define FLOCK fcntl_emulate_flock
# define FCNTL_EMULATE_FLOCK
@@
-113,7
+132,7
@@
static int dooneliner _((char *cmd, char *filename));
# endif /* no flock() or fcntl(F_SETLK,...) */
# ifdef FLOCK
# endif /* no flock() or fcntl(F_SETLK,...) */
# ifdef FLOCK
- static int FLOCK
(int, int
);
+ static int FLOCK
_((int, int)
);
/*
* These are the flock() constants. Since this sytems doesn't have
/*
* These are the flock() constants. Since this sytems doesn't have
@@
-135,6
+154,16
@@
static int dooneliner _((char *cmd, char *filename));
#endif /* no flock() */
#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. */
/* Pushy I/O. */
@@
-143,15
+172,23
@@
PP(pp_backtick)
dSP; dTARGET;
PerlIO *fp;
char *tmps = POPp;
dSP; dTARGET;
PerlIO *fp;
char *tmps = POPp;
+ I32 gimme = GIMME_V;
+
TAINT_PROPER("``");
fp = my_popen(tmps, "r");
if (fp) {
TAINT_PROPER("``");
fp = my_popen(tmps, "r");
if (fp) {
- sv_setpv(TARG, ""); /* note that this preserves previous buffer */
- if (GIMME == G_SCALAR) {
+ if (gimme == G_VOID) {
+ while (PerlIO_read(fp, tokenbuf, sizeof tokenbuf) > 0)
+ /*SUPPRESS 530*/
+ ;
+ }
+ else if (gimme == G_SCALAR) {
+ sv_setpv(TARG, ""); /* note that this preserves previous buffer */
while (sv_gets(TARG, fp, SvCUR(TARG)) != Nullch)
/*SUPPRESS 530*/
;
XPUSHs(TARG);
while (sv_gets(TARG, fp, SvCUR(TARG)) != Nullch)
/*SUPPRESS 530*/
;
XPUSHs(TARG);
+ SvTAINTED_on(TARG);
}
else {
SV *sv;
}
else {
SV *sv;
@@
-167,13
+204,15
@@
PP(pp_backtick)
SvLEN_set(sv, SvCUR(sv)+1);
Renew(SvPVX(sv), SvLEN(sv), char);
}
SvLEN_set(sv, SvCUR(sv)+1);
Renew(SvPVX(sv), SvLEN(sv), char);
}
+ SvTAINTED_on(sv);
}
}
}
}
- statusvalue = FIXSTATUS(my_pclose(fp));
+ STATUS_NATIVE_SET(my_pclose(fp));
+ TAINT; /* "I believe that this is not gratuitous!" */
}
else {
}
else {
-
statusvalue = -1
;
- if (
GIMME
== G_SCALAR)
+
STATUS_NATIVE_SET(-1)
;
+ if (
gimme
== G_SCALAR)
RETPUSHUNDEF;
}
RETPUSHUNDEF;
}
@@
-276,18
+315,18
@@
PP(pp_open)
if (MAXARG > 1)
sv = POPs;
if (MAXARG > 1)
sv = POPs;
- else if (SvTYPE(TOPs) == SVt_PVGV)
- sv = GvSV(TOPs);
- else
+ if (!isGV(TOPs))
DIE(no_usym, "filehandle");
DIE(no_usym, "filehandle");
+ if (MAXARG <= 1)
+ sv = GvSV(TOPs);
gv = (GV*)POPs;
gv = (GV*)POPs;
- if (IoFLAGS(GvIOn(gv)) & IOf_UNTAINT) /* This GV has UNTAINT previously set */
- IoFLAGS(GvIOp(gv)) &= ~IOf_UNTAINT; /* Clear it. We don't carry that over */
+ if (!isGV(gv))
+ DIE(no_usym, "filehandle");
+ if (GvIOp(gv))
+ IoFLAGS(GvIOp(gv)) &= ~IOf_UNTAINT;
tmps = SvPV(sv, len);
tmps = SvPV(sv, len);
- if (do_open(gv, tmps, len, FALSE, 0, 0, Nullfp)) {
- IoLINES(GvIOp(gv)) = 0;
+ if (do_open(gv, tmps, len, FALSE, 0, 0, Nullfp))
PUSHi( (I32)forkprocess );
PUSHi( (I32)forkprocess );
- }
else if (forkprocess == 0) /* we are a new child */
PUSHi(0);
else
else if (forkprocess == 0) /* we are a new child */
PUSHi(0);
else
@@
-305,7
+344,7
@@
PP(pp_close)
else
gv = (GV*)POPs;
EXTEND(SP, 1);
else
gv = (GV*)POPs;
EXTEND(SP, 1);
- PUSHs(
do_close(gv, TRUE) ? &sv_yes : &sv_no
);
+ PUSHs(
boolSV(do_close(gv, TRUE))
);
RETURN;
}
RETURN;
}
@@
-448,6
+487,7
@@
PP(pp_tie)
SV **mark = stack_base + ++*markstack_ptr; /* reuse in entersub */
I32 markoff = mark - stack_base - 1;
char *methname;
SV **mark = stack_base + ++*markstack_ptr; /* reuse in entersub */
I32 markoff = mark - stack_base - 1;
char *methname;
+ bool oldcatch = CATCH_GET;
varsv = mark[0];
if (SvTYPE(varsv) == SVt_PVHV)
varsv = mark[0];
if (SvTYPE(varsv) == SVt_PVHV)
@@
-460,14
+500,15
@@
PP(pp_tie)
methname = "TIESCALAR";
stash = gv_stashsv(mark[1], FALSE);
methname = "TIESCALAR";
stash = gv_stashsv(mark[1], FALSE);
- if (!stash || !(gv = gv_fetchmethod(stash, methname))
|| !GvCV(gv)
)
+ if (!stash || !(gv = gv_fetchmethod(stash, methname)))
DIE("Can't locate object method \"%s\" via package \"%s\"",
methname, SvPV(mark[1],na));
Zero(&myop, 1, BINOP);
myop.op_last = (OP *) &myop;
myop.op_next = Nullop;
DIE("Can't locate object method \"%s\" via package \"%s\"",
methname, SvPV(mark[1],na));
Zero(&myop, 1, BINOP);
myop.op_last = (OP *) &myop;
myop.op_next = Nullop;
- myop.op_flags = OPf_KNOW|OPf_STACKED;
+ myop.op_flags = OPf_WANT_SCALAR | OPf_STACKED;
+ CATCH_SET(TRUE);
ENTER;
SAVESPTR(op);
ENTER;
SAVESPTR(op);
@@
-475,13
+516,14
@@
PP(pp_tie)
if (perldb && curstash != debstash)
op->op_private |= OPpENTERSUB_DB;
if (perldb && curstash != debstash)
op->op_private |= OPpENTERSUB_DB;
- XPUSHs((SV*)
gv
);
+ XPUSHs((SV*)
GvCV(gv)
);
PUTBACK;
if (op = pp_entersub())
runops();
SPAGAIN;
PUTBACK;
if (op = pp_entersub())
runops();
SPAGAIN;
+ CATCH_SET(oldcatch);
sv = TOPs;
if (sv_isobject(sv)) {
if (SvTYPE(varsv) == SVt_PVHV || SvTYPE(varsv) == SVt_PVAV) {
sv = TOPs;
if (sv_isobject(sv)) {
if (SvTYPE(varsv) == SVt_PVHV || SvTYPE(varsv) == SVt_PVAV) {
@@
-515,8
+557,8
@@
PP(pp_untie)
mg = mg_find(sv, 'q') ;
if (mg && SvREFCNT(SvRV(mg->mg_obj)) > 1)
mg = mg_find(sv, 'q') ;
if (mg && SvREFCNT(SvRV(mg->mg_obj)) > 1)
- warn("untie attempted while %
d
inner references still exist",
- SvREFCNT(SvRV(mg->mg_obj)) - 1 ) ;
+ warn("untie attempted while %
lu
inner references still exist",
+
(unsigned long)
SvREFCNT(SvRV(mg->mg_obj)) - 1 ) ;
}
}
}
}
@@
-558,24
+600,26
@@
PP(pp_dbmopen)
GV *gv;
BINOP myop;
SV *sv;
GV *gv;
BINOP myop;
SV *sv;
+ bool oldcatch = CATCH_GET;
hv = (HV*)POPs;
sv = sv_mortalcopy(&sv_no);
sv_setpv(sv, "AnyDBM_File");
stash = gv_stashsv(sv, FALSE);
hv = (HV*)POPs;
sv = sv_mortalcopy(&sv_no);
sv_setpv(sv, "AnyDBM_File");
stash = gv_stashsv(sv, FALSE);
- if (!stash || !(gv = gv_fetchmethod(stash, "TIEHASH"))
|| !GvCV(gv)
) {
+ if (!stash || !(gv = gv_fetchmethod(stash, "TIEHASH"))) {
PUTBACK;
perl_require_pv("AnyDBM_File.pm");
SPAGAIN;
PUTBACK;
perl_require_pv("AnyDBM_File.pm");
SPAGAIN;
- if (!(gv = gv_fetchmethod(stash, "TIEHASH"))
|| !GvCV(gv)
)
+ if (!(gv = gv_fetchmethod(stash, "TIEHASH")))
DIE("No dbm on this machine");
}
Zero(&myop, 1, BINOP);
myop.op_last = (OP *) &myop;
myop.op_next = Nullop;
DIE("No dbm on this machine");
}
Zero(&myop, 1, BINOP);
myop.op_last = (OP *) &myop;
myop.op_next = Nullop;
- myop.op_flags = OPf_KNOW|OPf_STACKED;
+ myop.op_flags = OPf_WANT_SCALAR | OPf_STACKED;
+ CATCH_SET(TRUE);
ENTER;
SAVESPTR(op);
ENTER;
SAVESPTR(op);
@@
-593,7
+637,7
@@
PP(pp_dbmopen)
else
PUSHs(sv_2mortal(newSViv(O_RDWR)));
PUSHs(right);
else
PUSHs(sv_2mortal(newSViv(O_RDWR)));
PUSHs(right);
- PUSHs((SV*)
gv
);
+ PUSHs((SV*)
GvCV(gv)
);
PUTBACK;
if (op = pp_entersub())
PUTBACK;
if (op = pp_entersub())
@@
-610,7
+654,7
@@
PP(pp_dbmopen)
PUSHs(left);
PUSHs(sv_2mortal(newSViv(O_RDONLY)));
PUSHs(right);
PUSHs(left);
PUSHs(sv_2mortal(newSViv(O_RDONLY)));
PUSHs(right);
- PUSHs((SV*)
gv
);
+ PUSHs((SV*)
GvCV(gv)
);
PUTBACK;
if (op = pp_entersub())
PUTBACK;
if (op = pp_entersub())
@@
-618,6
+662,7
@@
PP(pp_dbmopen)
SPAGAIN;
}
SPAGAIN;
}
+ CATCH_SET(oldcatch);
if (sv_isobject(TOPs))
sv_magic((SV*)hv, TOPs, 'P', Nullch, 0);
LEAVE;
if (sv_isobject(TOPs))
sv_magic((SV*)hv, TOPs, 'P', Nullch, 0);
LEAVE;
@@
-667,7
+712,7
@@
PP(pp_sselect)
}
#if BYTEORDER == 0x1234 || BYTEORDER == 0x12345678
}
#if BYTEORDER == 0x1234 || BYTEORDER == 0x12345678
-#if
def __linux__
+#if
defined(__linux__) || defined(OS2)
growsize = sizeof(fd_set);
#else
growsize = maxlen; /* little endians can use vecs directly */
growsize = sizeof(fd_set);
#else
growsize = maxlen; /* little endians can use vecs directly */
@@
-790,11
+835,13
@@
PP(pp_select)
XPUSHs(&sv_undef);
else {
GV **gvp = (GV**)hv_fetch(hv, GvNAME(egv), GvNAMELEN(egv), FALSE);
XPUSHs(&sv_undef);
else {
GV **gvp = (GV**)hv_fetch(hv, GvNAME(egv), GvNAMELEN(egv), FALSE);
- if (gvp && *gvp == egv)
+ if (gvp && *gvp == egv)
{
gv_efullname3(TARG, defoutgv, Nullch);
gv_efullname3(TARG, defoutgv, Nullch);
- else
- sv_setsv(TARG, sv_2mortal(newRV((SV*)egv)));
- XPUSHTARG;
+ XPUSHTARG;
+ }
+ else {
+ XPUSHs(sv_2mortal(newRV((SV*)egv)));
+ }
}
if (newdefout) {
}
if (newdefout) {
@@
-810,6
+857,7
@@
PP(pp_getc)
{
dSP; dTARGET;
GV *gv;
{
dSP; dTARGET;
GV *gv;
+ MAGIC *mg;
if (MAXARG <= 0)
gv = stdingv;
if (MAXARG <= 0)
gv = stdingv;
@@
-817,6
+865,20
@@
PP(pp_getc)
gv = (GV*)POPs;
if (!gv)
gv = argvgv;
gv = (GV*)POPs;
if (!gv)
gv = argvgv;
+
+ if (SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) {
+ I32 gimme = GIMME_V;
+ PUSHMARK(SP);
+ XPUSHs(mg->mg_obj);
+ PUTBACK;
+ ENTER;
+ perl_call_method("GETC", gimme);
+ LEAVE;
+ SPAGAIN;
+ if (gimme == G_SCALAR)
+ SvSetMagicSV_nosteal(TARG, TOPs);
+ RETURN;
+ }
if (!gv || do_eof(gv)) /* make sure we have fp with something */
RETPUSHUNDEF;
TAINT;
if (!gv || do_eof(gv)) /* make sure we have fp with something */
RETPUSHUNDEF;
TAINT;
@@
-838,7
+900,7
@@
GV *gv;
OP *retop;
{
register CONTEXT *cx;
OP *retop;
{
register CONTEXT *cx;
- I32 gimme = GIMME;
+ I32 gimme = GIMME
_V
;
AV* padlist = CvPADLIST(cv);
SV** svp = AvARRAY(padlist);
AV* padlist = CvPADLIST(cv);
SV** svp = AvARRAY(padlist);
@@
-881,7
+943,6
@@
PP(pp_enterwrite)
fgv = gv;
cv = GvFORM(fgv);
fgv = gv;
cv = GvFORM(fgv);
-
if (!cv) {
if (fgv) {
SV *tmpsv = sv_newmortal();
if (!cv) {
if (fgv) {
SV *tmpsv = sv_newmortal();
@@
-890,8
+951,10
@@
PP(pp_enterwrite)
}
DIE("Not a format reference");
}
}
DIE("Not a format reference");
}
- IoFLAGS(io) &= ~IOf_DIDTOP;
+ if (CvCLONE(cv))
+ cv = (CV*)sv_2mortal((SV*)cv_clone(cv));
+ IoFLAGS(io) &= ~IOf_DIDTOP;
return doform(cv,gv,op->op_next);
}
return doform(cv,gv,op->op_next);
}
@@
-915,16
+978,16
@@
PP(pp_leavewrite)
CV *cv;
if (!IoTOP_GV(io)) {
GV *topgv;
CV *cv;
if (!IoTOP_GV(io)) {
GV *topgv;
-
char tmpbuf[256]
;
+
SV *topname
;
if (!IoTOP_NAME(io)) {
if (!IoFMT_NAME(io))
IoFMT_NAME(io) = savepv(GvNAME(gv));
if (!IoTOP_NAME(io)) {
if (!IoFMT_NAME(io))
IoFMT_NAME(io) = savepv(GvNAME(gv));
-
sprintf(tmpbuf, "%s_TOP", IoFMT_NAME(io
));
- topgv = gv_fetchpv(
tmpbuf,
FALSE, SVt_PVFM);
+
topname = sv_2mortal(newSVpvf("%s_TOP", IoFMT_NAME(io)
));
+ topgv = gv_fetchpv(
SvPVX(topname),
FALSE, SVt_PVFM);
if ((topgv && GvFORM(topgv)) ||
!gv_fetchpv("top",FALSE,SVt_PVFM))
if ((topgv && GvFORM(topgv)) ||
!gv_fetchpv("top",FALSE,SVt_PVFM))
- IoTOP_NAME(io) = savepv(
tmpbuf
);
+ IoTOP_NAME(io) = savepv(
SvPVX(topname)
);
else
IoTOP_NAME(io) = savepv("top");
}
else
IoTOP_NAME(io) = savepv("top");
}
@@
-967,6
+1030,8
@@
PP(pp_leavewrite)
gv_efullname3(tmpsv, fgv, Nullch);
DIE("Undefined top format \"%s\" called",SvPVX(tmpsv));
}
gv_efullname3(tmpsv, fgv, Nullch);
DIE("Undefined top format \"%s\" called",SvPVX(tmpsv));
}
+ if (CvCLONE(cv))
+ cv = (CV*)sv_2mortal((SV*)cv_clone(cv));
return doform(cv,gv,op);
}
return doform(cv,gv,op);
}
@@
-1013,12
+1078,35
@@
PP(pp_prtf)
GV *gv;
IO *io;
PerlIO *fp;
GV *gv;
IO *io;
PerlIO *fp;
- SV *sv = NEWSV(0,0);
+ SV *sv;
+ MAGIC *mg;
if (op->op_flags & OPf_STACKED)
gv = (GV*)*++MARK;
else
gv = defoutgv;
if (op->op_flags & OPf_STACKED)
gv = (GV*)*++MARK;
else
gv = defoutgv;
+
+ if (SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) {
+ if (MARK == ORIGMARK) {
+ EXTEND(SP, 1);
+ ++MARK;
+ Move(MARK, MARK + 1, (SP - MARK) + 1, SV*);
+ ++SP;
+ }
+ PUSHMARK(MARK - 1);
+ *MARK = mg->mg_obj;
+ PUTBACK;
+ ENTER;
+ perl_call_method("PRINTF", G_SCALAR);
+ LEAVE;
+ SPAGAIN;
+ MARK = ORIGMARK + 1;
+ *MARK = *SP;
+ SP = MARK;
+ RETURN;
+ }
+
+ sv = NEWSV(0,0);
if (!(io = GvIO(gv))) {
if (dowarn) {
gv_fullname3(sv, gv, Nullch);
if (!(io = GvIO(gv))) {
if (dowarn) {
gv_fullname3(sv, gv, Nullch);
@@
-1039,12
+1127,12
@@
PP(pp_prtf)
goto just_say_no;
}
else {
goto just_say_no;
}
else {
-#ifdef
LC
_NUMERIC
+#ifdef
USE_LOCALE
_NUMERIC
if (op->op_private & OPpLOCALE)
if (op->op_private & OPpLOCALE)
- NUMERIC_LOCAL();
+
SET_
NUMERIC_LOCAL();
else
else
- NUMERIC_STANDARD();
-#endif
/* LC_NUMERIC */
+
SET_
NUMERIC_STANDARD();
+#endif
do_sprintf(sv, SP - MARK, MARK + 1);
if (!do_print(sv, fp))
goto just_say_no;
do_sprintf(sv, SP - MARK, MARK + 1);
if (!do_print(sv, fp))
goto just_say_no;
@@
-1100,12
+1188,30
@@
PP(pp_sysread)
GV *gv;
IO *io;
char *buffer;
GV *gv;
IO *io;
char *buffer;
-
in
t length;
-
in
t bufsize;
+
SSize_
t length;
+
Sock_size_
t bufsize;
SV *bufsv;
STRLEN blen;
SV *bufsv;
STRLEN blen;
+ MAGIC *mg;
gv = (GV*)*++MARK;
gv = (GV*)*++MARK;
+ if ((op->op_type == OP_READ || op->op_type == OP_SYSREAD) &&
+ SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q')))
+ {
+ SV *sv;
+
+ PUSHMARK(MARK-1);
+ *MARK = mg->mg_obj;
+ ENTER;
+ perl_call_method("READ", G_SCALAR);
+ LEAVE;
+ SPAGAIN;
+ sv = POPs;
+ SP = ORIGMARK;
+ PUSHs(sv);
+ RETURN;
+ }
+
if (!gv)
goto say_undef;
bufsv = *++MARK;
if (!gv)
goto say_undef;
bufsv = *++MARK;
@@
-1125,11
+1231,12
@@
PP(pp_sysread)
goto say_undef;
#ifdef HAS_SOCKET
if (op->op_type == OP_RECV) {
goto say_undef;
#ifdef HAS_SOCKET
if (op->op_type == OP_RECV) {
- bufsize = sizeof buf;
+ char namebuf[MAXPATHLEN];
+ bufsize = sizeof namebuf;
buffer = SvGROW(bufsv, length+1);
/* 'offset' means 'flags' here */
length = recvfrom(PerlIO_fileno(IoIFP(io)), buffer, length, offset,
buffer = SvGROW(bufsv, length+1);
/* 'offset' means 'flags' here */
length = recvfrom(PerlIO_fileno(IoIFP(io)), buffer, length, offset,
-
(struct sockaddr *)
buf, &bufsize);
+
(struct sockaddr *)name
buf, &bufsize);
if (length < 0)
RETPUSHUNDEF;
SvCUR_set(bufsv, length);
if (length < 0)
RETPUSHUNDEF;
SvCUR_set(bufsv, length);
@@
-1140,7
+1247,7
@@
PP(pp_sysread)
if (!(IoFLAGS(io) & IOf_UNTAINT))
SvTAINTED_on(bufsv);
SP = ORIGMARK;
if (!(IoFLAGS(io) & IOf_UNTAINT))
SvTAINTED_on(bufsv);
SP = ORIGMARK;
- sv_setpvn(TARG, buf, bufsize);
+ sv_setpvn(TARG,
name
buf, bufsize);
PUSHs(TARG);
RETURN;
}
PUSHs(TARG);
RETURN;
}
@@
-1164,9
+1271,10
@@
PP(pp_sysread)
else
#ifdef HAS_SOCKET__bad_code_maybe
if (IoTYPE(io) == 's') {
else
#ifdef HAS_SOCKET__bad_code_maybe
if (IoTYPE(io) == 's') {
- bufsize = sizeof buf;
+ char namebuf[MAXPATHLEN];
+ bufsize = sizeof namebuf;
length = recvfrom(PerlIO_fileno(IoIFP(io)), buffer+offset, length, 0,
length = recvfrom(PerlIO_fileno(IoIFP(io)), buffer+offset, length, 0,
-
(struct sockaddr *)
buf, &bufsize);
+
(struct sockaddr *)name
buf, &bufsize);
}
else
#endif
}
else
#endif
@@
-1278,7
+1386,7
@@
PP(pp_eof)
gv = last_in_gv;
else
gv = last_in_gv = (GV*)POPs;
gv = last_in_gv;
else
gv = last_in_gv = (GV*)POPs;
- PUSHs(
!gv || do_eof(gv) ? &sv_yes : &sv_no
);
+ PUSHs(
boolSV(!gv || do_eof(gv))
);
RETURN;
}
RETURN;
}
@@
-1297,13
+1405,25
@@
PP(pp_tell)
PP(pp_seek)
{
PP(pp_seek)
{
+ return pp_sysseek(ARGS);
+}
+
+PP(pp_sysseek)
+{
dSP;
GV *gv;
int whence = POPi;
long offset = POPl;
gv = last_in_gv = (GV*)POPs;
dSP;
GV *gv;
int whence = POPi;
long offset = POPl;
gv = last_in_gv = (GV*)POPs;
- PUSHs( do_seek(gv, offset, whence) ? &sv_yes : &sv_no );
+ if (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
+ : sv_2mortal(n ? newSViv((IV)n)
+ : newSVpv(zero_but_true, ZBTLEN)));
+ }
RETURN;
}
RETURN;
}
@@
-1317,8
+1437,9
@@
PP(pp_truncate)
SETERRNO(0,0);
#if defined(HAS_TRUNCATE) || defined(HAS_CHSIZE) || defined(F_FREESP)
if (op->op_flags & OPf_SPECIAL) {
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);
+ tmpgv = gv_fetchpv(POPp,
FALSE, SVt_PVIO);
do_ftruncate:
do_ftruncate:
+ TAINT_PROPER("truncate");
if (!GvIO(tmpgv) || !IoIFP(GvIOp(tmpgv)) ||
#ifdef HAS_TRUNCATE
ftruncate(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), len) < 0)
if (!GvIO(tmpgv) || !IoIFP(GvIOp(tmpgv)) ||
#ifdef HAS_TRUNCATE
ftruncate(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), len) < 0)
@@
-1329,6
+1450,8
@@
PP(pp_truncate)
}
else {
SV *sv = POPs;
}
else {
SV *sv = POPs;
+ char *name;
+
if (SvTYPE(sv) == SVt_PVGV) {
tmpgv = (GV*)sv; /* *main::FRED for example */
goto do_ftruncate;
if (SvTYPE(sv) == SVt_PVGV) {
tmpgv = (GV*)sv; /* *main::FRED for example */
goto do_ftruncate;
@@
-1337,14
+1460,16
@@
PP(pp_truncate)
tmpgv = (GV*) SvRV(sv); /* \*main::FRED for example */
goto do_ftruncate;
}
tmpgv = (GV*) SvRV(sv); /* \*main::FRED for example */
goto do_ftruncate;
}
+
+ name = SvPV(sv, na);
+ TAINT_PROPER("truncate");
#ifdef HAS_TRUNCATE
#ifdef HAS_TRUNCATE
- if (truncate
(SvPV (sv, na)
, len) < 0)
+ if (truncate
(name
, len) < 0)
result = 0;
#else
{
int tmpfd;
result = 0;
#else
{
int tmpfd;
-
- if ((tmpfd = open(SvPV (sv, na), O_RDWR)) < 0)
+ if ((tmpfd = open(name, O_RDWR)) < 0)
result = 0;
else {
if (my_chsize(tmpfd, len) < 0)
result = 0;
else {
if (my_chsize(tmpfd, len) < 0)
@@
-1377,7
+1502,7
@@
PP(pp_ioctl)
unsigned int func = U_I(POPn);
int optype = op->op_type;
char *s;
unsigned int func = U_I(POPn);
int optype = op->op_type;
char *s;
-
int
retval;
+
IV
retval;
GV *gv = (GV*)POPs;
IO *io = GvIOn(gv);
GV *gv = (GV*)POPs;
IO *io = GvIOn(gv);
@@
-1388,22
+1513,19
@@
PP(pp_ioctl)
if (SvPOK(argsv) || !SvNIOK(argsv)) {
STRLEN len;
if (SvPOK(argsv) || !SvNIOK(argsv)) {
STRLEN len;
+ STRLEN need;
s = SvPV_force(argsv, len);
s = SvPV_force(argsv, len);
-
retval
= IOCPARM_LEN(func);
- if (len <
retval
) {
- s = Sv_Grow(argsv,
retval+
1);
- SvCUR_set(argsv,
retval
);
+
need
= IOCPARM_LEN(func);
+ if (len <
need
) {
+ s = Sv_Grow(argsv,
need +
1);
+ SvCUR_set(argsv,
need
);
}
s[SvCUR(argsv)] = 17; /* a little sanity check here */
}
else {
retval = SvIV(argsv);
}
s[SvCUR(argsv)] = 17; /* a little sanity check here */
}
else {
retval = SvIV(argsv);
-#ifdef DOSISH
- s = (char*)(long)retval; /* ouch */
-#else
s = (char*)retval; /* ouch */
s = (char*)retval; /* ouch */
-#endif
}
TAINT_PROPER(optype == OP_IOCTL ? "ioctl" : "fcntl");
}
TAINT_PROPER(optype == OP_IOCTL ? "ioctl" : "fcntl");
@@
-1439,7
+1561,7
@@
PP(pp_ioctl)
PUSHi(retval);
}
else {
PUSHi(retval);
}
else {
- PUSHp(
"0 but true", 10
);
+ PUSHp(
zero_but_true, ZBTLEN
);
}
RETURN;
}
}
RETURN;
}
@@
-1463,6
+1585,7
@@
PP(pp_flock)
else
fp = Nullfp;
if (fp) {
else
fp = Nullfp;
if (fp) {
+ (void)PerlIO_flush(fp);
value = (I32)(FLOCK(PerlIO_fileno(fp), argtype) >= 0);
}
else
value = (I32)(FLOCK(PerlIO_fileno(fp), argtype) >= 0);
}
else
@@
-1663,7
+1786,7
@@
PP(pp_accept)
register IO *nstio;
register IO *gstio;
struct sockaddr saddr; /* use a struct to avoid alignment problems */
register IO *nstio;
register IO *gstio;
struct sockaddr saddr; /* use a struct to avoid alignment problems */
-
in
t len = sizeof saddr;
+
Sock_size_
t len = sizeof saddr;
int fd;
ggv = (GV*)POPs;
int fd;
ggv = (GV*)POPs;
@@
-1755,7
+1878,7
@@
PP(pp_ssockopt)
unsigned int lvl;
GV *gv;
register IO *io;
unsigned int lvl;
GV *gv;
register IO *io;
-
int aint
;
+
Sock_size_t len
;
if (optype == OP_GSOCKOPT)
sv = sv_2mortal(NEWSV(22, 257));
if (optype == OP_GSOCKOPT)
sv = sv_2mortal(NEWSV(22, 257));
@@
-1776,24
+1899,26
@@
PP(pp_ssockopt)
(void)SvPOK_only(sv);
SvCUR_set(sv,256);
*SvEND(sv) ='\0';
(void)SvPOK_only(sv);
SvCUR_set(sv,256);
*SvEND(sv) ='\0';
-
aint
= SvCUR(sv);
- if (getsockopt(fd, lvl, optname, SvPVX(sv), &
aint
) < 0)
+
len
= SvCUR(sv);
+ if (getsockopt(fd, lvl, optname, SvPVX(sv), &
len
) < 0)
goto nuts2;
goto nuts2;
- SvCUR_set(sv,
aint
);
+ SvCUR_set(sv,
len
);
*SvEND(sv) ='\0';
PUSHs(sv);
break;
case OP_SSOCKOPT: {
*SvEND(sv) ='\0';
PUSHs(sv);
break;
case OP_SSOCKOPT: {
- STRLEN len = 0;
- char *buf = 0;
- if (SvPOKp(sv))
- buf = SvPV(sv, len);
+ char *buf;
+ int aint;
+ if (SvPOKp(sv)) {
+ buf = SvPV(sv, na);
+ len = na;
+ }
else if (SvOK(sv)) {
aint = (int)SvIV(sv);
buf = (char*)&aint;
len = sizeof(int);
}
else if (SvOK(sv)) {
aint = (int)SvIV(sv);
buf = (char*)&aint;
len = sizeof(int);
}
- if (setsockopt(fd, lvl, optname, buf,
(int)
len) < 0)
+ if (setsockopt(fd, lvl, optname, buf, len) < 0)
goto nuts2;
PUSHs(&sv_yes);
}
goto nuts2;
PUSHs(&sv_yes);
}
@@
-1831,28
+1956,34
@@
PP(pp_getpeername)
int fd;
GV *gv = (GV*)POPs;
register IO *io = GvIOn(gv);
int fd;
GV *gv = (GV*)POPs;
register IO *io = GvIOn(gv);
-
int aint
;
+
Sock_size_t len
;
if (!io || !IoIFP(io))
goto nuts;
sv = sv_2mortal(NEWSV(22, 257));
(void)SvPOK_only(sv);
if (!io || !IoIFP(io))
goto nuts;
sv = sv_2mortal(NEWSV(22, 257));
(void)SvPOK_only(sv);
- SvCUR_set(sv,256);
+ len = 256;
+ SvCUR_set(sv, len);
*SvEND(sv) ='\0';
*SvEND(sv) ='\0';
- aint = SvCUR(sv);
fd = PerlIO_fileno(IoIFP(io));
switch (optype) {
case OP_GETSOCKNAME:
fd = PerlIO_fileno(IoIFP(io));
switch (optype) {
case OP_GETSOCKNAME:
- if (getsockname(fd, (struct sockaddr *)SvPVX(sv), &
aint
) < 0)
+ if (getsockname(fd, (struct sockaddr *)SvPVX(sv), &
len
) < 0)
goto nuts2;
break;
case OP_GETPEERNAME:
goto nuts2;
break;
case OP_GETPEERNAME:
- if (getpeername(fd, (struct sockaddr *)SvPVX(sv), &
aint
) < 0)
+ if (getpeername(fd, (struct sockaddr *)SvPVX(sv), &
len
) < 0)
goto nuts2;
break;
}
goto nuts2;
break;
}
- SvCUR_set(sv,aint);
+#ifdef BOGUS_GETNAME_RETURN
+ /* Interactive Unix, getpeername() and getsockname()
+ does not return valid namelen */
+ if (len == BOGUS_GETNAME_RETURN)
+ len = sizeof(struct sockaddr);
+#endif
+ SvCUR_set(sv, len);
*SvEND(sv) ='\0';
PUSHs(sv);
RETURN;
*SvEND(sv) ='\0';
PUSHs(sv);
RETURN;
@@
-1880,6
+2011,7
@@
PP(pp_stat)
{
dSP;
GV *tmpgv;
{
dSP;
GV *tmpgv;
+ I32 gimme;
I32 max = 13;
if (op->op_flags & OPf_REF) {
I32 max = 13;
if (op->op_flags & OPf_REF) {
@@
-1889,13
+2021,10
@@
PP(pp_stat)
laststype = OP_STAT;
statgv = tmpgv;
sv_setpv(statname, "");
laststype = OP_STAT;
statgv = tmpgv;
sv_setpv(statname, "");
- if (!GvIO(tmpgv) || !IoIFP(GvIOp(tmpgv)) ||
- Fstat(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), &statcache) < 0) {
- max = 0;
- laststatval = -1;
- }
+ laststatval = (GvIO(tmpgv) && IoIFP(GvIOp(tmpgv))
+ ? Fstat(PerlIO_fileno(IoIFP(GvIOn(tmpgv))), &statcache) : -1);
}
}
-
else
if (laststatval < 0)
+ if (laststatval < 0)
max = 0;
}
else {
max = 0;
}
else {
@@
-1924,15
+2053,15
@@
PP(pp_stat)
}
}
}
}
- EXTEND(SP, 13);
- EXTEND_MORTAL(13);
- if (GIMME != G_ARRAY) {
- if (max)
- RETPUSHYES;
- else
- RETPUSHUNDEF;
+ gimme = GIMME_V;
+ if (gimme != G_ARRAY) {
+ if (gimme != G_VOID)
+ XPUSHs(boolSV(max));
+ RETURN;
}
if (max) {
}
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_dev)));
PUSHs(sv_2mortal(newSViv((I32)statcache.st_ino)));
PUSHs(sv_2mortal(newSViv((I32)statcache.st_mode)));
@@
-2266,11
+2395,21
@@
PP(pp_fttext)
STDCHAR tbuf[512];
register STDCHAR *s;
register IO *io;
STDCHAR tbuf[512];
register STDCHAR *s;
register IO *io;
- SV *sv;
+ register SV *sv;
+ GV *gv;
- if (op->op_flags & OPf_REF) {
+ if (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 = Nullgv;
+
+ if (gv) {
EXTEND(SP, 1);
EXTEND(SP, 1);
- if (
cGVOP->op_
gv == defgv) {
+ if (gv == defgv) {
if (statgv)
io = GvIO(statgv);
else {
if (statgv)
io = GvIO(statgv);
else {
@@
-2279,13
+2418,17
@@
PP(pp_fttext)
}
}
else {
}
}
else {
- statgv = cGVOP->op_gv;
+ statgv = gv;
+ laststatval = -1;
sv_setpv(statname, "");
io = GvIO(statgv);
}
if (io && IoIFP(io)) {
sv_setpv(statname, "");
io = GvIO(statgv);
}
if (io && IoIFP(io)) {
- if (PerlIO_has_base(IoIFP(io))) {
- Fstat(PerlIO_fileno(IoIFP(io)), &statcache);
+ if (! PerlIO_has_base(IoIFP(io)))
+ DIE("-T and -B not implemented on filehandles");
+ laststatval = Fstat(PerlIO_fileno(IoIFP(io)), &statcache);
+ if (laststatval < 0)
+ RETPUSHUNDEF;
if (S_ISDIR(statcache.st_mode)) /* handle NFS glitch */
if (op->op_type == OP_FTTEXT)
RETPUSHNO;
if (S_ISDIR(statcache.st_mode)) /* handle NFS glitch */
if (op->op_type == OP_FTTEXT)
RETPUSHNO;
@@
-2303,10
+2446,6
@@
PP(pp_fttext)
/* sfio can have large buffers - limit to 512 */
if (len > 512)
len = 512;
/* sfio can have large buffers - limit to 512 */
if (len > 512)
len = 512;
- }
- else {
- DIE("-T and -B not implemented on filehandles");
- }
}
else {
if (dowarn)
}
else {
if (dowarn)
@@
-2318,9
+2457,10
@@
PP(pp_fttext)
}
else {
sv = POPs;
}
else {
sv = POPs;
+ really_filename:
statgv = Nullgv;
statgv = Nullgv;
+ laststatval = -1;
sv_setpv(statname, SvPV(sv, na));
sv_setpv(statname, SvPV(sv, na));
- really_filename:
#ifdef HAS_OPEN3
i = open(SvPV(sv, na), O_RDONLY, 0);
#else
#ifdef HAS_OPEN3
i = open(SvPV(sv, na), O_RDONLY, 0);
#else
@@
-2331,7
+2471,9
@@
PP(pp_fttext)
warn(warn_nl, "open");
RETPUSHUNDEF;
}
warn(warn_nl, "open");
RETPUSHUNDEF;
}
- Fstat(i, &statcache);
+ laststatval = Fstat(i, &statcache);
+ if (laststatval < 0)
+ RETPUSHUNDEF;
len = read(i, tbuf, 512);
(void)close(i);
if (len <= 0) {
len = read(i, tbuf, 512);
(void)close(i);
if (len <= 0) {
@@
-2470,13
+2612,15
@@
PP(pp_rename)
#ifdef HAS_RENAME
anum = rename(tmps, tmps2);
#else
#ifdef HAS_RENAME
anum = rename(tmps, tmps2);
#else
- 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))
- (void)UNLINK(tmps2);
- if (!(anum = link(tmps, tmps2)))
- anum = UNLINK(tmps);
+ if (!(anum = Stat(tmps, &statbuf))) {
+ if (same_dirent(tmps2, tmps)) /* can always rename to same name */
+ anum = 1;
+ else {
+ if (euid || Stat(tmps2, &statbuf) < 0 || !S_ISDIR(statbuf.st_mode))
+ (void)UNLINK(tmps2);
+ if (!(anum = link(tmps, tmps2)))
+ anum = UNLINK(tmps);
+ }
}
#endif
SETi( anum >= 0 );
}
#endif
SETi( anum >= 0 );
@@
-2516,7
+2660,9
@@
PP(pp_readlink)
dSP; dTARGET;
#ifdef HAS_SYMLINK
char *tmps;
dSP; dTARGET;
#ifdef HAS_SYMLINK
char *tmps;
+ char buf[MAXPATHLEN];
int len;
int len;
+
tmps = POPp;
len = readlink(tmps, buf, sizeof buf);
EXTEND(SP, 1);
tmps = POPp;
len = readlink(tmps, buf, sizeof buf);
EXTEND(SP, 1);
@@
-2536,55
+2682,68
@@
dooneliner(cmd, filename)
char *cmd;
char *filename;
{
char *cmd;
char *filename;
{
- char mybuf[8192];
- char *s,
- *save_filename = filename;
- int anum = 1;
+ char *save_filename = filename;
+ char *cmdline;
+ char *s;
PerlIO *myfp;
PerlIO *myfp;
+ int anum = 1;
- strcpy(mybuf, cmd);
- strcat(mybuf, " ");
- for (s = mybuf+strlen(mybuf); *filename; ) {
+ New(666, cmdline, strlen(cmd) + (strlen(filename) * 2) + 10, char);
+ strcpy(cmdline, cmd);
+ strcat(cmdline, " ");
+ for (s = cmdline + strlen(cmdline); *filename; ) {
*s++ = '\\';
*s++ = *filename++;
}
strcpy(s, " 2>&1");
*s++ = '\\';
*s++ = *filename++;
}
strcpy(s, " 2>&1");
- myfp = my_popen(mybuf, "r");
+ myfp = my_popen(cmdline, "r");
+ Safefree(cmdline);
+
if (myfp) {
if (myfp) {
-
*mybuf = '\0'
;
+
SV *tmpsv = sv_newmortal()
;
/* Need to save/restore 'rs' ?? */
s = sv_gets(tmpsv, myfp, 0);
(void)my_pclose(myfp);
if (s != Nullch) {
/* Need to save/restore 'rs' ?? */
s = sv_gets(tmpsv, myfp, 0);
(void)my_pclose(myfp);
if (s != Nullch) {
- for (errno = 1; errno < sys_nerr; errno++) {
+ int e;
+ for (e = 1;
#ifdef HAS_SYS_ERRLIST
#ifdef HAS_SYS_ERRLIST
- if (instr(mybuf, sys_errlist[errno])) /* you don't see this */
- return 0;
+ e <= sys_nerr
+#endif
+ ; e++)
+ {
+ /* you don't see this */
+ char *errmsg =
+#ifdef HAS_SYS_ERRLIST
+ sys_errlist[e]
#else
#else
- char *errmsg; /* especially if it isn't there */
-
- if (instr(mybuf,
- (errmsg = strerror(errno)) ? errmsg : "NoErRoR"))
- return 0;
+ strerror(e)
#endif
#endif
+ ;
+ if (!errmsg)
+ break;
+ if (instr(s, errmsg)) {
+ SETERRNO(e,0);
+ return 0;
+ }
}
SETERRNO(0,0);
#ifndef EACCES
#define EACCES EPERM
#endif
}
SETERRNO(0,0);
#ifndef EACCES
#define EACCES EPERM
#endif
- if (instr(
mybuf
, "cannot make"))
+ if (instr(
s
, "cannot make"))
SETERRNO(EEXIST,RMS$_FEX);
SETERRNO(EEXIST,RMS$_FEX);
- else if (instr(
mybuf
, "existing file"))
+ else if (instr(
s
, "existing file"))
SETERRNO(EEXIST,RMS$_FEX);
SETERRNO(EEXIST,RMS$_FEX);
- else if (instr(
mybuf
, "ile exists"))
+ else if (instr(
s
, "ile exists"))
SETERRNO(EEXIST,RMS$_FEX);
SETERRNO(EEXIST,RMS$_FEX);
- else if (instr(
mybuf
, "non-exist"))
+ else if (instr(
s
, "non-exist"))
SETERRNO(ENOENT,RMS$_FNF);
SETERRNO(ENOENT,RMS$_FNF);
- else if (instr(
mybuf
, "does not exist"))
+ else if (instr(
s
, "does not exist"))
SETERRNO(ENOENT,RMS$_FNF);
SETERRNO(ENOENT,RMS$_FNF);
- else if (instr(
mybuf
, "not empty"))
+ else if (instr(
s
, "not empty"))
SETERRNO(EBUSY,SS$_DEVOFFLINE);
SETERRNO(EBUSY,SS$_DEVOFFLINE);
- else if (instr(
mybuf
, "cannot access"))
+ else if (instr(
s
, "cannot access"))
SETERRNO(EACCES,RMS$_PRV);
else
SETERRNO(EPERM,RMS$_PRV);
SETERRNO(EACCES,RMS$_PRV);
else
SETERRNO(EPERM,RMS$_PRV);
@@
-2617,7
+2776,7
@@
PP(pp_mkdir)
TAINT_PROPER("mkdir");
#ifdef HAS_MKDIR
TAINT_PROPER("mkdir");
#ifdef HAS_MKDIR
- SETi(
m
kdir(tmps, mode) >= 0 );
+ SETi(
M
kdir(tmps, mode) >= 0 );
#else
SETi( dooneliner("mkdir", tmps) );
oldumask = umask(0);
#else
SETi( dooneliner("mkdir", tmps) );
oldumask = umask(0);
@@
-2819,19
+2978,19
@@
nope:
PP(pp_fork)
{
PP(pp_fork)
{
+#ifdef HAS_FORK
dSP; dTARGET;
int childpid;
GV *tmpgv;
EXTEND(SP, 1);
dSP; dTARGET;
int childpid;
GV *tmpgv;
EXTEND(SP, 1);
-#ifdef HAS_FORK
childpid = fork();
if (childpid < 0)
RETSETUNDEF;
if (!childpid) {
/*SUPPRESS 560*/
if (tmpgv = gv_fetchpv("$", TRUE, SVt_PV))
childpid = fork();
if (childpid < 0)
RETSETUNDEF;
if (!childpid) {
/*SUPPRESS 560*/
if (tmpgv = gv_fetchpv("$", TRUE, SVt_PV))
- sv_setiv(GvSV(tmpgv), (I
32
)getpid());
+ sv_setiv(GvSV(tmpgv), (I
V
)getpid());
hv_clear(pidstatus); /* no kids, so don't wait for 'em */
}
PUSHi(childpid);
hv_clear(pidstatus); /* no kids, so don't wait for 'em */
}
PUSHi(childpid);
@@
-2843,19
+3002,14
@@
PP(pp_fork)
PP(pp_wait)
{
PP(pp_wait)
{
+#if !defined(DOSISH) || defined(OS2)
dSP; dTARGET;
int childpid;
int argflags;
dSP; dTARGET;
int childpid;
int argflags;
- I32 value;
- EXTEND(SP, 1);
-#ifdef HAS_WAIT
- childpid = wait(&argflags);
- if (childpid > 0)
- pidgone(childpid, argflags);
- value = (I32)childpid;
- statusvalue = FIXSTATUS(argflags);
- PUSHi(value);
+ childpid = wait4pid(-1, &argflags, 0);
+ STATUS_NATIVE_SET((childpid > 0) ? argflags : -1);
+ XPUSHi(childpid);
RETURN;
#else
DIE(no_func, "Unsupported function wait");
RETURN;
#else
DIE(no_func, "Unsupported function wait");
@@
-2864,19
+3018,17
@@
PP(pp_wait)
PP(pp_waitpid)
{
PP(pp_waitpid)
{
+#if !defined(DOSISH) || defined(OS2)
dSP; dTARGET;
int childpid;
int optype;
int argflags;
dSP; dTARGET;
int childpid;
int optype;
int argflags;
- I32 value;
-#ifdef HAS_WAIT
optype = POPi;
childpid = TOPi;
childpid = wait4pid(childpid, &argflags, optype);
optype = POPi;
childpid = TOPi;
childpid = wait4pid(childpid, &argflags, optype);
- value = (I32)childpid;
- statusvalue = FIXSTATUS(argflags);
- SETi(value);
+ STATUS_NATIVE_SET((childpid > 0) ? argflags : -1);
+ SETi(childpid);
RETURN;
#else
DIE(no_func, "Unsupported function wait");
RETURN;
#else
DIE(no_func, "Unsupported function wait");
@@
-2892,7
+3044,6
@@
PP(pp_system)
int status;
Sigsave_t ihand,qhand; /* place to save signals during system() */
int status;
Sigsave_t ihand,qhand; /* place to save signals during system() */
-#if (defined(HAS_FORK) || defined(AMIGAOS)) && !defined(VMS) && !defined(OS2)
if (SP - MARK == 1) {
if (tainting) {
char *junk = SvPV(TOPs, na);
if (SP - MARK == 1) {
if (tainting) {
char *junk = SvPV(TOPs, na);
@@
-2900,6
+3051,7
@@
PP(pp_system)
TAINT_PROPER("system");
}
}
TAINT_PROPER("system");
}
}
+#if (defined(HAS_FORK) || defined(AMIGAOS)) && !defined(VMS) && !defined(OS2)
while ((childpid = vfork()) == -1) {
if (errno != EAGAIN) {
value = -1;
while ((childpid = vfork()) == -1) {
if (errno != EAGAIN) {
value = -1;
@@
-2917,15
+3069,10
@@
PP(pp_system)
} while (result == -1 && errno == EINTR);
(void)rsignal_restore(SIGINT, &ihand);
(void)rsignal_restore(SIGQUIT, &qhand);
} while (result == -1 && errno == EINTR);
(void)rsignal_restore(SIGINT, &ihand);
(void)rsignal_restore(SIGQUIT, &qhand);
- statusvalue = FIXSTATUS(status);
- if (result < 0)
- value = -1;
- else {
- value = (I32)((unsigned int)status & 0xffff);
- }
+ STATUS_NATIVE_SET(result == -1 ? -1 : status);
do_execfree(); /* free any memory child malloced on vfork */
SP = ORIGMARK;
do_execfree(); /* free any memory child malloced on vfork */
SP = ORIGMARK;
- PUSHi(
value
);
+ PUSHi(
STATUS_CURRENT
);
RETURN;
}
if (op->op_flags & OPf_STACKED) {
RETURN;
}
if (op->op_flags & OPf_STACKED) {
@@
-2948,10
+3095,10
@@
PP(pp_system)
else {
value = (I32)do_spawn(SvPVx(sv_mortalcopy(*SP), na));
}
else {
value = (I32)do_spawn(SvPVx(sv_mortalcopy(*SP), na));
}
-
statusvalue = FIXSTATUS
(value);
+
STATUS_NATIVE_SET
(value);
do_execfree();
SP = ORIGMARK;
do_execfree();
SP = ORIGMARK;
- PUSHi(
value
);
+ PUSHi(
STATUS_CURRENT
);
#endif /* !FORK or VMS */
RETURN;
}
#endif /* !FORK or VMS */
RETURN;
}
@@
-3027,7
+3174,7
@@
PP(pp_getpgrp)
#ifdef BSD_GETPGRP
value = (I32)BSD_GETPGRP(pid);
#else
#ifdef BSD_GETPGRP
value = (I32)BSD_GETPGRP(pid);
#else
- if (pid != 0)
+ if (pid != 0
&& pid != getpid()
)
DIE("POSIX getpgrp can't take an argument");
value = (I32)getpgrp();
#endif
DIE("POSIX getpgrp can't take an argument");
value = (I32)getpgrp();
#endif
@@
-3057,9
+3204,8
@@
PP(pp_setpgrp)
#ifdef BSD_SETPGRP
SETi( BSD_SETPGRP(pid, pgrp) >= 0 );
#else
#ifdef BSD_SETPGRP
SETi( BSD_SETPGRP(pid, pgrp) >= 0 );
#else
- if ((pgrp != 0
) || (pid != 0)) {
+ if ((pgrp != 0
&& pgrp != getpid())) || (pid != 0 && pid != getpid()))
DIE("POSIX setpgrp can't take an argument");
DIE("POSIX setpgrp can't take an argument");
- }
SETi( setpgrp() >= 0 );
#endif /* USE_BSDPGRP */
RETURN;
SETi( setpgrp() >= 0 );
#endif /* USE_BSDPGRP */
RETURN;
@@
-3189,18
+3335,18
@@
PP(pp_gmtime)
EXTEND_MORTAL(9);
if (GIMME != G_ARRAY) {
dTARGET;
EXTEND_MORTAL(9);
if (GIMME != G_ARRAY) {
dTARGET;
-
char mybuf[30]
;
+
SV *tsv
;
if (!tmbuf)
RETPUSHUNDEF;
if (!tmbuf)
RETPUSHUNDEF;
-
sprintf(mybuf,
"%s %s %2d %02d:%02d:%02d %d",
- dayname[tmbuf->tm_wday],
- monname[tmbuf->tm_mon],
- tmbuf->tm_mday,
- tmbuf->tm_hour,
- tmbuf->tm_min,
- tmbuf->tm_sec,
- tmbuf->tm_year + 1900);
- PUSH
p(mybuf, strlen(mybuf
));
+
tsv = newSVpvf(
"%s %s %2d %02d:%02d:%02d %d",
+
dayname[tmbuf->tm_wday],
+
monname[tmbuf->tm_mon],
+
tmbuf->tm_mday,
+
tmbuf->tm_hour,
+
tmbuf->tm_min,
+
tmbuf->tm_sec,
+
tmbuf->tm_year + 1900);
+ PUSH
s(sv_2mortal(tsv
));
}
else if (tmbuf) {
PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_sec)));
}
else if (tmbuf) {
PUSHs(sv_2mortal(newSViv((I32)tmbuf->tm_sec)));
@@
-3349,7
+3495,7
@@
PP(pp_semctl)
PUSHi(anum);
}
else {
PUSHi(anum);
}
else {
- PUSHp(
"0 but true",10
);
+ PUSHp(
zero_but_true, ZBTLEN
);
}
RETURN;
#else
}
RETURN;
#else
@@
-3426,7
+3572,7
@@
PP(pp_ghostent)
#ifdef HOST_NOT_FOUND
if (!hent)
#ifdef HOST_NOT_FOUND
if (!hent)
-
statusvalue = FIXSTATUS
(h_errno);
+
STATUS_NATIVE_SET
(h_errno);
#endif
if (GIMME != G_ARRAY) {
#endif
if (GIMME != G_ARRAY) {
@@
-3452,10
+3598,10
@@
PP(pp_ghostent)
sv_catpvn(sv, " ", 1);
}
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_catpvn(sv, " ", 1);
}
PUSHs(sv = sv_mortalcopy(&sv_no));
- sv_setiv(sv, (I
32
)hent->h_addrtype);
+ sv_setiv(sv, (I
V
)hent->h_addrtype);
PUSHs(sv = sv_mortalcopy(&sv_no));
len = hent->h_length;
PUSHs(sv = sv_mortalcopy(&sv_no));
len = hent->h_length;
- sv_setiv(sv, (I
32
)len);
+ sv_setiv(sv, (I
V
)len);
#ifdef h_addr
for (elem = hent->h_addr_list; elem && *elem; elem++) {
XPUSHs(sv = sv_mortalcopy(&sv_no));
#ifdef h_addr
for (elem = hent->h_addr_list; elem && *elem; elem++) {
XPUSHs(sv = sv_mortalcopy(&sv_no));
@@
-3518,7
+3664,7
@@
PP(pp_gnetent)
PUSHs(sv = sv_newmortal());
if (nent) {
if (which == OP_GNBYNAME)
PUSHs(sv = sv_newmortal());
if (nent) {
if (which == OP_GNBYNAME)
- sv_setiv(sv, (I
32
)nent->n_net);
+ sv_setiv(sv, (I
V
)nent->n_net);
else
sv_setpv(sv, nent->n_name);
}
else
sv_setpv(sv, nent->n_name);
}
@@
-3535,9
+3681,9
@@
PP(pp_gnetent)
sv_catpvn(sv, " ", 1);
}
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_catpvn(sv, " ", 1);
}
PUSHs(sv = sv_mortalcopy(&sv_no));
- sv_setiv(sv, (I
32
)nent->n_addrtype);
+ sv_setiv(sv, (I
V
)nent->n_addrtype);
PUSHs(sv = sv_mortalcopy(&sv_no));
PUSHs(sv = sv_mortalcopy(&sv_no));
- sv_setiv(sv, (I
32
)nent->n_net);
+ sv_setiv(sv, (I
V
)nent->n_net);
}
RETURN;
}
RETURN;
@@
-3588,7
+3734,7
@@
PP(pp_gprotoent)
PUSHs(sv = sv_newmortal());
if (pent) {
if (which == OP_GPBYNAME)
PUSHs(sv = sv_newmortal());
if (pent) {
if (which == OP_GPBYNAME)
- sv_setiv(sv, (I
32
)pent->p_proto);
+ sv_setiv(sv, (I
V
)pent->p_proto);
else
sv_setpv(sv, pent->p_name);
}
else
sv_setpv(sv, pent->p_name);
}
@@
-3605,7
+3751,7
@@
PP(pp_gprotoent)
sv_catpvn(sv, " ", 1);
}
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_catpvn(sv, " ", 1);
}
PUSHs(sv = sv_mortalcopy(&sv_no));
- sv_setiv(sv, (I
32
)pent->p_proto);
+ sv_setiv(sv, (I
V
)pent->p_proto);
}
RETURN;
}
RETURN;
@@
-3655,8
+3801,11
@@
PP(pp_gservent)
}
else if (which == OP_GSBYPORT) {
char *proto = POPp;
}
else if (which == OP_GSBYPORT) {
char *proto = POPp;
-
int port = POPi
;
+
unsigned short port = POPu
;
+#ifdef HAS_HTONS
+ port = htons(port);
+#endif
sent = getservbyport(port, proto);
}
else
sent = getservbyport(port, proto);
}
else
@@
-3668,9
+3817,9
@@
PP(pp_gservent)
if (sent) {
if (which == OP_GSBYNAME) {
#ifdef HAS_NTOHS
if (sent) {
if (which == OP_GSBYNAME) {
#ifdef HAS_NTOHS
- sv_setiv(sv, (I
32
)ntohs(sent->s_port));
+ sv_setiv(sv, (I
V
)ntohs(sent->s_port));
#else
#else
- sv_setiv(sv, (I
32
)(sent->s_port));
+ sv_setiv(sv, (I
V
)(sent->s_port));
#endif
}
else
#endif
}
else
@@
-3690,9
+3839,9
@@
PP(pp_gservent)
}
PUSHs(sv = sv_mortalcopy(&sv_no));
#ifdef HAS_NTOHS
}
PUSHs(sv = sv_mortalcopy(&sv_no));
#ifdef HAS_NTOHS
- sv_setiv(sv, (I
32
)ntohs(sent->s_port));
+ sv_setiv(sv, (I
V
)ntohs(sent->s_port));
#else
#else
- sv_setiv(sv, (I
32
)(sent->s_port));
+ sv_setiv(sv, (I
V
)(sent->s_port));
#endif
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_setpv(sv, sent->s_proto);
#endif
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_setpv(sv, sent->s_proto);
@@
-3834,7
+3983,7
@@
PP(pp_gpwent)
PUSHs(sv = sv_newmortal());
if (pwent) {
if (which == OP_GPWNAM)
PUSHs(sv = sv_newmortal());
if (pwent) {
if (which == OP_GPWNAM)
- sv_setiv(sv, (I
32
)pwent->pw_uid);
+ sv_setiv(sv, (I
V
)pwent->pw_uid);
else
sv_setpv(sv, pwent->pw_name);
}
else
sv_setpv(sv, pwent->pw_name);
}
@@
-3847,15
+3996,15
@@
PP(pp_gpwent)
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_setpv(sv, pwent->pw_passwd);
PUSHs(sv = sv_mortalcopy(&sv_no));
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_setpv(sv, pwent->pw_passwd);
PUSHs(sv = sv_mortalcopy(&sv_no));
- sv_setiv(sv, (I
32
)pwent->pw_uid);
+ sv_setiv(sv, (I
V
)pwent->pw_uid);
PUSHs(sv = sv_mortalcopy(&sv_no));
PUSHs(sv = sv_mortalcopy(&sv_no));
- sv_setiv(sv, (I
32
)pwent->pw_gid);
+ sv_setiv(sv, (I
V
)pwent->pw_gid);
PUSHs(sv = sv_mortalcopy(&sv_no));
#ifdef PWCHANGE
PUSHs(sv = sv_mortalcopy(&sv_no));
#ifdef PWCHANGE
- sv_setiv(sv, (I
32
)pwent->pw_change);
+ sv_setiv(sv, (I
V
)pwent->pw_change);
#else
#ifdef PWQUOTA
#else
#ifdef PWQUOTA
- sv_setiv(sv, (I
32
)pwent->pw_quota);
+ sv_setiv(sv, (I
V
)pwent->pw_quota);
#else
#ifdef PWAGE
sv_setpv(sv, pwent->pw_age);
#else
#ifdef PWAGE
sv_setpv(sv, pwent->pw_age);
@@
-3878,7
+4027,7
@@
PP(pp_gpwent)
sv_setpv(sv, pwent->pw_shell);
#ifdef PWEXPIRE
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_setpv(sv, pwent->pw_shell);
#ifdef PWEXPIRE
PUSHs(sv = sv_mortalcopy(&sv_no));
- sv_setiv(sv, (I
32
)pwent->pw_expire);
+ sv_setiv(sv, (I
V
)pwent->pw_expire);
#endif
}
RETURN;
#endif
}
RETURN;
@@
-3890,7
+4039,7
@@
PP(pp_gpwent)
PP(pp_spwent)
{
dSP;
PP(pp_spwent)
{
dSP;
-#if
def HAS_PASSWD
+#if
defined(HAS_PASSWD) && !defined(CYGWIN32)
setpwent();
RETPUSHYES;
#else
setpwent();
RETPUSHYES;
#else
@@
-3948,7
+4097,7
@@
PP(pp_ggrent)
PUSHs(sv = sv_newmortal());
if (grent) {
if (which == OP_GGRNAM)
PUSHs(sv = sv_newmortal());
if (grent) {
if (which == OP_GGRNAM)
- sv_setiv(sv, (I
32
)grent->gr_gid);
+ sv_setiv(sv, (I
V
)grent->gr_gid);
else
sv_setpv(sv, grent->gr_name);
}
else
sv_setpv(sv, grent->gr_name);
}
@@
-3961,7
+4110,7
@@
PP(pp_ggrent)
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_setpv(sv, grent->gr_passwd);
PUSHs(sv = sv_mortalcopy(&sv_no));
PUSHs(sv = sv_mortalcopy(&sv_no));
sv_setpv(sv, grent->gr_passwd);
PUSHs(sv = sv_mortalcopy(&sv_no));
- sv_setiv(sv, (I
32
)grent->gr_gid);
+ sv_setiv(sv, (I
V
)grent->gr_gid);
PUSHs(sv = sv_mortalcopy(&sv_no));
for (elem = grent->gr_mem; *elem; elem++) {
sv_catpv(sv, *elem);
PUSHs(sv = sv_mortalcopy(&sv_no));
for (elem = grent->gr_mem; *elem; elem++) {
sv_catpv(sv, *elem);