new_body_type doesn't need to subtract the offset, that's what

[p5sagit/p5-mst-13.2.git] / doio.c

diff --git a/doio.c b/doio.c
index 1dc4169..8d55d3f 100644 (file)
--- a/doio.c
+++ b/doio.c
@@ -179,7 +179,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw,
        namesv = sv_2mortal(newSVpv(oname,0));
        num_svs = 1;
        svp = &namesv;
-        type = Nullch;
+       type = NULL;
        fp = PerlIO_openn(aTHX_ type, mode, -1, rawmode, rawperm, NULL, num_svs, svp);
     }
     else {
@@ -336,7 +336,8 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw,
                        }
                        else {
                            GV *thatgv;
-                           thatgv = gv_fetchpv(type,0,SVt_PVIO);
+                           thatgv = gv_fetchpvn_flags(type, tend - type,
+                                                      0, SVt_PVIO);
                            thatio = GvIO(thatgv);
                        }
                        if (!thatio) {
@@ -380,7 +381,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw,
                            fd = -1;
                    }
                    if (!num_svs)
-                       type = Nullch;
+                       type = NULL;
                    if (that_fp) {
                        fp = PerlIO_fdupopen(aTHX_ that_fp, NULL, dodup);
                    }
@@ -411,7 +412,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw,
                        namesv = sv_2mortal(newSVpvn(type,tend - type));
                        num_svs = 1;
                        svp = &namesv;
-                       type = Nullch;
+                       type = NULL;
                    }
                    fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
                }
@@ -449,7 +450,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw,
                    namesv = sv_2mortal(newSVpvn(type,tend - type));
                    num_svs = 1;
                    svp = &namesv;
-                   type = Nullch;
+                   type = NULL;
                }
                fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
            }
@@ -541,7 +542,7 @@ Perl_do_openn(pTHX_ GV *gv, register const char *oname, I32 len, int as_raw,
                    namesv = sv_2mortal(newSVpvn(type,tend - type));
                    num_svs = 1;
                    svp = &namesv;
-                   type = Nullch;
+                   type = NULL;
                }
                fp = PerlIO_openn(aTHX_ type,mode,-1,0,0,NULL,num_svs,svp);
            }
@@ -733,7 +734,7 @@ Perl_nextargv(pTHX_ register GV *gv)
     IO * const io = GvIOp(gv);
 
     if (!PL_argvoutgv)
-       PL_argvoutgv = gv_fetchpv("ARGVOUT",TRUE,SVt_PVIO);
+       PL_argvoutgv = gv_fetchpvs("ARGVOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
     if (io && (IoFLAGS(io) & IOf_ARGV) && (IoFLAGS(io) & IOf_START)) {
        IoFLAGS(io) &= ~IOf_START;
        if (PL_inplace) {
@@ -766,7 +767,8 @@ Perl_nextargv(pTHX_ register GV *gv)
            if (PL_inplace) {
                TAINT_PROPER("inplace open");
                if (oldlen == 1 && *PL_oldname == '-') {
-                   setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO));
+                   setdefout(gv_fetchpvs("STDOUT", GV_ADD|GV_NOTQUAL,
+                                         SVt_PVIO));
                    return IoIFP(GvIOp(gv));
                }
 #ifndef FLEXFILENAMES
@@ -933,7 +935,7 @@ Perl_nextargv(pTHX_ register GV *gv)
            SvREFCNT_dec(oldout);
            return Nullfp;
        }
-       setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO));
+       setdefout(gv_fetchpvs("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO));
     }
     return Nullfp;
 }
@@ -1295,7 +1297,7 @@ Perl_my_stat(pTHX)
                return PL_laststatval;
            if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
                report_evil_fh(gv, io, PL_op->op_type);
-           PL_statgv = Nullgv;
+           PL_statgv = NULL;
            sv_setpvn(PL_statname,"", 0);
            return (PL_laststatval = -1);
        }
@@ -1318,7 +1320,7 @@ Perl_my_stat(pTHX)
        }
 
        s = SvPV_const(sv, len);
-       PL_statgv = Nullgv;
+       PL_statgv = NULL;
        sv_setpvn(PL_statname, s, len);
        s = SvPVX_const(PL_statname);           /* s now NUL-terminated */
        PL_laststype = OP_STAT;
@@ -1355,7 +1357,7 @@ Perl_my_lstat(pTHX)
        Perl_croak(aTHX_ no_prev_lstat);
 
     PL_laststype = OP_LSTAT;
-    PL_statgv = Nullgv;
+    PL_statgv = NULL;
     sv = POPs;
     PUTBACK;
     if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVGV && ckWARN(WARN_IO)) {
@@ -1381,7 +1383,7 @@ Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
 #else
     if (sp > mark) {
        char **a;
-       const char *tmps = Nullch;
+       const char *tmps = NULL;
        Newx(PL_Argv, sp - mark + 1, char*);
        a = PL_Argv;
 
@@ -1391,7 +1393,7 @@ Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
            else
                *a++ = "";
        }
-       *a = Nullch;
+       *a = NULL;
        if (really)
            tmps = SvPV_nolen_const(really);
        if ((!really && *PL_Argv[0] != '/') ||
@@ -1425,7 +1427,7 @@ Perl_do_execfree(pTHX)
     Safefree(PL_Argv);
     PL_Argv = Null(char **);
     Safefree(PL_Cmd);
-    PL_Cmd = Nullch;
+    PL_Cmd = NULL;
 }
 
 #ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION
@@ -1544,7 +1546,7 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
        if (*s)
            *s++ = '\0';
     }
-    *a = Nullch;
+    *a = NULL;
     if (PL_Argv[0]) {
        PERL_FPU_PRE_EXEC
        PerlProc_execvp(PL_Argv[0],PL_Argv);
@@ -1553,15 +1555,13 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
            do_execfree();
            goto doshell;
        }
-       {
-           if (ckWARN(WARN_EXEC))
-               Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s",
-                   PL_Argv[0], Strerror(errno));
-           if (do_report) {
-               const int e = errno;
-               PerlLIO_write(fd, (void*)&e, sizeof(int));
-               PerlLIO_close(fd);
-           }
+       if (ckWARN(WARN_EXEC))
+           Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s",
+               PL_Argv[0], Strerror(errno));
+       if (do_report) {
+           const int e = errno;
+           PerlLIO_write(fd, (const void*)&e, sizeof(int));
+           PerlLIO_close(fd);
        }
     }
     do_execfree();
@@ -1959,9 +1959,10 @@ Perl_ingroup(pTHX_ Gid_t testgid, bool effective)
         Safefree(gary);
         return rc;
     }
-#endif
+#else
     return FALSE;
 #endif
+#endif
 }
 
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
@@ -2309,7 +2310,7 @@ PerlIO *
 Perl_start_glob (pTHX_ SV *tmpglob, IO *io)
 {
     dVAR;
-    SV * const tmpcmd = NEWSV(55, 0);
+    SV * const tmpcmd = newSV(0);
     PerlIO *fp;
     ENTER;
     SAVEFREESV(tmpcmd);