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
Fix PerlLIO_chsize() for platforms that don't have chsize()
[perl5.git]
/
doio.c
diff --git
a/doio.c
b/doio.c
index
2da66c6
..
db5e52a
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, 2004, 2005, 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.
@@
-14,6
+15,11
@@
* chattering, into calmer and more level reaches."
*/
* chattering, into calmer and more level reaches."
*/
+/* This file contains functions that do the actual I/O on behalf of ops.
+ * For example, pp_print() calls the do_print() function in this file for
+ * each argument needing printing.
+ */
+
#include "EXTERN.h"
#define PERL_IN_DOIO_C
#include "perl.h"
#include "EXTERN.h"
#define PERL_IN_DOIO_C
#include "perl.h"
@@
-47,9
+53,10
@@
# define OPEN_EXCL 0
#endif
# define OPEN_EXCL 0
#endif
-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
+#define PERL_MODE_MAX 8
+#define PERL_FLAGS_MAX 10
+
#include <signal.h>
#include <signal.h>
-#endif
bool
Perl_do_open(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
bool
Perl_do_open(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
@@
-85,7
+92,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
bool was_fdopen = FALSE;
bool in_raw = 0, in_crlf = 0, out_raw = 0, out_crlf = 0;
char *type = NULL;
bool was_fdopen = FALSE;
bool in_raw = 0, in_crlf = 0, out_raw = 0, out_crlf = 0;
char *type = NULL;
- char mode[
8];
/* stdio file mode ("r\0", "rb\0", "r+b\0" etc.) */
+ char mode[
PERL_MODE_MAX];
/* stdio file mode ("r\0", "rb\0", "r+b\0" etc.) */
SV *namesv;
Zero(mode,sizeof(mode),char);
SV *namesv;
Zero(mode,sizeof(mode),char);
@@
-93,7
+100,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);
@@
-140,7
+147,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if (as_raw) {
/* sysopen style args, i.e. integer mode and permissions */
STRLEN ix = 0;
if (as_raw) {
/* sysopen style args, i.e. integer mode and permissions */
STRLEN ix = 0;
- int appendtrunc =
+
const
int appendtrunc =
0
#ifdef O_APPEND /* Not fully portable. */
|O_APPEND
0
#ifdef O_APPEND /* Not fully portable. */
|O_APPEND
@@
-149,8
+156,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
|O_TRUNC
#endif
;
|O_TRUNC
#endif
;
- int modifyingmode =
- O_WRONLY|O_RDWR|O_CREAT|appendtrunc;
+ int modifyingmode = O_WRONLY|O_RDWR|O_CREAT|appendtrunc;
int ismodifying;
if (num_svs != 0) {
int ismodifying;
if (num_svs != 0) {
@@
-178,7
+184,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,7
+217,7
@@
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,'&')) {
STRLEN l = 0;
#ifdef USE_STDIO
if (SvROK(*svp) && !strchr(name,'&')) {
@@
-235,7
+241,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
+249,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++;
@@
-261,7
+267,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
errno = EPIPE;
goto say_false;
}
errno = EPIPE;
goto say_false;
}
- if (
strNE(name,"-"
) || num_svs)
+ if (
(*name == '-' && name[1] == '\0'
) || num_svs)
TAINT_ENV();
TAINT_PROPER("piped open");
if (!num_svs && name[len-1] == '|') {
TAINT_ENV();
TAINT_PROPER("piped open");
if (!num_svs && name[len-1] == '|') {
@@
-271,10
+277,17
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
}
mode[0] = 'w';
writing = 1;
}
mode[0] = 'w';
writing = 1;
+#ifdef HAS_STRLCAT
+ if (out_raw)
+ strlcat(mode, "b", PERL_MODE_MAX);
+ else if (out_crlf)
+ strlcat(mode, "t", PERL_MODE_MAX);
+#else
if (out_raw)
strcat(mode, "b");
else if (out_crlf)
strcat(mode, "t");
if (out_raw)
strcat(mode, "b");
else if (out_crlf)
strcat(mode, "t");
+#endif
if (num_svs > 1) {
fp = PerlProc_popen_list(mode, num_svs, svp);
}
if (num_svs > 1) {
fp = PerlProc_popen_list(mode, num_svs, svp);
}
@@
-288,7
+301,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
}
}
}
}
}
}
- }
+ }
/* IoTYPE_PIPE */
else if (*type == IoTYPE_WRONLY) {
TAINT_PROPER("open");
type++;
else if (*type == IoTYPE_WRONLY) {
TAINT_PROPER("open");
type++;
@@
-302,11
+315,17
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
}
writing = 1;
}
writing = 1;
+#ifdef HAS_STRLCAT
+ if (out_raw)
+ strlcat(mode, "b", PERL_MODE_MAX);
+ else if (out_crlf)
+ strlcat(mode, "t", PERL_MODE_MAX);
+#else
if (out_raw)
strcat(mode, "b");
else if (out_crlf)
strcat(mode, "t");
if (out_raw)
strcat(mode, "b");
else if (out_crlf)
strcat(mode, "t");
-
+#endif
if (*type == '&') {
duplicity:
dodup = PERLIO_DUP_FD;
if (*type == '&') {
duplicity:
dodup = PERLIO_DUP_FD;
@@
-323,24
+342,22
@@
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));
}
+ /*SUPPRESS 530*/
+ for (; isSPACE(*type); type++) ;
if (num_svs && (SvIOK(*svp) || (SvPOK(*svp) && looks_like_number(*svp)))) {
fd = SvUV(*svp);
num_svs = 0;
}
else if (isDIGIT(*type)) {
if (num_svs && (SvIOK(*svp) || (SvPOK(*svp) && looks_like_number(*svp)))) {
fd = SvUV(*svp);
num_svs = 0;
}
else if (isDIGIT(*type)) {
- /*SUPPRESS 530*/
- for (; isSPACE(*type); type++) ;
fd = atoi(type);
}
else {
fd = atoi(type);
}
else {
- IO* thatio;
+
const
IO* thatio;
if (num_svs) {
thatio = sv_2io(*svp);
}
else {
GV *thatgv;
if (num_svs) {
thatio = sv_2io(*svp);
}
else {
GV *thatgv;
- /*SUPPRESS 530*/
- for (; isSPACE(*type); type++) ;
thatgv = gv_fetchpv(type,FALSE,SVt_PVIO);
thatio = GvIO(thatgv);
}
thatgv = gv_fetchpv(type,FALSE,SVt_PVIO);
thatio = GvIO(thatgv);
}
@@
-423,16
+440,24
@@
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++) ;
mode[0] = 'r';
else if (*type == IoTYPE_RDONLY) {
/*SUPPRESS 530*/
for (type++; isSPACE(*type); type++) ;
mode[0] = 'r';
+#ifdef HAS_STRLCAT
+ if (in_raw)
+ strlcat(mode, "b", PERL_MODE_MAX);
+ else if (in_crlf)
+ strlcat(mode, "t", PERL_MODE_MAX);
+#else
if (in_raw)
strcat(mode, "b");
else if (in_crlf)
strcat(mode, "t");
if (in_raw)
strcat(mode, "b");
else if (in_crlf)
strcat(mode, "t");
-
+#endif
if (*type == '&') {
goto duplicity;
}
if (*type == '&') {
goto duplicity;
}
@@
-454,8
+479,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 '-|' */
@@
-476,14
+504,23
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
errno = EPIPE;
goto say_false;
}
errno = EPIPE;
goto say_false;
}
- if (
strNE(name,"-"
) || num_svs)
+ if (
!(*name == '-' && name[1] == '\0'
) || num_svs)
TAINT_ENV();
TAINT_PROPER("piped open");
mode[0] = 'r';
TAINT_ENV();
TAINT_PROPER("piped open");
mode[0] = 'r';
+
+#ifdef HAS_STRLCAT
+ if (in_raw)
+ strlcat(mode, "b", PERL_MODE_MAX);
+ else if (in_crlf)
+ strlcat(mode, "t", PERL_MODE_MAX);
+#else
if (in_raw)
strcat(mode, "b");
else if (in_crlf)
strcat(mode, "t");
if (in_raw)
strcat(mode, "b");
else if (in_crlf)
strcat(mode, "t");
+#endif
+
if (num_svs > 1) {
fp = PerlProc_popen_list(mode,num_svs,svp);
}
if (num_svs > 1) {
fp = PerlProc_popen_list(mode,num_svs,svp);
}
@@
-500,19
+537,28
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
}
}
}
}
}
}
- 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*/
for (; isSPACE(*name); name++) ;
mode[0] = 'r';
name = type;
IoTYPE(io) = IoTYPE_RDONLY;
/*SUPPRESS 530*/
for (; isSPACE(*name); name++) ;
mode[0] = 'r';
+
+#ifdef HAS_STRLCAT
+ if (in_raw)
+ strlcat(mode, "b", PERL_MODE_MAX);
+ else if (in_crlf)
+ strlcat(mode, "t", PERL_MODE_MAX);
+#else
if (in_raw)
strcat(mode, "b");
else if (in_crlf)
strcat(mode, "t");
if (in_raw)
strcat(mode, "b");
else if (in_crlf)
strcat(mode, "t");
- if (strEQ(name,"-")) {
+#endif
+
+ if (*name == '-' && name[1] == '\0') {
fp = PerlIO_stdin();
IoTYPE(io) = IoTYPE_STD;
}
fp = PerlIO_stdin();
IoTYPE(io) = IoTYPE_STD;
}
@@
-642,8
+688,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
@@
-667,8
+721,8
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if (IoTYPE(io) == IoTYPE_SOCKET
|| (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(PL_statbuf.st_mode)) ) {
char *s = mode;
if (IoTYPE(io) == IoTYPE_SOCKET
|| (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(PL_statbuf.st_mode)) ) {
char *s = mode;
- if (*s ==
'I' || *s == '#'
)
- s++;
+ 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);
*s = 'w';
if (!(IoOFP(io) = PerlIO_openn(aTHX_ type,s,fd,0,0,NULL,0,svp))) {
PerlIO_close(fp);
@@
-713,12
+767,16
@@
Perl_nextargv(pTHX_ register GV *gv)
if (PL_filemode & (S_ISUID|S_ISGID)) {
PerlIO_flush(IoIFP(GvIOn(PL_argvoutgv))); /* chmod must follow last write */
#ifdef HAS_FCHMOD
if (PL_filemode & (S_ISUID|S_ISGID)) {
PerlIO_flush(IoIFP(GvIOn(PL_argvoutgv))); /* chmod must follow last write */
#ifdef HAS_FCHMOD
- (void)fchmod(PL_lastfd,PL_filemode);
+ if (PL_lastfd != -1)
+ (void)fchmod(PL_lastfd,PL_filemode);
#else
(void)PerlLIO_chmod(PL_oldname,PL_filemode);
#endif
}
#else
(void)PerlLIO_chmod(PL_oldname,PL_filemode);
#endif
}
+ PL_lastfd = -1;
PL_filemode = 0;
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));
@@
-775,8
+833,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;
}
@@
-786,8
+844,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;
}
@@
-802,8
+860,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;
}
@@
-923,8
+981,8
@@
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;
IoOFP(rstio) = IoIFP(rstio);
IoIFP(wstio) = IoOFP(wstio);
IoTYPE(rstio) = IoTYPE_RDONLY;
@@
-1000,11
+1058,14
@@
Perl_io_close(pTHX_ IO *io, bool not_implicit)
retval = TRUE;
else {
if (IoOFP(io) && IoOFP(io) != IoIFP(io)) { /* a socket */
retval = TRUE;
else {
if (IoOFP(io) && IoOFP(io) != IoIFP(io)) { /* a socket */
- retval = (PerlIO_close(IoOFP(io)) != EOF);
+ bool prev_err = PerlIO_error(IoOFP(io));
+ retval = (PerlIO_close(IoOFP(io)) != EOF && !prev_err);
PerlIO_close(IoIFP(io)); /* clear stdio, fd already closed */
}
PerlIO_close(IoIFP(io)); /* clear stdio, fd already closed */
}
- else
- retval = (PerlIO_close(IoIFP(io)) != EOF);
+ else {
+ bool prev_err = PerlIO_error(IoIFP(io));
+ retval = (PerlIO_close(IoIFP(io)) != EOF && !prev_err);
+ }
}
IoOFP(io) = IoIFP(io) = Nullfp;
}
}
IoOFP(io) = IoIFP(io) = Nullfp;
}
@@
-1029,17
+1090,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)
@@
-1118,7
+1183,7
@@
Perl_mode_from_discipline(pTHX_ SV *discp)
if (*s == ':') {
switch (s[1]) {
case 'r':
if (*s == ':') {
switch (s[1]) {
case 'r':
- if (
len > 3 && strnEQ(s+1, "raw", 3)
+ if (
s[2] == 'a' && s[3] == 'w'
&& (!s[4] || s[4] == ':' || isSPACE(s[4])))
{
mode = O_BINARY;
&& (!s[4] || s[4] == ':' || isSPACE(s[4])))
{
mode = O_BINARY;
@@
-1128,7
+1193,7
@@
Perl_mode_from_discipline(pTHX_ SV *discp)
}
/* FALL THROUGH */
case 'c':
}
/* FALL THROUGH */
case 'c':
- if (
len > 4 && strnEQ(s+1, "crlf", 4)
+ if (
s[2] == 'r' && s[3] == 'l' && s[4] == 'f'
&& (!s[5] || s[5] == ':' || isSPACE(s[5])))
{
mode = O_TEXT;
&& (!s[5] || s[5] == ':' || isSPACE(s[5])))
{
mode = O_TEXT;
@@
-1152,8
+1217,9
@@
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
#else
+ len -= end-s;
s = end;
#endif
}
s = end;
#endif
}
@@
-1168,7
+1234,7
@@
Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode)
/* The old body of this is now in non-LAYER part of perlio.c
* This is a stub for any XS code which might have been calling it.
*/
/* The old body of this is now in non-LAYER part of perlio.c
* This is a stub for any XS code which might have been calling it.
*/
- char *name = ":raw";
+ c
onst c
har *name = ":raw";
#ifdef PERLIO_USING_CRLF
if (!(mode & O_BINARY))
name = ":crlf";
#ifdef PERLIO_USING_CRLF
if (!(mode & O_BINARY))
name = ":crlf";
@@
-1176,14
+1242,15
@@
Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode)
return PerlIO_binmode(aTHX_ fp, iotype, mode, name);
}
return PerlIO_binmode(aTHX_ fp, iotype, mode, name);
}
-#if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP)
- /* code courtesy of William Kucharski */
-#define HAS_CHSIZE
-
+#if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE)
I32 my_chsize(fd, length)
I32 fd; /* file descriptor */
Off_t length; /* length to set file to */
{
I32 my_chsize(fd, length)
I32 fd; /* file descriptor */
Off_t length; /* length to set file to */
{
+#ifdef F_FREESP
+ /* code courtesy of William Kucharski */
+#define HAS_CHSIZE
+
struct flock fl;
Stat_t filebuf;
struct flock fl;
Stat_t filebuf;
@@
-1224,13
+1291,17
@@
Off_t length; /* length to set file to */
}
return 0;
}
return 0;
-}
+#else
+ dTHX;
+ DIE(aTHX_ "truncate not implemented");
#endif /* F_FREESP */
#endif /* F_FREESP */
+}
+#endif /* !HAS_TRUNCATE && !HAS_CHSIZE */
bool
Perl_do_print(pTHX_ register SV *sv, PerlIO *fp)
{
bool
Perl_do_print(pTHX_ register SV *sv, PerlIO *fp)
{
- register char *tmps;
+ register c
onst c
har *tmps;
STRLEN len;
/* assuming fp is checked earlier */
STRLEN len;
/* assuming fp is checked earlier */
@@
-1252,7
+1323,7
@@
Perl_do_print(pTHX_ register SV *sv, PerlIO *fp)
switch (SvTYPE(sv)) {
case SVt_NULL:
if (ckWARN(WARN_UNINITIALIZED))
switch (SvTYPE(sv)) {
case SVt_NULL:
if (ckWARN(WARN_UNINITIALIZED))
- report_uninit();
+ report_uninit(
sv
);
return TRUE;
case SVt_IV:
if (SvIOK(sv)) {
return TRUE;
case SVt_IV:
if (SvIOK(sv)) {
@@
-1268,7
+1339,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)
@@
-1319,10
+1391,13
@@
Perl_my_stat(pTHX)
return (PL_laststatval = -1);
}
}
return (PL_laststatval = -1);
}
}
+ else if (PL_op->op_private & OPpFT_STACKED) {
+ return PL_laststatval;
+ }
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;
@@
-1333,9
+1408,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'))
@@
-1344,6
+1420,8
@@
Perl_my_stat(pTHX)
}
}
}
}
+static char no_prev_lstat[] = "The stat preceding -l _ wasn't an lstat";
+
I32
Perl_my_lstat(pTHX)
{
I32
Perl_my_lstat(pTHX)
{
@@
-1354,7
+1432,7
@@
Perl_my_lstat(pTHX)
EXTEND(SP,1);
if (cGVOP_gv == PL_defgv) {
if (PL_laststype != OP_LSTAT)
EXTEND(SP,1);
if (cGVOP_gv == PL_defgv) {
if (PL_laststype != OP_LSTAT)
- Perl_croak(aTHX_
"The stat preceding -l _ wasn't an lstat"
);
+ Perl_croak(aTHX_
no_prev_lstat
);
return PL_laststatval;
}
if (ckWARN(WARN_IO)) {
return PL_laststatval;
}
if (ckWARN(WARN_IO)) {
@@
-1363,6
+1441,9
@@
Perl_my_lstat(pTHX)
return (PL_laststatval = -1);
}
}
return (PL_laststatval = -1);
}
}
+ else if (ckWARN(WARN_IO) && PL_laststype != OP_LSTAT
+ && (PL_op->op_private & OPpFT_STACKED))
+ Perl_croak(aTHX_ no_prev_lstat);
PL_laststype = OP_LSTAT;
PL_statgv = Nullgv;
PL_laststype = OP_LSTAT;
PL_statgv = Nullgv;
@@
-1380,11
+1461,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,
@@
-1394,7
+1477,7
@@
Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
Perl_croak(aTHX_ "exec? I'm not *that* kind of operating system");
#else
register char **a;
Perl_croak(aTHX_ "exec? I'm not *that* kind of operating system");
#else
register char **a;
- char *tmps = Nullch;
+ c
onst c
har *tmps = Nullch;
STRLEN n_a;
if (sp > mark) {
STRLEN n_a;
if (sp > mark) {
@@
-1412,10
+1495,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));
@@
-1465,14
+1550,22
@@
Perl_do_exec3(pTHX_ char *cmd, int fd, int do_report)
#ifdef CSH
{
#ifdef CSH
{
- char flags[
10
];
+ char flags[
PERL_FLAGS_MAX
];
if (strnEQ(cmd,PL_cshname,PL_cshlen) &&
strnEQ(cmd+PL_cshlen," -c",3)) {
if (strnEQ(cmd,PL_cshname,PL_cshlen) &&
strnEQ(cmd+PL_cshlen," -c",3)) {
+#ifdef HAS_STRLCPY
+ strlcpy(flags, "-c", PERL_FLAGS_MAX);
+#else
strcpy(flags,"-c");
strcpy(flags,"-c");
+#endif
s = cmd+PL_cshlen+3;
if (*s == 'f') {
s++;
s = cmd+PL_cshlen+3;
if (*s == 'f') {
s++;
+#ifdef HAS_STRLCPY
+ strlcat(flags, "f", PERL_FLAGS_MAX);
+#else
strcat(flags,"f");
strcat(flags,"f");
+#endif
}
if (*s == ' ')
s++;
}
if (*s == ' ')
s++;
@@
-1485,7
+1578,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;
}
@@
-1522,13
+1617,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;
}
}
@@
-1546,7
+1643,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;
@@
-1575,7
+1674,7
@@
Perl_apply(pTHX_ I32 type, register SV **mark, register SV **sp)
register I32 val;
register I32 val2;
register I32 tot = 0;
register I32 val;
register I32 val2;
register I32 tot = 0;
- char *what;
+ c
onst c
har *what;
char *s;
SV **oldmark = mark;
STRLEN n_a;
char *s;
SV **oldmark = mark;
STRLEN n_a;
@@
-1642,10
+1741,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
@@
-1745,22
+1844,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);
@@
-2259,8
+2359,9
@@
Perl_start_glob (pTHX_ SV *tmpglob, IO *io)
if (*cp == '?') *cp = '%'; /* VMS style single-char wildcard */
while (ok && ((sts = lib$find_file(&wilddsc,&rsdsc,&cxt,
&dfltdsc,NULL,NULL,NULL))&1)) {
if (*cp == '?') *cp = '%'; /* VMS style single-char wildcard */
while (ok && ((sts = lib$find_file(&wilddsc,&rsdsc,&cxt,
&dfltdsc,NULL,NULL,NULL))&1)) {
- end = rstr + (unsigned long int) *rslt;
- if (!hasver) while (*end != ';') end--;
+ /* with varying string, 1st word of buffer contains result length */
+ end = rstr + *((unsigned short int*)rslt);
+ if (!hasver) while (*end != ';' && end > rstr) end--;
*(end++) = '\n'; *end = '\0';
for (cp = rstr; *cp; cp++) *cp = _tolower(*cp);
if (hasdir) {
*(end++) = '\n'; *end = '\0';
for (cp = rstr; *cp; cp++) *cp = _tolower(*cp);
if (hasdir) {