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
D'oh! This has been moved to lib/Digest/t/digest.t but not deleted.
[perl5.git]
/
doio.c
diff --git
a/doio.c
b/doio.c
index
fdcef27
..
5ba40b9
100644
(file)
--- a/
doio.c
+++ b/
doio.c
@@
-1,6
+1,7
@@
/* doio.c
*
/* doio.c
*
- * Copyright (c) 1991-2002, Larry Wall
+ * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ * 2000, 2001, 2002, 2003, by Larry Wall and others
*
* 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.
@@
-93,7
+94,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
/* Collect default raw/crlf info from the op */
if (PL_op && PL_op->op_type == OP_OPEN) {
/* Collect default raw/crlf info from the op */
if (PL_op && PL_op->op_type == OP_OPEN) {
- /* set up
discipline
s */
+ /* set up
IO layer
s */
U8 flags = PL_op->op_private;
in_raw = (flags & OPpOPEN_IN_RAW);
in_crlf = (flags & OPpOPEN_IN_CRLF);
U8 flags = PL_op->op_private;
in_raw = (flags & OPpOPEN_IN_RAW);
in_crlf = (flags & OPpOPEN_IN_CRLF);
@@
-178,7
+179,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
(ismodifying & (O_CREAT|appendtrunc)))
TAINT_PROPER("sysopen");
}
(ismodifying & (O_CREAT|appendtrunc)))
TAINT_PROPER("sysopen");
}
- mode[ix++] =
'#'
; /* Marker to openn to use numeric "sysopen" */
+ mode[ix++] =
IoTYPE_NUMERIC
; /* Marker to openn to use numeric "sysopen" */
#if defined(USE_64_BIT_RAWIO) && defined(O_LARGEFILE)
rawmode |= O_LARGEFILE; /* Transparently largefiley. */
#if defined(USE_64_BIT_RAWIO) && defined(O_LARGEFILE)
rawmode |= O_LARGEFILE; /* Transparently largefiley. */
@@
-211,14
+212,14
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
*--tend = '\0';
if (num_svs) {
*--tend = '\0';
if (num_svs) {
- /* New style explic
t name, type is just mode and discipline/
layer info */
+ /* New style explic
it name, type is just mode and
layer info */
STRLEN l = 0;
#ifdef USE_STDIO
if (SvROK(*svp) && !strchr(name,'&')) {
if (ckWARN(WARN_IO))
Perl_warner(aTHX_ packWARN(WARN_IO),
"Can't open a reference");
STRLEN l = 0;
#ifdef USE_STDIO
if (SvROK(*svp) && !strchr(name,'&')) {
if (ckWARN(WARN_IO))
Perl_warner(aTHX_ packWARN(WARN_IO),
"Can't open a reference");
- SETERRNO(EINVAL, LIB
$
_INVARG);
+ SETERRNO(EINVAL, LIB_INVARG);
goto say_false;
}
#endif /* USE_STDIO */
goto say_false;
}
#endif /* USE_STDIO */
@@
-235,7
+236,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if ((*type == IoTYPE_RDWR) && /* scary */
(*(type+1) == IoTYPE_RDONLY || *(type+1) == IoTYPE_WRONLY) &&
((!num_svs || (tend > type+1 && tend[-1] != IoTYPE_PIPE)))) {
if ((*type == IoTYPE_RDWR) && /* scary */
(*(type+1) == IoTYPE_RDONLY || *(type+1) == IoTYPE_WRONLY) &&
((!num_svs || (tend > type+1 && tend[-1] != IoTYPE_PIPE)))) {
- TAINT_PROPER("open");
+
TAINT_PROPER("open");
mode[1] = *type++;
writing = 1;
}
mode[1] = *type++;
writing = 1;
}
@@
-243,7
+244,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if (*type == IoTYPE_PIPE) {
if (num_svs) {
if (type[1] != IoTYPE_STD) {
if (*type == IoTYPE_PIPE) {
if (num_svs) {
if (type[1] != IoTYPE_STD) {
- unknown_
desr
:
+ unknown_
open_mode
:
Perl_croak(aTHX_ "Unknown open() mode '%.*s'", (int)olen, oname);
}
type++;
Perl_croak(aTHX_ "Unknown open() mode '%.*s'", (int)olen, oname);
}
type++;
@@
-281,7
+282,14
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
else {
fp = PerlProc_popen(name,mode);
}
else {
fp = PerlProc_popen(name,mode);
}
- }
+ if (num_svs) {
+ if (*type) {
+ if (PerlIO_apply_layers(aTHX_ fp, mode, type) != 0) {
+ goto say_false;
+ }
+ }
+ }
+ } /* IoTYPE_PIPE */
else if (*type == IoTYPE_WRONLY) {
TAINT_PROPER("open");
type++;
else if (*type == IoTYPE_WRONLY) {
TAINT_PROPER("open");
type++;
@@
-316,12
+324,13
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if (num_svs > 1) {
Perl_croak(aTHX_ "More than one argument to '%c&' open",IoTYPE(io));
}
if (num_svs > 1) {
Perl_croak(aTHX_ "More than one argument to '%c&' open",IoTYPE(io));
}
- if (num_svs && SvIOK(*svp)) {
+ /*SUPPRESS 530*/
+ for (; isSPACE(*type); type++) ;
+ if (num_svs && (SvIOK(*svp) || (SvPOK(*svp) && looks_like_number(*svp)))) {
fd = SvUV(*svp);
fd = SvUV(*svp);
+ num_svs = 0;
}
else if (isDIGIT(*type)) {
}
else if (isDIGIT(*type)) {
- /*SUPPRESS 530*/
- for (; isSPACE(*type); type++) ;
fd = atoi(type);
}
else {
fd = atoi(type);
}
else {
@@
-331,14
+340,12
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
}
else {
GV *thatgv;
}
else {
GV *thatgv;
- /*SUPPRESS 530*/
- for (; isSPACE(*type); type++) ;
thatgv = gv_fetchpv(type,FALSE,SVt_PVIO);
thatio = GvIO(thatgv);
}
if (!thatio) {
#ifdef EINVAL
thatgv = gv_fetchpv(type,FALSE,SVt_PVIO);
thatio = GvIO(thatgv);
}
if (!thatio) {
#ifdef EINVAL
- SETERRNO(EINVAL,SS
$
_IVCHAN);
+ SETERRNO(EINVAL,SS_IVCHAN);
#endif
goto say_false;
}
#endif
goto say_false;
}
@@
-415,7
+422,9
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
}
} /* !& */
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
}
} /* !& */
- }
+ if (!fp && type && *type && *type != ':' && !isIDFIRST(*type))
+ goto unknown_open_mode;
+ } /* IoTYPE_WRONLY */
else if (*type == IoTYPE_RDONLY) {
/*SUPPRESS 530*/
for (type++; isSPACE(*type); type++) ;
else if (*type == IoTYPE_RDONLY) {
/*SUPPRESS 530*/
for (type++; isSPACE(*type); type++) ;
@@
-446,8
+455,11
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
}
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
}
}
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
}
- }
- else if ((num_svs && type[0] == IoTYPE_STD && type[1] == IoTYPE_PIPE) ||
+ if (!fp && type && *type && *type != ':' && !isIDFIRST(*type))
+ goto unknown_open_mode;
+ } /* IoTYPE_RDONLY */
+ else if ((num_svs && /* '-|...' or '...|' */
+ type[0] == IoTYPE_STD && type[1] == IoTYPE_PIPE) ||
(!num_svs && tend > type+1 && tend[-1] == IoTYPE_PIPE)) {
if (num_svs) {
type += 2; /* skip over '-|' */
(!num_svs && tend > type+1 && tend[-1] == IoTYPE_PIPE)) {
if (num_svs) {
type += 2; /* skip over '-|' */
@@
-483,10
+495,18
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
fp = PerlProc_popen(name,mode);
}
IoTYPE(io) = IoTYPE_PIPE;
fp = PerlProc_popen(name,mode);
}
IoTYPE(io) = IoTYPE_PIPE;
+ if (num_svs) {
+ for (; isSPACE(*type); type++) ;
+ if (*type) {
+ if (PerlIO_apply_layers(aTHX_ fp, mode, type) != 0) {
+ goto say_false;
+ }
+ }
+ }
}
}
- else {
+ else {
/* layer(Args) */
if (num_svs)
if (num_svs)
- goto unknown_
desr
;
+ goto unknown_
open_mode
;
name = type;
IoTYPE(io) = IoTYPE_RDONLY;
/*SUPPRESS 530*/
name = type;
IoTYPE(io) = IoTYPE_RDONLY;
/*SUPPRESS 530*/
@@
-521,18
+541,20
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if ((IoTYPE(io) == IoTYPE_RDONLY) &&
(fp == PerlIO_stdout() || fp == PerlIO_stderr())) {
Perl_warner(aTHX_ packWARN(WARN_IO),
if ((IoTYPE(io) == IoTYPE_RDONLY) &&
(fp == PerlIO_stdout() || fp == PerlIO_stderr())) {
Perl_warner(aTHX_ packWARN(WARN_IO),
- "Filehandle STD%s opened only for input",
- (fp == PerlIO_stdout()) ? "OUT" : "ERR");
+ "Filehandle STD%s reopened as %s only for input",
+ ((fp == PerlIO_stdout()) ? "OUT" : "ERR"),
+ GvENAME(gv));
}
else if ((IoTYPE(io) == IoTYPE_WRONLY) && fp == PerlIO_stdin()) {
Perl_warner(aTHX_ packWARN(WARN_IO),
}
else if ((IoTYPE(io) == IoTYPE_WRONLY) && fp == PerlIO_stdin()) {
Perl_warner(aTHX_ packWARN(WARN_IO),
- "Filehandle STDIN opened only for output");
+ "Filehandle STDIN reopened as %s only for output",
+ GvENAME(gv));
}
}
fd = PerlIO_fileno(fp);
}
}
fd = PerlIO_fileno(fp);
- /* If there is no fd (e.g. PerlIO::
S
calar) assume it isn't a
- * socket - this covers PerlIO::
S
calar - otherwise unless we "know" the
+ /* If there is no fd (e.g. PerlIO::
s
calar) assume it isn't a
+ * socket - this covers PerlIO::
s
calar - otherwise unless we "know" the
* type probe for socket-ness.
*/
if (IoTYPE(io) && IoTYPE(io) != IoTYPE_PIPE && IoTYPE(io) != IoTYPE_STD && fd >= 0) {
* type probe for socket-ness.
*/
if (IoTYPE(io) && IoTYPE(io) != IoTYPE_PIPE && IoTYPE(io) != IoTYPE_STD && fd >= 0) {
@@
-581,7
+603,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
}
}
if (savefd != fd) {
}
}
if (savefd != fd) {
- /* Still a small can-of-worms here if (say) PerlIO::
S
calar
+ /* Still a small can-of-worms here if (say) PerlIO::
s
calar
is assigned to (say) STDOUT - for now let dup2() fail
and provide the error
*/
is assigned to (say) STDOUT - for now let dup2() fail
and provide the error
*/
@@
-624,8
+646,16
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
/* need to close fp without closing underlying fd */
int ofd = PerlIO_fileno(fp);
int dupfd = PerlLIO_dup(ofd);
/* need to close fp without closing underlying fd */
int ofd = PerlIO_fileno(fp);
int dupfd = PerlLIO_dup(ofd);
+#if defined(HAS_FCNTL) && defined(F_SETFD)
+ /* Assume if we have F_SETFD we have F_GETFD */
+ int coe = fcntl(ofd,F_GETFD);
+#endif
PerlIO_close(fp);
PerlLIO_dup2(dupfd,ofd);
PerlIO_close(fp);
PerlLIO_dup2(dupfd,ofd);
+#if defined(HAS_FCNTL) && defined(F_SETFD)
+ /* The dup trick has lost close-on-exec on ofd */
+ fcntl(ofd,F_SETFD, coe);
+#endif
PerlLIO_close(dupfd);
}
else
PerlLIO_close(dupfd);
}
else
@@
-648,8
+678,11
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if (writing) {
if (IoTYPE(io) == IoTYPE_SOCKET
|| (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(PL_statbuf.st_mode)) ) {
if (writing) {
if (IoTYPE(io) == IoTYPE_SOCKET
|| (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(PL_statbuf.st_mode)) ) {
- mode[0] = 'w';
- if (!(IoOFP(io) = PerlIO_openn(aTHX_ type,mode,fd,0,0,NULL,0,svp))) {
+ char *s = mode;
+ if (*s == IoTYPE_IMPLICIT || *s == IoTYPE_NUMERIC)
+ s++;
+ *s = 'w';
+ if (!(IoOFP(io) = PerlIO_openn(aTHX_ type,s,fd,0,0,NULL,0,svp))) {
PerlIO_close(fp);
IoIFP(io) = Nullfp;
goto say_false;
PerlIO_close(fp);
IoIFP(io) = Nullfp;
goto say_false;
@@
-698,6
+731,8
@@
Perl_nextargv(pTHX_ register GV *gv)
#endif
}
PL_filemode = 0;
#endif
}
PL_filemode = 0;
+ if (!GvAV(gv))
+ return Nullfp;
while (av_len(GvAV(gv)) >= 0) {
STRLEN oldlen;
sv = av_shift(GvAV(gv));
while (av_len(GvAV(gv)) >= 0) {
STRLEN oldlen;
sv = av_shift(GvAV(gv));
@@
-754,8
+789,8
@@
Perl_nextargv(pTHX_ register GV *gv)
{
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
{
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
- "Can't do inplace edit: %
s
would not be unique",
-
SvPVX(sv)
);
+ "Can't do inplace edit: %
"SVf"
would not be unique",
+
sv
);
do_close(gv,FALSE);
continue;
}
do_close(gv,FALSE);
continue;
}
@@
-765,8
+800,8
@@
Perl_nextargv(pTHX_ register GV *gv)
if (PerlLIO_rename(PL_oldname,SvPVX(sv)) < 0) {
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
if (PerlLIO_rename(PL_oldname,SvPVX(sv)) < 0) {
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
- "Can't rename %s to %
s
: %s, skipping file",
- PL_oldname,
SvPVX(sv)
, Strerror(errno) );
+ "Can't rename %s to %
"SVf"
: %s, skipping file",
+ PL_oldname,
sv
, Strerror(errno) );
do_close(gv,FALSE);
continue;
}
do_close(gv,FALSE);
continue;
}
@@
-781,8
+816,8
@@
Perl_nextargv(pTHX_ register GV *gv)
if (link(PL_oldname,SvPVX(sv)) < 0) {
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
if (link(PL_oldname,SvPVX(sv)) < 0) {
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
- "Can't rename %s to %
s
: %s, skipping file",
- PL_oldname,
SvPVX(sv)
, Strerror(errno) );
+ "Can't rename %s to %
"SVf"
: %s, skipping file",
+ PL_oldname,
sv
, Strerror(errno) );
do_close(gv,FALSE);
continue;
}
do_close(gv,FALSE);
continue;
}
@@
-790,7
+825,7
@@
Perl_nextargv(pTHX_ register GV *gv)
#endif
}
else {
#endif
}
else {
-#if !defined(DOSISH) && !defined(AMIGAOS)
&& !defined(__CYGWIN__)
+#if !defined(DOSISH) && !defined(AMIGAOS)
# ifndef VMS /* Don't delete; use automatic file versioning */
if (UNLINK(PL_oldname) < 0) {
if (ckWARN_d(WARN_INPLACE))
# ifndef VMS /* Don't delete; use automatic file versioning */
if (UNLINK(PL_oldname) < 0) {
if (ckWARN_d(WARN_INPLACE))
@@
-902,8
+937,9
@@
Perl_do_pipe(pTHX_ SV *sv, GV *rgv, GV *wgv)
if (PerlProc_pipe(fd) < 0)
goto badexit;
if (PerlProc_pipe(fd) < 0)
goto badexit;
- IoIFP(rstio) = PerlIO_fdopen(fd[0], "r");
- IoOFP(wstio) = PerlIO_fdopen(fd[1], "w");
+ IoIFP(rstio) = PerlIO_fdopen(fd[0], "r"PIPE_OPEN_MODE);
+ IoOFP(wstio) = PerlIO_fdopen(fd[1], "w"PIPE_OPEN_MODE);
+ IoOFP(rstio) = IoIFP(rstio);
IoIFP(wstio) = IoOFP(wstio);
IoTYPE(rstio) = IoTYPE_RDONLY;
IoTYPE(wstio) = IoTYPE_WRONLY;
IoIFP(wstio) = IoOFP(wstio);
IoTYPE(rstio) = IoTYPE_RDONLY;
IoTYPE(wstio) = IoTYPE_WRONLY;
@@
-935,7
+971,7
@@
Perl_do_close(pTHX_ GV *gv, bool not_implicit)
gv = PL_argvgv;
if (!gv || SvTYPE(gv) != SVt_PVGV) {
if (not_implicit)
gv = PL_argvgv;
if (!gv || SvTYPE(gv) != SVt_PVGV) {
if (not_implicit)
- SETERRNO(EBADF,SS
$
_IVCHAN);
+ SETERRNO(EBADF,SS_IVCHAN);
return FALSE;
}
io = GvIO(gv);
return FALSE;
}
io = GvIO(gv);
@@
-943,7
+979,7
@@
Perl_do_close(pTHX_ GV *gv, bool not_implicit)
if (not_implicit) {
if (ckWARN(WARN_UNOPENED)) /* no check for closed here */
report_evil_fh(gv, io, PL_op->op_type);
if (not_implicit) {
if (ckWARN(WARN_UNOPENED)) /* no check for closed here */
report_evil_fh(gv, io, PL_op->op_type);
- SETERRNO(EBADF,SS
$
_IVCHAN);
+ SETERRNO(EBADF,SS_IVCHAN);
}
return FALSE;
}
}
return FALSE;
}
@@
-987,7
+1023,7
@@
Perl_io_close(pTHX_ IO *io, bool not_implicit)
IoOFP(io) = IoIFP(io) = Nullfp;
}
else if (not_implicit) {
IoOFP(io) = IoIFP(io) = Nullfp;
}
else if (not_implicit) {
- SETERRNO(EBADF,SS
$
_IVCHAN);
+ SETERRNO(EBADF,SS_IVCHAN);
}
return retval;
}
return retval;
@@
-1007,17
+1043,21
@@
Perl_do_eof(pTHX_ GV *gv)
report_evil_fh(gv, io, OP_phoney_OUTPUT_ONLY);
while (IoIFP(io)) {
report_evil_fh(gv, io, OP_phoney_OUTPUT_ONLY);
while (IoIFP(io)) {
+ int saverrno;
if (PerlIO_has_cntptr(IoIFP(io))) { /* (the code works without this) */
if (PerlIO_get_cnt(IoIFP(io)) > 0) /* cheat a little, since */
return FALSE; /* this is the most usual case */
}
if (PerlIO_has_cntptr(IoIFP(io))) { /* (the code works without this) */
if (PerlIO_get_cnt(IoIFP(io)) > 0) /* cheat a little, since */
return FALSE; /* this is the most usual case */
}
+ saverrno = errno; /* getc and ungetc can stomp on errno */
ch = PerlIO_getc(IoIFP(io));
if (ch != EOF) {
(void)PerlIO_ungetc(IoIFP(io),ch);
ch = PerlIO_getc(IoIFP(io));
if (ch != EOF) {
(void)PerlIO_ungetc(IoIFP(io),ch);
+ errno = saverrno;
return FALSE;
}
return FALSE;
}
+ errno = saverrno;
if (PerlIO_has_cntptr(IoIFP(io)) && PerlIO_canset_cnt(IoIFP(io))) {
if (PerlIO_get_cnt(IoIFP(io)) < -1)
if (PerlIO_has_cntptr(IoIFP(io)) && PerlIO_canset_cnt(IoIFP(io))) {
if (PerlIO_get_cnt(IoIFP(io)) < -1)
@@
-1048,7
+1088,7
@@
Perl_do_tell(pTHX_ GV *gv)
}
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
}
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
- SETERRNO(EBADF,RMS
$
_IFI);
+ SETERRNO(EBADF,RMS_IFI);
return (Off_t)-1;
}
return (Off_t)-1;
}
@@
-1067,7
+1107,7
@@
Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence)
}
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
}
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
- SETERRNO(EBADF,RMS
$
_IFI);
+ SETERRNO(EBADF,RMS_IFI);
return FALSE;
}
return FALSE;
}
@@
-1081,7
+1121,7
@@
Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence)
return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence);
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence);
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
- SETERRNO(EBADF,RMS
$
_IFI);
+ SETERRNO(EBADF,RMS_IFI);
return (Off_t)-1;
}
return (Off_t)-1;
}
@@
-1130,7
+1170,7
@@
fail_discipline:
if (!end)
end = s+len;
#ifndef PERLIO_LAYERS
if (!end)
end = s+len;
#ifndef PERLIO_LAYERS
- Perl_croak(aTHX_ "
Unknown discipline '%.*s'
", end-s, s);
+ Perl_croak(aTHX_ "
IO layers (like '%.*s') unavailable
", end-s, s);
#else
s = end;
#endif
#else
s = end;
#endif
@@
-1246,7
+1286,8
@@
Perl_do_print(pTHX_ register SV *sv, PerlIO *fp)
default:
if (PerlIO_isutf8(fp)) {
if (!SvUTF8(sv))
default:
if (PerlIO_isutf8(fp)) {
if (!SvUTF8(sv))
- sv_utf8_upgrade(sv = sv_mortalcopy(sv));
+ sv_utf8_upgrade_flags(sv = sv_mortalcopy(sv),
+ SV_GMAGIC|SV_UTF8_NO_ENCODING);
}
else if (DO_UTF8(sv)) {
if (!sv_utf8_downgrade((sv = sv_mortalcopy(sv)), TRUE)
}
else if (DO_UTF8(sv)) {
if (!sv_utf8_downgrade((sv = sv_mortalcopy(sv)), TRUE)
@@
-1300,7
+1341,7
@@
Perl_my_stat(pTHX)
else {
SV* sv = POPs;
char *s;
else {
SV* sv = POPs;
char *s;
- STRLEN
n_a
;
+ STRLEN
len
;
PUTBACK;
if (SvTYPE(sv) == SVt_PVGV) {
gv = (GV*)sv;
PUTBACK;
if (SvTYPE(sv) == SVt_PVGV) {
gv = (GV*)sv;
@@
-1311,9
+1352,10
@@
Perl_my_stat(pTHX)
goto do_fstat;
}
goto do_fstat;
}
- s = SvPV(sv,
n_a
);
+ s = SvPV(sv,
len
);
PL_statgv = Nullgv;
PL_statgv = Nullgv;
- sv_setpv(PL_statname, s);
+ sv_setpvn(PL_statname, s, len);
+ s = SvPVX(PL_statname); /* s now NUL-terminated */
PL_laststype = OP_STAT;
PL_laststatval = PerlLIO_stat(s, &PL_statcache);
if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && strchr(s, '\n'))
PL_laststype = OP_STAT;
PL_laststatval = PerlLIO_stat(s, &PL_statcache);
if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && strchr(s, '\n'))
@@
-1358,11
+1400,13
@@
Perl_my_lstat(pTHX)
return PL_laststatval;
}
return PL_laststatval;
}
+#ifndef OS2
bool
Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp)
{
return do_aexec5(really, mark, sp, 0, 0);
}
bool
Perl_do_aexec(pTHX_ SV *really, register SV **mark, register SV **sp)
{
return do_aexec5(really, mark, sp, 0, 0);
}
+#endif
bool
Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
bool
Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
@@
-1390,10
+1434,12
@@
Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
if ((!really && *PL_Argv[0] != '/') ||
(really && *tmps != '/')) /* will execvp use PATH? */
TAINT_ENV(); /* testing IFS here is overkill, probably */
if ((!really && *PL_Argv[0] != '/') ||
(really && *tmps != '/')) /* will execvp use PATH? */
TAINT_ENV(); /* testing IFS here is overkill, probably */
+ PERL_FPU_PRE_EXEC
if (really && *tmps)
PerlProc_execvp(tmps,EXEC_ARGV_CAST(PL_Argv));
else
PerlProc_execvp(PL_Argv[0],EXEC_ARGV_CAST(PL_Argv));
if (really && *tmps)
PerlProc_execvp(tmps,EXEC_ARGV_CAST(PL_Argv));
else
PerlProc_execvp(PL_Argv[0],EXEC_ARGV_CAST(PL_Argv));
+ PERL_FPU_POST_EXEC
if (ckWARN(WARN_EXEC))
Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s",
(really ? tmps : PL_Argv[0]), Strerror(errno));
if (ckWARN(WARN_EXEC))
Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s",
(really ? tmps : PL_Argv[0]), Strerror(errno));
@@
-1463,7
+1509,9
@@
Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report)
*--s = '\0';
if (s[-1] == '\'') {
*--s = '\0';
*--s = '\0';
if (s[-1] == '\'') {
*--s = '\0';
+ PERL_FPU_PRE_EXEC
PerlProc_execl(PL_cshname,"csh", flags, ncmd, (char*)0);
PerlProc_execl(PL_cshname,"csh", flags, ncmd, (char*)0);
+ PERL_FPU_POST_EXEC
*s = '\'';
return FALSE;
}
*s = '\'';
return FALSE;
}
@@
-1500,13
+1548,15
@@
Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report)
while (*t && isSPACE(*t))
++t;
while (*t && isSPACE(*t))
++t;
- if (!*t && (dup2(1,2) != -1)) {
+ if (!*t && (
PerlLIO_
dup2(1,2) != -1)) {
s[-2] = '\0';
break;
}
}
doshell:
s[-2] = '\0';
break;
}
}
doshell:
+ PERL_FPU_PRE_EXEC
PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char*)0);
PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char*)0);
+ PERL_FPU_POST_EXEC
return FALSE;
}
}
return FALSE;
}
}
@@
-1524,7
+1574,9
@@
Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report)
}
*a = Nullch;
if (PL_Argv[0]) {
}
*a = Nullch;
if (PL_Argv[0]) {
+ PERL_FPU_PRE_EXEC
PerlProc_execvp(PL_Argv[0],PL_Argv);
PerlProc_execvp(PL_Argv[0],PL_Argv);
+ PERL_FPU_POST_EXEC
if (errno == ENOEXEC) { /* for system V NIH syndrome */
do_execfree();
goto doshell;
if (errno == ENOEXEC) { /* for system V NIH syndrome */
do_execfree();
goto doshell;
@@
-1620,10
+1672,10
@@
nothing in the core.
if (mark == sp)
break;
s = SvPVx(*++mark, n_a);
if (mark == sp)
break;
s = SvPVx(*++mark, n_a);
- if (is
UPPER
(*s)) {
+ if (is
ALPHA
(*s)) {
if (*s == 'S' && s[1] == 'I' && s[2] == 'G')
s += 3;
if (*s == 'S' && s[1] == 'I' && s[2] == 'G')
s += 3;
- if (
!(val = whichsig(s))
)
+ if (
(val = whichsig(s)) < 0
)
Perl_croak(aTHX_ "Unrecognized signal name \"%s\"",s);
}
else
Perl_croak(aTHX_ "Unrecognized signal name \"%s\"",s);
}
else
@@
-1723,22
+1775,23
@@
nothing in the core.
SV* modified = *++mark;
void * utbufp = &utbuf;
SV* modified = *++mark;
void * utbufp = &utbuf;
- /*
b
e like C, and if both times are undefined, let the C
-
library figure out what to do. This usually means
-
"current time"
*/
+ /*
B
e like C, and if both times are undefined, let the C
+
*
library figure out what to do. This usually means
+
* "current time".
*/
if ( accessed == &PL_sv_undef && modified == &PL_sv_undef )
if ( accessed == &PL_sv_undef && modified == &PL_sv_undef )
- utbufp = NULL;
-
- Zero(&utbuf, sizeof utbuf, char);
+
utbufp = NULL;
+ else {
+
Zero(&utbuf, sizeof utbuf, char);
#ifdef BIG_TIME
#ifdef BIG_TIME
-
utbuf.actime = (Time_t)SvNVx(accessed);
/* time accessed */
-
utbuf.modtime = (Time_t)SvNVx(modified);
/* time modified */
+
utbuf.actime = (Time_t)SvNVx(accessed);
/* time accessed */
+
utbuf.modtime = (Time_t)SvNVx(modified);
/* time modified */
#else
#else
-
utbuf.actime = (Time_t)SvIVx(accessed);
/* time accessed */
-
utbuf.modtime = (Time_t)SvIVx(modified);
/* time modified */
+
utbuf.actime = (Time_t)SvIVx(accessed);
/* time accessed */
+
utbuf.modtime = (Time_t)SvIVx(modified);
/* time modified */
#endif
#endif
- APPLY_TAINT_PROPER();
+ }
+ APPLY_TAINT_PROPER();
tot = sp - mark;
while (++mark <= sp) {
char *name = SvPVx(*mark, n_a);
tot = sp - mark;
while (++mark <= sp) {
char *name = SvPVx(*mark, n_a);
@@
-2070,7
+2123,7
@@
Perl_do_semop(pTHX_ SV **mark, SV **sp)
opbuf = SvPV(opstr, opsize);
if (opsize < 3 * SHORTSIZE
|| (opsize % (3 * SHORTSIZE))) {
opbuf = SvPV(opstr, opsize);
if (opsize < 3 * SHORTSIZE
|| (opsize % (3 * SHORTSIZE))) {
- SETERRNO(EINVAL,LIB
$
_INVARG);
+ SETERRNO(EINVAL,LIB_INVARG);
return -1;
}
SETERRNO(0,0);
return -1;
}
SETERRNO(0,0);
@@
-2127,7
+2180,7
@@
Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
if (shmctl(id, IPC_STAT, &shmds) == -1)
return -1;
if (mpos < 0 || msize < 0 || mpos + msize > shmds.shm_segsz) {
if (shmctl(id, IPC_STAT, &shmds) == -1)
return -1;
if (mpos < 0 || msize < 0 || mpos + msize > shmds.shm_segsz) {
- SETERRNO(EFAULT,SS
$_ACCVIO);
/* can't do as caller requested */
+ SETERRNO(EFAULT,SS
_ACCVIO);
/* can't do as caller requested */
return -1;
}
shm = (char *)shmat(id, (char*)NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0);
return -1;
}
shm = (char *)shmat(id, (char*)NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0);
@@
-2254,7
+2307,7
@@
Perl_start_glob (pTHX_ SV *tmpglob, IO *io)
}
if (cxt) (void)lib$find_file_end(&cxt);
if (ok && sts != RMS$_NMF &&
}
if (cxt) (void)lib$find_file_end(&cxt);
if (ok && sts != RMS$_NMF &&
- sts != RMS$_DNF && sts != RMS
$
_FNF) ok = 0;
+ sts != RMS$_DNF && sts != RMS_FNF) ok = 0;
if (!ok) {
if (!(sts & 1)) {
SETERRNO((sts == RMS$_SYN ? EINVAL : EVMSERR),sts);
if (!ok) {
if (!(sts & 1)) {
SETERRNO((sts == RMS$_SYN ? EINVAL : EVMSERR),sts);