X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.c;h=225d3dcabb401a406c93d7872145ea38c84b47a8;hb=3b0e0cb610a437b422e9557a50cdb439557976dd;hp=308d0d31c61390a69df3b481ab0c0856656ca543;hpb=5b3035ed4d02db655cf5d2d62ab1ebb11c131def;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perl.c b/perl.c
index 308d0d3..225d3dc 100644
--- a/perl.c
+++ b/perl.c
@@ -473,11 +473,11 @@ perl_destruct(pTHXx)
 
     /* magical thingies */
 
-    Safefree(PL_ofs);		/* $, */
-    PL_ofs = Nullch;
+    SvREFCNT_dec(PL_ofs_sv);	/* $, */
+    PL_ofs_sv = Nullsv;
 
-    Safefree(PL_ors);		/* $\ */
-    PL_ors = Nullch;
+    SvREFCNT_dec(PL_ors_sv);	/* $\ */
+    PL_ors_sv = Nullsv;
 
     SvREFCNT_dec(PL_rs);	/* $/ */
     PL_rs = Nullsv;
@@ -785,12 +785,18 @@ perl_free(pTHXx)
 #if defined(PERL_OBJECT)
     PerlMem_free(this);
 #else
-#  if defined(PERL_IMPLICIT_SYS) && defined(WIN32)
+#  if defined(WIN32)
+#  if defined(PERL_IMPLICIT_SYS)
     void *host = w32_internal_host;
-    if (PerlProc_lasthost())
+    if (PerlProc_lasthost()) {
 	PerlIO_cleanup();     
+    }
     PerlMem_free(aTHXx);
     win32_delete_internal_host(host);
+#else
+    PerlIO_cleanup();     
+    PerlMem_free(aTHXx);
+#endif
 #  else
     PerlMem_free(aTHXx);
 #  endif
@@ -2152,23 +2158,23 @@ Perl_moreswitches(pTHX_ char *s)
     case 'l':
 	PL_minus_l = TRUE;
 	s++;
-	if (PL_ors)
-	    Safefree(PL_ors);
+	if (PL_ors_sv) {
+	    SvREFCNT_dec(PL_ors_sv);
+	    PL_ors_sv = Nullsv;
+	}
 	if (isDIGIT(*s)) {
-	    PL_ors = savepv("\n");
-	    PL_orslen = 1;
+	    PL_ors_sv = newSVpvn("\n",1);
 	    numlen = 0;			/* disallow underscores */
-	    *PL_ors = (char)scan_oct(s, 3 + (*s == '0'), &numlen);
+	    *SvPVX(PL_ors_sv) = (char)scan_oct(s, 3 + (*s == '0'), &numlen);
 	    s += numlen;
 	}
 	else {
 	    if (RsPARA(PL_nrs)) {
-		PL_ors = "\n\n";
-		PL_orslen = 2;
+		PL_ors_sv = newSVpvn("\n\n",2);
+	    }
+	    else {
+		PL_ors_sv = newSVsv(PL_nrs);
 	    }
-	    else
-		PL_ors = SvPV(PL_nrs, PL_orslen);
-	    PL_ors = savepvn(PL_ors, PL_orslen);
 	}
 	return s;
     case 'M':