Use perl's $/ more idiomatically

adunstan · adunstan · commit 8f00d84afc0d · 2020-04-13T12:06:11.000-04:00
This replaces a few occurrences of ugly code with a more clean and idiomatic usage. The problem was highlighted by perlcritic, but we're not enforcing the policy that led to the discovery. Discussion: https://postgr.es/m/20200412074245.GB623763@rfd.leadboat.com
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
@@ -762,13 +762,10 @@ sub read_file
 {
 	my $filename = shift;
 	my $F;
-	my $t = $/;
-
-	undef $/;
+	local $/ = undef;
 	open($F, '<', $filename) || die "Could not open file $filename\n";
 	my $txt = <$F>;
 	close($F);
-	$/ = $t;
 
 	return $txt;
 }
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
@@ -420,13 +420,10 @@ sub read_file
 {
 	my $filename = shift;
 	my $F;
-	my $t = $/;
-
-	undef $/;
+	local $/ = undef;
 	open($F, '<', $filename) || croak "Could not open file $filename\n";
 	my $txt = <$F>;
 	close($F);
-	$/ = $t;
 
 	return $txt;
 }
@@ -435,15 +432,12 @@ sub read_makefile
 {
 	my $reldir = shift;
 	my $F;
-	my $t = $/;
-
-	undef $/;
+	local $/ = undef;
 	open($F, '<', "$reldir/GNUmakefile")
 	  || open($F, '<', "$reldir/Makefile")
 	  || confess "Could not open $reldir/Makefile\n";
 	my $txt = <$F>;
 	close($F);
-	$/ = $t;
 
 	return $txt;
 }
diff --git a/src/tools/win32tzlist.pl b/src/tools/win32tzlist.pl
@@ -60,12 +60,13 @@
 # Fetch all timezones currently in the file
 #
 my @file_zones;
+my $pgtz;
 open(my $tzfh, '<', $tzfile) or die "Could not open $tzfile!\n";
-my $t = $/;
-undef $/;
-my $pgtz = <$tzfh>;
+{
+	local $/ = undef;
+	$pgtz = <$tzfh>;
+}
 close($tzfh);
-$/ = $t;
 
 # Attempt to locate and extract the complete win32_tzmap struct
 $pgtz =~ /win32_tzmap\[\] =\s+{\s+\/\*[^\/]+\*\/\s+(.+?)};/gs

Original file line number	Diff line number	Diff line change
`@@ -762,13 +762,10 @@ sub read_file`
`762`	`762`	`{`
`763`	`763`	`my $filename = shift;`
`764`	`764`	`my $F;`
`765`		`- my $t = $/;`
`766`		`-`
`767`		`- undef $/;`
	`765`	`+ local $/ = undef;`
`768`	`766`	`open($F, '<', $filename) \|\| die "Could not open file $filename\n";`
`769`	`767`	`my $txt = <$F>;`
`770`	`768`	`close($F);`
`771`		`- $/ = $t;`
`772`	`769`
`773`	`770`	`return $txt;`
`774`	`771`	`}`