gitweb: Localize magic variable $/

Instead of undefining and then restoring magic variable $/ (input
record separator) for 'slurp mode', localize it.

While at it, state explicitely that "local $/;" makes it undefined, by
using explicit  "local $/ = undef;".

Signed-off-by: Jakub Narebski <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/gitweb.perl b/gitweb.perl
index b7524e96606464c9affbeea4a0590a06d259e4f47bde5d71bd72a499273313f8..9f0e84e04b12e1a67599bb363cc3988bca3bfc12c5161441d98613e94df6841e 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -3326,7 +3326,7 @@ sub git_get_link_target {
        open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                or return;
        {
        open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                or return;
        {

-               local $/;
+               local $/ = undef;

                $link_target = <$fd>;
        }
        close $fd
                $link_target = <$fd>;
        }
        close $fd


@@ -4801,11 +4801,10 @@ sub git_blob_plain {
                -content_disposition =>
                        ($sandbox ? 'attachment' : 'inline')
                        . '; filename="' . $save_as . '"');
                -content_disposition =>
                        ($sandbox ? 'attachment' : 'inline')
                        . '; filename="' . $save_as . '"');

-       undef $/;
+       local $/ = undef;

        binmode STDOUT, ':raw';
        print <$fd>;
        binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
        binmode STDOUT, ':raw';
        print <$fd>;
        binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi

-       $/ = "\n";

        close $fd;
 }
 
        close $fd;
 }
 


@@ -4907,12 +4906,16 @@ sub git_tree {
                }
        }
        die_error(404, "No such tree") unless defined($hash);
                }
        }
        die_error(404, "No such tree") unless defined($hash);

-       $/ = "\0";
-       open my $fd, "-|", git_cmd(), "ls-tree", '-z', $hash
-               or die_error(500, "Open git-ls-tree failed");
-       my @entries = map { chomp; $_ } <$fd>;
-       close $fd or die_error(404, "Reading tree failed");
-       $/ = "\n";
+
+       my @entries = ();
+       {
+               local $/ = "\0";
+               open my $fd, "-|", git_cmd(), "ls-tree", '-z', $hash
+                       or die_error(500, "Open git-ls-tree failed");
+               @entries = map { chomp; $_ } <$fd>;
+               close $fd
+                       or die_error(404, "Reading tree failed");
+       }

 
        my $refs = git_get_references();
        my $ref = format_ref_marker($refs, $hash_base);
 
        my $refs = git_get_references();
        my $ref = format_ref_marker($refs, $hash_base);


@@ -5807,7 +5810,7 @@ sub git_search {
 
                print "<table class=\"pickaxe search\">\n";
                my $alternate = 1;
 
                print "<table class=\"pickaxe search\">\n";
                my $alternate = 1;

-               $/ = "\n";
+               local $/ = "\n";

                open my $fd, '-|', git_cmd(), '--no-pager', 'log', @diff_opts,
                        '--pretty=format:%H', '--no-abbrev', '--raw', "-S$searchtext",
                        ($search_use_regexp ? '--pickaxe-regex' : ());
                open my $fd, '-|', git_cmd(), '--no-pager', 'log', @diff_opts,
                        '--pretty=format:%H', '--no-abbrev', '--raw', "-S$searchtext",
                        ($search_use_regexp ? '--pickaxe-regex' : ());


@@ -5877,7 +5880,7 @@ sub git_search {
                print "<table class=\"grep_search\">\n";
                my $alternate = 1;
                my $matches = 0;
                print "<table class=\"grep_search\">\n";
                my $alternate = 1;
                my $matches = 0;

-               $/ = "\n";
+               local $/ = "\n";

                open my $fd, "-|", git_cmd(), 'grep', '-n',
                        $search_use_regexp ? ('-E', '-i') : '-F',
                        $searchtext, $co{'tree'};
                open my $fd, "-|", git_cmd(), 'grep', '-n',
                        $search_use_regexp ? ('-E', '-i') : '-F',
                        $searchtext, $co{'tree'};