This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
new perldelta
[perl5.git] / doio.c
diff --git a/doio.c b/doio.c
index ecfe3db..5b8c528 100644 (file)
--- a/doio.c
+++ b/doio.c
 
 #include <signal.h>
 
 
 #include <signal.h>
 
+void
+Perl_setfd_cloexec(int fd)
+{
+    assert(fd >= 0);
+#if defined(HAS_FCNTL) && defined(F_SETFD) && defined(FD_CLOEXEC)
+    (void) fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
+}
+
+void
+Perl_setfd_inhexec(int fd)
+{
+    assert(fd >= 0);
+#if defined(HAS_FCNTL) && defined(F_SETFD) && defined(FD_CLOEXEC)
+    (void) fcntl(fd, F_SETFD, 0);
+#endif
+}
+
+void
+Perl_setfd_cloexec_for_nonsysfd(pTHX_ int fd)
+{
+    assert(fd >= 0);
+    if(fd > PL_maxsysfd)
+        setfd_cloexec(fd);
+}
+
+void
+Perl_setfd_inhexec_for_sysfd(pTHX_ int fd)
+{
+    assert(fd >= 0);
+    if(fd <= PL_maxsysfd)
+        setfd_inhexec(fd);
+}
+void
+Perl_setfd_cloexec_or_inhexec_by_sysfdness(pTHX_ int fd)
+{
+    assert(fd >= 0);
+    if(fd <= PL_maxsysfd)
+        setfd_inhexec(fd);
+    else
+        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)
+#if defined(HAS_FCNTL) && defined(F_SETFD) && defined(FD_CLOEXEC) && \
+                        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)
+#else
+#  define DO_GENOPEN_EXPERIMENTING_CLOEXEC(strategy, TESTFD, GENOPEN_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)
+#define DO_ONEOPEN_EXPERIMENTING_CLOEXEC(strategy, \
+                ONEOPEN_CLOEXEC, ONEOPEN_NORMAL) \
+        do { \
+            int fd; \
+            DO_GENOPEN_EXPERIMENTING_CLOEXEC(strategy, \
+                fd, \
+                fd = (ONEOPEN_CLOEXEC), \
+                fd = (ONEOPEN_NORMAL), setfd_cloexec(fd)); \
+        } while(0)
+
+#define DO_PIPESETFD_CLOEXEC(PIPEFD) \
+        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))
+#define DO_PIPEOPEN_EXPERIMENTING_CLOEXEC(strategy, PIPEFD, PIPEOPEN_CLOEXEC, \
+                        PIPEOPEN_NORMAL) \
+        DO_GENOPEN_EXPERIMENTING_CLOEXEC(strategy, \
+                (PIPEFD)[0], PIPEOPEN_CLOEXEC, \
+            PIPEOPEN_NORMAL, DO_PIPESETFD_CLOEXEC(PIPEFD))
+
+int
+Perl_PerlLIO_dup_cloexec(pTHX_ int oldfd)
+{
+#if !defined(PERL_IMPLICIT_SYS) && defined(F_DUPFD_CLOEXEC)
+    /*
+     * struct IPerlLIO doesn't cover fcntl(), and there's no clear way
+     * to extend it, so for the time being this just isn't available on
+     * PERL_IMPLICIT_SYS builds.
+     */
+    DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
+        PL_strategy_dup,
+        fcntl(oldfd, F_DUPFD_CLOEXEC, 0),
+        PerlLIO_dup(oldfd));
+#else
+    DO_ONEOPEN_THEN_CLOEXEC(PerlLIO_dup(oldfd));
+#endif
+}
+
+int
+Perl_PerlLIO_dup2_cloexec(pTHX_ int oldfd, int newfd)
+{
+#if !defined(PERL_IMPLICIT_SYS) && defined(HAS_DUP3) && defined(O_CLOEXEC)
+    /*
+     * struct IPerlLIO doesn't cover dup3(), and there's no clear way
+     * to extend it, so for the time being this just isn't available on
+     * PERL_IMPLICIT_SYS builds.
+     */
+    DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
+        PL_strategy_dup2,
+        dup3(oldfd, newfd, O_CLOEXEC),
+        PerlLIO_dup2(oldfd, newfd));
+#else
+    DO_ONEOPEN_THEN_CLOEXEC(PerlLIO_dup2(oldfd, newfd));
+#endif
+}
+
+#if defined(OEMVS)
+  #if (__CHARSET_LIB == 1)
+#   include <stdio.h>
+#   include <stdlib.h>
+
+    static int setccsid(int fd, int ccsid) 
+    {
+      attrib_t attr;
+      int rc;
+
+      memset(&attr, 0, sizeof(attr));
+      attr.att_filetagchg = 1;
+      attr.att_filetag.ft_ccsid = ccsid;
+      attr.att_filetag.ft_txtflag = 1;
+
+      rc = __fchattr(fd, &attr, sizeof(attr));
+      return rc;
+    }
+
+    static void updateccsid(int fd, const char* path, int oflag, int perm) 
+    { 
+      int rc;
+      if (oflag & O_CREAT) {
+        rc = setccsid(fd, 819);
+      }
+    }
+
+    int asciiopen(const char* path, int oflag) 
+    {
+      int rc;
+      int fd = open(path, oflag);
+      if (fd == -1) { 
+        return fd;
+      }
+      updateccsid(fd, path, oflag, -1);
+      return fd; 
+    }
+
+    int asciiopen3(const char* path, int oflag, int perm) 
+    {
+      int rc;
+      int fd = open(path, oflag, perm);
+      if (fd == -1) { 
+        return fd;
+      }
+      updateccsid(fd, path, oflag, perm);
+      return fd;
+    } 
+  #endif
+#endif
+
+int
+Perl_PerlLIO_open_cloexec(pTHX_ const char *file, int flag)
+{
+    PERL_ARGS_ASSERT_PERLLIO_OPEN_CLOEXEC;
+#if defined(O_CLOEXEC)
+    DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
+        PL_strategy_open,
+        PerlLIO_open(file, flag | O_CLOEXEC),
+        PerlLIO_open(file, flag));
+#else
+    DO_ONEOPEN_THEN_CLOEXEC(PerlLIO_open(file, flag));
+#endif
+}
+
+int
+Perl_PerlLIO_open3_cloexec(pTHX_ const char *file, int flag, int perm)
+{
+    PERL_ARGS_ASSERT_PERLLIO_OPEN3_CLOEXEC;
+#if defined(O_CLOEXEC)
+    DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
+        PL_strategy_open3,
+        PerlLIO_open3(file, flag | O_CLOEXEC, perm),
+        PerlLIO_open3(file, flag, perm));
+#else
+    DO_ONEOPEN_THEN_CLOEXEC(PerlLIO_open3(file, flag, perm));
+#endif
+}
+
+#if defined(OEMVS)
+  #if (__CHARSET_LIB == 1)
+    #define TEMP_CCSID 819
+  #endif
+static int Internal_Perl_my_mkstemp_cloexec(char *templte)
+{     
+    PERL_ARGS_ASSERT_MY_MKSTEMP_CLOEXEC;
+#  if defined(O_CLOEXEC)
+    DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
+       PL_strategy_mkstemp,
+       Perl_my_mkostemp(templte, O_CLOEXEC),
+        Perl_my_mkstemp(templte));
+#  else
+    DO_ONEOPEN_THEN_CLOEXEC(Perl_my_mkstemp(templte));
+#  endif
+}
+int
+Perl_my_mkstemp_cloexec(char *templte) 
+{
+    int tempfd = Internal_Perl_my_mkstemp_cloexec(templte);
+#  if defined(TEMP_CCSID)
+    setccsid(tempfd, TEMP_CCSID);
+#  endif
+    return tempfd;
+}
+
+#  else /* Below is ! OEMVS */
+int
+Perl_my_mkstemp_cloexec(char *templte) 
+{
+    PERL_ARGS_ASSERT_MY_MKSTEMP_CLOEXEC;
+#  if defined(O_CLOEXEC)
+    DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
+        PL_strategy_mkstemp,
+        Perl_my_mkostemp(templte, O_CLOEXEC),
+        Perl_my_mkstemp(templte));
+#  else
+    DO_ONEOPEN_THEN_CLOEXEC(Perl_my_mkstemp(templte));
+#  endif
+}
+#endif
+
+int
+Perl_my_mkostemp_cloexec(char *templte, int flags)
+{
+    PERL_ARGS_ASSERT_MY_MKOSTEMP_CLOEXEC;
+#if defined(O_CLOEXEC)
+    DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
+        PL_strategy_mkstemp,
+        Perl_my_mkostemp(templte, flags | O_CLOEXEC),
+        Perl_my_mkostemp(templte, flags));
+#else
+    DO_ONEOPEN_THEN_CLOEXEC(Perl_my_mkostemp(templte, flags));
+#endif
+}
+
+#ifdef HAS_PIPE
+int
+Perl_PerlProc_pipe_cloexec(pTHX_ int *pipefd)
+{
+    PERL_ARGS_ASSERT_PERLPROC_PIPE_CLOEXEC;
+    /*
+     * struct IPerlProc doesn't cover pipe2(), and there's no clear way
+     * to extend it, so for the time being this just isn't available on
+     * PERL_IMPLICIT_SYS builds.
+     */
+#  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));
+#  else
+    DO_PIPEOPEN_THEN_CLOEXEC(pipefd, PerlProc_pipe(pipefd));
+#  endif
+}
+#endif
+
+#ifdef HAS_SOCKET
+
+int
+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));
+#  else
+    DO_ONEOPEN_THEN_CLOEXEC(PerlSock_socket(domain, type, protocol));
+#  endif
+}
+
+int
+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)
+    /*
+     * 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
+     * on PERL_IMPLICIT_SYS builds.
+     */
+    DO_ONEOPEN_EXPERIMENTING_CLOEXEC(
+        PL_strategy_accept,
+        accept4(listenfd, addr, addrlen, SOCK_CLOEXEC),
+        PerlSock_accept(listenfd, addr, addrlen));
+#  else
+    DO_ONEOPEN_THEN_CLOEXEC(PerlSock_accept(listenfd, addr, addrlen));
+#  endif
+}
+
+#endif
+
+#if defined (HAS_SOCKETPAIR) || \
+    (defined (HAS_SOCKET) && defined(SOCK_DGRAM) && \
+        defined(AF_INET) && defined(PF_INET))
+int
+Perl_PerlSock_socketpair_cloexec(pTHX_ int domain, int type, int protocol,
+    int *pairfd)
+{
+    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));
+#  else
+    DO_PIPEOPEN_THEN_CLOEXEC(pairfd,
+        PerlSock_socketpair(domain, type, protocol, pairfd));
+#  endif
+}
+#endif
+
 static IO *
 S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp,
               int *savefd,  char *savetype)
 static IO *
 S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp,
               int *savefd,  char *savetype)
@@ -78,13 +447,13 @@ S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp,
 
     /* If currently open - close before we re-open */
     if (IoIFP(io)) {
 
     /* 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));
 
             const int old_fd = PerlIO_fileno(IoIFP(io));
 
-            if (old_fd >= 0 && old_fd <= PL_maxsysfd) {
+            if (inRANGE(old_fd, 0, PL_maxsysfd)) {
                 /* This is one of the original STD* handles */
                 *saveifp  = IoIFP(io);
                 *saveofp  = IoOFP(io);
                 /* This is one of the original STD* handles */
                 *saveifp  = IoIFP(io);
                 *saveofp  = IoOFP(io);
@@ -110,39 +479,40 @@ S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp,
                 if (result == EOF && old_fd > PL_maxsysfd) {
                     /* Why is this not Perl_warn*() call ? */
                     PerlIO_printf(Perl_error_log,
                 if (result == EOF && old_fd > PL_maxsysfd) {
                     /* Why is this not Perl_warn*() call ? */
                     PerlIO_printf(Perl_error_log,
-                                  "Warning: unable to close filehandle %"HEKf" properly.\n",
+                                  "Warning: unable to close filehandle %" HEKf
+                                  " properly.\n",
                                   HEKfARG(GvENAME_HEK(gv))
                         );
                 }
             }
         }
                                   HEKfARG(GvENAME_HEK(gv))
                         );
                 }
             }
         }
-       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,
     }
     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 */
 
 {
     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);
-       }
-        return do_open_raw(gv, oname, len, rawmode, rawperm);
+        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);
 }
 
 bool
 Perl_do_open_raw(pTHX_ GV *gv, const char *oname, STRLEN len,
     }
     return do_open6(gv, oname, len, supplied_fp, svp, num_svs);
 }
 
 bool
 Perl_do_open_raw(pTHX_ GV *gv, const char *oname, STRLEN len,
-                 int rawmode, int rawperm)
+                 int rawmode, int rawperm, Stat_t *statbufp)
 {
     PerlIO *saveifp;
     PerlIO *saveofp;
 {
     PerlIO *saveifp;
     PerlIO *saveofp;
@@ -158,55 +528,55 @@ 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 */
     /* 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. */
 #ifdef O_APPEND        /* Not fully portable. */
-            |O_APPEND
+             |O_APPEND
 #endif
 #ifdef O_TRUNC /* Not fully portable. */
 #endif
 #ifdef O_TRUNC /* Not fully portable. */
-            |O_TRUNC
+             |O_TRUNC
 #endif
 #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;
 
         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)
 
 #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);
 
 #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,
     }
     return openn_cleanup(gv, io, fp, mode, oname, saveifp, saveofp, savefd,
-                         savetype, writing, 0, NULL);
+                         savetype, writing, 0, NULL, statbufp);
 }
 
 bool
 }
 
 bool
@@ -228,11 +598,11 @@ Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
 
     /* For ease of blame back to 5.000, keep the existing indenting. */
     {
 
     /* 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 */
         bool in_raw = 0, in_crlf = 0, out_raw = 0, out_crlf = 0;
 
         /* Collect default raw/crlf info from the op */
@@ -245,29 +615,29 @@ Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
             out_crlf = (flags & OPpOPEN_OUT_CRLF);
         }
 
             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 */
 
         /* Lose leading and trailing white space */
-       while (isSPACE(*type))
-           type++;
+        while (isSPACE(*type))
+            type++;
         while (tend > type && isSPACE(tend[-1]))
         while (tend > type && isSPACE(tend[-1]))
-           *--tend = '\0';
+            *--tend = '\0';
 
 
-       if (num_svs) {
+        if (num_svs) {
             const char *p;
             STRLEN nlen = 0;
             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
 #ifdef USE_STDIO
-           if (SvROK(*svp) && !strchr(oname,'&')) {
-               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;
                 fp = NULL;
-               goto say_false;
-           }
+                goto say_false;
+            }
 #endif /* USE_STDIO */
             p = (SvOK(*svp) || SvGMAGICAL(*svp)) ? SvPV(*svp, nlen) : NULL;
 
 #endif /* USE_STDIO */
             p = (SvOK(*svp) || SvGMAGICAL(*svp)) ? SvPV(*svp, nlen) : NULL;
 
@@ -276,336 +646,336 @@ Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
                 goto say_false;
             }
 
                 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) &&
            (*(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;
                 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)
             if (out_raw)
-               mode[1] = 'b';
+                mode[1] = 'b';
             else if (out_crlf)
             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;
                         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)
 
             if (out_raw)
-               mode[1] = 'b';
+                mode[1] = 'b';
             else if (out_crlf)
             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;
                     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);
                         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;
                         && 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
 #ifdef EINVAL
-                           SETERRNO(EINVAL,SS_IVCHAN);
+                            SETERRNO(EINVAL,SS_IVCHAN);
 #endif
                             fp = NULL;
 #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;
                                 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;
                         }
                         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)
-                            wanted_fd = PerlLIO_dup(wanted_fd);
-                       else
-                           was_fdopen = TRUE;
+                    }
+                    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;
                         if (!(fp = PerlIO_openn(aTHX_ type,mode,wanted_fd,0,0,NULL,num_svs,svp))) {
                             if (dodup && wanted_fd >= 0)
                                 PerlLIO_close(wanted_fd);
                         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);
                         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);
                         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)
             if (in_raw)
-               mode[1] = 'b';
+                mode[1] = 'b';
             else if (in_crlf)
             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);
                     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);
                     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;
                 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)
 
             if (in_raw)
-               mode[1] = 'b';
+                mode[1] = 'b';
             else if (in_crlf)
             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;
                         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)
 
             if (in_raw)
-               mode[1] = 'b';
+                mode[1] = 'b';
             else if (in_crlf)
             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 {
                     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);
                     fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,1,&namesv);
-               }
-           }
-       }
+                }
+            }
+        }
     }
 
   say_false:
     return openn_cleanup(gv, io, fp, mode, oname, saveifp, saveofp, savefd,
     }
 
   say_false:
     return openn_cleanup(gv, io, fp, mode, oname, saveifp, saveofp, savefd,
-                         savetype, writing, was_fdopen, type);
+                         savetype, writing, was_fdopen, type, NULL);
 }
 
 /* Yes, this is ugly, but it's private, and I don't see a cleaner way to
 }
 
 /* Yes, this is ugly, but it's private, and I don't see a cleaner way to
@@ -613,40 +983,43 @@ Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
 static bool
 S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
                 PerlIO *saveifp, PerlIO *saveofp, int savefd, char savetype,
 static bool
 S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
                 PerlIO *saveifp, PerlIO *saveofp, int savefd, char savetype,
-                int writing, bool was_fdopen, const char *type)
+                int writing, bool was_fdopen, const char *type, Stat_t *statbufp)
 {
     int fd;
 {
     int fd;
+    Stat_t statbuf;
 
     PERL_ARGS_ASSERT_OPENN_CLEANUP;
 
 
     PERL_ARGS_ASSERT_OPENN_CLEANUP;
 
+    Zero(&statbuf, 1, Stat_t);
+
     if (!fp) {
     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(-Wformat-nonliteral); /* PL_warn_nl is constant */
-           Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "open");
-            GCC_DIAG_RESTORE;
+            GCC_DIAG_IGNORE_STMT(-Wformat-nonliteral); /* PL_warn_nl is constant */
+            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 (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);
     }
 
     fd = PerlIO_fileno(fp);
@@ -655,29 +1028,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) {
      * 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,&PL_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(PL_statbuf.st_mode))
-           IoTYPE(io) = IoTYPE_SOCKET; /* in case a socket was passed in to us */
+        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 (S_ISSOCK(statbuf.st_mode))
+            IoTYPE(io) = IoTYPE_SOCKET;        /* in case a socket was passed in to us */
 #ifdef HAS_SOCKET
 #ifdef HAS_SOCKET
-       else if (
-           !(PL_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 /* HAS_SOCKET */
-#endif /* !PERL_MICRO */
     }
 
     /* Eeek - FIXME !!!
     }
 
     /* Eeek - FIXME !!!
@@ -689,26 +1060,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 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);
                 SETERRNO(EBADF,RMS_IFI);
-               goto say_false;
+                goto say_false;
             } else if (PerlLIO_dup2(fd, savefd) < 0) {
             } else if (PerlLIO_dup2(fd, savefd) < 0) {
-               (void)PerlIO_close(fp);
-               goto say_false;
-           }
+                (void)PerlIO_close(fp);
+                goto say_false;
+            }
 #ifdef VMS
 #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()))
                 char newname[FILENAME_MAX+1];
                 if (PerlIO_getname(fp, newname)) {
                     if (fd == PerlIO_fileno(PerlIO_stdout()))
@@ -716,7 +1087,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);
                 }
                     if (fd == PerlIO_fileno(PerlIO_stderr()))
                         vmssetuserlnm("SYS$ERROR", newname);
                 }
-           }
+            }
 #endif
 
 #if !defined(WIN32)
 #endif
 
 #if !defined(WIN32)
@@ -736,65 +1107,48 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
             }
 #endif
 
             }
 #endif
 
-           if (was_fdopen) {
+            if (was_fdopen) {
                 /* need to close fp without closing underlying fd */
                 int ofd = PerlIO_fileno(fp);
                 /* need to close fp without closing underlying fd */
                 int ofd = PerlIO_fileno(fp);
-                int dupfd = ofd >= 0 ? PerlLIO_dup(ofd) : -1;
-#if defined(HAS_FCNTL) && defined(F_SETFD)
-               /* Assume if we have F_SETFD we have F_GETFD */
-                int coe = ofd >= 0 ? fcntl(ofd, F_GETFD) : -1;
-                if (coe < 0) {
-                    if (dupfd >= 0)
-                        PerlLIO_close(dupfd);
-                    goto say_false;
-                }
-#endif
+                int dupfd = ofd >= 0 ? PerlLIO_dup_cloexec(ofd) : -1;
                 if (ofd < 0 || dupfd < 0) {
                     if (dupfd >= 0)
                         PerlLIO_close(dupfd);
                     goto say_false;
                 }
                 PerlIO_close(fp);
                 if (ofd < 0 || dupfd < 0) {
                     if (dupfd >= 0)
                         PerlLIO_close(dupfd);
                     goto say_false;
                 }
                 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_dup2_cloexec(dupfd, ofd);
+                setfd_inhexec_for_sysfd(ofd);
                 PerlLIO_close(dupfd);
                 PerlLIO_close(dupfd);
-           }
+            }
             else
             else
-               PerlIO_close(fp);
-       }
-       fp = saveifp;
-       PerlIO_clearerr(fp);
-       fd = PerlIO_fileno(fp);
-    }
-#if defined(HAS_FCNTL) && defined(F_SETFD)
-    if (fd >= 0) {
-        if (fcntl(fd, F_SETFD, fd > PL_maxsysfd) < 0) {
-            PerlLIO_close(fd);
-            goto say_false;
+                PerlIO_close(fp);
         }
         }
+        fp = saveifp;
+        PerlIO_clearerr(fp);
+        fd = PerlIO_fileno(fp);
     }
     }
-#endif
     IoIFP(io) = fp;
 
     IoFLAGS(io) &= ~IOf_NOLINE;
     if (writing) {
     IoIFP(io) = fp;
 
     IoFLAGS(io) &= ~IOf_NOLINE;
     if (writing) {
-       if (IoTYPE(io) == IoTYPE_SOCKET
-           || (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(PL_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;
+
     return TRUE;
 
   say_false:
     return TRUE;
 
   say_false:
@@ -804,319 +1158,821 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
     return FALSE;
 }
 
     return FALSE;
 }
 
+/* Open a temp file in the same directory as an original name.
+*/
+
+static bool
+S_openindirtemp(pTHX_ GV *gv, SV *orig_name, SV *temp_out_name) {
+    int fd;
+    PerlIO *fp;
+    const char *p = SvPV_nolen(orig_name);
+    const char *sep;
+
+    /* look for the last directory separator */
+    sep = strrchr(p, '/');
+
+#ifdef DOSISH
+    {
+        const char *sep2;
+        if ((sep2 = strrchr(sep ? sep : p, '\\')))
+            sep = sep2;
+    }
+#endif
+#ifdef VMS
+    if (!sep) {
+        const char *openp = strchr(p, '[');
+        if (openp)
+            sep = strchr(openp, ']');
+        else {
+            sep = strchr(p, ':');
+        }
+    }
+#endif
+    if (sep) {
+        sv_setpvn(temp_out_name, p, sep - p + 1);
+        sv_catpvs(temp_out_name, "XXXXXXXX");
+    }
+    else
+        sv_setpvs(temp_out_name, "XXXXXXXX");
+
+    {
+      int old_umask = umask(0177);
+      fd = Perl_my_mkstemp_cloexec(SvPVX(temp_out_name));
+      umask(old_umask);
+    }
+
+    if (fd < 0)
+        return FALSE;
+
+    fp = PerlIO_fdopen(fd, "w+");
+    if (!fp)
+        return FALSE;
+
+    return do_openn(gv, "+>&", 3, 0, 0, 0, fp, NULL, 0);
+}
+
+#if defined(HAS_UNLINKAT) && defined(HAS_RENAMEAT) && defined(HAS_FCHMODAT) && \
+    (defined(HAS_DIRFD) || defined(HAS_DIR_DD_FD)) && !defined(NO_USE_ATFUNCTIONS) && \
+    defined(HAS_LINKAT)
+#  define ARGV_USE_ATFUNCTIONS
+#endif
+
+/* Win32 doesn't necessarily return useful information
+ * in st_dev, st_ino.
+ */
+#ifndef DOSISH
+#  define ARGV_USE_STAT_INO
+#endif
+
+#define ARGVMG_BACKUP_NAME 0
+#define ARGVMG_TEMP_NAME 1
+#define ARGVMG_ORIG_NAME 2
+#define ARGVMG_ORIG_MODE 3
+#define ARGVMG_ORIG_PID 4
+
+/* we store the entire stat_t since the ino_t and dev_t values might
+   not fit in an IV.  I could have created a new structure and
+   transferred them across, but this seemed too much effort for very
+   little win.
+
+   We store it even when the *at() functions are available, since
+   while the C runtime might have definitions for these functions, the
+   operating system or a specific filesystem might not implement them.
+   eg. NetBSD 6 implements linkat() but only where the fds are AT_FDCWD.
+ */
+#ifdef ARGV_USE_STAT_INO
+#  define ARGVMG_ORIG_CWD_STAT 5
+#endif
+
+#ifdef ARGV_USE_ATFUNCTIONS
+#  define ARGVMG_ORIG_DIRP 6
+#endif
+
+#ifdef ENOTSUP
+#define NotSupported(e) ((e) == ENOSYS || (e) == ENOTSUP)
+#else
+#define NotSupported(e) ((e) == ENOSYS)
+#endif
+
+static int
+S_argvout_free(pTHX_ SV *io, MAGIC *mg) {
+    PERL_UNUSED_ARG(io);
+
+    /* note this can be entered once the file has been
+       successfully deleted too */
+    assert(IoTYPE(io) != IoTYPE_PIPE);
+
+    /* mg_obj can be NULL if a thread is created with the handle open, in which
+     case we leave any clean up to the parent thread */
+    if (mg->mg_obj) {
+#ifdef ARGV_USE_ATFUNCTIONS
+        SV **dir_psv;
+        DIR *dir;
+
+        dir_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_DIRP, FALSE);
+        assert(dir_psv && *dir_psv && SvIOK(*dir_psv));
+        dir = INT2PTR(DIR *, SvIV(*dir_psv));
+#endif
+        if (IoIFP(io)) {
+            if (PL_phase == PERL_PHASE_DESTRUCT && PL_statusvalue == 0) {
+                (void)argvout_final(mg, (IO*)io, FALSE);
+            }
+            else {
+                SV **pid_psv;
+                PerlIO *iop = IoIFP(io);
+
+                assert(SvTYPE(mg->mg_obj) == SVt_PVAV);
+
+                pid_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_PID, FALSE);
+
+                assert(pid_psv && *pid_psv);
+
+                if (SvIV(*pid_psv) == (IV)PerlProc_getpid()) {
+                    /* if we get here the file hasn't been closed explicitly by the
+                       user and hadn't been closed implicitly by nextargv(), so
+                       abandon the edit */
+                    SV **temp_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_TEMP_NAME, FALSE);
+                    const char *temp_pv = SvPVX(*temp_psv);
+
+                    assert(temp_psv && *temp_psv && SvPOK(*temp_psv));
+                    (void)PerlIO_close(iop);
+                    IoIFP(io) = IoOFP(io) = NULL;
+#ifdef ARGV_USE_ATFUNCTIONS
+                    if (dir) {
+                        if (unlinkat(my_dirfd(dir), temp_pv, 0) < 0 &&
+                            NotSupported(errno))
+                            (void)UNLINK(temp_pv);
+                    }
+#else
+                    (void)UNLINK(temp_pv);
+#endif
+                }
+            }
+        }
+#ifdef ARGV_USE_ATFUNCTIONS
+        if (dir)
+            closedir(dir);
+#endif
+    }
+
+    return 0;
+}
+
+static int
+S_argvout_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param) {
+    PERL_UNUSED_ARG(param);
+
+    /* ideally we could just remove the magic from the SV but we don't get the SV here */
+    SvREFCNT_dec(mg->mg_obj);
+    mg->mg_obj = NULL;
+
+    return 0;
+}
+
+/* Magic of this type has an AV containing the following:
+   0: name of the backup file (if any)
+   1: name of the temp output file
+   2: name of the original file
+   3: file mode of the original file
+   4: pid of the process we opened at, to prevent doing the renaming
+      etc in both the child and the parent after a fork
+
+If we have useful inode/device ids in stat_t we also keep:
+   5: a stat of the original current working directory
+
+If we have unlinkat(), renameat(), fchmodat(), dirfd() we also keep:
+   6: the DIR * for the current directory when we open the file, stored as an IV
+ */
+
+static const MGVTBL argvout_vtbl =
+    {
+        NULL, /* svt_get */
+        NULL, /* svt_set */
+        NULL, /* svt_len */
+        NULL, /* svt_clear */
+        S_argvout_free, /* svt_free */
+        NULL, /* svt_copy */
+        S_argvout_dup,  /* svt_dup */
+        NULL /* svt_local */
+    };
+
+static bool
+S_is_fork_open(const char *name) {
+    /* return true if name matches /^\A\s*(\|\s+-|\-\s+|)\s*\z/ */
+    while (isSPACE(*name))
+        name++;
+    if (*name == '|') {
+        ++name;
+        while (isSPACE(*name))
+            name++;
+        if (*name != '-')
+            return false;
+        ++name;
+    }
+    else if (*name == '-') {
+        ++name;
+        while (isSPACE(*name))
+            name++;
+        if (*name != '|')
+            return false;
+        ++name;
+    }
+    else
+        return false;
+
+    while (isSPACE(*name))
+        name++;
+
+    return *name == 0;
+}
+
 PerlIO *
 Perl_nextargv(pTHX_ GV *gv, bool nomagicopen)
 {
     IO * const io = GvIOp(gv);
 PerlIO *
 Perl_nextargv(pTHX_ GV *gv, bool nomagicopen)
 {
     IO * const io = GvIOp(gv);
+    SV *const old_out_name = PL_inplace ? newSVsv(GvSV(gv)) : NULL;
 
     PERL_ARGS_ASSERT_NEXTARGV;
 
 
     PERL_ARGS_ASSERT_NEXTARGV;
 
+    if (old_out_name)
+        SAVEFREESV(old_out_name);
+
     if (!PL_argvoutgv)
     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)) {
     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));
-       }
-    }
-    if (PL_filemode & (S_ISUID|S_ISGID)) {
-       PerlIO_flush(IoIFP(GvIOn(PL_argvoutgv)));  /* chmod must follow last write */
-#ifdef HAS_FCHMOD
-       if (PL_lastfd != -1)
-           (void)fchmod(PL_lastfd,PL_filemode);
-#else
-       (void)PerlLIO_chmod(PL_oldname,PL_filemode);
-#endif
+        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));
+        }
     }
     }
+
+    {
+        IO * const io = GvIOp(PL_argvoutgv);
+        if (io && IoIFP(io) && old_out_name) {
+            do_close(PL_argvoutgv, FALSE);
+        }
+    }
+
     PL_lastfd = -1;
     PL_filemode = 0;
     if (!GvAV(gv))
     PL_lastfd = -1;
     PL_filemode = 0;
     if (!GvAV(gv))
-       return NULL;
-    while (av_tindex(GvAV(gv)) >= 0) {
-       STRLEN oldlen;
+        return NULL;
+    while (av_count(GvAV(gv)) > 0) {
+        STRLEN oldlen;
         SV *const sv = av_shift(GvAV(gv));
         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 (LIKELY(!PL_inplace)) {
-            if (nomagicopen
-                    ? do_open6(gv, "<", 1, NULL, &GvSV(gv), 1)
-                    : do_open6(gv, PL_oldname, oldlen, NULL, NULL, 0)
-               ) {
-                return IoIFP(GvIOp(gv));
+            if (nomagicopen) {
+                if (do_open6(gv, "<", 1, NULL, &GvSV(gv), 1)) {
+                    return IoIFP(GvIOp(gv));
+                }
+            }
+            else {
+                if (is_fork_open(PL_oldname)) {
+                    Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
+                                     "Forked open '%s' not meaningful in <>",
+                                     PL_oldname);
+                    continue;
+                }
+
+                if ( do_open6(gv, PL_oldname, oldlen, NULL, NULL, 0) ) {
+                    return IoIFP(GvIOp(gv));
+                }
             }
         }
         else {
             }
         }
         else {
+            Stat_t statbuf;
             /* This very long block ends with return IoIFP(GvIOp(gv));
                Both this block and the block above fall through on open
                failure to the warning code, and then the while loop above tries
                the next entry. */
             /* This very long block ends with return IoIFP(GvIOp(gv));
                Both this block and the block above fall through on open
                failure to the warning code, and then the while loop above tries
                the next entry. */
-            if (do_open_raw(gv, PL_oldname, oldlen, O_RDONLY, 0)) {
+            if (do_open_raw(gv, PL_oldname, oldlen, O_RDONLY, 0, &statbuf)) {
 #ifndef FLEXFILENAMES
                 int filedev;
                 int fileino;
 #endif
 #ifndef FLEXFILENAMES
                 int filedev;
                 int fileino;
 #endif
+#ifdef ARGV_USE_ATFUNCTIONS
+                DIR *curdir;
+#endif
                 Uid_t fileuid;
                 Gid_t filegid;
                 Uid_t fileuid;
                 Gid_t filegid;
-
-               TAINT_PROPER("inplace open");
-               if (oldlen == 1 && *PL_oldname == '-') {
-                   setdefout(gv_fetchpvs("STDOUT", GV_ADD|GV_NOTQUAL,
-                                         SVt_PVIO));
-                   return IoIFP(GvIOp(gv));
-               }
+                AV *magic_av = NULL;
+                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));
+                }
 #ifndef FLEXFILENAMES
 #ifndef FLEXFILENAMES
-               filedev = PL_statbuf.st_dev;
-               fileino = PL_statbuf.st_ino;
-#endif
-               PL_filemode = PL_statbuf.st_mode;
-               fileuid = PL_statbuf.st_uid;
-               filegid = PL_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;
-               }
-               if (*PL_inplace && strNE(PL_inplace, "*")) {
-                   const char *star = strchr(PL_inplace, '*');
-                   if (star) {
-                       const char *begin = PL_inplace;
-                       sv_setpvs(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);
-                   }
+                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;
+                        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);
+                    }
 #ifndef FLEXFILENAMES
 #ifndef FLEXFILENAMES
-                   if ((PerlLIO_stat(SvPVX_const(sv),&PL_statbuf) >= 0
-                        && PL_statbuf.st_dev == filedev
-                        && PL_statbuf.st_ino == fileino)
-#ifdef DJGPP
-                       || ((_djstat_fail_bits & _STFAIL_TRUENAME)!=0)
-#endif
+                    if ((PerlLIO_stat(SvPVX_const(sv),&statbuf) >= 0
+                         && statbuf.st_dev == filedev
+                         && statbuf.st_ino == fileino)
                       )
                       )
-                   {
-                       Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
-                                        "Can't do inplace edit: %"SVf" would not be unique",
-                                        SVfARG(sv));
-                       do_close(gv,FALSE);
-                       continue;
-                   }
+                    {
+                        Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
+                                         "Can't do inplace edit: %"
+                                         SVf " would not be unique",
+                                         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 */
+                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) );
+#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));
+                av_store(magic_av, ARGVMG_ORIG_PID, newSViv((IV)PerlProc_getpid()));
+#if defined(ARGV_USE_ATFUNCTIONS)
+                curdir = opendir(".");
+                av_store(magic_av, ARGVMG_ORIG_DIRP, newSViv(PTR2IV(curdir)));
+#elif defined(ARGV_USE_STAT_INO)
+                if (PerlLIO_stat(".", &statbuf) >= 0) {
+                    av_store(magic_av, ARGVMG_ORIG_CWD_STAT,
+                             newSVpvn((char *)&statbuf, sizeof(statbuf)));
+                }
+#endif
+                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)));
+                if (PL_lastfd >= 0) {
+                    (void)PerlLIO_fstat(PL_lastfd,&statbuf);
+#ifdef HAS_FCHMOD
+                    (void)fchmod(PL_lastfd,PL_filemode);
+#else
+                    (void)PerlLIO_chmod(PL_oldname,PL_filemode);
+#endif
+                    if (fileuid != statbuf.st_uid || filegid != statbuf.st_gid) {
+                        /* XXX silently ignore failures */
+#ifdef HAS_FCHOWN
+                        PERL_UNUSED_RESULT(fchown(PL_lastfd,fileuid,filegid));
+#elif defined(HAS_CHOWN)
+                        PERL_UNUSED_RESULT(PerlLIO_chown(PL_oldname,fileuid,filegid));
+#endif
+                    }
+                }
+                return IoIFP(GvIOp(gv));
+            }
+        } /* successful do_open_raw(), PL_inplace non-NULL */
+
+        if (ckWARN_d(WARN_INPLACE)) {
+            const int eno = errno;
+            Stat_t statbuf;
+            if (PerlLIO_stat(PL_oldname, &statbuf) >= 0
+                && !S_ISREG(statbuf.st_mode)) {
+                Perl_warner(aTHX_ packWARN(WARN_INPLACE),
+                            "Can't do inplace edit: %s is not a regular file",
+                            PL_oldname);
+            }
+            else {
+                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;
+    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));
+    }
+    return NULL;
+}
+
+#ifdef ARGV_USE_ATFUNCTIONS
+#  if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+
+/* FreeBSD 11 renameat() mis-behaves strangely with absolute paths in cases where the
+ * equivalent rename() succeeds
+ */
+static int
+S_my_renameat(int olddfd, const char *oldpath, int newdfd, const char *newpath) {
+    /* this is intended only for use in Perl_do_close() */
+    assert(olddfd == newdfd);
+    assert(PERL_FILE_IS_ABSOLUTE(oldpath) == PERL_FILE_IS_ABSOLUTE(newpath));
+    if (PERL_FILE_IS_ABSOLUTE(oldpath)) {
+        return PerlLIO_rename(oldpath, newpath);
+    }
+    else {
+        return renameat(olddfd, oldpath, newdfd, newpath);
+    }
+}
+
+#  else
+#    define S_my_renameat(dh1, pv1, dh2, pv2) renameat((dh1), (pv1), (dh2), (pv2))
+#  endif /* if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */
+#endif
+
+static bool
+S_dir_unchanged(pTHX_ const char *orig_pv, MAGIC *mg) {
+    Stat_t statbuf;
+
+#ifdef ARGV_USE_STAT_INO
+    SV **stat_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_CWD_STAT, FALSE);
+    Stat_t *orig_cwd_stat = stat_psv && *stat_psv ? (Stat_t *)SvPVX(*stat_psv) : NULL;
+
+    /* if the path is absolute the possible moving of cwd (which the file
+       might be in) isn't our problem.
+       This code tries to be reasonably balanced about detecting a changed
+       CWD, if we have the information needed to check that curdir has changed, we
+       check it
+    */
+    if (!PERL_FILE_IS_ABSOLUTE(orig_pv)
+        && orig_cwd_stat
+        && PerlLIO_stat(".", &statbuf) >= 0
+        && ( statbuf.st_dev != orig_cwd_stat->st_dev
+                     || statbuf.st_ino != orig_cwd_stat->st_ino)) {
+        Perl_croak(aTHX_ "Cannot complete in-place edit of %s: %s",
+                   orig_pv, "Current directory has changed");
+    }
+#else
+    SV **temp_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_TEMP_NAME, FALSE);
+
+    /* Some platforms don't have useful st_ino etc, so just
+       check we can see the work file.
+    */
+    if (!PERL_FILE_IS_ABSOLUTE(orig_pv)
+        && PerlLIO_stat(SvPVX(*temp_psv), &statbuf) < 0) {
+        Perl_croak(aTHX_ "Cannot complete in-place edit of %s: %s",
+                   orig_pv,
+                   "Work file is missing - did you change directory?");
+    }
+#endif
+
+    return TRUE;
+}
+
+#define dir_unchanged(orig_psv, mg) \
+    S_dir_unchanged(aTHX_ (orig_psv), (mg))
+
+STATIC bool
+S_argvout_final(pTHX_ MAGIC *mg, IO *io, bool is_explict) {
+    bool retval;
+
+    /* ensure args are checked before we start using them */
+    PERL_ARGS_ASSERT_ARGVOUT_FINAL;
+
+    {
+        /* handle to an in-place edit work file */
+        SV **back_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_BACKUP_NAME, FALSE);
+        SV **temp_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_TEMP_NAME, FALSE);
+        /* PL_oldname may have been modified by a nested ARGV use at this point */
+        SV **orig_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_NAME, FALSE);
+        SV **mode_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_MODE, FALSE);
+        SV **pid_psv  = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_PID, FALSE);
+#if defined(ARGV_USE_ATFUNCTIONS)
+        SV **dir_psv  = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_DIRP, FALSE);
+        DIR *dir;
+        int dfd;
+#endif
+        UV mode;
+        int fd;
+
+        const char *orig_pv;
+
+        assert(temp_psv && *temp_psv);
+        assert(orig_psv && *orig_psv);
+        assert(mode_psv && *mode_psv);
+        assert(pid_psv && *pid_psv);
+#ifdef ARGV_USE_ATFUNCTIONS
+        assert(dir_psv && *dir_psv);
+        dir = INT2PTR(DIR *, SvIVX(*dir_psv));
+        dfd = my_dirfd(dir);
+#endif
+
+        orig_pv = SvPVX(*orig_psv);
+        mode = SvUV(*mode_psv);
+
+        if ((mode & (S_ISUID|S_ISGID)) != 0
+            && (fd = PerlIO_fileno(IoIFP(io))) >= 0) {
+            (void)PerlIO_flush(IoIFP(io));
+#ifdef HAS_FCHMOD
+            (void)fchmod(fd, mode);
+#else
+            (void)PerlLIO_chmod(orig_pv, mode);
+#endif
+        }
+
+        retval = io_close(io, NULL, is_explict, FALSE);
+
+        if (SvIV(*pid_psv) != (IV)PerlProc_getpid()) {
+            /* this is a child process, don't duplicate our rename() etc
+               processing below */
+            goto freext;
+        }
+
+        if (retval) {
+#if defined(DOSISH) || defined(__CYGWIN__)
+            if (PL_argvgv && GvIOp(PL_argvgv)
+                && IoIFP(GvIOp(PL_argvgv))
+                && (IoFLAGS(GvIOp(PL_argvgv)) & (IOf_ARGV|IOf_START)) == IOf_ARGV) {
+                do_close(PL_argvgv, FALSE);
+            }
+#endif
+#ifndef ARGV_USE_ATFUNCTIONS
+            if (!dir_unchanged(orig_pv, mg))
+                goto abort_inplace;
+#endif
+            if (back_psv && *back_psv) {
+#if defined(HAS_LINK) && !defined(DOSISH) && !defined(__CYGWIN__) && defined(HAS_RENAME)
+                if (
+#  ifdef ARGV_USE_ATFUNCTIONS
+                    linkat(dfd, orig_pv, dfd, SvPVX(*back_psv), 0) < 0 &&
+                    !(UNLIKELY(NotSupported(errno)) &&
+                      dir_unchanged(orig_pv, mg) &&
+                               link(orig_pv, SvPVX(*back_psv)) == 0)
+#  else
+                    link(orig_pv, SvPVX(*back_psv)) < 0
+#  endif
+                    )
 #endif
 #endif
+                {
 #ifdef HAS_RENAME
 #ifdef HAS_RENAME
-#if !defined(DOSISH) && !defined(__CYGWIN__)
-                   if (PerlLIO_rename(PL_oldname,SvPVX_const(sv)) < 0) {
-                       Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
-                                        "Can't rename %s to %"SVf": %s, skipping file",
-                                        PL_oldname, SVfARG(sv), Strerror(errno));
-                       do_close(gv,FALSE);
-                       continue;
-                   }
-#else
-                   do_close(gv,FALSE);
-                   (void)PerlLIO_unlink(SvPVX_const(sv));
-                   (void)PerlLIO_rename(PL_oldname,SvPVX_const(sv));
-                   do_open_raw(gv, SvPVX_const(sv), SvCUR(sv), O_RDONLY, 0);
-#endif /* DOSISH */
-#else
-                   (void)UNLINK(SvPVX_const(sv));
-                   if (link(PL_oldname,SvPVX_const(sv)) < 0) {
-                       Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
-                                        "Can't rename %s to %"SVf": %s, skipping file",
-                                        PL_oldname, SVfARG(sv), Strerror(errno) );
-                       do_close(gv,FALSE);
-                       continue;
-                   }
-                   (void)UNLINK(PL_oldname);
-#endif
-               }
-               else {
-#if !defined(DOSISH) && !defined(AMIGAOS)
-#  ifndef VMS  /* Don't delete; use automatic file versioning */
-                   if (UNLINK(PL_oldname) < 0) {
-                       Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE),
-                                        "Can't remove %s: %s, skipping file",
-                                        PL_oldname, Strerror(errno) );
-                       do_close(gv,FALSE);
-                       continue;
-                   }
+                    if (
+#  ifdef ARGV_USE_ATFUNCTIONS
+                        S_my_renameat(dfd, orig_pv, dfd, SvPVX(*back_psv)) < 0 &&
+                        !(UNLIKELY(NotSupported(errno)) &&
+                          dir_unchanged(orig_pv, mg) &&
+                          PerlLIO_rename(orig_pv, SvPVX(*back_psv)) == 0)
+#  else
+                        PerlLIO_rename(orig_pv, SvPVX(*back_psv)) < 0
 #  endif
 #  endif
+                        ) {
+                        if (!is_explict) {
+#  ifdef ARGV_USE_ATFUNCTIONS
+                            if (unlinkat(dfd, SvPVX_const(*temp_psv), 0) < 0 &&
+                                UNLIKELY(NotSupported(errno)) &&
+                                dir_unchanged(orig_pv, mg))
+                                (void)UNLINK(SvPVX_const(*temp_psv));
+#  else
+                            UNLINK(SvPVX(*temp_psv));
+#  endif
+                            Perl_croak(aTHX_ "Can't rename %s to %s: %s, skipping file",
+                                       SvPVX(*orig_psv), SvPVX(*back_psv), Strerror(errno));
+                        }
+                        /* should we warn here? */
+                        goto abort_inplace;
+                    }
 #else
 #else
-                   Perl_croak(aTHX_ "Can't do inplace edit without backup");
+                    (void)UNLINK(SvPVX(*back_psv));
+                    if (link(orig_pv, SvPVX(*back_psv))) {
+                        if (!is_explict) {
+                            Perl_croak(aTHX_ "Can't rename %s to %s: %s, skipping file",
+                                       SvPVX(*orig_psv), SvPVX(*back_psv), Strerror(errno));
+                        }
+                        goto abort_inplace;
+                    }
+                    /* we need to use link() to get the temp into place too, and linK()
+                       fails if the new link name exists */
+                    (void)UNLINK(orig_pv);
 #endif
 #endif
-               }
-
-               sv_setpvn(sv,PL_oldname,oldlen);
-               SETERRNO(0,0);          /* in case sprintf set errno */
-               if (!Perl_do_open_raw(aTHX_ PL_argvoutgv, SvPVX_const(sv),
-                                      SvCUR(sv),
-#ifdef VMS
-                                      O_WRONLY|O_CREAT|O_TRUNC, 0
+                }
+            }
+#if defined(DOSISH) || defined(__CYGWIN__) || !defined(HAS_RENAME)
+            else {
+                UNLINK(orig_pv);
+            }
+#endif
+            if (
+#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 &&
+                !(UNLIKELY(NotSupported(errno)) &&
+                  dir_unchanged(orig_pv, mg) &&
+                  PerlLIO_rename(SvPVX(*temp_psv), orig_pv) == 0)
 #else
 #else
-                                      O_WRONLY|O_CREAT|OPEN_EXCL, 0600
-#endif
-                        )) {
-                   Perl_ck_warner_d(aTHX_ packWARN(WARN_INPLACE), "Can't do inplace edit on %s: %s",
-                                    PL_oldname, Strerror(errno) );
-                   do_close(gv,FALSE);
-                   continue;
-               }
-               setdefout(PL_argvoutgv);
-               PL_lastfd = PerlIO_fileno(IoIFP(GvIOp(PL_argvoutgv)));
-                if (PL_lastfd >= 0) {
-                    (void)PerlLIO_fstat(PL_lastfd,&PL_statbuf);
-#ifdef HAS_FCHMOD
-                    (void)fchmod(PL_lastfd,PL_filemode);
+                PerlLIO_rename(SvPVX(*temp_psv), orig_pv) < 0
+#endif
+                ) {
+                if (!is_explict) {
+#ifdef ARGV_USE_ATFUNCTIONS
+                    if (unlinkat(dfd, SvPVX_const(*temp_psv), 0) < 0 &&
+                        NotSupported(errno))
+                        UNLINK(SvPVX(*temp_psv));
 #else
 #else
-                    (void)PerlLIO_chmod(PL_oldname,PL_filemode);
+                    UNLINK(SvPVX(*temp_psv));
 #endif
 #endif
-                    if (fileuid != PL_statbuf.st_uid || filegid != PL_statbuf.st_gid) {
-                        /* XXX silently ignore failures */
-#ifdef HAS_FCHOWN
-                        PERL_UNUSED_RESULT(fchown(PL_lastfd,fileuid,filegid));
-#else
-#ifdef HAS_CHOWN
-                        PERL_UNUSED_RESULT(PerlLIO_chown(PL_oldname,fileuid,filegid));
+                    /* diag_listed_as: Cannot complete in-place edit of %s: %s */
+                    Perl_croak(aTHX_ "Cannot complete in-place edit of %s: failed to rename work file '%s' to '%s': %s",
+                               orig_pv, SvPVX(*temp_psv), orig_pv, Strerror(errno));
+                }
+            abort_inplace:
+                UNLINK(SvPVX_const(*temp_psv));
+                retval = FALSE;
+            }
+#ifndef HAS_RENAME
+            UNLINK(SvPVX(*temp_psv));
 #endif
 #endif
+        }
+        else {
+#ifdef ARGV_USE_ATFUNCTIONS
+            if (unlinkat(dfd, SvPVX_const(*temp_psv), 0) &&
+                NotSupported(errno))
+                UNLINK(SvPVX_const(*temp_psv));
+                
+#else
+            UNLINK(SvPVX_const(*temp_psv));
 #endif
 #endif
-                    }
-               }
-                return IoIFP(GvIOp(gv));
-           }
-       } /* successful do_open_raw(), PL_inplace non-NULL */
-
-        if (ckWARN_d(WARN_INPLACE)) {
-            const int eno = errno;
-            if (PerlLIO_stat(PL_oldname, &PL_statbuf) >= 0
-                && !S_ISREG(PL_statbuf.st_mode)) {
-                Perl_warner(aTHX_ packWARN(WARN_INPLACE),
-                            "Can't do inplace edit: %s is not a regular file",
-                            PL_oldname);
+            if (!is_explict) {
+                Perl_croak(aTHX_ "Failed to close in-place work file %s: %s",
+                           SvPVX(*temp_psv), Strerror(errno));
             }
             }
-            else {
-                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;
-    if (PL_inplace) {
-       (void)do_close(PL_argvoutgv,FALSE);
-       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));
+        }
+ freext:
+        ;
     }
     }
-    return NULL;
+    return retval;
 }
 
 }
 
-/* explicit renamed to avoid C++ conflict    -- kja */
+/*
+=for apidoc do_close
+
+Close an I/O stream.  This implements Perl L<perlfunc/C<close>>.
+
+C<gv> is the glob associated with the stream.
+
+C<is_explict> is C<true> if this is an explicit close of the stream; C<false>
+if it is part of another operation, such as closing a pipe (which involves
+implicitly closing both ends).
+
+Returns C<true> if successful; otherwise returns C<false> and sets C<errno> to
+indicate the cause.
+
+=cut
+*/
+
 bool
 bool
-Perl_do_close(pTHX_ GV *gv, bool not_implicit)
+Perl_do_close(pTHX_ GV *gv, bool is_explict)
 {
     bool retval;
     IO *io;
 {
     bool retval;
     IO *io;
+    MAGIC *mg;
 
     if (!gv)
 
     if (!gv)
-       gv = PL_argvgv;
+        gv = PL_argvgv;
     if (!gv || !isGV_with_GP(gv)) {
     if (!gv || !isGV_with_GP(gv)) {
-       if (not_implicit)
-           SETERRNO(EBADF,SS_IVCHAN);
-       return FALSE;
+        if (is_explict)
+            SETERRNO(EBADF,SS_IVCHAN);
+        return FALSE;
     }
     io = GvIO(gv);
     if (!io) {         /* never opened */
     }
     io = GvIO(gv);
     if (!io) {         /* never opened */
-       if (not_implicit) {
-           report_evil_fh(gv);
-           SETERRNO(EBADF,SS_IVCHAN);
-       }
-       return FALSE;
-    }
-    retval = io_close(io, NULL, not_implicit, FALSE);
-    if (not_implicit) {
-       IoLINES(io) = 0;
-       IoPAGE(io) = 0;
-       IoLINES_LEFT(io) = IoPAGE_LEN(io);
+        if (is_explict) {
+            report_evil_fh(gv);
+            SETERRNO(EBADF,SS_IVCHAN);
+        }
+        return FALSE;
+    }
+    if ((mg = mg_findext((SV*)io, PERL_MAGIC_uvar, &argvout_vtbl))
+        && mg->mg_obj) {
+        retval = argvout_final(mg, io, is_explict);
+        mg_freeext((SV*)io, PERL_MAGIC_uvar, &argvout_vtbl);
+    }
+    else {
+        retval = io_close(io, NULL, is_explict, FALSE);
+    }
+    if (is_explict) {
+        IoLINES(io) = 0;
+        IoPAGE(io) = 0;
+        IoLINES_LEFT(io) = IoPAGE_LEN(io);
     }
     IoTYPE(io) = IoTYPE_CLOSED;
     return retval;
 }
 
 bool
     }
     IoTYPE(io) = IoTYPE_CLOSED;
     return retval;
 }
 
 bool
-Perl_io_close(pTHX_ IO *io, GV *gv, bool not_implicit, bool warn_on_fail)
+Perl_io_close(pTHX_ IO *io, GV *gv, bool is_explict, bool warn_on_fail)
 {
     bool retval = FALSE;
 
     PERL_ARGS_ASSERT_IO_CLOSE;
 
     if (IoIFP(io)) {
 {
     bool retval = FALSE;
 
     PERL_ARGS_ASSERT_IO_CLOSE;
 
     if (IoIFP(io)) {
-       if (IoTYPE(io) == IoTYPE_PIPE) {
-           const int status = PerlProc_pclose(IoIFP(io));
-           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));
+        if (IoTYPE(io) == IoTYPE_PIPE) {
+            PerlIO *fh = IoIFP(io);
+            int status;
+
+            /* my_pclose() can propagate signals which might bypass any code
+               after the call here if the signal handler throws an exception.
+               This would leave the handle in the IO object and try to close it again
+               when the SV is destroyed on unwind or global destruction.
+               So NULL it early.
+            */
+            IoOFP(io) = IoIFP(io) = NULL;
+            status = PerlProc_pclose(fh);
+            if (is_explict) {
+                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
 #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
 #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)));
                                  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);
+    else if (is_explict) {
+        SETERRNO(EBADF,SS_IVCHAN);
     }
 
     return retval;
     }
 
     return retval;
@@ -1130,38 +1986,38 @@ Perl_do_eof(pTHX_ GV *gv)
     PERL_ARGS_ASSERT_DO_EOF;
 
     if (!io)
     PERL_ARGS_ASSERT_DO_EOF;
 
     if (!io)
-       return TRUE;
+        return TRUE;
     else if (IoTYPE(io) == IoTYPE_WRONLY)
     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) */
 
     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_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;
 }
     }
     return TRUE;
 }
@@ -1175,7 +2031,7 @@ Perl_do_tell(pTHX_ GV *gv)
     PERL_ARGS_ASSERT_DO_TELL;
 
     if (io && (fp = IoIFP(io))) {
     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);
     }
     report_evil_fh(gv);
     SETERRNO(EBADF,RMS_IFI);
@@ -1189,7 +2045,7 @@ Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence)
     PerlIO *fp;
 
     if (io && (fp = IoIFP(io))) {
     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);
     }
     report_evil_fh(gv);
     SETERRNO(EBADF,RMS_IFI);
@@ -1224,104 +2080,112 @@ Perl_mode_from_discipline(pTHX_ const char *s, STRLEN len)
     int mode = O_BINARY;
     PERL_UNUSED_CONTEXT;
     if (s) {
     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:
   fail_discipline:
-               end = strchr(s+1, ':');
-               if (!end)
-                   end = s+len;
+                end = (char *) memchr(s+1, ':', len);
+                if (!end)
+                    end = s+len;
 #ifndef PERLIO_LAYERS
 #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
 #else
-               len -= end-s;
-               s = end;
+                len -= end-s;
+                s = end;
 #endif
 #endif
-           }
-       }
+            }
+        }
     }
     return mode;
 }
 
     }
     return mode;
 }
 
+/*
+=for apidoc my_chsize
+
+The C library L<chsize(3)> if available, or a Perl implementation of it.
+
+=cut
+*/
+
 #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE)
 I32
 my_chsize(int fd, Off_t length)
 {
 #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE)
 I32
 my_chsize(int fd, Off_t length)
 {
-#ifdef F_FREESP
-       /* code courtesy of William Kucharski */
-#define HAS_CHSIZE
+#  ifdef F_FREESP
+        /* code courtesy of William Kucharski */
+#  define HAS_CHSIZE
 
     Stat_t filebuf;
 
     if (PerlLIO_fstat(fd, &filebuf) < 0)
 
     Stat_t filebuf;
 
     if (PerlLIO_fstat(fd, &filebuf) < 0)
-       return -1;
+        return -1;
 
     if (filebuf.st_size < length) {
 
 
     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 {
     }
     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?
-       */
-
-       if (fcntl(fd, F_FREESP, &fl) < 0)
-           return -1;
+        /* 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;
 
     }
     return 0;
 
     }
     return 0;
-#else
+#  else
     Perl_croak_nocontext("truncate not implemented");
     Perl_croak_nocontext("truncate not implemented");
-#endif /* F_FREESP */
+#  endif /* F_FREESP */
     return -1;
 }
 #endif /* !HAS_TRUNCATE && !HAS_CHSIZE */
     return -1;
 }
 #endif /* !HAS_TRUNCATE && !HAS_CHSIZE */
@@ -1333,92 +2197,95 @@ Perl_do_print(pTHX_ SV *sv, PerlIO *fp)
 
     /* assuming fp is checked earlier */
     if (!sv)
 
     /* assuming fp is checked earlier */
     if (!sv)
-       return TRUE;
+        return TRUE;
     if (SvTYPE(sv) == SVt_IV && SvIOK(sv)) {
     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 {
     }
     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;
     }
 }
 
 I32
 Perl_my_stat_flags(pTHX_ const U32 flags)
 {
     }
 }
 
 I32
 Perl_my_stat_flags(pTHX_ const U32 flags)
 {
-    dSP;
     IO *io;
     GV* gv;
 
     if (PL_op->op_flags & OPf_REF) {
     IO *io;
     GV* gv;
 
     if (PL_op->op_flags & OPf_REF) {
-       gv = cGVOP_gv;
+        gv = cGVOP_gv;
       do_fstat:
       do_fstat:
-        if (gv == PL_defgv)
+        if (gv == PL_defgv) {
+            if (PL_laststatval < 0)
+                SETERRNO(EBADF,RMS_IFI);
             return PL_laststatval;
             return PL_laststatval;
-       io = GvIO(gv);
+        }
+        io = GvIO(gv);
         do_fstat_have_io:
         PL_laststype = OP_STAT;
         PL_statgv = gv ? gv : (GV *)io;
         do_fstat_have_io:
         PL_laststype = OP_STAT;
         PL_statgv = gv ? gv : (GV *)io;
-        sv_setpvs(PL_statname, "");
+        SvPVCLEAR(PL_statname);
         if (io) {
         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. */
                 int fd = PerlIO_fileno(IoIFP(io));
                 if (fd < 0) {
                     /* E.g. PerlIO::scalar has no real fd. */
+                    SETERRNO(EBADF,RMS_IFI);
                     return (PL_laststatval = -1);
                 } else {
                     return (PL_laststatval = PerlLIO_fstat(fd, &PL_statcache));
                     return (PL_laststatval = -1);
                 } else {
                     return (PL_laststatval = PerlLIO_fstat(fd, &PL_statcache));
@@ -1427,38 +2294,44 @@ Perl_my_stat_flags(pTHX_ const U32 flags)
                 return (PL_laststatval = PerlLIO_fstat(my_dirfd(IoDIRP(io)), &PL_statcache));
             }
         }
                 return (PL_laststatval = PerlLIO_fstat(my_dirfd(IoDIRP(io)), &PL_statcache));
             }
         }
-       PL_laststatval = -1;
-       report_evil_fh(gv);
-       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))
     }
     else if ((PL_op->op_private & (OPpFT_STACKED|OPpFT_AFTER_t))
-            == OPpFT_STACKED)
-       return PL_laststatval;
+             == OPpFT_STACKED)
+        return PL_laststatval;
     else {
     else {
-       SV* const sv = TOPs;
-       const char *s;
-       STRLEN len;
-       if ((gv = MAYBE_DEREF_GV_flags(sv,flags))) {
-           goto do_fstat;
-       }
+        SV* const sv = *PL_stack_sp;
+        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));
         else if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVIO) {
             io = MUTABLE_IO(SvRV(sv));
-           gv = NULL;
+            gv = NULL;
             goto do_fstat_have_io;
         }
 
             goto do_fstat_have_io;
         }
 
-       s = SvPV_flags_const(sv, len, flags);
-       PL_statgv = NULL;
-       sv_setpvn(PL_statname, s, len);
-       s = SvPVX_const(PL_statname);           /* s now NUL-terminated */
-       PL_laststype = OP_STAT;
-       PL_laststatval = PerlLIO_stat(s, &PL_statcache);
-       if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && should_warn_nl(s)) {
-            GCC_DIAG_IGNORE(-Wformat-nonliteral); /* PL_warn_nl is constant */
-           Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "stat");
-            GCC_DIAG_RESTORE;
+        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)) {
+            GCC_DIAG_IGNORE_STMT(-Wformat-nonliteral); /* PL_warn_nl is constant */
+            Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "stat");
+            GCC_DIAG_RESTORE_STMT;
         }
         }
-       return PL_laststatval;
+        return PL_laststatval;
     }
 }
 
     }
 }
 
@@ -1467,29 +2340,32 @@ I32
 Perl_my_lstat_flags(pTHX_ const U32 flags)
 {
     static const char* const no_prev_lstat = "The stat preceding -l _ wasn't an lstat";
 Perl_my_lstat_flags(pTHX_ const U32 flags)
 {
     static const char* const no_prev_lstat = "The stat preceding -l _ wasn't an lstat";
-    dSP;
     const char *file;
     const char *file;
-    SV* const sv = TOPs;
+    STRLEN len;
+    SV* const sv = *PL_stack_sp;
     bool isio = FALSE;
     if (PL_op->op_flags & OPf_REF) {
     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);
-           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)));
-       }
-       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))
     }
     if ((PL_op->op_private & (OPpFT_STACKED|OPpFT_AFTER_t))
-            == OPpFT_STACKED) {
+             == OPpFT_STACKED) {
       if (PL_laststype != OP_LSTAT)
       if (PL_laststype != OP_LSTAT)
-       Perl_croak(aTHX_ "%s", no_prev_lstat);
+        Perl_croak(aTHX_ "%s", no_prev_lstat);
       return PL_laststatval;
     }
 
       return PL_laststatval;
     }
 
@@ -1502,23 +2378,28 @@ Perl_my_lstat_flags(pTHX_ const U32 flags)
          )
       && ckWARN(WARN_IO)) {
         if (isio)
          )
       && 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
             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),
             Perl_warner(aTHX_ packWARN(WARN_IO),
-                             "Use of -l on filehandle %"HEKf,
+                             "Use of -l on filehandle %" HEKf,
                               HEKfARG(GvENAME_HEK((const GV *)
                                           (SvROK(sv) ? SvRV(sv) : sv))));
     }
                               HEKfARG(GvENAME_HEK((const GV *)
                                           (SvROK(sv) ? SvRV(sv) : sv))));
     }
-    file = SvPV_flags_const_nolen(sv, flags);
+    file = SvPV_flags_const(sv, len, flags);
     sv_setpv(PL_statname,file);
     sv_setpv(PL_statname,file);
-    PL_laststatval = PerlLIO_lstat(file,&PL_statcache);
+    if (!IS_SAFE_PATHNAME(file, len, OP_NAME(PL_op))) {
+        PL_laststatval = -1;
+    }
+    else {
+        PL_laststatval = PerlLIO_lstat(file,&PL_statcache);
+    }
     if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && should_warn_nl(file)) {
     if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && should_warn_nl(file)) {
-        GCC_DIAG_IGNORE(-Wformat-nonliteral); /* PL_warn_nl is constant */
+        GCC_DIAG_IGNORE_STMT(-Wformat-nonliteral); /* PL_warn_nl is constant */
         Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "lstat");
         Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "lstat");
-        GCC_DIAG_RESTORE;
+        GCC_DIAG_RESTORE_STMT;
     }
     return PL_laststatval;
 }
     }
     return PL_laststatval;
 }
@@ -1528,72 +2409,72 @@ S_exec_failed(pTHX_ const char *cmd, int fd, int do_report)
 {
     const int e = errno;
     PERL_ARGS_ASSERT_EXEC_FAILED;
 {
     const int e = errno;
     PERL_ARGS_ASSERT_EXEC_FAILED;
+
     if (ckWARN(WARN_EXEC))
     if (ckWARN(WARN_EXEC))
-       Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s",
-                   cmd, Strerror(e));
+        Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s",
+                    cmd, Strerror(e));
     if (do_report) {
         /* XXX silently ignore failures */
         PERL_UNUSED_RESULT(PerlLIO_write(fd, (void*)&e, sizeof(int)));
     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,
     }
 }
 
 bool
 Perl_do_aexec5(pTHX_ SV *really, SV **mark, SV **sp,
-              int fd, int do_report)
+               int fd, int do_report)
 {
 {
-    dVAR;
     PERL_ARGS_ASSERT_DO_AEXEC5;
     PERL_ARGS_ASSERT_DO_AEXEC5;
-#if defined(__SYMBIAN32__) || defined(__LIBCATAMOUNT__)
+#if defined(__LIBCATAMOUNT__)
     Perl_croak(aTHX_ "exec? I'm not *that* kind of operating system");
 #else
     Perl_croak(aTHX_ "exec? I'm not *that* kind of operating system");
 #else
-    if (sp > mark) {
-       const char **a;
-       const char *tmps = NULL;
-       Newx(PL_Argv, sp - mark + 1, const char*);
-       a = PL_Argv;
-
-       while (++mark <= sp) {
-           if (*mark)
-               *a++ = SvPV_nolen_const(*mark);
-           else
-               *a++ = "";
-       }
-       *a = NULL;
-       if (really)
-           tmps = SvPV_nolen_const(really);
-       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));
-       PERL_FPU_POST_EXEC
-       S_exec_failed(aTHX_ (really ? tmps : PL_Argv[0]), fd, do_report);
-    }
-    do_execfree();
+    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);
+        }
+        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) {
+            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
+        S_exec_failed(aTHX_ (really ? tmps : argv[0] ? argv[0] : ""), fd, do_report);
+    }
+    LEAVE;
 #endif
     return FALSE;
 }
 
 #endif
     return FALSE;
 }
 
-void
-Perl_do_execfree(pTHX)
-{
-    Safefree(PL_Argv);
-    PL_Argv = NULL;
-    Safefree(PL_Cmd);
-    PL_Cmd = NULL;
-}
-
 #ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION
 
 bool
 Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
 {
 #ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION
 
 bool
 Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
 {
-    dVAR;
-    const char **a;
+    const char **argv, **a;
     char *s;
     char *buf;
     char *cmd;
     char *s;
     char *buf;
     char *cmd;
@@ -1602,135 +2483,131 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
 
     PERL_ARGS_ASSERT_DO_EXEC3;
 
 
     PERL_ARGS_ASSERT_DO_EXEC3;
 
+    ENTER;
     Newx(buf, cmdlen, char);
     Newx(buf, cmdlen, char);
+    SAVEFREEPV(buf);
     cmd = buf;
     memcpy(cmd, incmd, cmdlen);
 
     while (*cmd && isSPACE(*cmd))
     cmd = buf;
     memcpy(cmd, incmd, cmdlen);
 
     while (*cmd && isSPACE(*cmd))
-       cmd++;
+        cmd++;
 
     /* save an extra exec if possible */
 
 #ifdef CSH
     {
         char flags[PERL_FLAGS_MAX];
 
     /* save an extra exec if possible */
 
 #ifdef CSH
     {
         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) &&
+            strBEGINs(cmd+PL_cshlen," -c")) {
           my_strlcpy(flags, "-c", PERL_FLAGS_MAX);
           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);
               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);
-                 Safefree(buf);
-                 return FALSE;
-             }
-         }
-       }
+          }
+          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]))
     }
 #endif /* CSH */
 
     /* see if there are shell metacharacters in it */
 
     if (*cmd == '.' && isSPACE(cmd[1]))
-       goto doshell;
+        goto doshell;
 
 
-    if (strnEQ(cmd,"exec",4) && isSPACE(cmd[4]))
-       goto doshell;
+    if (strBEGINs(cmd,"exec") && isSPACE(cmd[4]))
+        goto doshell;
 
     s = cmd;
     while (isWORDCHAR(*s))
 
     s = cmd;
     while (isWORDCHAR(*s))
-       s++;    /* catch VAR=val gizmo */
+        s++;   /* catch VAR=val gizmo */
     if (*s == '=')
     if (*s == '=')
-       goto doshell;
+        goto doshell;
 
     for (s = cmd; *s; s++) {
 
     for (s = cmd; *s; s++) {
-       if (*s != ' ' && !isALPHA(*s) &&
-           strchr("$&*(){}[]'\";\\|?<>~`\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;
 
                 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
-           PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char *)NULL);
-           PERL_FPU_POST_EXEC
-           S_exec_failed(aTHX_ PL_sh_path, fd, do_report);
-           Safefree(buf);
-           return FALSE;
-       }
-    }
-
-    Newx(PL_Argv, (s - cmd) / 2 + 2, const char*);
-    PL_Cmd = savepvn(cmd, s-cmd);
-    a = PL_Argv;
-    for (s = PL_Cmd; *s;) {
-       while (isSPACE(*s))
-           s++;
-       if (*s)
-           *(a++) = s;
-       while (*s && !isSPACE(*s))
-           s++;
-       if (*s)
-           *s++ = '\0';
+                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;
+        }
+    }
+
+    Newx(argv, (s - cmd) / 2 + 2, const char*);
+    SAVEFREEPV(argv);
+    cmd = savepvn(cmd, s-cmd);
+    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';
     }
     *a = NULL;
     }
     *a = NULL;
-    if (PL_Argv[0]) {
-       PERL_FPU_PRE_EXEC
-       PerlProc_execvp(PL_Argv[0],EXEC_ARGV_CAST(PL_Argv));
-       PERL_FPU_POST_EXEC
-       if (errno == ENOEXEC) {         /* for system V NIH syndrome */
-           do_execfree();
-           goto doshell;
-       }
-       S_exec_failed(aTHX_ PL_Argv[0], fd, do_report);
-    }
-    do_execfree();
-    Safefree(buf);
+    if (argv[0]) {
+        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);
+    }
+leave:
+    LEAVE;
     return FALSE;
 }
 
 #endif /* OS2 || WIN32 */
 
     return FALSE;
 }
 
 #endif /* OS2 || WIN32 */
 
-#ifdef VMS
-#include <starlet.h> /* for sys$delprc */
-#endif
-
-I32
+SSize_t
 Perl_apply(pTHX_ I32 type, SV **mark, SV **sp)
 {
     I32 val;
 Perl_apply(pTHX_ I32 type, SV **mark, SV **sp)
 {
     I32 val;
-    I32 tot = 0;
+    SSize_t tot = 0;
     const char *const what = PL_op_name[type];
     const char *s;
     STRLEN len;
     const char *const what = PL_op_name[type];
     const char *s;
     STRLEN len;
@@ -1742,113 +2619,113 @@ Perl_apply(pTHX_ I32 type, SV **mark, SV **sp)
     PERL_UNUSED_VAR(what); /* may not be used depending on compile options */
 
     /* Doing this ahead of the switch statement preserves the old behaviour,
     PERL_UNUSED_VAR(what); /* may not be used depending on compile options */
 
     /* Doing this ahead of the switch statement preserves the old behaviour,
-       where attempting to use kill as a taint test test would fail on
+       where attempting to use kill as a taint test would fail on
        platforms where kill was not defined.  */
 #ifndef HAS_KILL
     if (type == OP_KILL)
        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)
 #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 {                                                       \
 #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) {
     } 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:
     }
     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))) {
                 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)));
 #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
                         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
 #endif
-                   }
-                   else {
+                    }
+                    else {
                         SETERRNO(EBADF,RMS_IFI);
                         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--;
                     }
                     if (!IS_SAFE_PATHNAME(name, len, "chmod") ||
                         PerlLIO_chmod(name, val)) {
                         tot--;
                     }
-               }
-           }
-       }
-       break;
+                }
+            }
+        }
+        break;
 #ifdef HAS_CHOWN
     case OP_CHOWN:
 #ifdef HAS_CHOWN
     case OP_CHOWN:
-       APPLY_TAINT_PROPER();
-       if (sp - mark > 2) {
+        APPLY_TAINT_PROPER();
+        if (sp - mark > 2) {
             I32 val2;
             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;
                 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)));
 #ifdef HAS_FCHOWN
                         int fd = PerlIO_fileno(IoIFP(GvIOn(gv)));
-                       APPLY_TAINT_PROPER();
+                        APPLY_TAINT_PROPER();
                         if (fd < 0) {
                             SETERRNO(EBADF,RMS_IFI);
                         if (fd < 0) {
                             SETERRNO(EBADF,RMS_IFI);
-                           tot--;
+                            tot--;
                         } else if (fchown(fd, val, val2))
                         } else if (fchown(fd, val, val2))
-                           tot--;
+                            tot--;
 #else
 #else
-                       Perl_die(aTHX_ PL_no_func, "fchown");
+                        Perl_die(aTHX_ PL_no_func, "fchown");
 #endif
 #endif
-                   }
-                   else {
+                    }
+                    else {
                         SETERRNO(EBADF,RMS_IFI);
                         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)) {
                     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?
 #endif
 /*
 XXX Should we make lchown() directly available from perl?
@@ -1858,76 +2735,44 @@ nothing in the core.
 */
 #ifdef HAS_KILL
     case OP_KILL:
 */
 #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;
             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)
                 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;
+               Perl_croak(aTHX_ "Unrecognized signal name \"%" SVf "\"",
+                                SVfARG(*mark));
+        }
+        else
+        {
+            val = SvIV(*mark);
+            if (val < 0)
+            {
+                killgp = TRUE;
                 val = -val;
                 val = -val;
-           }
-       }
-       APPLY_TAINT_PROPER();
-       tot = sp - mark;
-#ifdef VMS
-       /* kill() doesn't do process groups (job trees?) under VMS */
-       if (val == SIGKILL) {
-           /* Use native sys$delprc() to insure that target process is
-            * deleted; supervisor-mode images don't pay attention to
-            * CRTL's emulation of Unix-style signals and kill()
-            */
-           while (++mark <= sp) {
-               I32 proc;
-               unsigned long int __vmssts;
-               SvGETMAGIC(*mark);
-               if (!(SvIOK(*mark) || SvNOK(*mark) || looks_like_number(*mark)))
-                   Perl_croak(aTHX_ "Can't kill a non-numeric process ID");
-               proc = SvIV_nomg(*mark);
-               APPLY_TAINT_PROPER();
-               if (!((__vmssts = sys$delprc(&proc,0)) & 1)) {
-                   tot--;
-                   switch (__vmssts) {
-                       case SS$_NONEXPR:
-                       case SS$_NOSUCHNODE:
-                           SETERRNO(ESRCH,__vmssts);
-                           break;
-                       case SS$_NOPRIV:
-                           SETERRNO(EPERM,__vmssts);
-                           break;
-                       default:
-                           SETERRNO(EVMSERR,__vmssts);
-                   }
-               }
-           }
-           PERL_ASYNC_CHECK();
-           break;
-       }
-#endif
-       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 */
 #ifdef HAS_KILLPG
             /* use killpg in preference, as the killpg() wrapper for Win32
              * understands process groups, but the kill() wrapper doesn't */
@@ -1936,58 +2781,87 @@ nothing in the core.
 #else
             if (PerlProc_kill(killgp ? -proc: proc, val))
 #endif
 #else
             if (PerlProc_kill(killgp ? -proc: proc, val))
 #endif
-               tot--;
-       }
-       PERL_ASYNC_CHECK();
-       break;
+                tot--;
+        }
+        PERL_ASYNC_CHECK();
+        break;
 #endif
     case OP_UNLINK:
 #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--;
             }
                 tot--;
             }
-           else if (PL_unsafe) {
-               if (UNLINK(s))
-                   tot--;
-           }
-           else {      /* don't let root wipe out directories without -U */
-               if (PerlLIO_lstat(s,&PL_statbuf) < 0)
-                   tot--;
-               else if (S_ISDIR(PL_statbuf.st_mode)) {
-                   tot--;
-                   SETERRNO(EISDIR, SS_NOPRIV);
-               }
-               else {
-                   if (UNLINK(s))
-                       tot--;
-               }
-           }
-       }
-       break;
+            else if (PL_unsafe) {
+                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 around. */
+                  if ((access(s,F_OK) != -1))
+                  {
+                    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 */
+                                /* around */
+                                if((access(s,F_OK) != -1))
+                                {
+                                        tot--;
+                                }
+                        }      
+#endif
+                }
+            }
+        }
+        break;
 #if defined(HAS_UTIME) || defined(HAS_FUTIMES)
     case OP_UTIME:
 #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)
 #if defined(HAS_FUTIMES)
-           struct timeval utbuf[2];
-           void *utbufp = utbuf;
+            struct timeval utbuf[2];
+            void *utbufp = utbuf;
 #elif defined(I_UTIME) || defined(VMS)
 #elif defined(I_UTIME) || defined(VMS)
-           struct utimbuf utbuf;
-           struct utimbuf *utbufp = &utbuf;
+            struct utimbuf utbuf;
+            struct utimbuf *utbufp = &utbuf;
 #else
 #else
-           struct {
-               Time_t  actime;
-               Time_t  modtime;
-           } utbuf;
-           void *utbufp = &utbuf;
+            struct {
+                Time_t actime;
+                Time_t modtime;
+            } utbuf;
+            void *utbufp = &utbuf;
 #endif
 
 #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
 
            /* Be like C, and if both times are undefined, let the C
             * library figure out what to do.  This usually means
@@ -1998,10 +2872,10 @@ nothing in the core.
            else {
                 Zero(&utbuf, sizeof utbuf, char);
 #ifdef HAS_FUTIMES
            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 = (time_t)SvIV(accessed);  /* time accessed */
+                utbuf[0].tv_usec = 0;
+                utbuf[1].tv_sec = (time_t)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 */
 #elif defined(BIG_TIME)
                 utbuf.actime = (Time_t)SvNV(accessed);  /* time accessed */
                 utbuf.modtime = (Time_t)SvNV(modified); /* time modified */
@@ -2010,48 +2884,49 @@ nothing in the core.
                 utbuf.modtime = (Time_t)SvIV(modified); /* time modified */
 #endif
             }
                 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))) {
                 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)));
 #ifdef HAS_FUTIMES
                         int fd =  PerlIO_fileno(IoIFP(GvIOn(gv)));
-                       APPLY_TAINT_PROPER();
+                        APPLY_TAINT_PROPER();
                         if (fd < 0) {
                             SETERRNO(EBADF,RMS_IFI);
                             tot--;
                         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
 #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 {
+                        SETERRNO(EBADF,RMS_IFI);
+                        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
                         tot--;
                     }
                     else
 #ifdef HAS_FUTIMES
-                   if (utimes(name, (struct timeval *)utbufp))
+                    if (utimes(name, (struct timeval *)utbufp))
 #else
 #else
-                   if (PerlLIO_utime(name, utbufp))
+                    if (PerlLIO_utime(name, utbufp))
 #endif
 #endif
-                       tot--;
-               }
+                        tot--;
+                }
 
 
-           }
-       }
-       else
-           tot = 0;
-       break;
+            }
+        }
+        else
+            tot = 0;
+        break;
 #endif
     }
     return tot;
 #endif
     }
     return tot;
@@ -2059,7 +2934,7 @@ nothing in the core.
 #undef APPLY_TAINT_PROPER
 }
 
 #undef APPLY_TAINT_PROPER
 }
 
-/* Do the permissions allow some operation?  Assumes statcache already set. */
+/* Do the permissions in *statbufp allow some operation? */
 #ifndef VMS /* VMS' cando is in vms.c */
 bool
 Perl_cando(pTHX_ Mode_t mode, bool effective, const Stat_t *statbufp)
 #ifndef VMS /* VMS' cando is in vms.c */
 bool
 Perl_cando(pTHX_ Mode_t mode, bool effective, const Stat_t *statbufp)
@@ -2092,7 +2967,7 @@ Perl_cando(pTHX_ Mode_t mode, bool effective, const Stat_t *statbufp)
      /* Atari stat() does pretty much the same thing. we set x_bit_set_in_stat
       * too so it will actually look into the files for magic numbers
       */
      /* Atari stat() does pretty much the same thing. we set x_bit_set_in_stat
       * too so it will actually look into the files for magic numbers
       */
-     return (mode & statbufp->st_mode) ? TRUE : FALSE;
+    return cBOOL(mode & statbufp->st_mode);
 
 #else /* ! DOSISH */
 # ifdef __CYGWIN__
 
 #else /* ! DOSISH */
 # ifdef __CYGWIN__
@@ -2100,24 +2975,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
 # 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_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)) {
     }
     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)
     }
     else if (statbufp->st_mode & mode >> 6)
-       return TRUE;    /* ok as "other" */
+        return TRUE;   /* ok as "other" */
     return FALSE;
 #endif /* ! DOSISH */
 }
     return FALSE;
 #endif /* ! DOSISH */
 }
@@ -2131,14 +3006,14 @@ S_ingroup(pTHX_ Gid_t testgid, bool effective)
     PERL_UNUSED_CONTEXT;
 #endif
     if (testgid == (effective ? PerlProc_getegid() : PerlProc_getgid()))
     PERL_UNUSED_CONTEXT;
 #endif
     if (testgid == (effective ? PerlProc_getegid() : PerlProc_getgid()))
-       return TRUE;
+        return TRUE;
 #ifdef HAS_GETGROUPS
     {
 #ifdef HAS_GETGROUPS
     {
-       Groups_t *gary = NULL;
-       I32 anum;
+        Groups_t *gary = NULL;
+        I32 anum;
         bool rc = FALSE;
 
         bool rc = FALSE;
 
-       anum = getgroups(0, gary);
+        anum = getgroups(0, gary);
         if (anum > 0) {
             Newx(gary, anum, Groups_t);
             anum = getgroups(anum, gary);
         if (anum > 0) {
             Newx(gary, anum, Groups_t);
             anum = getgroups(anum, gary);
@@ -2174,20 +3049,20 @@ Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp)
     {
 #ifdef HAS_MSG
     case OP_MSGGET:
     {
 #ifdef HAS_MSG
     case OP_MSGGET:
-       return msgget(key, flags);
+        return msgget(key, flags);
 #endif
 #ifdef HAS_SEM
     case OP_SEMGET:
 #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:
 #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 */
 #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 */
 #endif
     }
     return -1;                 /* should never happen */
@@ -2214,80 +3089,94 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp)
     {
 #ifdef HAS_MSG
     case OP_MSGCTL:
     {
 #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:
 #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
 #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
 #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 */
 #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
 #endif
-       break;
+        break;
 #endif
 #if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM)
     default:
         /* diag_listed_as: shm%s not implemented */
 #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)
     {
 #endif
     }
 
     if (infosize)
     {
-       if (getinfo)
-       {
-           SvPV_force_nolen(astr);
-           a = SvGROW(astr, infosize+1);
-       }
-       else
-       {
-           STRLEN len;
-           a = SvPV(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);
-       }
+        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);
+        }
     }
     else
     {
     }
     else
     {
-       const IV i = SvIV(astr);
-       a = INT2PTR(char *,i);          /* ouch */
+        /* We historically treat this as a pointer if we don't otherwise recognize
+           the op, but for many ops the value is simply ignored anyway, so
+           don't warn on undef.
+        */
+        SvGETMAGIC(astr);
+        if (SvOK(astr)) {
+            const IV i = SvIV_nomg(astr);
+            a = INT2PTR(char *,i);             /* ouch */
+        }
+        else {
+            a = NULL;
+        }
     }
     SETERRNO(0,0);
     switch (optype)
     {
 #ifdef HAS_MSG
     case OP_MSGCTL:
     }
     SETERRNO(0,0);
     switch (optype)
     {
 #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: {
 #endif
 #ifdef HAS_SEM
     case OP_SEMCTL: {
@@ -2304,24 +3193,25 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp)
                 unsemds.buf = (struct semid_ds *)a;
 #endif
             }
                 unsemds.buf = (struct semid_ds *)a;
 #endif
             }
-           ret = Semctl(id, n, cmd, unsemds);
+            ret = Semctl(id, n, cmd, unsemds);
 #else
 #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
         }
 #endif
         }
-       break;
+        break;
 #endif
 #ifdef HAS_SHM
     case OP_SHMCTL:
 #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) {
 #endif
     }
     if (getinfo && ret >= 0) {
-       SvCUR_set(astr, infosize);
-       *SvEND(astr) = '\0';
-       SvSETMAGIC(astr);
+        SvCUR_set(astr, infosize);
+        *SvEND(astr) = '\0';
+        SvPOK_only(astr);
+        SvSETMAGIC(astr);
     }
     return ret;
 }
     }
     return ret;
 }
@@ -2330,18 +3220,20 @@ I32
 Perl_do_msgsnd(pTHX_ SV **mark, SV **sp)
 {
 #ifdef HAS_MSG
 Perl_do_msgsnd(pTHX_ SV **mark, SV **sp)
 {
 #ifdef HAS_MSG
+    PERL_ARGS_ASSERT_DO_MSGSND;
+    PERL_UNUSED_ARG(sp);
+
     STRLEN len;
     const I32 id = SvIVx(*++mark);
     SV * const mstr = *++mark;
     const I32 flags = SvIVx(*++mark);
     STRLEN len;
     const I32 id = SvIVx(*++mark);
     SV * const mstr = *++mark;
     const I32 flags = SvIVx(*++mark);
-    const char * const mbuf = SvPV_const(mstr, len);
-    const I32 msize = len - sizeof(long);
+    const char * const mbuf = SvPVbyte(mstr, len);
 
 
-    PERL_ARGS_ASSERT_DO_MSGSND;
-    PERL_UNUSED_ARG(sp);
+    if (len < sizeof(long))
+        Perl_croak(aTHX_ "Arg too short for msgsnd");
+
+    const STRLEN msize = len - sizeof(long);
 
 
-    if (msize < 0)
-       Perl_croak(aTHX_ "Arg too short for msgsnd");
     SETERRNO(0,0);
     if (id >= 0 && flags >= 0) {
       return msgsnd(id, (struct msgbuf *)mbuf, msize, flags);
     SETERRNO(0,0);
     if (id >= 0 && flags >= 0) {
       return msgsnd(id, (struct msgbuf *)mbuf, msize, flags);
@@ -2358,13 +3250,13 @@ Perl_do_msgsnd(pTHX_ SV **mark, SV **sp)
 #endif
 }
 
 #endif
 }
 
-I32
+SSize_t
 Perl_do_msgrcv(pTHX_ SV **mark, SV **sp)
 {
 #ifdef HAS_MSG
     char *mbuf;
     long mtype;
 Perl_do_msgrcv(pTHX_ SV **mark, SV **sp)
 {
 #ifdef HAS_MSG
     char *mbuf;
     long mtype;
-    I32 msize, flags, ret;
+    I32 flags;
     const I32 id = SvIVx(*++mark);
     SV * const mstr = *++mark;
 
     const I32 id = SvIVx(*++mark);
     SV * const mstr = *++mark;
 
@@ -2373,26 +3265,30 @@ Perl_do_msgrcv(pTHX_ SV **mark, SV **sp)
 
     /* suppress warning when reading into undef var --jhi */
     if (! SvOK(mstr))
 
     /* suppress warning when reading into undef var --jhi */
     if (! SvOK(mstr))
-       sv_setpvs(mstr, "");
-    msize = SvIVx(*++mark);
+        SvPVCLEAR(mstr);
+    SSize_t msize = SvIVx(*++mark);
     mtype = (long)SvIVx(*++mark);
     flags = SvIVx(*++mark);
     mtype = (long)SvIVx(*++mark);
     flags = SvIVx(*++mark);
-    SvPV_force_nolen(mstr);
-    mbuf = SvGROW(mstr, sizeof(long)+msize+1);
+    SvPV_force_nomg_nolen(mstr);
 
     SETERRNO(0,0);
 
     SETERRNO(0,0);
+    SSize_t ret;
     if (id >= 0 && msize >= 0 && flags >= 0) {
     if (id >= 0 && msize >= 0 && flags >= 0) {
+        mbuf = SvGROW(mstr, sizeof(long)+msize+1);
         ret = msgrcv(id, (struct msgbuf *)mbuf, msize, mtype, flags);
     } else {
         SETERRNO(EINVAL,LIB_INVARG);
         ret = -1;
     }
     if (ret >= 0) {
         ret = msgrcv(id, (struct msgbuf *)mbuf, msize, mtype, flags);
     } else {
         SETERRNO(EINVAL,LIB_INVARG);
         ret = -1;
     }
     if (ret >= 0) {
-       SvCUR_set(mstr, sizeof(long)+ret);
-       *SvEND(mstr) = '\0';
-       /* who knows who has been playing with this message? */
-       SvTAINTED_on(mstr);
+        SvCUR_set(mstr, sizeof(long)+ret);
+        SvPOK_only(mstr);
+        *SvEND(mstr) = '\0';
+        SvSETMAGIC(mstr);
+        /* who knows who has been playing with this message? */
+        SvTAINTED_on(mstr);
     }
     }
+
     return ret;
 #else
     PERL_UNUSED_ARG(sp);
     return ret;
 #else
     PERL_UNUSED_ARG(sp);
@@ -2410,15 +3306,15 @@ Perl_do_semop(pTHX_ SV **mark, SV **sp)
     STRLEN opsize;
     const I32 id = SvIVx(*++mark);
     SV * const opstr = *++mark;
     STRLEN opsize;
     const I32 id = SvIVx(*++mark);
     SV * const opstr = *++mark;
-    const char * const opbuf = SvPV_const(opstr, opsize);
+    const char * const opbuf = SvPVbyte(opstr, opsize);
 
     PERL_ARGS_ASSERT_DO_SEMOP;
     PERL_UNUSED_ARG(sp);
 
     if (opsize < 3 * SHORTSIZE
 
     PERL_ARGS_ASSERT_DO_SEMOP;
     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). */
     }
     SETERRNO(0,0);
     /* We can't assume that sizeof(struct sembuf) == 3 * sizeof(short). */
@@ -2464,11 +3360,11 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
 
     SETERRNO(0,0);
     if (shmctl(id, IPC_STAT, &shmds) == -1)
 
     SETERRNO(0,0);
     if (shmctl(id, IPC_STAT, &shmds) == -1)
-       return -1;
+        return -1;
     if (mpos < 0 || msize < 0
     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);
     }
     if (id >= 0) {
         shm = (char *)shmat(id, NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0);
@@ -2477,32 +3373,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;
     }
     if (shm == (char *)-1)     /* I hate System V IPC, I really do */
-       return -1;
+        return -1;
     if (optype == OP_SHMREAD) {
     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))
-           sv_setpvs(mstr, "");
-       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);
+        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);
+
+        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 {
     }
     else {
-       STRLEN len;
+        STRLEN len;
 
 
-       const char *mbuf = SvPV_const(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
     }
     return shmdt(shm);
 #else
@@ -2515,14 +3411,13 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
 #endif /* SYSV IPC */
 
 /*
 #endif /* SYSV IPC */
 
 /*
-=head1 IO Functions
-
 =for apidoc start_glob
 
 Function called by C<do_readline> to spawn a glob (or do the glob inside
 perl on VMS).  This code used to be inline, but now perl uses C<File::Glob>
 =for apidoc start_glob
 
 Function called by C<do_readline> to spawn a glob (or do the glob inside
 perl on VMS).  This code used to be inline, but now perl uses C<File::Glob>
-this glob starter is only used by miniperl during the build process.
-Moving it away shrinks pp_hot.c; shrinking pp_hot.c helps speed perl up.
+this glob starter is only used by miniperl during the build process,
+or when PERL_EXTERNAL_GLOB is defined.
+Moving it away shrinks F<pp_hot.c>; shrinking F<pp_hot.c> helps speed perl up.
 
 =cut
 */
 
 =cut
 */
@@ -2553,42 +3448,32 @@ Perl_vms_start_glob
     fp = Perl_vms_start_glob(aTHX_ tmpglob, io);
 
 #else /* !VMS */
     fp = Perl_vms_start_glob(aTHX_ tmpglob, io);
 
 #else /* !VMS */
-#ifdef DOSISH
-#ifdef OS2
+# ifdef DOSISH
+#  if defined(OS2)
     sv_setpv(tmpcmd, "for a in ");
     sv_catsv(tmpcmd, tmpglob);
     sv_setpv(tmpcmd, "for a in ");
     sv_catsv(tmpcmd, tmpglob);
-    sv_catpv(tmpcmd, "; do echo \"$a\\0\\c\"; done |");
-#else
-#ifdef DJGPP
-    sv_setpv(tmpcmd, "/dev/dosglob/"); /* File System Extension */
-    sv_catsv(tmpcmd, tmpglob);
-#else
+    sv_catpvs(tmpcmd, "; do echo \"$a\\0\\c\"; done |");
+#  else
     sv_setpv(tmpcmd, "perlglob ");
     sv_catsv(tmpcmd, tmpglob);
     sv_setpv(tmpcmd, "perlglob ");
     sv_catsv(tmpcmd, tmpglob);
-    sv_catpv(tmpcmd, " |");
-#endif /* !DJGPP */
-#endif /* !OS2 */
-#else /* !DOSISH */
-#if defined(CSH)
+    sv_catpvs(tmpcmd, " |");
+#  endif
+# elif defined(CSH)
     sv_setpvn(tmpcmd, PL_cshname, PL_cshlen);
     sv_setpvn(tmpcmd, PL_cshname, PL_cshlen);
-    sv_catpv(tmpcmd, " -cf 'set nonomatch; glob ");
+    sv_catpvs(tmpcmd, " -cf 'set nonomatch; glob ");
     sv_catsv(tmpcmd, tmpglob);
     sv_catsv(tmpcmd, tmpglob);
-    sv_catpv(tmpcmd, "' 2>/dev/null |");
-#else
+    sv_catpvs(tmpcmd, "' 2>/dev/null |");
+# else
     sv_setpv(tmpcmd, "echo ");
     sv_catsv(tmpcmd, tmpglob);
     sv_setpv(tmpcmd, "echo ");
     sv_catsv(tmpcmd, tmpglob);
-    sv_catpv(tmpcmd, "|tr -s ' \t\f\r' '\\n\\n\\n\\n'|");
-#endif /* !CSH */
-#endif /* !DOSISH */
+    sv_catpvs(tmpcmd, "|tr -s ' \t\f\r' '\\n\\n\\n\\n'|");
+# endif /* !DOSISH && !CSH */
     {
     {
-       GV * const envgv = gv_fetchpvs("ENV", 0, SVt_PVHV);
-       SV ** const home = hv_fetchs(GvHV(envgv), "HOME", 0);
-       SV ** const path = hv_fetchs(GvHV(envgv), "PATH", 0);
-       if (home && *home) SvGETMAGIC(*home);
-       if (path && *path) SvGETMAGIC(*path);
-       save_hash(gv_fetchpvs("ENV", 0, SVt_PVHV));
-       if (home && *home) SvSETMAGIC(*home);
-       if (path && *path) SvSETMAGIC(*path);
+        SV ** const svp = hv_fetchs(GvHVn(PL_envgv), "LS_COLORS", 0);
+        if (svp && *svp)
+            save_helem_flags(GvHV(PL_envgv),
+                             newSVpvs_flags("LS_COLORS", SVs_TEMP), svp,
+                             SAVEf_SETMAGIC);
     }
     (void)do_open6(PL_last_in_gv, SvPVX_const(tmpcmd), SvCUR(tmpcmd),
                    NULL, NULL, 0);
     }
     (void)do_open6(PL_last_in_gv, SvPVX_const(tmpcmd), SvCUR(tmpcmd),
                    NULL, NULL, 0);