Output "read only" editor blocks from regen_perly.pl

Use safer_open() and read_only_bottom_close_and_rename() from regen_lib.pl
Consistently use 3 argument open and lexical file handles.

A side effect of this change is that the generated files are no longer made
read-only on disk - if this is desirable, then probably better to change
regen_lib.pl so that all generated files are made read-only.

1 files changed, 23 insertions, 29 deletions

diff --git a/regen_perly.pl b/regen_perly.pl
index e4de1a0f33..00d2a59a18 100644
--- a/regen_perly.pl
+++ b/regen_perly.pl
@@ -29,6 +29,7 @@
 # it may work elsewhere but no specific attempt has been made to make it
 # portable.
 
+use 5.006;
 sub usage { die "usage: $0 [ -b bison_executable ] [ file.y ]\n" }
 
 use warnings;
@@ -52,9 +53,6 @@ usage unless @ARGV==0 && $y_file =~ /\.y$/;
 (my $tab_file  = $y_file) =~ s/\.y$/.tab/;
 (my $tmpc_file = $y_file) =~ s/\.y$/tmp.c/;
 (my $tmph_file = $y_file) =~ s/\.y$/tmp.h/;
-my $new_h_file = "$h_file-new";
-my $new_act_file = "$act_file-new";
-my $new_tab_file = "$tab_file-new";
 
 # the yytranslate[] table generated by bison is ASCII/EBCDIC sensitive
 
@@ -88,28 +86,26 @@ EOF
 # creates $tmpc_file and $tmph_file
 my_system("$bison -d -o $tmpc_file $y_file");
 
-open CTMPFILE, $tmpc_file or die "Can't open $tmpc_file: $!\n";
+open my $ctmp_fh, '<', $tmpc_file or die "Can't open $tmpc_file: $!\n";
 my $clines;
-{ local $/; $clines = <CTMPFILE>; }
+{ local $/; $clines = <$ctmp_fh>; }
 die "failed to read $tmpc_file: length mismatch\n"
     unless length $clines == -s $tmpc_file;
-close CTMPFILE;
+close $ctmp_fh;
 
 my ($actlines, $tablines) = extract($clines);
 
 $tablines .= make_type_tab($y_file, $tablines);
 
-chmod 0644, $new_act_file;
-open ACTFILE, ">$new_act_file" or die "can't open $new_act_file: $!\n";
-print ACTFILE $actlines;
-close ACTFILE;
-chmod 0444, $new_act_file;
+my $read_only = read_only_top(lang => 'C', by => $0, from => $y_file);
 
-chmod 0644, $new_tab_file;
-open TABFILE, ">$new_tab_file" or die "can't open $new_tab_file: $!\n";
-print TABFILE $tablines;
-close TABFILE;
-chmod 0444, $new_tab_file;
+my $act_fh = safer_open("$act_file-new", $act_file);
+print $act_fh $read_only, $actlines;
+read_only_bottom_close_and_rename($act_fh);
+
+my $tab_fh = safer_open("$tab_file-new", $tab_file);
+print $tab_fh $read_only, $tablines;
+read_only_bottom_close_and_rename($tab_fh);
 
 unlink $tmpc_file;
 
@@ -117,17 +113,19 @@ unlink $tmpc_file;
 # C<#line 30 "perly.y"> confuses the Win32 resource compiler and the
 # C<#line 188 "perlytmp.h"> gets picked up by make depend, so remove them.
 
-open TMPH_FILE, $tmph_file or die "Can't open $tmph_file: $!\n";
-chmod 0644, $new_h_file;
-open H_FILE, ">$new_h_file" or die "Can't open $new_h_file: $!\n";
+open my $tmph_fh, '<', $tmph_file or die "Can't open $tmph_file: $!\n";
+my $h_fh = safer_open("$h_file-new", $h_file);
+
+print $h_fh $read_only;
+
 my $endcore_done = 0;
 # Token macros need to be generated manually on bison 2.4
 my $gather_tokens = ($version =~ /\b2\.4\b/ ? undef : 0);
 my $tokens;
-while (<TMPH_FILE>) {
-    print H_FILE "#ifdef PERL_CORE\n" if $. == 1;
+while (<$tmph_fh>) {
+    print $h_fh "#ifdef PERL_CORE\n" if $. == 1;
     if (!$endcore_done and /YYSTYPE_IS_DECLARED/) {
-	print H_FILE "#endif /* PERL_CORE */\n";
+	print $h_fh "#endif /* PERL_CORE */\n";
 	$endcore_done = 1;
     }
     next if /^#line \d+ ".*"/;
@@ -144,16 +142,12 @@ while (<TMPH_FILE>) {
 	    $tokens .= "#define $tok $val\n" if $tok;
 	}
     }
-    print H_FILE $_;
+    print $h_fh $_;
 }
-close TMPH_FILE;
-close H_FILE;
-chmod 0444, $new_h_file;
+close $tmph_fh;
 unlink $tmph_file;
 
-rename_if_different($new_h_file, $h_file);
-rename_if_different($new_tab_file, $tab_file);
-rename_if_different($new_act_file, $act_file);
+read_only_bottom_close_and_rename($h_fh);
 
 exit 0;