summaryrefslogtreecommitdiff
path: root/doio.c
diff options
context:
space:
mode:
authorMichael G. Schwern <schwern@pobox.com>2020-12-28 18:04:52 -0800
committerKarl Williamson <khw@cpan.org>2021-01-17 09:18:15 -0700
commit1604cfb0273418ed479719f39def5ee559bffda2 (patch)
tree166a5ab935a029ab86cf6295d6f3cb77da22e559 /doio.c
parent557ff1b2a4ecd18fe9229e7e0eb8fa123adc5670 (diff)
downloadperl-1604cfb0273418ed479719f39def5ee559bffda2.tar.gz
style: Detabify indentation of the C code maintained by the core.
This just detabifies to get rid of the mixed tab/space indentation. Applying consistent indentation and dealing with other tabs are another issue. Done with `expand -i`. * vutil.* left alone, it's part of version. * Left regen managed files alone for now.
Diffstat (limited to 'doio.c')
-rw-r--r--doio.c2406
1 files changed, 1203 insertions, 1203 deletions
diff --git a/doio.c b/doio.c
index 439f2d096a..baca499d10 100644
--- a/doio.c
+++ b/doio.c
@@ -83,7 +83,7 @@ Perl_setfd_cloexec_for_nonsysfd(pTHX_ int fd)
{
assert(fd >= 0);
if(fd > PL_maxsysfd)
- setfd_cloexec(fd);
+ setfd_cloexec(fd);
}
void
@@ -91,96 +91,96 @@ Perl_setfd_inhexec_for_sysfd(pTHX_ int fd)
{
assert(fd >= 0);
if(fd <= PL_maxsysfd)
- setfd_inhexec(fd);
+ setfd_inhexec(fd);
}
void
Perl_setfd_cloexec_or_inhexec_by_sysfdness(pTHX_ int fd)
{
assert(fd >= 0);
if(fd <= PL_maxsysfd)
- setfd_inhexec(fd);
+ setfd_inhexec(fd);
else
- setfd_cloexec(fd);
+ setfd_cloexec(fd);
}
#define DO_GENOPEN_THEN_CLOEXEC(GENOPEN_NORMAL, GENSETFD_CLOEXEC) \
- do { \
- int res = (GENOPEN_NORMAL); \
- if(LIKELY(res != -1)) GENSETFD_CLOEXEC; \
- return res; \
- } while(0)
+ do { \
+ int res = (GENOPEN_NORMAL); \
+ if(LIKELY(res != -1)) GENSETFD_CLOEXEC; \
+ return res; \
+ } while(0)
#if defined(HAS_FCNTL) && defined(F_SETFD) && defined(FD_CLOEXEC) && \
- defined(F_GETFD)
+ defined(F_GETFD)
enum { CLOEXEC_EXPERIMENT = 0, CLOEXEC_AT_OPEN, CLOEXEC_AFTER_OPEN };
# define DO_GENOPEN_EXPERIMENTING_CLOEXEC(strategy, TESTFD, GENOPEN_CLOEXEC, \
- GENOPEN_NORMAL, GENSETFD_CLOEXEC) \
- do { \
- switch (strategy) { \
- case CLOEXEC_EXPERIMENT: default: { \
- int res = (GENOPEN_CLOEXEC), eno; \
- if (LIKELY(res != -1)) { \
- int fdflags = fcntl((TESTFD), F_GETFD); \
- if (LIKELY(fdflags != -1) && \
- LIKELY(fdflags & FD_CLOEXEC)) { \
- strategy = CLOEXEC_AT_OPEN; \
- } else { \
- strategy = CLOEXEC_AFTER_OPEN; \
- GENSETFD_CLOEXEC; \
- } \
- } else if (UNLIKELY((eno = errno) == EINVAL || \
- eno == ENOSYS)) { \
- res = (GENOPEN_NORMAL); \
- if (LIKELY(res != -1)) { \
- strategy = CLOEXEC_AFTER_OPEN; \
- GENSETFD_CLOEXEC; \
- } else if (!LIKELY((eno = errno) == EINVAL || \
- eno == ENOSYS)) { \
- strategy = CLOEXEC_AFTER_OPEN; \
- } \
- } \
- return res; \
- } \
- case CLOEXEC_AT_OPEN: \
- return (GENOPEN_CLOEXEC); \
- case CLOEXEC_AFTER_OPEN: \
- DO_GENOPEN_THEN_CLOEXEC(GENOPEN_NORMAL, GENSETFD_CLOEXEC); \
- } \
- } while(0)
+ GENOPEN_NORMAL, GENSETFD_CLOEXEC) \
+ do { \
+ switch (strategy) { \
+ case CLOEXEC_EXPERIMENT: default: { \
+ int res = (GENOPEN_CLOEXEC), eno; \
+ if (LIKELY(res != -1)) { \
+ int fdflags = fcntl((TESTFD), F_GETFD); \
+ if (LIKELY(fdflags != -1) && \
+ LIKELY(fdflags & FD_CLOEXEC)) { \
+ strategy = CLOEXEC_AT_OPEN; \
+ } else { \
+ strategy = CLOEXEC_AFTER_OPEN; \
+ GENSETFD_CLOEXEC; \
+ } \
+ } else if (UNLIKELY((eno = errno) == EINVAL || \
+ eno == ENOSYS)) { \
+ res = (GENOPEN_NORMAL); \
+ if (LIKELY(res != -1)) { \
+ strategy = CLOEXEC_AFTER_OPEN; \
+ GENSETFD_CLOEXEC; \
+ } else if (!LIKELY((eno = errno) == EINVAL || \
+ eno == ENOSYS)) { \
+ strategy = CLOEXEC_AFTER_OPEN; \
+ } \
+ } \
+ return res; \
+ } \
+ case CLOEXEC_AT_OPEN: \
+ return (GENOPEN_CLOEXEC); \
+ case CLOEXEC_AFTER_OPEN: \
+ DO_GENOPEN_THEN_CLOEXEC(GENOPEN_NORMAL, GENSETFD_CLOEXEC); \
+ } \
+ } while(0)
#else
# define DO_GENOPEN_EXPERIMENTING_CLOEXEC(strategy, TESTFD, GENOPEN_CLOEXEC, \
- GENOPEN_NORMAL, GENSETFD_CLOEXEC) \
- DO_GENOPEN_THEN_CLOEXEC(GENOPEN_NORMAL, GENSETFD_CLOEXEC)
+ GENOPEN_NORMAL, GENSETFD_CLOEXEC) \
+ DO_GENOPEN_THEN_CLOEXEC(GENOPEN_NORMAL, GENSETFD_CLOEXEC)
#endif
#define DO_ONEOPEN_THEN_CLOEXEC(ONEOPEN_NORMAL) \
- do { \
- int fd; \
- DO_GENOPEN_THEN_CLOEXEC(fd = (ONEOPEN_NORMAL), \
- setfd_cloexec(fd)); \
- } while(0)
+ do { \
+ int fd; \
+ DO_GENOPEN_THEN_CLOEXEC(fd = (ONEOPEN_NORMAL), \
+ setfd_cloexec(fd)); \
+ } while(0)
#define DO_ONEOPEN_EXPERIMENTING_CLOEXEC(strategy, \
ONEOPEN_CLOEXEC, ONEOPEN_NORMAL) \
- do { \
- int fd; \
- DO_GENOPEN_EXPERIMENTING_CLOEXEC(strategy, \
+ do { \
+ int fd; \
+ DO_GENOPEN_EXPERIMENTING_CLOEXEC(strategy, \
fd, \
fd = (ONEOPEN_CLOEXEC), \
- fd = (ONEOPEN_NORMAL), setfd_cloexec(fd)); \
- } while(0)
+ fd = (ONEOPEN_NORMAL), setfd_cloexec(fd)); \
+ } while(0)
#define DO_PIPESETFD_CLOEXEC(PIPEFD) \
- do { \
- setfd_cloexec((PIPEFD)[0]); \
- setfd_cloexec((PIPEFD)[1]); \
- } while(0)
+ do { \
+ setfd_cloexec((PIPEFD)[0]); \
+ setfd_cloexec((PIPEFD)[1]); \
+ } while(0)
#define DO_PIPEOPEN_THEN_CLOEXEC(PIPEFD, PIPEOPEN_NORMAL) \
- DO_GENOPEN_THEN_CLOEXEC(PIPEOPEN_NORMAL, DO_PIPESETFD_CLOEXEC(PIPEFD))
+ DO_GENOPEN_THEN_CLOEXEC(PIPEOPEN_NORMAL, DO_PIPESETFD_CLOEXEC(PIPEFD))
#define DO_PIPEOPEN_EXPERIMENTING_CLOEXEC(strategy, PIPEFD, PIPEOPEN_CLOEXEC, \
- PIPEOPEN_NORMAL) \
- DO_GENOPEN_EXPERIMENTING_CLOEXEC(strategy, \
+ PIPEOPEN_NORMAL) \
+ DO_GENOPEN_EXPERIMENTING_CLOEXEC(strategy, \
(PIPEFD)[0], PIPEOPEN_CLOEXEC, \
- PIPEOPEN_NORMAL, DO_PIPESETFD_CLOEXEC(PIPEFD))
+ PIPEOPEN_NORMAL, DO_PIPESETFD_CLOEXEC(PIPEFD))
int
Perl_PerlLIO_dup_cloexec(pTHX_ int oldfd)
@@ -193,8 +193,8 @@ Perl_PerlLIO_dup_cloexec(pTHX_ int oldfd)
*/
DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
PL_strategy_dup,
- fcntl(oldfd, F_DUPFD_CLOEXEC, 0),
- PerlLIO_dup(oldfd));
+ fcntl(oldfd, F_DUPFD_CLOEXEC, 0),
+ PerlLIO_dup(oldfd));
#else
DO_ONEOPEN_THEN_CLOEXEC(PerlLIO_dup(oldfd));
#endif
@@ -211,8 +211,8 @@ Perl_PerlLIO_dup2_cloexec(pTHX_ int oldfd, int newfd)
*/
DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
PL_strategy_dup2,
- dup3(oldfd, newfd, O_CLOEXEC),
- PerlLIO_dup2(oldfd, newfd));
+ dup3(oldfd, newfd, O_CLOEXEC),
+ PerlLIO_dup2(oldfd, newfd));
#else
DO_ONEOPEN_THEN_CLOEXEC(PerlLIO_dup2(oldfd, newfd));
#endif
@@ -225,8 +225,8 @@ Perl_PerlLIO_open_cloexec(pTHX_ const char *file, int flag)
#if defined(O_CLOEXEC)
DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
PL_strategy_open,
- PerlLIO_open(file, flag | O_CLOEXEC),
- PerlLIO_open(file, flag));
+ PerlLIO_open(file, flag | O_CLOEXEC),
+ PerlLIO_open(file, flag));
#else
DO_ONEOPEN_THEN_CLOEXEC(PerlLIO_open(file, flag));
#endif
@@ -239,8 +239,8 @@ Perl_PerlLIO_open3_cloexec(pTHX_ const char *file, int flag, int perm)
#if defined(O_CLOEXEC)
DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
PL_strategy_open3,
- PerlLIO_open3(file, flag | O_CLOEXEC, perm),
- PerlLIO_open3(file, flag, perm));
+ PerlLIO_open3(file, flag | O_CLOEXEC, perm),
+ PerlLIO_open3(file, flag, perm));
#else
DO_ONEOPEN_THEN_CLOEXEC(PerlLIO_open3(file, flag, perm));
#endif
@@ -253,8 +253,8 @@ Perl_my_mkstemp_cloexec(char *templte)
#if defined(O_CLOEXEC)
DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
PL_strategy_mkstemp,
- Perl_my_mkostemp(templte, O_CLOEXEC),
- Perl_my_mkstemp(templte));
+ Perl_my_mkostemp(templte, O_CLOEXEC),
+ Perl_my_mkstemp(templte));
#else
DO_ONEOPEN_THEN_CLOEXEC(Perl_my_mkstemp(templte));
#endif
@@ -267,8 +267,8 @@ Perl_my_mkostemp_cloexec(char *templte, int flags)
#if defined(O_CLOEXEC)
DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
PL_strategy_mkstemp,
- Perl_my_mkostemp(templte, flags | O_CLOEXEC),
- Perl_my_mkostemp(templte, flags));
+ Perl_my_mkostemp(templte, flags | O_CLOEXEC),
+ Perl_my_mkostemp(templte, flags));
#else
DO_ONEOPEN_THEN_CLOEXEC(Perl_my_mkostemp(templte, flags));
#endif
@@ -286,8 +286,8 @@ Perl_PerlProc_pipe_cloexec(pTHX_ int *pipefd)
*/
# if !defined(PERL_IMPLICIT_SYS) && defined(HAS_PIPE2) && defined(O_CLOEXEC)
DO_PIPEOPEN_EXPERIMENTING_CLOEXEC(PL_strategy_pipe, pipefd,
- pipe2(pipefd, O_CLOEXEC),
- PerlProc_pipe(pipefd));
+ pipe2(pipefd, O_CLOEXEC),
+ PerlProc_pipe(pipefd));
# else
DO_PIPEOPEN_THEN_CLOEXEC(pipefd, PerlProc_pipe(pipefd));
# endif
@@ -302,8 +302,8 @@ Perl_PerlSock_socket_cloexec(pTHX_ int domain, int type, int protocol)
# if defined(SOCK_CLOEXEC)
DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
PL_strategy_socket,
- PerlSock_socket(domain, type | SOCK_CLOEXEC, protocol),
- PerlSock_socket(domain, type, protocol));
+ PerlSock_socket(domain, type | SOCK_CLOEXEC, protocol),
+ PerlSock_socket(domain, type, protocol));
# else
DO_ONEOPEN_THEN_CLOEXEC(PerlSock_socket(domain, type, protocol));
# endif
@@ -314,7 +314,7 @@ Perl_PerlSock_accept_cloexec(pTHX_ int listenfd, struct sockaddr *addr,
Sock_size_t *addrlen)
{
# if !defined(PERL_IMPLICIT_SYS) && \
- defined(HAS_ACCEPT4) && defined(SOCK_CLOEXEC)
+ defined(HAS_ACCEPT4) && defined(SOCK_CLOEXEC)
/*
* struct IPerlSock doesn't cover accept4(), and there's no clear
* way to extend it, so for the time being this just isn't available
@@ -322,8 +322,8 @@ Perl_PerlSock_accept_cloexec(pTHX_ int listenfd, struct sockaddr *addr,
*/
DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
PL_strategy_accept,
- accept4(listenfd, addr, addrlen, SOCK_CLOEXEC),
- PerlSock_accept(listenfd, addr, addrlen));
+ accept4(listenfd, addr, addrlen, SOCK_CLOEXEC),
+ PerlSock_accept(listenfd, addr, addrlen));
# else
DO_ONEOPEN_THEN_CLOEXEC(PerlSock_accept(listenfd, addr, addrlen));
# endif
@@ -333,7 +333,7 @@ Perl_PerlSock_accept_cloexec(pTHX_ int listenfd, struct sockaddr *addr,
#if defined (HAS_SOCKETPAIR) || \
(defined (HAS_SOCKET) && defined(SOCK_DGRAM) && \
- defined(AF_INET) && defined(PF_INET))
+ defined(AF_INET) && defined(PF_INET))
int
Perl_PerlSock_socketpair_cloexec(pTHX_ int domain, int type, int protocol,
int *pairfd)
@@ -341,11 +341,11 @@ Perl_PerlSock_socketpair_cloexec(pTHX_ int domain, int type, int protocol,
PERL_ARGS_ASSERT_PERLSOCK_SOCKETPAIR_CLOEXEC;
# ifdef SOCK_CLOEXEC
DO_PIPEOPEN_EXPERIMENTING_CLOEXEC(PL_strategy_socketpair, pairfd,
- PerlSock_socketpair(domain, type | SOCK_CLOEXEC, protocol, pairfd),
- PerlSock_socketpair(domain, type, protocol, pairfd));
+ PerlSock_socketpair(domain, type | SOCK_CLOEXEC, protocol, pairfd),
+ PerlSock_socketpair(domain, type, protocol, pairfd));
# else
DO_PIPEOPEN_THEN_CLOEXEC(pairfd,
- PerlSock_socketpair(domain, type, protocol, pairfd));
+ PerlSock_socketpair(domain, type, protocol, pairfd));
# endif
}
#endif
@@ -368,10 +368,10 @@ S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp,
/* If currently open - close before we re-open */
if (IoIFP(io)) {
- if (IoTYPE(io) == IoTYPE_STD) {
- /* This is a clone of one of STD* handles */
- }
- else {
+ if (IoTYPE(io) == IoTYPE_STD) {
+ /* This is a clone of one of STD* handles */
+ }
+ else {
const int old_fd = PerlIO_fileno(IoIFP(io));
if (inRANGE(old_fd, 0, PL_maxsysfd)) {
@@ -407,25 +407,25 @@ S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp,
}
}
}
- IoOFP(io) = IoIFP(io) = NULL;
+ IoOFP(io) = IoIFP(io) = NULL;
}
return io;
}
bool
Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw,
- int rawmode, int rawperm, PerlIO *supplied_fp, SV **svp,
- I32 num_svs)
+ int rawmode, int rawperm, PerlIO *supplied_fp, SV **svp,
+ I32 num_svs)
{
PERL_ARGS_ASSERT_DO_OPENN;
if (as_raw) {
/* sysopen style args, i.e. integer mode and permissions */
- if (num_svs != 0) {
- Perl_croak(aTHX_ "panic: sysopen with multiple args, num_svs=%ld",
- (long) num_svs);
- }
+ if (num_svs != 0) {
+ Perl_croak(aTHX_ "panic: sysopen with multiple args, num_svs=%ld",
+ (long) num_svs);
+ }
return do_open_raw(gv, oname, len, rawmode, rawperm, NULL);
}
return do_open6(gv, oname, len, supplied_fp, svp, num_svs);
@@ -449,52 +449,52 @@ Perl_do_open_raw(pTHX_ GV *gv, const char *oname, STRLEN len,
/* For ease of blame back to 5.000, keep the existing indenting. */
{
/* sysopen style args, i.e. integer mode and permissions */
- STRLEN ix = 0;
- const int appendtrunc =
- 0
+ STRLEN ix = 0;
+ const int appendtrunc =
+ 0
#ifdef O_APPEND /* Not fully portable. */
- |O_APPEND
+ |O_APPEND
#endif
#ifdef O_TRUNC /* Not fully portable. */
- |O_TRUNC
+ |O_TRUNC
#endif
- ;
- const int modifyingmode = O_WRONLY|O_RDWR|O_CREAT|appendtrunc;
- int ismodifying;
+ ;
+ const int modifyingmode = O_WRONLY|O_RDWR|O_CREAT|appendtrunc;
+ int ismodifying;
SV *namesv;
- /* It's not always
+ /* It's not always
- O_RDONLY 0
- O_WRONLY 1
- O_RDWR 2
+ O_RDONLY 0
+ O_WRONLY 1
+ O_RDWR 2
- It might be (in OS/390 and Mac OS Classic it is)
+ It might be (in OS/390 and Mac OS Classic it is)
- O_WRONLY 1
- O_RDONLY 2
- O_RDWR 3
+ O_WRONLY 1
+ O_RDONLY 2
+ O_RDWR 3
- This means that simple & with O_RDWR would look
- like O_RDONLY is present. Therefore we have to
- be more careful.
- */
- if ((ismodifying = (rawmode & modifyingmode))) {
- if ((ismodifying & O_WRONLY) == O_WRONLY ||
- (ismodifying & O_RDWR) == O_RDWR ||
- (ismodifying & (O_CREAT|appendtrunc)))
- TAINT_PROPER("sysopen");
- }
- mode[ix++] = IoTYPE_NUMERIC; /* Marker to openn to use numeric "sysopen" */
+ This means that simple & with O_RDWR would look
+ like O_RDONLY is present. Therefore we have to
+ be more careful.
+ */
+ if ((ismodifying = (rawmode & modifyingmode))) {
+ if ((ismodifying & O_WRONLY) == O_WRONLY ||
+ (ismodifying & O_RDWR) == O_RDWR ||
+ (ismodifying & (O_CREAT|appendtrunc)))
+ TAINT_PROPER("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. */
+ rawmode |= O_LARGEFILE; /* Transparently largefiley. */
#endif
IoTYPE(io) = PerlIO_intmode2str(rawmode, &mode[ix], &writing);
- namesv = newSVpvn_flags(oname, len, SVs_TEMP);
- fp = PerlIO_openn(aTHX_ NULL, mode, -1, rawmode, rawperm, NULL, 1, &namesv);
+ namesv = newSVpvn_flags(oname, len, SVs_TEMP);
+ fp = PerlIO_openn(aTHX_ NULL, mode, -1, rawmode, rawperm, NULL, 1, &namesv);
}
return openn_cleanup(gv, io, fp, mode, oname, saveifp, saveofp, savefd,
savetype, writing, 0, NULL, statbufp);
@@ -519,11 +519,11 @@ Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
/* For ease of blame back to 5.000, keep the existing indenting. */
{
- /* Regular (non-sys) open */
- char *name;
- STRLEN olen = len;
- char *tend;
- int dodup = 0;
+ /* Regular (non-sys) open */
+ char *name;
+ STRLEN olen = len;
+ char *tend;
+ int dodup = 0;
bool in_raw = 0, in_crlf = 0, out_raw = 0, out_crlf = 0;
/* Collect default raw/crlf info from the op */
@@ -536,29 +536,29 @@ Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
out_crlf = (flags & OPpOPEN_OUT_CRLF);
}
- type = savepvn(oname, len);
- tend = type+len;
- SAVEFREEPV(type);
+ type = savepvn(oname, len);
+ tend = type+len;
+ SAVEFREEPV(type);
/* Lose leading and trailing white space */
- while (isSPACE(*type))
- type++;
+ while (isSPACE(*type))
+ type++;
while (tend > type && isSPACE(tend[-1]))
- *--tend = '\0';
+ *--tend = '\0';
- if (num_svs) {
+ if (num_svs) {
const char *p;
STRLEN nlen = 0;
- /* New style explicit name, type is just mode and layer info */
+ /* New style explicit name, type is just mode and layer info */
#ifdef USE_STDIO
- if (SvROK(*svp) && !memchr(oname, '&', len)) {
- if (ckWARN(WARN_IO))
- Perl_warner(aTHX_ packWARN(WARN_IO),
- "Can't open a reference");
- SETERRNO(EINVAL, LIB_INVARG);
+ if (SvROK(*svp) && !memchr(oname, '&', len)) {
+ if (ckWARN(WARN_IO))
+ Perl_warner(aTHX_ packWARN(WARN_IO),
+ "Can't open a reference");
+ SETERRNO(EINVAL, LIB_INVARG);
fp = NULL;
- goto say_false;
- }
+ goto say_false;
+ }
#endif /* USE_STDIO */
p = (SvOK(*svp) || SvGMAGICAL(*svp)) ? SvPV(*svp, nlen) : NULL;
@@ -567,331 +567,331 @@ Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
goto say_false;
}
- name = p ? savepvn(p, nlen) : savepvs("");
+ name = p ? savepvn(p, nlen) : savepvs("");
- SAVEFREEPV(name);
- }
- else {
- name = type;
- len = tend-type;
- }
- IoTYPE(io) = *type;
- if ((*type == IoTYPE_RDWR) && /* scary */
+ SAVEFREEPV(name);
+ }
+ else {
+ name = type;
+ len = tend-type;
+ }
+ IoTYPE(io) = *type;
+ 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");
- mode[1] = *type++;
- writing = 1;
- }
-
- if (*type == IoTYPE_PIPE) {
- if (num_svs) {
- if (type[1] != IoTYPE_STD) {
- unknown_open_mode:
- Perl_croak(aTHX_ "Unknown open() mode '%.*s'", (int)olen, oname);
- }
- type++;
- }
- do {
- type++;
- } while (isSPACE(*type));
- if (!num_svs) {
- name = type;
- len = tend-type;
- }
- if (*name == '\0') {
- /* command is missing 19990114 */
- if (ckWARN(WARN_PIPE))
- Perl_warner(aTHX_ packWARN(WARN_PIPE), "Missing command in piped open");
- errno = EPIPE;
+ ((!num_svs || (tend > type+1 && tend[-1] != IoTYPE_PIPE)))) {
+ TAINT_PROPER("open");
+ mode[1] = *type++;
+ writing = 1;
+ }
+
+ if (*type == IoTYPE_PIPE) {
+ if (num_svs) {
+ if (type[1] != IoTYPE_STD) {
+ unknown_open_mode:
+ Perl_croak(aTHX_ "Unknown open() mode '%.*s'", (int)olen, oname);
+ }
+ type++;
+ }
+ do {
+ type++;
+ } while (isSPACE(*type));
+ if (!num_svs) {
+ name = type;
+ len = tend-type;
+ }
+ if (*name == '\0') {
+ /* command is missing 19990114 */
+ if (ckWARN(WARN_PIPE))
+ Perl_warner(aTHX_ packWARN(WARN_PIPE), "Missing command in piped open");
+ errno = EPIPE;
fp = NULL;
- goto say_false;
- }
- if (!(*name == '-' && name[1] == '\0') || num_svs)
- TAINT_ENV();
- TAINT_PROPER("piped open");
- if (!num_svs && name[len-1] == '|') {
- name[--len] = '\0' ;
- if (ckWARN(WARN_PIPE))
- Perl_warner(aTHX_ packWARN(WARN_PIPE), "Can't open bidirectional pipe");
- }
- mode[0] = 'w';
- writing = 1;
+ goto say_false;
+ }
+ if (!(*name == '-' && name[1] == '\0') || num_svs)
+ TAINT_ENV();
+ TAINT_PROPER("piped open");
+ if (!num_svs && name[len-1] == '|') {
+ name[--len] = '\0' ;
+ if (ckWARN(WARN_PIPE))
+ Perl_warner(aTHX_ packWARN(WARN_PIPE), "Can't open bidirectional pipe");
+ }
+ mode[0] = 'w';
+ writing = 1;
if (out_raw)
- mode[1] = 'b';
+ mode[1] = 'b';
else if (out_crlf)
- mode[1] = 't';
- if (num_svs > 1) {
- fp = PerlProc_popen_list(mode, num_svs, svp);
- }
- else {
- fp = PerlProc_popen(name,mode);
- }
- if (num_svs) {
- if (*type) {
- if (PerlIO_apply_layers(aTHX_ fp, mode, type) != 0) {
+ mode[1] = 't';
+ if (num_svs > 1) {
+ fp = PerlProc_popen_list(mode, num_svs, svp);
+ }
+ else {
+ fp = PerlProc_popen(name,mode);
+ }
+ if (num_svs) {
+ if (*type) {
+ if (PerlIO_apply_layers(aTHX_ fp, mode, type) != 0) {
fp = NULL;
- goto say_false;
- }
- }
- }
- } /* IoTYPE_PIPE */
- else if (*type == IoTYPE_WRONLY) {
- TAINT_PROPER("open");
- type++;
- if (*type == IoTYPE_WRONLY) {
- /* Two IoTYPE_WRONLYs in a row make for an IoTYPE_APPEND. */
- mode[0] = IoTYPE(io) = IoTYPE_APPEND;
- type++;
- }
- else {
- mode[0] = 'w';
- }
- writing = 1;
+ goto say_false;
+ }
+ }
+ }
+ } /* IoTYPE_PIPE */
+ else if (*type == IoTYPE_WRONLY) {
+ TAINT_PROPER("open");
+ type++;
+ if (*type == IoTYPE_WRONLY) {
+ /* Two IoTYPE_WRONLYs in a row make for an IoTYPE_APPEND. */
+ mode[0] = IoTYPE(io) = IoTYPE_APPEND;
+ type++;
+ }
+ else {
+ mode[0] = 'w';
+ }
+ writing = 1;
if (out_raw)
- mode[1] = 'b';
+ mode[1] = 'b';
else if (out_crlf)
- mode[1] = 't';
- if (*type == '&') {
- duplicity:
- dodup = PERLIO_DUP_FD;
- type++;
- if (*type == '=') {
- dodup = 0;
- type++;
- }
- if (!num_svs && !*type && supplied_fp) {
- /* "<+&" etc. is used by typemaps */
- fp = supplied_fp;
- }
- else {
- PerlIO *that_fp = NULL;
+ mode[1] = 't';
+ if (*type == '&') {
+ duplicity:
+ dodup = PERLIO_DUP_FD;
+ type++;
+ if (*type == '=') {
+ dodup = 0;
+ type++;
+ }
+ if (!num_svs && !*type && supplied_fp) {
+ /* "<+&" etc. is used by typemaps */
+ fp = supplied_fp;
+ }
+ else {
+ PerlIO *that_fp = NULL;
int wanted_fd;
UV uv;
- if (num_svs > 1) {
- /* diag_listed_as: More than one argument to '%s' open */
- Perl_croak(aTHX_ "More than one argument to '%c&' open",IoTYPE(io));
- }
- while (isSPACE(*type))
- type++;
- if (num_svs && (
- SvIOK(*svp)
- || (SvPOKp(*svp) && looks_like_number(*svp))
- )) {
+ if (num_svs > 1) {
+ /* diag_listed_as: More than one argument to '%s' open */
+ Perl_croak(aTHX_ "More than one argument to '%c&' open",IoTYPE(io));
+ }
+ while (isSPACE(*type))
+ type++;
+ if (num_svs && (
+ SvIOK(*svp)
+ || (SvPOKp(*svp) && looks_like_number(*svp))
+ )) {
wanted_fd = SvUV(*svp);
- num_svs = 0;
- }
- else if (isDIGIT(*type)
+ num_svs = 0;
+ }
+ else if (isDIGIT(*type)
&& grok_atoUV(type, &uv, NULL)
&& uv <= INT_MAX
) {
wanted_fd = (int)uv;
- }
- else {
- const IO* thatio;
- if (num_svs) {
- thatio = sv_2io(*svp);
- }
- else {
- GV * const thatgv = gv_fetchpvn_flags(type, tend - type,
- 0, SVt_PVIO);
- thatio = GvIO(thatgv);
- }
- if (!thatio) {
+ }
+ else {
+ const IO* thatio;
+ if (num_svs) {
+ thatio = sv_2io(*svp);
+ }
+ else {
+ GV * const thatgv = gv_fetchpvn_flags(type, tend - type,
+ 0, SVt_PVIO);
+ thatio = GvIO(thatgv);
+ }
+ if (!thatio) {
#ifdef EINVAL
- SETERRNO(EINVAL,SS_IVCHAN);
+ SETERRNO(EINVAL,SS_IVCHAN);
#endif
fp = NULL;
- goto say_false;
- }
- if ((that_fp = IoIFP(thatio))) {
- /* Flush stdio buffer before dup. --mjd
- * Unfortunately SEEK_CURing 0 seems to
- * be optimized away on most platforms;
- * only Solaris and Linux seem to flush
- * on that. --jhi */
- /* On the other hand, do all platforms
- * take gracefully to flushing a read-only
- * filehandle? Perhaps we should do
- * fsetpos(src)+fgetpos(dst)? --nik */
- PerlIO_flush(that_fp);
- wanted_fd = PerlIO_fileno(that_fp);
- /* When dup()ing STDIN, STDOUT or STDERR
- * explicitly set appropriate access mode */
- if (that_fp == PerlIO_stdout()
- || that_fp == PerlIO_stderr())
- IoTYPE(io) = IoTYPE_WRONLY;
- else if (that_fp == PerlIO_stdin())
+ goto say_false;
+ }
+ if ((that_fp = IoIFP(thatio))) {
+ /* Flush stdio buffer before dup. --mjd
+ * Unfortunately SEEK_CURing 0 seems to
+ * be optimized away on most platforms;
+ * only Solaris and Linux seem to flush
+ * on that. --jhi */
+ /* On the other hand, do all platforms
+ * take gracefully to flushing a read-only
+ * filehandle? Perhaps we should do
+ * fsetpos(src)+fgetpos(dst)? --nik */
+ PerlIO_flush(that_fp);
+ wanted_fd = PerlIO_fileno(that_fp);
+ /* When dup()ing STDIN, STDOUT or STDERR
+ * explicitly set appropriate access mode */
+ if (that_fp == PerlIO_stdout()
+ || that_fp == PerlIO_stderr())
+ IoTYPE(io) = IoTYPE_WRONLY;
+ else if (that_fp == PerlIO_stdin())
IoTYPE(io) = IoTYPE_RDONLY;
- /* When dup()ing a socket, say result is
- * one as well */
- else if (IoTYPE(thatio) == IoTYPE_SOCKET)
- IoTYPE(io) = IoTYPE_SOCKET;
- }
+ /* When dup()ing a socket, say result is
+ * one as well */
+ else if (IoTYPE(thatio) == IoTYPE_SOCKET)
+ IoTYPE(io) = IoTYPE_SOCKET;
+ }
else {
SETERRNO(EBADF, RMS_IFI);
fp = NULL;
goto say_false;
}
- }
- if (!num_svs)
- type = NULL;
- if (that_fp) {
- fp = PerlIO_fdupopen(aTHX_ that_fp, NULL, dodup);
- }
- else {
- if (dodup)
+ }
+ if (!num_svs)
+ type = NULL;
+ if (that_fp) {
+ fp = PerlIO_fdupopen(aTHX_ that_fp, NULL, dodup);
+ }
+ else {
+ if (dodup)
wanted_fd = PerlLIO_dup_cloexec(wanted_fd);
- else
- was_fdopen = TRUE;
+ else
+ was_fdopen = TRUE;
if (!(fp = PerlIO_openn(aTHX_ type,mode,wanted_fd,0,0,NULL,num_svs,svp))) {
if (dodup && wanted_fd >= 0)
PerlLIO_close(wanted_fd);
- }
- }
- }
- } /* & */
- else {
- while (isSPACE(*type))
- type++;
- if (*type == IoTYPE_STD && (!type[1] || isSPACE(type[1]) || type[1] == ':')) {
- type++;
- fp = PerlIO_stdout();
- IoTYPE(io) = IoTYPE_STD;
- if (num_svs > 1) {
- /* diag_listed_as: More than one argument to '%s' open */
- Perl_croak(aTHX_ "More than one argument to '>%c' open",IoTYPE_STD);
- }
- }
- else {
- if (num_svs) {
+ }
+ }
+ }
+ } /* & */
+ else {
+ while (isSPACE(*type))
+ type++;
+ if (*type == IoTYPE_STD && (!type[1] || isSPACE(type[1]) || type[1] == ':')) {
+ type++;
+ fp = PerlIO_stdout();
+ IoTYPE(io) = IoTYPE_STD;
+ if (num_svs > 1) {
+ /* diag_listed_as: More than one argument to '%s' open */
+ Perl_croak(aTHX_ "More than one argument to '>%c' open",IoTYPE_STD);
+ }
+ }
+ else {
+ if (num_svs) {
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
}
else {
SV *namesv = newSVpvn_flags(type, tend - type, SVs_TEMP);
- type = NULL;
+ type = NULL;
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,1,&namesv);
- }
- }
- } /* !& */
- if (!fp && type && *type && *type != ':' && !isIDFIRST(*type))
- goto unknown_open_mode;
- } /* IoTYPE_WRONLY */
- else if (*type == IoTYPE_RDONLY) {
- do {
- type++;
- } while (isSPACE(*type));
- mode[0] = 'r';
+ }
+ }
+ } /* !& */
+ if (!fp && type && *type && *type != ':' && !isIDFIRST(*type))
+ goto unknown_open_mode;
+ } /* IoTYPE_WRONLY */
+ else if (*type == IoTYPE_RDONLY) {
+ do {
+ type++;
+ } while (isSPACE(*type));
+ mode[0] = 'r';
if (in_raw)
- mode[1] = 'b';
+ mode[1] = 'b';
else if (in_crlf)
- mode[1] = 't';
- if (*type == '&') {
- goto duplicity;
- }
- if (*type == IoTYPE_STD && (!type[1] || isSPACE(type[1]) || type[1] == ':')) {
- type++;
- fp = PerlIO_stdin();
- IoTYPE(io) = IoTYPE_STD;
- if (num_svs > 1) {
- /* diag_listed_as: More than one argument to '%s' open */
- Perl_croak(aTHX_ "More than one argument to '<%c' open",IoTYPE_STD);
- }
- }
- else {
- if (num_svs) {
+ mode[1] = 't';
+ if (*type == '&') {
+ goto duplicity;
+ }
+ if (*type == IoTYPE_STD && (!type[1] || isSPACE(type[1]) || type[1] == ':')) {
+ type++;
+ fp = PerlIO_stdin();
+ IoTYPE(io) = IoTYPE_STD;
+ if (num_svs > 1) {
+ /* diag_listed_as: More than one argument to '%s' open */
+ Perl_croak(aTHX_ "More than one argument to '<%c' open",IoTYPE_STD);
+ }
+ }
+ else {
+ if (num_svs) {
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
}
else {
SV *namesv = newSVpvn_flags(type, tend - type, SVs_TEMP);
- type = NULL;
+ type = NULL;
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,1,&namesv);
- }
- }
- 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 '-|' */
- }
- else {
- *--tend = '\0';
- while (tend > type && isSPACE(tend[-1]))
- *--tend = '\0';
- for (; isSPACE(*type); type++)
- ;
- name = type;
- len = tend-type;
- }
- if (*name == '\0') {
- /* command is missing 19990114 */
- if (ckWARN(WARN_PIPE))
- Perl_warner(aTHX_ packWARN(WARN_PIPE), "Missing command in piped open");
- errno = EPIPE;
+ }
+ }
+ 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 '-|' */
+ }
+ else {
+ *--tend = '\0';
+ while (tend > type && isSPACE(tend[-1]))
+ *--tend = '\0';
+ for (; isSPACE(*type); type++)
+ ;
+ name = type;
+ len = tend-type;
+ }
+ if (*name == '\0') {
+ /* command is missing 19990114 */
+ if (ckWARN(WARN_PIPE))
+ Perl_warner(aTHX_ packWARN(WARN_PIPE), "Missing command in piped open");
+ errno = EPIPE;
fp = NULL;
- goto say_false;
- }
- if (!(*name == '-' && name[1] == '\0') || num_svs)
- TAINT_ENV();
- TAINT_PROPER("piped open");
- mode[0] = 'r';
+ goto say_false;
+ }
+ if (!(*name == '-' && name[1] == '\0') || num_svs)
+ TAINT_ENV();
+ TAINT_PROPER("piped open");
+ mode[0] = 'r';
if (in_raw)
- mode[1] = 'b';
+ mode[1] = 'b';
else if (in_crlf)
- mode[1] = 't';
-
- if (num_svs > 1) {
- fp = PerlProc_popen_list(mode,num_svs,svp);
- }
- else {
- fp = PerlProc_popen(name,mode);
- }
- IoTYPE(io) = IoTYPE_PIPE;
- if (num_svs) {
- while (isSPACE(*type))
- type++;
- if (*type) {
- if (PerlIO_apply_layers(aTHX_ fp, mode, type) != 0) {
+ mode[1] = 't';
+
+ if (num_svs > 1) {
+ fp = PerlProc_popen_list(mode,num_svs,svp);
+ }
+ else {
+ fp = PerlProc_popen(name,mode);
+ }
+ IoTYPE(io) = IoTYPE_PIPE;
+ if (num_svs) {
+ while (isSPACE(*type))
+ type++;
+ if (*type) {
+ if (PerlIO_apply_layers(aTHX_ fp, mode, type) != 0) {
fp = NULL;
- goto say_false;
- }
- }
- }
- }
- else { /* layer(Args) */
- if (num_svs)
- goto unknown_open_mode;
- name = type;
- IoTYPE(io) = IoTYPE_RDONLY;
- for (; isSPACE(*name); name++)
- ;
- mode[0] = 'r';
+ goto say_false;
+ }
+ }
+ }
+ }
+ else { /* layer(Args) */
+ if (num_svs)
+ goto unknown_open_mode;
+ name = type;
+ IoTYPE(io) = IoTYPE_RDONLY;
+ for (; isSPACE(*name); name++)
+ ;
+ mode[0] = 'r';
if (in_raw)
- mode[1] = 'b';
+ mode[1] = 'b';
else if (in_crlf)
- mode[1] = 't';
-
- if (*name == '-' && name[1] == '\0') {
- fp = PerlIO_stdin();
- IoTYPE(io) = IoTYPE_STD;
- }
- else {
- if (num_svs) {
+ mode[1] = 't';
+
+ if (*name == '-' && name[1] == '\0') {
+ fp = PerlIO_stdin();
+ IoTYPE(io) = IoTYPE_STD;
+ }
+ else {
+ if (num_svs) {
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
}
else {
- SV *namesv = newSVpvn_flags(type, tend - type, SVs_TEMP);
- type = NULL;
+ SV *namesv = newSVpvn_flags(type, tend - type, SVs_TEMP);
+ type = NULL;
fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,1,&namesv);
- }
- }
- }
+ }
+ }
+ }
}
say_false:
@@ -914,33 +914,33 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
Zero(&statbuf, 1, Stat_t);
if (!fp) {
- if (IoTYPE(io) == IoTYPE_RDONLY && ckWARN(WARN_NEWLINE)
- && should_warn_nl(oname)
-
- )
+ if (IoTYPE(io) == IoTYPE_RDONLY && ckWARN(WARN_NEWLINE)
+ && should_warn_nl(oname)
+
+ )
{
GCC_DIAG_IGNORE_STMT(-Wformat-nonliteral); /* PL_warn_nl is constant */
- Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "open");
+ Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "open");
GCC_DIAG_RESTORE_STMT;
}
- goto say_false;
+ goto say_false;
}
if (ckWARN(WARN_IO)) {
- if ((IoTYPE(io) == IoTYPE_RDONLY) &&
- (fp == PerlIO_stdout() || fp == PerlIO_stderr())) {
- Perl_warner(aTHX_ packWARN(WARN_IO),
- "Filehandle STD%s reopened as %" HEKf
- " only for input",
- ((fp == PerlIO_stdout()) ? "OUT" : "ERR"),
- HEKfARG(GvENAME_HEK(gv)));
- }
- else if ((IoTYPE(io) == IoTYPE_WRONLY) && fp == PerlIO_stdin()) {
- Perl_warner(aTHX_ packWARN(WARN_IO),
- "Filehandle STDIN reopened as %" HEKf " only for output",
- HEKfARG(GvENAME_HEK(gv))
- );
- }
+ if ((IoTYPE(io) == IoTYPE_RDONLY) &&
+ (fp == PerlIO_stdout() || fp == PerlIO_stderr())) {
+ Perl_warner(aTHX_ packWARN(WARN_IO),
+ "Filehandle STD%s reopened as %" HEKf
+ " only for input",
+ ((fp == PerlIO_stdout()) ? "OUT" : "ERR"),
+ HEKfARG(GvENAME_HEK(gv)));
+ }
+ else if ((IoTYPE(io) == IoTYPE_WRONLY) && fp == PerlIO_stdin()) {
+ Perl_warner(aTHX_ packWARN(WARN_IO),
+ "Filehandle STDIN reopened as %" HEKf " only for output",
+ HEKfARG(GvENAME_HEK(gv))
+ );
+ }
}
fd = PerlIO_fileno(fp);
@@ -949,27 +949,27 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
* otherwise unless we "know" the type probe for socket-ness.
*/
if (IoTYPE(io) && IoTYPE(io) != IoTYPE_PIPE && IoTYPE(io) != IoTYPE_STD && fd >= 0) {
- if (PerlLIO_fstat(fd,&statbuf) < 0) {
- /* If PerlIO claims to have fd we had better be able to fstat() it. */
- (void) PerlIO_close(fp);
- goto say_false;
- }
+ if (PerlLIO_fstat(fd,&statbuf) < 0) {
+ /* If PerlIO claims to have fd we had better be able to fstat() it. */
+ (void) PerlIO_close(fp);
+ goto say_false;
+ }
#ifndef PERL_MICRO
- if (S_ISSOCK(statbuf.st_mode))
- IoTYPE(io) = IoTYPE_SOCKET; /* in case a socket was passed in to us */
+ if (S_ISSOCK(statbuf.st_mode))
+ IoTYPE(io) = IoTYPE_SOCKET; /* in case a socket was passed in to us */
#ifdef HAS_SOCKET
- else if (
- !(statbuf.st_mode & S_IFMT)
- && IoTYPE(io) != IoTYPE_WRONLY /* Dups of STD* filehandles already have */
- && IoTYPE(io) != IoTYPE_RDONLY /* type so they aren't marked as sockets */
- ) { /* on OS's that return 0 on fstat()ed pipe */
- char tmpbuf[256];
- Sock_size_t buflen = sizeof tmpbuf;
- if (PerlSock_getsockname(fd, (struct sockaddr *)tmpbuf, &buflen) >= 0
- || errno != ENOTSOCK)
- IoTYPE(io) = IoTYPE_SOCKET; /* some OS's return 0 on fstat()ed socket */
- /* but some return 0 for streams too, sigh */
- }
+ else if (
+ !(statbuf.st_mode & S_IFMT)
+ && IoTYPE(io) != IoTYPE_WRONLY /* Dups of STD* filehandles already have */
+ && IoTYPE(io) != IoTYPE_RDONLY /* type so they aren't marked as sockets */
+ ) { /* on OS's that return 0 on fstat()ed pipe */
+ char tmpbuf[256];
+ Sock_size_t buflen = sizeof tmpbuf;
+ if (PerlSock_getsockname(fd, (struct sockaddr *)tmpbuf, &buflen) >= 0
+ || errno != ENOTSOCK)
+ IoTYPE(io) = IoTYPE_SOCKET; /* some OS's return 0 on fstat()ed socket */
+ /* but some return 0 for streams too, sigh */
+ }
#endif /* HAS_SOCKET */
#endif /* !PERL_MICRO */
}
@@ -983,26 +983,26 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
/* If fd is less that PL_maxsysfd i.e. STDIN..STDERR
then dup the new fileno down
*/
- if (saveofp) {
- PerlIO_flush(saveofp); /* emulate PerlIO_close() */
- if (saveofp != saveifp) { /* was a socket? */
- PerlIO_close(saveofp);
- }
- }
- if (savefd != fd) {
- /* Still a small can-of-worms here if (say) PerlIO::scalar
- is assigned to (say) STDOUT - for now let dup2() fail
- and provide the error
- */
- if (fd < 0) {
+ if (saveofp) {
+ PerlIO_flush(saveofp); /* emulate PerlIO_close() */
+ if (saveofp != saveifp) { /* was a socket? */
+ PerlIO_close(saveofp);
+ }
+ }
+ if (savefd != fd) {
+ /* Still a small can-of-worms here if (say) PerlIO::scalar
+ is assigned to (say) STDOUT - for now let dup2() fail
+ and provide the error
+ */
+ if (fd < 0) {
SETERRNO(EBADF,RMS_IFI);
- goto say_false;
+ goto say_false;
} else if (PerlLIO_dup2(fd, savefd) < 0) {
- (void)PerlIO_close(fp);
- goto say_false;
- }
+ (void)PerlIO_close(fp);
+ goto say_false;
+ }
#ifdef VMS
- if (savefd != PerlIO_fileno(PerlIO_stdin())) {
+ if (savefd != PerlIO_fileno(PerlIO_stdin())) {
char newname[FILENAME_MAX+1];
if (PerlIO_getname(fp, newname)) {
if (fd == PerlIO_fileno(PerlIO_stdout()))
@@ -1010,7 +1010,7 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
if (fd == PerlIO_fileno(PerlIO_stderr()))
vmssetuserlnm("SYS$ERROR", newname);
}
- }
+ }
#endif
#if !defined(WIN32)
@@ -1030,7 +1030,7 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
}
#endif
- if (was_fdopen) {
+ if (was_fdopen) {
/* need to close fp without closing underlying fd */
int ofd = PerlIO_fileno(fp);
int dupfd = ofd >= 0 ? PerlLIO_dup_cloexec(ofd) : -1;
@@ -1043,31 +1043,31 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
PerlLIO_dup2_cloexec(dupfd, ofd);
setfd_inhexec_for_sysfd(ofd);
PerlLIO_close(dupfd);
- }
+ }
else
- PerlIO_close(fp);
- }
- fp = saveifp;
- PerlIO_clearerr(fp);
- fd = PerlIO_fileno(fp);
+ PerlIO_close(fp);
+ }
+ fp = saveifp;
+ PerlIO_clearerr(fp);
+ fd = PerlIO_fileno(fp);
}
IoIFP(io) = fp;
IoFLAGS(io) &= ~IOf_NOLINE;
if (writing) {
- if (IoTYPE(io) == IoTYPE_SOCKET
- || (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(statbuf.st_mode)) ) {
- 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,NULL))) {
- PerlIO_close(fp);
- goto say_false;
- }
- }
- else
- IoOFP(io) = fp;
+ if (IoTYPE(io) == IoTYPE_SOCKET
+ || (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(statbuf.st_mode)) ) {
+ 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,NULL))) {
+ PerlIO_close(fp);
+ goto say_false;
+ }
+ }
+ else
+ IoOFP(io) = fp;
}
if (statbufp)
*statbufp = statbuf;
@@ -1291,14 +1291,14 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen)
SAVEFREESV(old_out_name);
if (!PL_argvoutgv)
- PL_argvoutgv = gv_fetchpvs("ARGVOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
+ PL_argvoutgv = gv_fetchpvs("ARGVOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
if (io && (IoFLAGS(io) & (IOf_ARGV|IOf_START)) == (IOf_ARGV|IOf_START)) {
- IoFLAGS(io) &= ~IOf_START;
- if (PL_inplace) {
- assert(PL_defoutgv);
- Perl_av_create_and_push(aTHX_ &PL_argvout_stack,
- SvREFCNT_inc_simple_NN(PL_defoutgv));
- }
+ IoFLAGS(io) &= ~IOf_START;
+ if (PL_inplace) {
+ assert(PL_defoutgv);
+ Perl_av_create_and_push(aTHX_ &PL_argvout_stack,
+ SvREFCNT_inc_simple_NN(PL_defoutgv));
+ }
}
{
@@ -1311,15 +1311,15 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen)
PL_lastfd = -1;
PL_filemode = 0;
if (!GvAV(gv))
- return NULL;
+ return NULL;
while (av_count(GvAV(gv)) > 0) {
- STRLEN oldlen;
+ STRLEN oldlen;
SV *const sv = av_shift(GvAV(gv));
- SAVEFREESV(sv);
- SvTAINTED_off(GvSVn(gv)); /* previous tainting irrelevant */
- sv_setsv(GvSVn(gv),sv);
- SvSETMAGIC(GvSV(gv));
- PL_oldname = SvPVx(GvSV(gv), oldlen);
+ SAVEFREESV(sv);
+ SvTAINTED_off(GvSVn(gv)); /* previous tainting irrelevant */
+ sv_setsv(GvSVn(gv),sv);
+ SvSETMAGIC(GvSV(gv));
+ PL_oldname = SvPVx(GvSV(gv), oldlen);
if (LIKELY(!PL_inplace)) {
if (nomagicopen
? do_open6(gv, "<", 1, NULL, &GvSV(gv), 1)
@@ -1348,77 +1348,77 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen)
SV *temp_name_sv = NULL;
MAGIC *mg;
- TAINT_PROPER("inplace open");
- if (oldlen == 1 && *PL_oldname == '-') {
- setdefout(gv_fetchpvs("STDOUT", GV_ADD|GV_NOTQUAL,
- SVt_PVIO));
- return IoIFP(GvIOp(gv));
- }
+ TAINT_PROPER("inplace open");
+ if (oldlen == 1 && *PL_oldname == '-') {
+ setdefout(gv_fetchpvs("STDOUT", GV_ADD|GV_NOTQUAL,
+ SVt_PVIO));
+ return IoIFP(GvIOp(gv));
+ }
#ifndef FLEXFILENAMES
- filedev = statbuf.st_dev;
- fileino = statbuf.st_ino;
-#endif
- PL_filemode = statbuf.st_mode;
- fileuid = statbuf.st_uid;
- filegid = statbuf.st_gid;
- if (!S_ISREG(PL_filemode)) {
- Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
- "Can't do inplace edit: %s is not a regular file",
- PL_oldname );
- do_close(gv,FALSE);
- continue;
- }
+ filedev = statbuf.st_dev;
+ fileino = statbuf.st_ino;
+#endif
+ PL_filemode = statbuf.st_mode;
+ fileuid = statbuf.st_uid;
+ filegid = statbuf.st_gid;
+ if (!S_ISREG(PL_filemode)) {
+ Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
+ "Can't do inplace edit: %s is not a regular file",
+ PL_oldname );
+ do_close(gv,FALSE);
+ continue;
+ }
magic_av = newAV();
- if (*PL_inplace && strNE(PL_inplace, "*")) {
- const char *star = strchr(PL_inplace, '*');
- if (star) {
- const char *begin = PL_inplace;
+ if (*PL_inplace && strNE(PL_inplace, "*")) {
+ const char *star = strchr(PL_inplace, '*');
+ if (star) {
+ const char *begin = PL_inplace;
SvPVCLEAR(sv);
- do {
- sv_catpvn(sv, begin, star - begin);
- sv_catpvn(sv, PL_oldname, oldlen);
- begin = ++star;
- } while ((star = strchr(begin, '*')));
- if (*begin)
- sv_catpv(sv,begin);
- }
- else {
- sv_catpv(sv,PL_inplace);
- }
+ do {
+ sv_catpvn(sv, begin, star - begin);
+ sv_catpvn(sv, PL_oldname, oldlen);
+ begin = ++star;
+ } while ((star = strchr(begin, '*')));
+ if (*begin)
+ sv_catpv(sv,begin);
+ }
+ else {
+ sv_catpv(sv,PL_inplace);
+ }
#ifndef FLEXFILENAMES
- if ((PerlLIO_stat(SvPVX_const(sv),&statbuf) >= 0
- && statbuf.st_dev == filedev
- && statbuf.st_ino == fileino)
+ if ((PerlLIO_stat(SvPVX_const(sv),&statbuf) >= 0
+ && statbuf.st_dev == filedev
+ && statbuf.st_ino == fileino)
#ifdef DJGPP
- || ((_djstat_fail_bits & _STFAIL_TRUENAME)!=0)
+ || ((_djstat_fail_bits & _STFAIL_TRUENAME)!=0)
#endif
)
- {
- Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
- "Can't do inplace edit: %"
+ {
+ Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
+ "Can't do inplace edit: %"
SVf " would not be unique",
- SVfARG(sv));
+ SVfARG(sv));
goto cleanup_argv;
- }
+ }
#endif
av_store(magic_av, ARGVMG_BACKUP_NAME, newSVsv(sv));
- }
+ }
- sv_setpvn(sv,PL_oldname,oldlen);
- SETERRNO(0,0); /* in case sprintf set errno */
+ sv_setpvn(sv,PL_oldname,oldlen);
+ SETERRNO(0,0); /* in case sprintf set errno */
temp_name_sv = newSV(0);
if (!S_openindirtemp(aTHX_ PL_argvoutgv, GvSV(gv), temp_name_sv)) {
SvREFCNT_dec(temp_name_sv);
/* diag_listed_as: Can't do inplace edit on %s: %s */
Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), "Can't do inplace edit on %s: Cannot make temp name: %s",
- PL_oldname, Strerror(errno) );
+ PL_oldname, Strerror(errno) );
#ifndef FLEXFILENAMES
cleanup_argv:
#endif
do_close(gv,FALSE);
SvREFCNT_dec(magic_av);
continue;
- }
+ }
av_store(magic_av, ARGVMG_TEMP_NAME, temp_name_sv);
av_store(magic_av, ARGVMG_ORIG_NAME, newSVsv(sv));
av_store(magic_av, ARGVMG_ORIG_MODE, newSVuv(PL_filemode));
@@ -1432,12 +1432,12 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen)
newSVpvn((char *)&statbuf, sizeof(statbuf)));
}
#endif
- setdefout(PL_argvoutgv);
+ setdefout(PL_argvoutgv);
sv_setsv(GvSVn(PL_argvoutgv), temp_name_sv);
mg = sv_magicext((SV*)GvIOp(PL_argvoutgv), (SV*)magic_av, PERL_MAGIC_uvar, &argvout_vtbl, NULL, 0);
mg->mg_flags |= MGf_DUP;
SvREFCNT_dec(magic_av);
- PL_lastfd = PerlIO_fileno(IoIFP(GvIOp(PL_argvoutgv)));
+ PL_lastfd = PerlIO_fileno(IoIFP(GvIOp(PL_argvoutgv)));
if (PL_lastfd >= 0) {
(void)PerlLIO_fstat(PL_lastfd,&statbuf);
#ifdef HAS_FCHMOD
@@ -1453,10 +1453,10 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen)
PERL_UNUSED_RESULT(PerlLIO_chown(PL_oldname,fileuid,filegid));
#endif
}
- }
+ }
return IoIFP(GvIOp(gv));
- }
- } /* successful do_open_raw(), PL_inplace non-NULL */
+ }
+ } /* successful do_open_raw(), PL_inplace non-NULL */
if (ckWARN_d(WARN_INPLACE)) {
const int eno = errno;
@@ -1471,20 +1471,20 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen)
Perl_warner(aTHX_ packWARN(WARN_INPLACE), "Can't open %s: %s",
PL_oldname, Strerror(eno));
}
- }
+ }
}
if (io && (IoFLAGS(io) & IOf_ARGV))
- IoFLAGS(io) |= IOf_START;
+ IoFLAGS(io) |= IOf_START;
if (PL_inplace) {
- if (io && (IoFLAGS(io) & IOf_ARGV)
- && PL_argvout_stack && AvFILLp(PL_argvout_stack) >= 0)
- {
- GV * const oldout = MUTABLE_GV(av_pop(PL_argvout_stack));
- setdefout(oldout);
- SvREFCNT_dec_NN(oldout);
- return NULL;
- }
- setdefout(gv_fetchpvs("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO));
+ if (io && (IoFLAGS(io) & IOf_ARGV)
+ && PL_argvout_stack && AvFILLp(PL_argvout_stack) >= 0)
+ {
+ GV * const oldout = MUTABLE_GV(av_pop(PL_argvout_stack));
+ setdefout(oldout);
+ SvREFCNT_dec_NN(oldout);
+ return NULL;
+ }
+ setdefout(gv_fetchpvs("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO));
}
return NULL;
}
@@ -1687,7 +1687,7 @@ S_argvout_final(pTHX_ MAGIC *mg, IO *io, bool not_implicit) {
#if !defined(HAS_RENAME)
link(SvPVX(*temp_psv), orig_pv) < 0
#elif defined(ARGV_USE_ATFUNCTIONS)
- S_my_renameat(dfd, SvPVX(*temp_psv), dfd, orig_pv) < 0 &&
+ S_my_renameat(dfd, SvPVX(*temp_psv), dfd, orig_pv) < 0 &&
!(UNLIKELY(NotSupported(errno)) &&
dir_unchanged(orig_pv, mg) &&
PerlLIO_rename(SvPVX(*temp_psv), orig_pv) == 0)
@@ -1744,19 +1744,19 @@ Perl_do_close(pTHX_ GV *gv, bool not_implicit)
MAGIC *mg;
if (!gv)
- gv = PL_argvgv;
+ gv = PL_argvgv;
if (!gv || !isGV_with_GP(gv)) {
- if (not_implicit)
- SETERRNO(EBADF,SS_IVCHAN);
- return FALSE;
+ if (not_implicit)
+ SETERRNO(EBADF,SS_IVCHAN);
+ return FALSE;
}
io = GvIO(gv);
if (!io) { /* never opened */
- if (not_implicit) {
- report_evil_fh(gv);
- SETERRNO(EBADF,SS_IVCHAN);
- }
- return FALSE;
+ if (not_implicit) {
+ report_evil_fh(gv);
+ SETERRNO(EBADF,SS_IVCHAN);
+ }
+ return FALSE;
}
if ((mg = mg_findext((SV*)io, PERL_MAGIC_uvar, &argvout_vtbl))
&& mg->mg_obj) {
@@ -1767,9 +1767,9 @@ Perl_do_close(pTHX_ GV *gv, bool not_implicit)
retval = io_close(io, NULL, not_implicit, FALSE);
}
if (not_implicit) {
- IoLINES(io) = 0;
- IoPAGE(io) = 0;
- IoLINES_LEFT(io) = IoPAGE_LEN(io);
+ IoLINES(io) = 0;
+ IoPAGE(io) = 0;
+ IoLINES_LEFT(io) = IoPAGE_LEN(io);
}
IoTYPE(io) = IoTYPE_CLOSED;
return retval;
@@ -1783,7 +1783,7 @@ Perl_io_close(pTHX_ IO *io, GV *gv, bool not_implicit, bool warn_on_fail)
PERL_ARGS_ASSERT_IO_CLOSE;
if (IoIFP(io)) {
- if (IoTYPE(io) == IoTYPE_PIPE) {
+ if (IoTYPE(io) == IoTYPE_PIPE) {
PerlIO *fh = IoIFP(io);
int status;
@@ -1794,54 +1794,54 @@ Perl_io_close(pTHX_ IO *io, GV *gv, bool not_implicit, bool warn_on_fail)
So NULL it early.
*/
IoOFP(io) = IoIFP(io) = NULL;
- status = PerlProc_pclose(fh);
- if (not_implicit) {
- STATUS_NATIVE_CHILD_SET(status);
- retval = (STATUS_UNIX == 0);
- }
- else {
- retval = (status != -1);
- }
- }
- else if (IoTYPE(io) == IoTYPE_STD)
- retval = TRUE;
- else {
- if (IoOFP(io) && IoOFP(io) != IoIFP(io)) { /* a socket */
- const bool prev_err = PerlIO_error(IoOFP(io));
+ status = PerlProc_pclose(fh);
+ if (not_implicit) {
+ STATUS_NATIVE_CHILD_SET(status);
+ retval = (STATUS_UNIX == 0);
+ }
+ else {
+ retval = (status != -1);
+ }
+ }
+ else if (IoTYPE(io) == IoTYPE_STD)
+ retval = TRUE;
+ else {
+ if (IoOFP(io) && IoOFP(io) != IoIFP(io)) { /* a socket */
+ const bool prev_err = PerlIO_error(IoOFP(io));
#ifdef USE_PERLIO
- if (prev_err)
- PerlIO_restore_errno(IoOFP(io));
-#endif
- retval = (PerlIO_close(IoOFP(io)) != EOF && !prev_err);
- PerlIO_close(IoIFP(io)); /* clear stdio, fd already closed */
- }
- else {
- const bool prev_err = PerlIO_error(IoIFP(io));
+ if (prev_err)
+ PerlIO_restore_errno(IoOFP(io));
+#endif
+ retval = (PerlIO_close(IoOFP(io)) != EOF && !prev_err);
+ PerlIO_close(IoIFP(io)); /* clear stdio, fd already closed */
+ }
+ else {
+ const bool prev_err = PerlIO_error(IoIFP(io));
#ifdef USE_PERLIO
- if (prev_err)
- PerlIO_restore_errno(IoIFP(io));
-#endif
- retval = (PerlIO_close(IoIFP(io)) != EOF && !prev_err);
- }
- }
- IoOFP(io) = IoIFP(io) = NULL;
-
- if (warn_on_fail && !retval) {
- if (gv)
- Perl_ck_warner_d(aTHX_ packWARN(WARN_IO),
- "Warning: unable to close filehandle %"
- HEKf " properly: %" SVf,
- HEKfARG(GvNAME_HEK(gv)),
+ if (prev_err)
+ PerlIO_restore_errno(IoIFP(io));
+#endif
+ retval = (PerlIO_close(IoIFP(io)) != EOF && !prev_err);
+ }
+ }
+ IoOFP(io) = IoIFP(io) = NULL;
+
+ if (warn_on_fail && !retval) {
+ if (gv)
+ Perl_ck_warner_d(aTHX_ packWARN(WARN_IO),
+ "Warning: unable to close filehandle %"
+ HEKf " properly: %" SVf,
+ HEKfARG(GvNAME_HEK(gv)),
SVfARG(get_sv("!",GV_ADD)));
- else
- Perl_ck_warner_d(aTHX_ packWARN(WARN_IO),
- "Warning: unable to close filehandle "
- "properly: %" SVf,
- SVfARG(get_sv("!",GV_ADD)));
- }
+ else
+ Perl_ck_warner_d(aTHX_ packWARN(WARN_IO),
+ "Warning: unable to close filehandle "
+ "properly: %" SVf,
+ SVfARG(get_sv("!",GV_ADD)));
+ }
}
else if (not_implicit) {
- SETERRNO(EBADF,SS_IVCHAN);
+ SETERRNO(EBADF,SS_IVCHAN);
}
return retval;
@@ -1855,38 +1855,38 @@ Perl_do_eof(pTHX_ GV *gv)
PERL_ARGS_ASSERT_DO_EOF;
if (!io)
- return TRUE;
+ return TRUE;
else if (IoTYPE(io) == IoTYPE_WRONLY)
- report_wrongway_fh(gv, '>');
+ report_wrongway_fh(gv, '>');
while (IoIFP(io)) {
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 */
- }
-
- {
- /* getc and ungetc can stomp on errno */
- dSAVE_ERRNO;
- const int ch = PerlIO_getc(IoIFP(io));
- if (ch != EOF) {
- (void)PerlIO_ungetc(IoIFP(io),ch);
- RESTORE_ERRNO;
- return FALSE;
- }
- RESTORE_ERRNO;
- }
+ if (PerlIO_get_cnt(IoIFP(io)) > 0) /* cheat a little, since */
+ return FALSE; /* this is the most usual case */
+ }
+
+ {
+ /* getc and ungetc can stomp on errno */
+ dSAVE_ERRNO;
+ const int ch = PerlIO_getc(IoIFP(io));
+ if (ch != EOF) {
+ (void)PerlIO_ungetc(IoIFP(io),ch);
+ RESTORE_ERRNO;
+ return FALSE;
+ }
+ RESTORE_ERRNO;
+ }
if (PerlIO_has_cntptr(IoIFP(io)) && PerlIO_canset_cnt(IoIFP(io))) {
- if (PerlIO_get_cnt(IoIFP(io)) < -1)
- PerlIO_set_cnt(IoIFP(io),-1);
- }
- if (PL_op->op_flags & OPf_SPECIAL) { /* not necessarily a real EOF yet? */
- if (gv != PL_argvgv || !nextargv(gv, FALSE)) /* get another fp handy */
- return TRUE;
- }
- else
- return TRUE; /* normal fp, definitely end of file */
+ if (PerlIO_get_cnt(IoIFP(io)) < -1)
+ PerlIO_set_cnt(IoIFP(io),-1);
+ }
+ if (PL_op->op_flags & OPf_SPECIAL) { /* not necessarily a real EOF yet? */
+ if (gv != PL_argvgv || !nextargv(gv, FALSE)) /* get another fp handy */
+ return TRUE;
+ }
+ else
+ return TRUE; /* normal fp, definitely end of file */
}
return TRUE;
}
@@ -1900,7 +1900,7 @@ Perl_do_tell(pTHX_ GV *gv)
PERL_ARGS_ASSERT_DO_TELL;
if (io && (fp = IoIFP(io))) {
- return PerlIO_tell(fp);
+ return PerlIO_tell(fp);
}
report_evil_fh(gv);
SETERRNO(EBADF,RMS_IFI);
@@ -1914,7 +1914,7 @@ Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence)
PerlIO *fp;
if (io && (fp = IoIFP(io))) {
- return PerlIO_seek(fp, pos, whence) >= 0;
+ return PerlIO_seek(fp, pos, whence) >= 0;
}
report_evil_fh(gv);
SETERRNO(EBADF,RMS_IFI);
@@ -1949,51 +1949,51 @@ Perl_mode_from_discipline(pTHX_ const char *s, STRLEN len)
int mode = O_BINARY;
PERL_UNUSED_CONTEXT;
if (s) {
- while (*s) {
- if (*s == ':') {
- switch (s[1]) {
- case 'r':
- if (s[2] == 'a' && s[3] == 'w'
- && (!s[4] || s[4] == ':' || isSPACE(s[4])))
- {
- mode = O_BINARY;
- s += 4;
- len -= 4;
- break;
- }
- /* FALLTHROUGH */
- case 'c':
- if (s[2] == 'r' && s[3] == 'l' && s[4] == 'f'
- && (!s[5] || s[5] == ':' || isSPACE(s[5])))
- {
- mode = O_TEXT;
- s += 5;
- len -= 5;
- break;
- }
- /* FALLTHROUGH */
- default:
- goto fail_discipline;
- }
- }
- else if (isSPACE(*s)) {
- ++s;
- --len;
- }
- else {
- const char *end;
+ while (*s) {
+ if (*s == ':') {
+ switch (s[1]) {
+ case 'r':
+ if (s[2] == 'a' && s[3] == 'w'
+ && (!s[4] || s[4] == ':' || isSPACE(s[4])))
+ {
+ mode = O_BINARY;
+ s += 4;
+ len -= 4;
+ break;
+ }
+ /* FALLTHROUGH */
+ case 'c':
+ if (s[2] == 'r' && s[3] == 'l' && s[4] == 'f'
+ && (!s[5] || s[5] == ':' || isSPACE(s[5])))
+ {
+ mode = O_TEXT;
+ s += 5;
+ len -= 5;
+ break;
+ }
+ /* FALLTHROUGH */
+ default:
+ goto fail_discipline;
+ }
+ }
+ else if (isSPACE(*s)) {
+ ++s;
+ --len;
+ }
+ else {
+ const char *end;
fail_discipline:
- end = (char *) memchr(s+1, ':', len);
- if (!end)
- end = s+len;
+ end = (char *) memchr(s+1, ':', len);
+ if (!end)
+ end = s+len;
#ifndef PERLIO_LAYERS
- Perl_croak(aTHX_ "IO layers (like '%.*s') unavailable", end-s, s);
+ Perl_croak(aTHX_ "IO layers (like '%.*s') unavailable", end-s, s);
#else
- len -= end-s;
- s = end;
+ len -= end-s;
+ s = end;
#endif
- }
- }
+ }
+ }
}
return mode;
}
@@ -2003,44 +2003,44 @@ I32
my_chsize(int fd, Off_t length)
{
#ifdef F_FREESP
- /* code courtesy of William Kucharski */
+ /* code courtesy of William Kucharski */
#define HAS_CHSIZE
Stat_t filebuf;
if (PerlLIO_fstat(fd, &filebuf) < 0)
- return -1;
+ return -1;
if (filebuf.st_size < length) {
- /* extend file length */
+ /* extend file length */
- if ((PerlLIO_lseek(fd, (length - 1), 0)) < 0)
- return -1;
+ if ((PerlLIO_lseek(fd, (length - 1), 0)) < 0)
+ return -1;
- /* write a "0" byte */
+ /* write a "0" byte */
- if ((PerlLIO_write(fd, "", 1)) != 1)
- return -1;
+ if ((PerlLIO_write(fd, "", 1)) != 1)
+ return -1;
}
else {
- /* truncate length */
- struct flock fl;
- fl.l_whence = 0;
- fl.l_len = 0;
- fl.l_start = length;
- fl.l_type = F_WRLCK; /* write lock on file space */
-
- /*
- * This relies on the UNDOCUMENTED F_FREESP argument to
- * fcntl(2), which truncates the file so that it ends at the
- * position indicated by fl.l_start.
- *
- * Will minor miracles never cease?
- */
+ /* truncate length */
+ struct flock fl;
+ fl.l_whence = 0;
+ fl.l_len = 0;
+ fl.l_start = length;
+ fl.l_type = F_WRLCK; /* write lock on file space */
+
+ /*
+ * This relies on the UNDOCUMENTED F_FREESP argument to
+ * fcntl(2), which truncates the file so that it ends at the
+ * position indicated by fl.l_start.
+ *
+ * Will minor miracles never cease?
+ */
- if (fcntl(fd, F_FREESP, &fl) < 0)
- return -1;
+ if (fcntl(fd, F_FREESP, &fl) < 0)
+ return -1;
}
return 0;
@@ -2058,67 +2058,67 @@ Perl_do_print(pTHX_ SV *sv, PerlIO *fp)
/* assuming fp is checked earlier */
if (!sv)
- return TRUE;
+ return TRUE;
if (SvTYPE(sv) == SVt_IV && SvIOK(sv)) {
- assert(!SvGMAGICAL(sv));
- if (SvIsUV(sv))
- PerlIO_printf(fp, "%" UVuf, (UV)SvUVX(sv));
- else
- PerlIO_printf(fp, "%" IVdf, (IV)SvIVX(sv));
- return !PerlIO_error(fp);
+ assert(!SvGMAGICAL(sv));
+ if (SvIsUV(sv))
+ PerlIO_printf(fp, "%" UVuf, (UV)SvUVX(sv));
+ else
+ PerlIO_printf(fp, "%" IVdf, (IV)SvIVX(sv));
+ return !PerlIO_error(fp);
}
else {
- STRLEN len;
- /* Do this first to trigger any overloading. */
- const char *tmps = SvPV_const(sv, len);
- U8 *tmpbuf = NULL;
- bool happy = TRUE;
-
- if (PerlIO_isutf8(fp)) { /* If the stream is utf8 ... */
- if (!SvUTF8(sv)) { /* Convert to utf8 if necessary */
- /* We don't modify the original scalar. */
- tmpbuf = bytes_to_utf8((const U8*) tmps, &len);
- tmps = (char *) tmpbuf;
- }
- else if (ckWARN4_d(WARN_UTF8, WARN_SURROGATE, WARN_NON_UNICODE, WARN_NONCHAR)) {
- (void) check_utf8_print((const U8*) tmps, len);
- }
- } /* else stream isn't utf8 */
- else if (DO_UTF8(sv)) { /* But if is utf8 internally, attempt to
- convert to bytes */
- STRLEN tmplen = len;
- bool utf8 = TRUE;
- U8 * const result = bytes_from_utf8((const U8*) tmps, &tmplen, &utf8);
- if (!utf8) {
-
- /* Here, succeeded in downgrading from utf8. Set up to below
- * output the converted value */
- tmpbuf = result;
- tmps = (char *) tmpbuf;
- len = tmplen;
- }
- else { /* Non-utf8 output stream, but string only representable in
- utf8 */
- assert((char *)result == tmps);
- Perl_ck_warner_d(aTHX_ packWARN(WARN_UTF8),
- "Wide character in %s",
- PL_op ? OP_DESC(PL_op) : "print"
- );
- /* Could also check that isn't one of the things to avoid
- * in utf8 by using check_utf8_print(), but not doing so,
- * since the stream isn't a UTF8 stream */
- }
- }
- /* To detect whether the process is about to overstep its
- * filesize limit we would need getrlimit(). We could then
- * also transparently raise the limit with setrlimit() --
- * but only until the system hard limit/the filesystem limit,
- * at which we would get EPERM. Note that when using buffered
- * io the write failure can be delayed until the flush/close. --jhi */
- if (len && (PerlIO_write(fp,tmps,len) == 0))
- happy = FALSE;
- Safefree(tmpbuf);
- return happy ? !PerlIO_error(fp) : FALSE;
+ STRLEN len;
+ /* Do this first to trigger any overloading. */
+ const char *tmps = SvPV_const(sv, len);
+ U8 *tmpbuf = NULL;
+ bool happy = TRUE;
+
+ if (PerlIO_isutf8(fp)) { /* If the stream is utf8 ... */
+ if (!SvUTF8(sv)) { /* Convert to utf8 if necessary */
+ /* We don't modify the original scalar. */
+ tmpbuf = bytes_to_utf8((const U8*) tmps, &len);
+ tmps = (char *) tmpbuf;
+ }
+ else if (ckWARN4_d(WARN_UTF8, WARN_SURROGATE, WARN_NON_UNICODE, WARN_NONCHAR)) {
+ (void) check_utf8_print((const U8*) tmps, len);
+ }
+ } /* else stream isn't utf8 */
+ else if (DO_UTF8(sv)) { /* But if is utf8 internally, attempt to
+ convert to bytes */
+ STRLEN tmplen = len;
+ bool utf8 = TRUE;
+ U8 * const result = bytes_from_utf8((const U8*) tmps, &tmplen, &utf8);
+ if (!utf8) {
+
+ /* Here, succeeded in downgrading from utf8. Set up to below
+ * output the converted value */
+ tmpbuf = result;
+ tmps = (char *) tmpbuf;
+ len = tmplen;
+ }
+ else { /* Non-utf8 output stream, but string only representable in
+ utf8 */
+ assert((char *)result == tmps);
+ Perl_ck_warner_d(aTHX_ packWARN(WARN_UTF8),
+ "Wide character in %s",
+ PL_op ? OP_DESC(PL_op) : "print"
+ );
+ /* Could also check that isn't one of the things to avoid
+ * in utf8 by using check_utf8_print(), but not doing so,
+ * since the stream isn't a UTF8 stream */
+ }
+ }
+ /* To detect whether the process is about to overstep its
+ * filesize limit we would need getrlimit(). We could then
+ * also transparently raise the limit with setrlimit() --
+ * but only until the system hard limit/the filesystem limit,
+ * at which we would get EPERM. Note that when using buffered
+ * io the write failure can be delayed until the flush/close. --jhi */
+ if (len && (PerlIO_write(fp,tmps,len) == 0))
+ happy = FALSE;
+ Safefree(tmpbuf);
+ return happy ? !PerlIO_error(fp) : FALSE;
}
}
@@ -2130,24 +2130,24 @@ Perl_my_stat_flags(pTHX_ const U32 flags)
GV* gv;
if (PL_op->op_flags & OPf_REF) {
- gv = cGVOP_gv;
+ gv = cGVOP_gv;
do_fstat:
if (gv == PL_defgv) {
- if (PL_laststatval < 0)
- SETERRNO(EBADF,RMS_IFI);
+ if (PL_laststatval < 0)
+ SETERRNO(EBADF,RMS_IFI);
return PL_laststatval;
- }
- io = GvIO(gv);
+ }
+ io = GvIO(gv);
do_fstat_have_io:
PL_laststype = OP_STAT;
PL_statgv = gv ? gv : (GV *)io;
SvPVCLEAR(PL_statname);
if (io) {
- if (IoIFP(io)) {
+ if (IoIFP(io)) {
int fd = PerlIO_fileno(IoIFP(io));
if (fd < 0) {
/* E.g. PerlIO::scalar has no real fd. */
- SETERRNO(EBADF,RMS_IFI);
+ SETERRNO(EBADF,RMS_IFI);
return (PL_laststatval = -1);
} else {
return (PL_laststatval = PerlLIO_fstat(fd, &PL_statcache));
@@ -2156,44 +2156,44 @@ Perl_my_stat_flags(pTHX_ const U32 flags)
return (PL_laststatval = PerlLIO_fstat(my_dirfd(IoDIRP(io)), &PL_statcache));
}
}
- PL_laststatval = -1;
- report_evil_fh(gv);
- SETERRNO(EBADF,RMS_IFI);
- return -1;
+ PL_laststatval = -1;
+ report_evil_fh(gv);
+ SETERRNO(EBADF,RMS_IFI);
+ return -1;
}
else if ((PL_op->op_private & (OPpFT_STACKED|OPpFT_AFTER_t))
- == OPpFT_STACKED)
- return PL_laststatval;
+ == OPpFT_STACKED)
+ return PL_laststatval;
else {
- SV* const sv = TOPs;
- const char *s, *d;
- STRLEN len;
- if ((gv = MAYBE_DEREF_GV_flags(sv,flags))) {
- goto do_fstat;
- }
+ SV* const sv = TOPs;
+ const char *s, *d;
+ STRLEN len;
+ if ((gv = MAYBE_DEREF_GV_flags(sv,flags))) {
+ goto do_fstat;
+ }
else if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVIO) {
io = MUTABLE_IO(SvRV(sv));
- gv = NULL;
+ gv = NULL;
goto do_fstat_have_io;
}
- s = SvPV_flags_const(sv, len, flags);
- PL_statgv = NULL;
- sv_setpvn(PL_statname, s, len);
- d = SvPVX_const(PL_statname); /* s now NUL-terminated */
- PL_laststype = OP_STAT;
+ s = SvPV_flags_const(sv, len, flags);
+ PL_statgv = NULL;
+ sv_setpvn(PL_statname, s, len);
+ d = SvPVX_const(PL_statname); /* s now NUL-terminated */
+ PL_laststype = OP_STAT;
if (!IS_SAFE_PATHNAME(s, len, OP_NAME(PL_op))) {
PL_laststatval = -1;
}
else {
PL_laststatval = PerlLIO_stat(d, &PL_statcache);
}
- if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && should_warn_nl(s)) {
+ if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && should_warn_nl(s)) {
GCC_DIAG_IGNORE_STMT(-Wformat-nonliteral); /* PL_warn_nl is constant */
- Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "stat");
+ Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "stat");
GCC_DIAG_RESTORE_STMT;
}
- return PL_laststatval;
+ return PL_laststatval;
}
}
@@ -2208,27 +2208,27 @@ Perl_my_lstat_flags(pTHX_ const U32 flags)
SV* const sv = TOPs;
bool isio = FALSE;
if (PL_op->op_flags & OPf_REF) {
- if (cGVOP_gv == PL_defgv) {
- if (PL_laststype != OP_LSTAT)
- Perl_croak(aTHX_ "%s", no_prev_lstat);
- if (PL_laststatval < 0)
- SETERRNO(EBADF,RMS_IFI);
- return PL_laststatval;
- }
- PL_laststatval = -1;
- if (ckWARN(WARN_IO)) {
- /* diag_listed_as: Use of -l on filehandle%s */
- Perl_warner(aTHX_ packWARN(WARN_IO),
- "Use of -l on filehandle %" HEKf,
- HEKfARG(GvENAME_HEK(cGVOP_gv)));
- }
- SETERRNO(EBADF,RMS_IFI);
- return -1;
+ if (cGVOP_gv == PL_defgv) {
+ if (PL_laststype != OP_LSTAT)
+ Perl_croak(aTHX_ "%s", no_prev_lstat);
+ if (PL_laststatval < 0)
+ SETERRNO(EBADF,RMS_IFI);
+ return PL_laststatval;
+ }
+ PL_laststatval = -1;
+ if (ckWARN(WARN_IO)) {
+ /* diag_listed_as: Use of -l on filehandle%s */
+ Perl_warner(aTHX_ packWARN(WARN_IO),
+ "Use of -l on filehandle %" HEKf,
+ HEKfARG(GvENAME_HEK(cGVOP_gv)));
+ }
+ SETERRNO(EBADF,RMS_IFI);
+ return -1;
}
if ((PL_op->op_private & (OPpFT_STACKED|OPpFT_AFTER_t))
- == OPpFT_STACKED) {
+ == OPpFT_STACKED) {
if (PL_laststype != OP_LSTAT)
- Perl_croak(aTHX_ "%s", no_prev_lstat);
+ Perl_croak(aTHX_ "%s", no_prev_lstat);
return PL_laststatval;
}
@@ -2241,11 +2241,11 @@ Perl_my_lstat_flags(pTHX_ const U32 flags)
)
&& ckWARN(WARN_IO)) {
if (isio)
- /* diag_listed_as: Use of -l on filehandle%s */
+ /* diag_listed_as: Use of -l on filehandle%s */
Perl_warner(aTHX_ packWARN(WARN_IO),
"Use of -l on filehandle");
else
- /* diag_listed_as: Use of -l on filehandle%s */
+ /* diag_listed_as: Use of -l on filehandle%s */
Perl_warner(aTHX_ packWARN(WARN_IO),
"Use of -l on filehandle %" HEKf,
HEKfARG(GvENAME_HEK((const GV *)
@@ -2279,13 +2279,13 @@ S_exec_failed(pTHX_ const char *cmd, int fd, int do_report)
if (do_report) {
/* XXX silently ignore failures */
PERL_UNUSED_RESULT(PerlLIO_write(fd, (void*)&e, sizeof(int)));
- PerlLIO_close(fd);
+ PerlLIO_close(fd);
}
}
bool
Perl_do_aexec5(pTHX_ SV *really, SV **mark, SV **sp,
- int fd, int do_report)
+ int fd, int do_report)
{
PERL_ARGS_ASSERT_DO_AEXEC5;
#if defined(__LIBCATAMOUNT__)
@@ -2294,37 +2294,37 @@ Perl_do_aexec5(pTHX_ SV *really, SV **mark, SV **sp,
assert(sp >= mark);
ENTER;
{
- const char **argv, **a;
- const char *tmps = NULL;
- Newx(argv, sp - mark + 1, const char*);
- SAVEFREEPV(argv);
- a = argv;
-
- while (++mark <= sp) {
- if (*mark) {
- char *arg = savepv(SvPV_nolen_const(*mark));
- SAVEFREEPV(arg);
- *a++ = arg;
- } else
- *a++ = "";
- }
- *a = NULL;
- if (really) {
- tmps = savepv(SvPV_nolen_const(really));
- SAVEFREEPV(tmps);
- }
+ const char **argv, **a;
+ const char *tmps = NULL;
+ Newx(argv, sp - mark + 1, const char*);
+ SAVEFREEPV(argv);
+ a = argv;
+
+ while (++mark <= sp) {
+ if (*mark) {
+ char *arg = savepv(SvPV_nolen_const(*mark));
+ SAVEFREEPV(arg);
+ *a++ = arg;
+ } else
+ *a++ = "";
+ }
+ *a = NULL;
+ if (really) {
+ tmps = savepv(SvPV_nolen_const(really));
+ SAVEFREEPV(tmps);
+ }
if ((!really && argv[0] && *argv[0] != '/') ||
- (really && *tmps != '/')) /* will execvp use PATH? */
- TAINT_ENV(); /* testing IFS here is overkill, probably */
- PERL_FPU_PRE_EXEC
- if (really && *tmps) {
+ (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(argv));
} else if (argv[0]) {
PerlProc_execvp(argv[0],EXEC_ARGV_CAST(argv));
} else {
SETERRNO(ENOENT,RMS_FNF);
}
- PERL_FPU_POST_EXEC
+ PERL_FPU_POST_EXEC
S_exec_failed(aTHX_ (really ? tmps : argv[0] ? argv[0] : ""), fd, do_report);
}
LEAVE;
@@ -2353,86 +2353,86 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
memcpy(cmd, incmd, cmdlen);
while (*cmd && isSPACE(*cmd))
- cmd++;
+ cmd++;
/* save an extra exec if possible */
#ifdef CSH
{
char flags[PERL_FLAGS_MAX];
- if (strnEQ(cmd,PL_cshname,PL_cshlen) &&
- strBEGINs(cmd+PL_cshlen," -c")) {
+ if (strnEQ(cmd,PL_cshname,PL_cshlen) &&
+ strBEGINs(cmd+PL_cshlen," -c")) {
my_strlcpy(flags, "-c", PERL_FLAGS_MAX);
- s = cmd+PL_cshlen+3;
- if (*s == 'f') {
- s++;
+ s = cmd+PL_cshlen+3;
+ if (*s == 'f') {
+ s++;
my_strlcat(flags, "f", PERL_FLAGS_MAX - 2);
- }
- if (*s == ' ')
- s++;
- if (*s++ == '\'') {
- char * const ncmd = s;
-
- while (*s)
- s++;
- if (s[-1] == '\n')
- *--s = '\0';
- if (s[-1] == '\'') {
- *--s = '\0';
- PERL_FPU_PRE_EXEC
- PerlProc_execl(PL_cshname, "csh", flags, ncmd, (char*)NULL);
- PERL_FPU_POST_EXEC
- *s = '\'';
- S_exec_failed(aTHX_ PL_cshname, fd, do_report);
- goto leave;
- }
- }
- }
+ }
+ if (*s == ' ')
+ s++;
+ if (*s++ == '\'') {
+ char * const ncmd = s;
+
+ while (*s)
+ s++;
+ if (s[-1] == '\n')
+ *--s = '\0';
+ if (s[-1] == '\'') {
+ *--s = '\0';
+ PERL_FPU_PRE_EXEC
+ PerlProc_execl(PL_cshname, "csh", flags, ncmd, (char*)NULL);
+ PERL_FPU_POST_EXEC
+ *s = '\'';
+ S_exec_failed(aTHX_ PL_cshname, fd, do_report);
+ goto leave;
+ }
+ }
+ }
}
#endif /* CSH */
/* see if there are shell metacharacters in it */
if (*cmd == '.' && isSPACE(cmd[1]))
- goto doshell;
+ goto doshell;
if (strBEGINs(cmd,"exec") && isSPACE(cmd[4]))
- goto doshell;
+ goto doshell;
s = cmd;
while (isWORDCHAR(*s))
- s++; /* catch VAR=val gizmo */
+ s++; /* catch VAR=val gizmo */
if (*s == '=')
- goto doshell;
+ goto doshell;
for (s = cmd; *s; s++) {
- if (*s != ' ' && !isALPHA(*s) &&
- memCHRs("$&*(){}[]'\";\\|?<>~`\n",*s)) {
- if (*s == '\n' && !s[1]) {
- *s = '\0';
- break;
- }
- /* handle the 2>&1 construct at the end */
- if (*s == '>' && s[1] == '&' && s[2] == '1'
- && s > cmd + 1 && s[-1] == '2' && isSPACE(s[-2])
- && (!s[3] || isSPACE(s[3])))
- {
+ if (*s != ' ' && !isALPHA(*s) &&
+ memCHRs("$&*(){}[]'\";\\|?<>~`\n",*s)) {
+ if (*s == '\n' && !s[1]) {
+ *s = '\0';
+ break;
+ }
+ /* handle the 2>&1 construct at the end */
+ if (*s == '>' && s[1] == '&' && s[2] == '1'
+ && s > cmd + 1 && s[-1] == '2' && isSPACE(s[-2])
+ && (!s[3] || isSPACE(s[3])))
+ {
const char *t = s + 3;
- while (*t && isSPACE(*t))
- ++t;
- if (!*t && (PerlLIO_dup2(1,2) != -1)) {
- s[-2] = '\0';
- break;
- }
- }
- doshell:
- PERL_FPU_PRE_EXEC
+ while (*t && isSPACE(*t))
+ ++t;
+ if (!*t && (PerlLIO_dup2(1,2) != -1)) {
+ s[-2] = '\0';
+ break;
+ }
+ }
+ doshell:
+ PERL_FPU_PRE_EXEC
PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char *)NULL);
- PERL_FPU_POST_EXEC
- S_exec_failed(aTHX_ PL_sh_path, fd, do_report);
- goto leave;
- }
+ PERL_FPU_POST_EXEC
+ S_exec_failed(aTHX_ PL_sh_path, fd, do_report);
+ goto leave;
+ }
}
Newx(argv, (s - cmd) / 2 + 2, const char*);
@@ -2441,23 +2441,23 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
SAVEFREEPV(cmd);
a = argv;
for (s = cmd; *s;) {
- while (isSPACE(*s))
- s++;
- if (*s)
- *(a++) = s;
- while (*s && !isSPACE(*s))
- s++;
- if (*s)
- *s++ = '\0';
+ while (isSPACE(*s))
+ s++;
+ if (*s)
+ *(a++) = s;
+ while (*s && !isSPACE(*s))
+ s++;
+ if (*s)
+ *s++ = '\0';
}
*a = NULL;
if (argv[0]) {
- PERL_FPU_PRE_EXEC
+ PERL_FPU_PRE_EXEC
PerlProc_execvp(argv[0],EXEC_ARGV_CAST(argv));
- PERL_FPU_POST_EXEC
- if (errno == ENOEXEC) /* for system V NIH syndrome */
- goto doshell;
- S_exec_failed(aTHX_ argv[0], fd, do_report);
+ PERL_FPU_POST_EXEC
+ if (errno == ENOEXEC) /* for system V NIH syndrome */
+ goto doshell;
+ S_exec_failed(aTHX_ argv[0], fd, do_report);
}
leave:
LEAVE;
@@ -2486,109 +2486,109 @@ Perl_apply(pTHX_ I32 type, SV **mark, SV **sp)
platforms where kill was not defined. */
#ifndef HAS_KILL
if (type == OP_KILL)
- Perl_die(aTHX_ PL_no_func, what);
+ Perl_die(aTHX_ PL_no_func, what);
#endif
#ifndef HAS_CHOWN
if (type == OP_CHOWN)
- Perl_die(aTHX_ PL_no_func, what);
+ Perl_die(aTHX_ PL_no_func, what);
#endif
#define APPLY_TAINT_PROPER() \
STMT_START { \
- if (TAINT_get) { TAINT_PROPER(what); } \
+ if (TAINT_get) { TAINT_PROPER(what); } \
} STMT_END
/* This is a first heuristic; it doesn't catch tainting magic. */
if (TAINTING_get) {
- while (++mark <= sp) {
- if (SvTAINTED(*mark)) {
- TAINT;
- break;
- }
- }
- mark = oldmark;
+ while (++mark <= sp) {
+ if (SvTAINTED(*mark)) {
+ TAINT;
+ break;
+ }
+ }
+ mark = oldmark;
}
switch (type) {
case OP_CHMOD:
- APPLY_TAINT_PROPER();
- if (++mark <= sp) {
- val = SvIV(*mark);
- APPLY_TAINT_PROPER();
- tot = sp - mark;
- while (++mark <= sp) {
+ APPLY_TAINT_PROPER();
+ if (++mark <= sp) {
+ val = SvIV(*mark);
+ APPLY_TAINT_PROPER();
+ tot = sp - mark;
+ while (++mark <= sp) {
GV* gv;
if ((gv = MAYBE_DEREF_GV(*mark))) {
- if (GvIO(gv) && IoIFP(GvIOp(gv))) {
+ if (GvIO(gv) && IoIFP(GvIOp(gv))) {
#ifdef HAS_FCHMOD
int fd = PerlIO_fileno(IoIFP(GvIOn(gv)));
- APPLY_TAINT_PROPER();
+ APPLY_TAINT_PROPER();
if (fd < 0) {
SETERRNO(EBADF,RMS_IFI);
tot--;
} else if (fchmod(fd, val))
tot--;
#else
- Perl_die(aTHX_ PL_no_func, "fchmod");
+ Perl_die(aTHX_ PL_no_func, "fchmod");
#endif
- }
- else {
+ }
+ else {
SETERRNO(EBADF,RMS_IFI);
- tot--;
- }
- }
- else {
- const char *name = SvPV_nomg_const(*mark, len);
- APPLY_TAINT_PROPER();
+ tot--;
+ }
+ }
+ else {
+ const char *name = SvPV_nomg_const(*mark, len);
+ APPLY_TAINT_PROPER();
if (!IS_SAFE_PATHNAME(name, len, "chmod") ||
PerlLIO_chmod(name, val)) {
tot--;
}
- }
- }
- }
- break;
+ }
+ }
+ }
+ break;
#ifdef HAS_CHOWN
case OP_CHOWN:
- APPLY_TAINT_PROPER();
- if (sp - mark > 2) {
+ APPLY_TAINT_PROPER();
+ if (sp - mark > 2) {
I32 val2;
- val = SvIVx(*++mark);
- val2 = SvIVx(*++mark);
- APPLY_TAINT_PROPER();
- tot = sp - mark;
- while (++mark <= sp) {
+ val = SvIVx(*++mark);
+ val2 = SvIVx(*++mark);
+ APPLY_TAINT_PROPER();
+ tot = sp - mark;
+ while (++mark <= sp) {
GV* gv;
- if ((gv = MAYBE_DEREF_GV(*mark))) {
- if (GvIO(gv) && IoIFP(GvIOp(gv))) {
+ if ((gv = MAYBE_DEREF_GV(*mark))) {
+ if (GvIO(gv) && IoIFP(GvIOp(gv))) {
#ifdef HAS_FCHOWN
int fd = PerlIO_fileno(IoIFP(GvIOn(gv)));
- APPLY_TAINT_PROPER();
+ APPLY_TAINT_PROPER();
if (fd < 0) {
SETERRNO(EBADF,RMS_IFI);
- tot--;
+ tot--;
} else if (fchown(fd, val, val2))
- tot--;
+ tot--;
#else
- Perl_die(aTHX_ PL_no_func, "fchown");
+ Perl_die(aTHX_ PL_no_func, "fchown");
#endif
- }
- else {
+ }
+ else {
SETERRNO(EBADF,RMS_IFI);
- tot--;
- }
- }
- else {
- const char *name = SvPV_nomg_const(*mark, len);
- APPLY_TAINT_PROPER();
+ tot--;
+ }
+ }
+ else {
+ const char *name = SvPV_nomg_const(*mark, len);
+ APPLY_TAINT_PROPER();
if (!IS_SAFE_PATHNAME(name, len, "chown") ||
PerlLIO_chown(name, val, val2)) {
- tot--;
+ tot--;
}
- }
- }
- }
- break;
+ }
+ }
+ }
+ break;
#endif
/*
XXX Should we make lchown() directly available from perl?
@@ -2598,44 +2598,44 @@ nothing in the core.
*/
#ifdef HAS_KILL
case OP_KILL:
- APPLY_TAINT_PROPER();
- if (mark == sp)
- break;
- s = SvPVx_const(*++mark, len);
- if (*s == '-' && isALPHA(s[1]))
- {
- s++;
- len--;
+ APPLY_TAINT_PROPER();
+ if (mark == sp)
+ break;
+ s = SvPVx_const(*++mark, len);
+ if (*s == '-' && isALPHA(s[1]))
+ {
+ s++;
+ len--;
killgp = TRUE;
- }
- if (isALPHA(*s)) {
- if (*s == 'S' && s[1] == 'I' && s[2] == 'G') {
- s += 3;
+ }
+ if (isALPHA(*s)) {
+ if (*s == 'S' && s[1] == 'I' && s[2] == 'G') {
+ s += 3;
len -= 3;
}
if ((val = whichsig_pvn(s, len)) < 0)
Perl_croak(aTHX_ "Unrecognized signal name \"%" SVf "\"",
SVfARG(*mark));
- }
- else
- {
- val = SvIV(*mark);
- if (val < 0)
- {
- killgp = TRUE;
+ }
+ else
+ {
+ val = SvIV(*mark);
+ if (val < 0)
+ {
+ killgp = TRUE;
val = -val;
- }
- }
- APPLY_TAINT_PROPER();
- tot = sp - mark;
-
- while (++mark <= sp) {
- Pid_t proc;
- SvGETMAGIC(*mark);
- if (!(SvNIOK(*mark) || looks_like_number(*mark)))
- Perl_croak(aTHX_ "Can't kill a non-numeric process ID");
- proc = SvIV_nomg(*mark);
- APPLY_TAINT_PROPER();
+ }
+ }
+ APPLY_TAINT_PROPER();
+ tot = sp - mark;
+
+ while (++mark <= sp) {
+ Pid_t proc;
+ SvGETMAGIC(*mark);
+ if (!(SvNIOK(*mark) || looks_like_number(*mark)))
+ Perl_croak(aTHX_ "Can't kill a non-numeric process ID");
+ proc = SvIV_nomg(*mark);
+ APPLY_TAINT_PROPER();
#ifdef HAS_KILLPG
/* use killpg in preference, as the killpg() wrapper for Win32
* understands process groups, but the kill() wrapper doesn't */
@@ -2644,28 +2644,28 @@ nothing in the core.
#else
if (PerlProc_kill(killgp ? -proc: proc, val))
#endif
- tot--;
- }
- PERL_ASYNC_CHECK();
- break;
+ tot--;
+ }
+ PERL_ASYNC_CHECK();
+ break;
#endif
case OP_UNLINK:
- APPLY_TAINT_PROPER();
- tot = sp - mark;
- while (++mark <= sp) {
- s = SvPV_const(*mark, len);
- APPLY_TAINT_PROPER();
- if (!IS_SAFE_PATHNAME(s, len, "unlink")) {
+ APPLY_TAINT_PROPER();
+ tot = sp - mark;
+ while (++mark <= sp) {
+ s = SvPV_const(*mark, len);
+ APPLY_TAINT_PROPER();
+ if (!IS_SAFE_PATHNAME(s, len, "unlink")) {
tot--;
}
- else if (PL_unsafe) {
- if (UNLINK(s))
- {
- tot--;
- }
+ else if (PL_unsafe) {
+ if (UNLINK(s))
+ {
+ tot--;
+ }
#if defined(__amigaos4__) && defined(NEWLIB)
- else
- {
+ else
+ {
/* Under AmigaOS4 unlink only 'fails' if the
* filename is invalid. It may not remove the file
* if it's locked, so check if it's still around. */
@@ -2673,58 +2673,58 @@ nothing in the core.
{
tot--;
}
- }
-#endif
- }
- else { /* don't let root wipe out directories without -U */
- Stat_t statbuf;
- if (PerlLIO_lstat(s, &statbuf) < 0)
- tot--;
- else if (S_ISDIR(statbuf.st_mode)) {
- SETERRNO(EISDIR, SS_NOPRIV);
- tot--;
- }
- else {
- if (UNLINK(s))
- {
- tot--;
- }
+ }
+#endif
+ }
+ else { /* don't let root wipe out directories without -U */
+ Stat_t statbuf;
+ if (PerlLIO_lstat(s, &statbuf) < 0)
+ tot--;
+ else if (S_ISDIR(statbuf.st_mode)) {
+ SETERRNO(EISDIR, SS_NOPRIV);
+ tot--;
+ }
+ else {
+ if (UNLINK(s))
+ {
+ tot--;
+ }
#if defined(__amigaos4__) && defined(NEWLIB)
- else
- {
- /* Under AmigaOS4 unlink only 'fails' if the filename is invalid */
- /* It may not remove the file if it's Locked, so check if it's still */
- /* arround */
- if((access(s,F_OK) != -1))
- {
- tot--;
- }
- }
-#endif
- }
- }
- }
- break;
+ else
+ {
+ /* Under AmigaOS4 unlink only 'fails' if the filename is invalid */
+ /* It may not remove the file if it's Locked, so check if it's still */
+ /* arround */
+ if((access(s,F_OK) != -1))
+ {
+ tot--;
+ }
+ }
+#endif
+ }
+ }
+ }
+ break;
#if defined(HAS_UTIME) || defined(HAS_FUTIMES)
case OP_UTIME:
- APPLY_TAINT_PROPER();
- if (sp - mark > 2) {
+ APPLY_TAINT_PROPER();
+ if (sp - mark > 2) {
#if defined(HAS_FUTIMES)
- struct timeval utbuf[2];
- void *utbufp = utbuf;
+ struct timeval utbuf[2];
+ void *utbufp = utbuf;
#elif defined(I_UTIME) || defined(VMS)
- struct utimbuf utbuf;
- struct utimbuf *utbufp = &utbuf;
+ struct utimbuf utbuf;
+ struct utimbuf *utbufp = &utbuf;
#else
- struct {
- Time_t actime;
- Time_t modtime;
- } utbuf;
- void *utbufp = &utbuf;
+ struct {
+ Time_t actime;
+ Time_t modtime;
+ } utbuf;
+ void *utbufp = &utbuf;
#endif
- SV* const accessed = *++mark;
- SV* const modified = *++mark;
+ SV* const accessed = *++mark;
+ SV* const modified = *++mark;
/* Be like C, and if both times are undefined, let the C
* library figure out what to do. This usually means
@@ -2735,10 +2735,10 @@ nothing in the core.
else {
Zero(&utbuf, sizeof utbuf, char);
#ifdef HAS_FUTIMES
- utbuf[0].tv_sec = (long)SvIV(accessed); /* time accessed */
- utbuf[0].tv_usec = 0;
- utbuf[1].tv_sec = (long)SvIV(modified); /* time modified */
- utbuf[1].tv_usec = 0;
+ utbuf[0].tv_sec = (long)SvIV(accessed); /* time accessed */
+ utbuf[0].tv_usec = 0;
+ utbuf[1].tv_sec = (long)SvIV(modified); /* time modified */
+ utbuf[1].tv_usec = 0;
#elif defined(BIG_TIME)
utbuf.actime = (Time_t)SvNV(accessed); /* time accessed */
utbuf.modtime = (Time_t)SvNV(modified); /* time modified */
@@ -2747,48 +2747,48 @@ nothing in the core.
utbuf.modtime = (Time_t)SvIV(modified); /* time modified */
#endif
}
- APPLY_TAINT_PROPER();
- tot = sp - mark;
- while (++mark <= sp) {
+ APPLY_TAINT_PROPER();
+ tot = sp - mark;
+ while (++mark <= sp) {
GV* gv;
if ((gv = MAYBE_DEREF_GV(*mark))) {
- if (GvIO(gv) && IoIFP(GvIOp(gv))) {
+ if (GvIO(gv) && IoIFP(GvIOp(gv))) {
#ifdef HAS_FUTIMES
int fd = PerlIO_fileno(IoIFP(GvIOn(gv)));
- APPLY_TAINT_PROPER();
+ APPLY_TAINT_PROPER();
if (fd < 0) {
SETERRNO(EBADF,RMS_IFI);
tot--;
- } else if (futimes(fd, (struct timeval *) utbufp))
- tot--;
+ } else if (futimes(fd, (struct timeval *) utbufp))
+ tot--;
#else
- Perl_die(aTHX_ PL_no_func, "futimes");
-#endif
- }
- else {
- tot--;
- }
- }
- else {
- const char * const name = SvPV_nomg_const(*mark, len);
- APPLY_TAINT_PROPER();
- if (!IS_SAFE_PATHNAME(name, len, "utime")) {
+ Perl_die(aTHX_ PL_no_func, "futimes");
+#endif
+ }
+ else {
+ tot--;
+ }
+ }
+ else {
+ const char * const name = SvPV_nomg_const(*mark, len);
+ APPLY_TAINT_PROPER();
+ if (!IS_SAFE_PATHNAME(name, len, "utime")) {
tot--;
}
else
#ifdef HAS_FUTIMES
- if (utimes(name, (struct timeval *)utbufp))
+ if (utimes(name, (struct timeval *)utbufp))
#else
- if (PerlLIO_utime(name, utbufp))
+ if (PerlLIO_utime(name, utbufp))
#endif
- tot--;
- }
+ tot--;
+ }
- }
- }
- else
- tot = 0;
- break;
+ }
+ }
+ else
+ tot = 0;
+ break;
#endif
}
return tot;
@@ -2837,24 +2837,24 @@ Perl_cando(pTHX_ Mode_t mode, bool effective, const Stat_t *statbufp)
# else
if ((effective ? PerlProc_geteuid() : PerlProc_getuid()) == 0) { /* root is special */
# endif
- if (mode == S_IXUSR) {
- if (statbufp->st_mode & 0111 || S_ISDIR(statbufp->st_mode))
- return TRUE;
- }
- else
- return TRUE; /* root reads and writes anything */
- return FALSE;
+ if (mode == S_IXUSR) {
+ if (statbufp->st_mode & 0111 || S_ISDIR(statbufp->st_mode))
+ return TRUE;
+ }
+ else
+ return TRUE; /* root reads and writes anything */
+ return FALSE;
}
if (statbufp->st_uid == (effective ? PerlProc_geteuid() : PerlProc_getuid()) ) {
- if (statbufp->st_mode & mode)
- return TRUE; /* ok as "user" */
+ if (statbufp->st_mode & mode)
+ return TRUE; /* ok as "user" */
}
else if (ingroup(statbufp->st_gid,effective)) {
- if (statbufp->st_mode & mode >> 3)
- return TRUE; /* ok as "group" */
+ if (statbufp->st_mode & mode >> 3)
+ return TRUE; /* ok as "group" */
}
else if (statbufp->st_mode & mode >> 6)
- return TRUE; /* ok as "other" */
+ return TRUE; /* ok as "other" */
return FALSE;
#endif /* ! DOSISH */
}
@@ -2868,14 +2868,14 @@ S_ingroup(pTHX_ Gid_t testgid, bool effective)
PERL_UNUSED_CONTEXT;
#endif
if (testgid == (effective ? PerlProc_getegid() : PerlProc_getgid()))
- return TRUE;
+ return TRUE;
#ifdef HAS_GETGROUPS
{
- Groups_t *gary = NULL;
- I32 anum;
+ Groups_t *gary = NULL;
+ I32 anum;
bool rc = FALSE;
- anum = getgroups(0, gary);
+ anum = getgroups(0, gary);
if (anum > 0) {
Newx(gary, anum, Groups_t);
anum = getgroups(anum, gary);
@@ -2911,20 +2911,20 @@ Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp)
{
#ifdef HAS_MSG
case OP_MSGGET:
- return msgget(key, flags);
+ return msgget(key, flags);
#endif
#ifdef HAS_SEM
case OP_SEMGET:
- return semget(key, (int) SvIV(nsv), flags);
+ return semget(key, (int) SvIV(nsv), flags);
#endif
#ifdef HAS_SHM
case OP_SHMGET:
- return shmget(key, (size_t) SvUV(nsv), flags);
+ return shmget(key, (size_t) SvUV(nsv), flags);
#endif
#if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM)
default:
/* diag_listed_as: msg%s not implemented */
- Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]);
+ Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]);
#endif
}
return -1; /* should never happen */
@@ -2951,71 +2951,71 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp)
{
#ifdef HAS_MSG
case OP_MSGCTL:
- if (cmd == IPC_STAT || cmd == IPC_SET)
- infosize = sizeof(struct msqid_ds);
- break;
+ if (cmd == IPC_STAT || cmd == IPC_SET)
+ infosize = sizeof(struct msqid_ds);
+ break;
#endif
#ifdef HAS_SHM
case OP_SHMCTL:
- if (cmd == IPC_STAT || cmd == IPC_SET)
- infosize = sizeof(struct shmid_ds);
- break;
+ if (cmd == IPC_STAT || cmd == IPC_SET)
+ infosize = sizeof(struct shmid_ds);
+ break;
#endif
#ifdef HAS_SEM
case OP_SEMCTL:
#ifdef Semctl
- if (cmd == IPC_STAT || cmd == IPC_SET)
- infosize = sizeof(struct semid_ds);
- else if (cmd == GETALL || cmd == SETALL)
- {
- struct semid_ds semds;
- union semun semun;
+ if (cmd == IPC_STAT || cmd == IPC_SET)
+ infosize = sizeof(struct semid_ds);
+ else if (cmd == GETALL || cmd == SETALL)
+ {
+ struct semid_ds semds;
+ union semun semun;
#ifdef EXTRA_F_IN_SEMUN_BUF
semun.buff = &semds;
#else
semun.buf = &semds;
#endif
- getinfo = (cmd == GETALL);
- if (Semctl(id, 0, IPC_STAT, semun) == -1)
- return -1;
- infosize = semds.sem_nsems * sizeof(short);
- /* "short" is technically wrong but much more portable
- than guessing about u_?short(_t)? */
- }
+ getinfo = (cmd == GETALL);
+ if (Semctl(id, 0, IPC_STAT, semun) == -1)
+ return -1;
+ infosize = semds.sem_nsems * sizeof(short);
+ /* "short" is technically wrong but much more portable
+ than guessing about u_?short(_t)? */
+ }
#else
/* diag_listed_as: sem%s not implemented */
- Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]);
+ Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]);
#endif
- break;
+ break;
#endif
#if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM)
default:
/* diag_listed_as: shm%s not implemented */
- Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]);
+ Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]);
#endif
}
if (infosize)
{
- if (getinfo)
- {
+ if (getinfo)
+ {
/* we're not using the value here, so don't SvPVanything */
SvUPGRADE(astr, SVt_PV);
SvGETMAGIC(astr);
if (SvTHINKFIRST(astr))
sv_force_normal_flags(astr, 0);
- a = SvGROW(astr, infosize+1);
- }
- else
- {
- STRLEN len;
- a = SvPVbyte(astr, len);
- if (len != infosize)
- Perl_croak(aTHX_ "Bad arg length for %s, is %lu, should be %ld",
- PL_op_desc[optype],
- (unsigned long)len,
- (long)infosize);
- }
+ a = SvGROW(astr, infosize+1);
+ }
+ else
+ {
+ STRLEN len;
+ a = SvPVbyte(astr, len);
+ if (len != infosize)
+ Perl_croak(aTHX_ "Bad arg length for %s, is %lu, should be %ld",
+ PL_op_desc[optype],
+ (unsigned long)len,
+ (long)infosize);
+ }
}
else
{
@@ -3037,8 +3037,8 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp)
{
#ifdef HAS_MSG
case OP_MSGCTL:
- ret = msgctl(id, cmd, (struct msqid_ds *)a);
- break;
+ ret = msgctl(id, cmd, (struct msqid_ds *)a);
+ break;
#endif
#ifdef HAS_SEM
case OP_SEMCTL: {
@@ -3055,25 +3055,25 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp)
unsemds.buf = (struct semid_ds *)a;
#endif
}
- ret = Semctl(id, n, cmd, unsemds);
+ ret = Semctl(id, n, cmd, unsemds);
#else
- /* diag_listed_as: sem%s not implemented */
- Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]);
+ /* diag_listed_as: sem%s not implemented */
+ Perl_croak(aTHX_ "%s not implemented", PL_op_desc[optype]);
#endif
}
- break;
+ break;
#endif
#ifdef HAS_SHM
case OP_SHMCTL:
- ret = shmctl(id, cmd, (struct shmid_ds *)a);
- break;
+ ret = shmctl(id, cmd, (struct shmid_ds *)a);
+ break;
#endif
}
if (getinfo && ret >= 0) {
- SvCUR_set(astr, infosize);
- *SvEND(astr) = '\0';
+ SvCUR_set(astr, infosize);
+ *SvEND(astr) = '\0';
SvPOK_only(astr);
- SvSETMAGIC(astr);
+ SvSETMAGIC(astr);
}
return ret;
}
@@ -3093,7 +3093,7 @@ Perl_do_msgsnd(pTHX_ SV **mark, SV **sp)
PERL_UNUSED_ARG(sp);
if (msize < 0)
- Perl_croak(aTHX_ "Arg too short for msgsnd");
+ Perl_croak(aTHX_ "Arg too short for msgsnd");
SETERRNO(0,0);
if (id >= 0 && flags >= 0) {
return msgsnd(id, (struct msgbuf *)mbuf, msize, flags);
@@ -3140,11 +3140,11 @@ Perl_do_msgrcv(pTHX_ SV **mark, SV **sp)
ret = -1;
}
if (ret >= 0) {
- SvCUR_set(mstr, sizeof(long)+ret);
+ SvCUR_set(mstr, sizeof(long)+ret);
SvPOK_only(mstr);
- *SvEND(mstr) = '\0';
- /* who knows who has been playing with this message? */
- SvTAINTED_on(mstr);
+ *SvEND(mstr) = '\0';
+ /* who knows who has been playing with this message? */
+ SvTAINTED_on(mstr);
}
return ret;
#else
@@ -3169,9 +3169,9 @@ Perl_do_semop(pTHX_ SV **mark, SV **sp)
PERL_UNUSED_ARG(sp);
if (opsize < 3 * SHORTSIZE
- || (opsize % (3 * SHORTSIZE))) {
- SETERRNO(EINVAL,LIB_INVARG);
- return -1;
+ || (opsize % (3 * SHORTSIZE))) {
+ SETERRNO(EINVAL,LIB_INVARG);
+ return -1;
}
SETERRNO(0,0);
/* We can't assume that sizeof(struct sembuf) == 3 * sizeof(short). */
@@ -3217,11 +3217,11 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
SETERRNO(0,0);
if (shmctl(id, IPC_STAT, &shmds) == -1)
- return -1;
+ return -1;
if (mpos < 0 || msize < 0
- || (size_t)mpos + msize > (size_t)shmds.shm_segsz) {
- SETERRNO(EFAULT,SS_ACCVIO); /* can't do as caller requested */
- return -1;
+ || (size_t)mpos + msize > (size_t)shmds.shm_segsz) {
+ SETERRNO(EFAULT,SS_ACCVIO); /* can't do as caller requested */
+ return -1;
}
if (id >= 0) {
shm = (char *)shmat(id, NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0);
@@ -3230,32 +3230,32 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
return -1;
}
if (shm == (char *)-1) /* I hate System V IPC, I really do */
- return -1;
+ return -1;
if (optype == OP_SHMREAD) {
- char *mbuf;
- /* suppress warning when reading into undef var (tchrist 3/Mar/00) */
- SvGETMAGIC(mstr);
- SvUPGRADE(mstr, SVt_PV);
- if (! SvOK(mstr))
+ char *mbuf;
+ /* suppress warning when reading into undef var (tchrist 3/Mar/00) */
+ SvGETMAGIC(mstr);
+ SvUPGRADE(mstr, SVt_PV);
+ if (! SvOK(mstr))
SvPVCLEAR(mstr);
- SvPOK_only(mstr);
- mbuf = SvGROW(mstr, (STRLEN)msize+1);
+ SvPOK_only(mstr);
+ mbuf = SvGROW(mstr, (STRLEN)msize+1);
- Copy(shm + mpos, mbuf, msize, char);
- SvCUR_set(mstr, msize);
- *SvEND(mstr) = '\0';
- SvSETMAGIC(mstr);
- /* who knows who has been playing with this shared memory? */
- SvTAINTED_on(mstr);
+ Copy(shm + mpos, mbuf, msize, char);
+ SvCUR_set(mstr, msize);
+ *SvEND(mstr) = '\0';
+ SvSETMAGIC(mstr);
+ /* who knows who has been playing with this shared memory? */
+ SvTAINTED_on(mstr);
}
else {
- STRLEN len;
+ STRLEN len;
- const char *mbuf = SvPVbyte(mstr, len);
- const I32 n = ((I32)len > msize) ? msize : (I32)len;
- Copy(mbuf, shm + mpos, n, char);
- if (n < msize)
- memzero(shm + mpos + n, msize - n);
+ const char *mbuf = SvPVbyte(mstr, len);
+ const I32 n = ((I32)len > msize) ? msize : (I32)len;
+ Copy(mbuf, shm + mpos, n, char);
+ if (n < msize)
+ memzero(shm + mpos + n, msize - n);
}
return shmdt(shm);
#else
View Lorry Controller Status