X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.c;h=c67134378b428530584cff916ef7d72d6c5c26ff;hb=37a581db7e8c594db4c6ef42b6fe4d8a81fc4ca3;hp=4a605da7ff5a1ecabc0867612efe968fd84a6792;hpb=7c474504105f41654af9663caa833041d25306dc;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perl.c b/perl.c
index 4a605da..c671343 100644
--- a/perl.c
+++ b/perl.c
@@ -212,8 +212,7 @@ perl_construct(pTHXx)
 #endif
     }
 
-    PL_nrs = newSVpvn("\n", 1);
-    PL_rs = SvREFCNT_inc(PL_nrs);
+    PL_rs = newSVpvn("\n", 1);
 
     init_stacks();
 
@@ -273,6 +272,27 @@ perl_construct(pTHXx)
     New(31337, PL_reentrant_buffer,1, REBUF);
     New(31337, PL_reentrant_buffer->tmbuff,1, struct tm);
 #endif
+
+    /* Note that strtab is a rather special HV.  Assumptions are made
+       about not iterating on it, and not adding tie magic to it.
+       It is properly deallocated in perl_destruct() */
+    PL_strtab = newHV();
+
+#ifdef USE_5005THREADS
+    MUTEX_INIT(&PL_strtab_mutex);
+#endif
+    HvSHAREKEYS_off(PL_strtab);			/* mandatory */
+    hv_ksplit(PL_strtab, 512);
+
+#if defined(__DYNAMIC__) && (defined(NeXT) || defined(__NeXT__))
+    _dyld_lookup_and_bind
+	("__environ", (unsigned long *) &environ_pointer, NULL);
+#endif /* environ */
+
+#ifdef  USE_ENVIRON_ARRAY
+    PL_origenviron = environ;
+#endif
+
     ENTER;
 }
 
@@ -451,6 +471,7 @@ perl_destruct(pTHXx)
 
 	for (i = 0; environ[i]; i++)
 	    safesysfree(environ[i]);
+
 	/* Must use safesysfree() when working with environ. */
 	safesysfree(environ);		
 
@@ -470,7 +491,7 @@ perl_destruct(pTHXx)
 
         while (i) {
             SV *resv = ary[--i];
-            REGEXP *re = (REGEXP *)SvIVX(resv);
+            REGEXP *re = INT2PTR(REGEXP *,SvIVX(resv));
 
             if (SvFLAGS(resv) & SVf_BREAK) {
                 /* this is PL_reg_curpm, already freed
@@ -540,9 +561,6 @@ perl_destruct(pTHXx)
     SvREFCNT_dec(PL_rs);	/* $/ */
     PL_rs = Nullsv;
 
-    SvREFCNT_dec(PL_nrs);	/* $/ helper */
-    PL_nrs = Nullsv;
-
     PL_multiline = 0;		/* $* */
     Safefree(PL_osname);	/* $^O */
     PL_osname = Nullch;
@@ -568,10 +586,12 @@ perl_destruct(pTHXx)
 
     /* startup and shutdown function lists */
     SvREFCNT_dec(PL_beginav);
+    SvREFCNT_dec(PL_beginav_save);
     SvREFCNT_dec(PL_endav);
     SvREFCNT_dec(PL_checkav);
     SvREFCNT_dec(PL_initav);
     PL_beginav = Nullav;
+    PL_beginav_save = Nullav;
     PL_endav = Nullav;
     PL_checkav = Nullav;
     PL_initav = Nullav;
@@ -864,7 +884,9 @@ perl_free(pTHXx)
 #    endif
 #    ifndef NETWARE
     if (PerlProc_lasthost()) {
+#      ifdef USE_PERLIO
 	PerlIO_cleanup();
+#      endif
     }
 #    endif
     PerlMem_free(aTHXx);
@@ -874,7 +896,9 @@ perl_free(pTHXx)
     win32_delete_internal_host(host);
 #    endif
 #  else
+#    ifdef USE_PERLIO
     PerlIO_cleanup();
+#    endif
     PerlMem_free(aTHXx);
 #  endif
 #else
@@ -917,11 +941,6 @@ setuid perl scripts securely.\n");
 #endif
 #endif
 
-#if defined(__DYNAMIC__) && (defined(NeXT) || defined(__NeXT__))
-    _dyld_lookup_and_bind
-	("__environ", (unsigned long *) &environ_pointer, NULL);
-#endif /* environ */
-
     PL_origargc = argc;
     {
         /* we copy rather than point to argv
@@ -937,9 +956,7 @@ setuid perl scripts securely.\n");
         }
     }
 
-#ifdef  USE_ENVIRON_ARRAY
-    PL_origenviron = environ;
-#endif
+
 
     if (PL_do_undump) {
 
@@ -1427,10 +1444,12 @@ print \"  \\@INC:\\n    @INC\\n\";");
 	PL_e_script = Nullsv;
     }
 
-    /* now that script is parsed, we can modify record separator */
-    SvREFCNT_dec(PL_rs);
-    PL_rs = SvREFCNT_inc(PL_nrs);
+/*
+   Not sure that this is still the right place to do this now that we
+   no longer use PL_nrs. HVDS 2001/09/09
+*/
     sv_setsv(get_sv("/", TRUE), PL_rs);
+
     if (PL_do_undump)
 	my_unexec();
 
@@ -1543,7 +1562,7 @@ S_run_body(pTHX_ I32 oldscope)
 
 	if (PL_minus_c) {
 #ifdef MACOS_TRADITIONAL
-	    PerlIO_printf(Perl_error_log, "%s syntax OK\n", MacPerl_MPWFileName(PL_origfilename));
+	    PerlIO_printf(Perl_error_log, "# %s syntax OK\n", MacPerl_MPWFileName(PL_origfilename));
 #else
 	    PerlIO_printf(Perl_error_log, "%s syntax OK\n", PL_origfilename);
 #endif
@@ -2144,16 +2163,17 @@ Perl_moreswitches(pTHX_ char *s)
     switch (*s) {
     case '0':
     {
-	numlen = 0;			/* disallow underscores */
-	rschar = (U32)scan_oct(s, 4, &numlen);
-	SvREFCNT_dec(PL_nrs);
+        I32 flags = 0;
+	numlen = 4;
+	rschar = (U32)grok_oct(s, &numlen, &flags, NULL);
+	SvREFCNT_dec(PL_rs);
 	if (rschar & ~((U8)~0))
-	    PL_nrs = &PL_sv_undef;
+	    PL_rs = &PL_sv_undef;
 	else if (!rschar && numlen >= 2)
-	    PL_nrs = newSVpvn("", 0);
+	    PL_rs = newSVpvn("", 0);
 	else {
 	    char ch = rschar;
-	    PL_nrs = newSVpvn(&ch, 1);
+	    PL_rs = newSVpvn(&ch, 1);
 	}
 	return s + numlen;
     }
@@ -2276,17 +2296,18 @@ Perl_moreswitches(pTHX_ char *s)
 	    PL_ors_sv = Nullsv;
 	}
 	if (isDIGIT(*s)) {
+            I32 flags = 0;
 	    PL_ors_sv = newSVpvn("\n",1);
-	    numlen = 0;			/* disallow underscores */
-	    *SvPVX(PL_ors_sv) = (char)scan_oct(s, 3 + (*s == '0'), &numlen);
+	    numlen = 3 + (*s == '0');
+	    *SvPVX(PL_ors_sv) = (char)grok_oct(s, &numlen, &flags, NULL);
 	    s += numlen;
 	}
 	else {
-	    if (RsPARA(PL_nrs)) {
+	    if (RsPARA(PL_rs)) {
 		PL_ors_sv = newSVpvn("\n\n",2);
 	    }
 	    else {
-		PL_ors_sv = newSVsv(PL_nrs);
+		PL_ors_sv = newSVsv(PL_rs);
 	    }
 	}
 	return s;
@@ -2580,15 +2601,7 @@ S_init_main_stash(pTHX)
 {
     GV *gv;
 
-    /* Note that strtab is a rather special HV.  Assumptions are made
-       about not iterating on it, and not adding tie magic to it.
-       It is properly deallocated in perl_destruct() */
-    PL_strtab = newHV();
-#ifdef USE_5005THREADS
-    MUTEX_INIT(&PL_strtab_mutex);
-#endif
-    HvSHAREKEYS_off(PL_strtab);			/* mandatory */
-    hv_ksplit(PL_strtab, 512);
+
 
     PL_curstash = PL_defstash = newHV();
     PL_curstname = newSVpvn("main",4);