Change to use $^O and &Cwd:cwd

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

diff --git a/doio.c b/doio.c
index f20d9f7..f28da95 100644 (file)
--- a/doio.c
+++ b/doio.c
@@ -278,7 +278,7 @@ FILE *supplied_fp;
     if (saveifp) {             /* must use old fp? */
        fd = fileno(saveifp);
        if (saveofp) {
-           fflush(saveofp);            /* emulate fclose() */
+           Fflush(saveofp);            /* emulate fclose() */
            if (saveofp != saveifp) {   /* was a socket? */
                fclose(saveofp);
                if (fd > 2)
@@ -344,7 +344,7 @@ register GV *gv;
     if (!argvoutgv)
        argvoutgv = gv_fetchpv("ARGVOUT",TRUE,SVt_PVIO);
     if (filemode & (S_ISUID|S_ISGID)) {
-       fflush(IoIFP(GvIOn(argvoutgv)));  /* chmod must follow last write */
+       Fflush(IoIFP(GvIOn(argvoutgv)));  /* chmod must follow last write */
 #ifdef HAS_FCHMOD
        (void)fchmod(lastfd,filemode);
 #else
@@ -407,7 +407,7 @@ register GV *gv;
                    do_close(gv,FALSE);
                    (void)unlink(SvPVX(sv));
                    (void)rename(oldname,SvPVX(sv));
-                   do_open(gv,SvPVX(sv),SvCUR(GvSV(gv)),FALSE,0,0,Nullfp);
+                   do_open(gv,SvPVX(sv),SvCUR(sv),FALSE,0,0,Nullfp);
 #endif /* MSDOS */
 #else
                    (void)UNLINK(SvPVX(sv));
@@ -529,9 +529,8 @@ bool explicit;
 do_close(GV *gv, bool explicit)
 #endif /* CAN_PROTOTYPE */
 {
-    bool retval = FALSE;
-    register IO *io;
-    int status;
+    bool retval;
+    IO *io;
 
     if (!gv)
        gv = argvgv;
@@ -545,6 +544,23 @@ do_close(GV *gv, bool explicit)
            warn("Close on unopened file <%s>",GvENAME(gv));
        return FALSE;
     }
+    retval = io_close(io);
+    if (explicit) {
+       IoLINES(io) = 0;
+       IoPAGE(io) = 0;
+       IoLINES_LEFT(io) = IoPAGE_LEN(io);
+    }
+    IoTYPE(io) = ' ';
+    return retval;
+}
+
+bool
+io_close(io)
+IO* io;
+{
+    bool retval = FALSE;
+    int status;
+
     if (IoIFP(io)) {
        if (IoTYPE(io) == '|') {
            status = my_pclose(IoIFP(io));
@@ -563,12 +579,7 @@ do_close(GV *gv, bool explicit)
        }
        IoOFP(io) = IoIFP(io) = Nullfp;
     }
-    if (explicit) {
-       IoLINES(io) = 0;
-       IoPAGE(io) = 0;
-       IoLINES_LEFT(io) = IoPAGE_LEN(io);
-    }
-    IoTYPE(io) = ' ';
+
     return retval;
 }