Change 17664: Neglected to include old bugfix from main branch

Change 17664 by pudge@pudge-mobile on 2002/07/29 19:20:51

	Neglected to include old bugfix from main branch

Affected files ...

.... //depot/maint-5.6/macperl/perl.c#11 edit

Differences ...

==== //depot/maint-5.6/macperl/perl.c#11 (text) ====
Index: macperl/perl.c
--- macperl/perl.c#10~17663~	Mon Jul 29 11:25:57 2002
+++ macperl/perl.c	Mon Jul 29 12:20:51 2002
@@ -1010,7 +1010,7 @@
 #ifdef MACOS_TRADITIONAL
 	    /* ignore -e for Dev:Pseudo argument */
 	    if (argv[1] && !strcmp(argv[1], "Dev:Pseudo"))
-	    	break; 
+		break;
 #endif
 	    if (PL_euid != PL_uid || PL_egid != PL_gid)
 		Perl_croak(aTHX_ "No -e allowed in setuid scripts");
@@ -1452,7 +1452,9 @@
 
 	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%s syntax OK\n",
+		(gMacPerl_ErrorFormat ? "# " : ""),
+		MacPerl_MPWFileName(PL_origfilename));
 #else
 	    PerlIO_printf(Perl_error_log, "%s syntax OK\n", PL_origfilename);
 #endif
@@ -3063,6 +3065,7 @@
     forbid_setid("-x");
 #ifdef MACOS_TRADITIONAL
     /* Since the Mac OS does not honor #! arguments for us, we do it ourselves */
+
     while (PL_doextract || gMacPerl_AlwaysExtract) {
 	if ((s = sv_gets(PL_linestr, PL_rsfp, 0)) == Nullch) {
 	    if (!gMacPerl_AlwaysExtract)
@@ -3073,10 +3076,10 @@
 		    Perl_croak(aTHX_ "User aborted script\n");
 		else
 		    PL_doextract = FALSE;
-		
+
 	    /* Pater peccavi, file does not have #! */
 	    PerlIO_rewind(PL_rsfp);
-	    
+
 	    break;
 	}
 #else
End of Patch.
-- 
Chris Nandor                      pudge@pobox.com    http://pudge.net/
Open Source Development Network    pudge@osdn.com     http://osdn.com/

• Change 17664: Neglected to include old bugfix from main branch by Chris Nandor