gitweb: Simplify snapshot format detection logic in evaluate_path_info

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 794724c2bd178207c45280f403557b25e97fb41b7c6d78a48fd8e33e81709cbc..acc010d89008505e5bcfe039c0366c9218758ab0efa4c631b4bde0606cd1c259 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -403,13 +403,13 @@ sub feature_bool {
        my $key = shift;
        my ($val) = git_get_project_config($key, '--bool');
 
        my $key = shift;
        my ($val) = git_get_project_config($key, '--bool');
 

-       if ($val eq 'true') {
+       if (!defined $val) {
+               return ($_[0]);
+       } elsif ($val eq 'true') {

                return (1);
        } elsif ($val eq 'false') {
                return (0);
        }
                return (1);
        } elsif ($val eq 'false') {
                return (0);
        }

-
-       return ($_[0]);

 }
 
 sub feature_snapshot {
 }
 
 sub feature_snapshot {


@@ -459,8 +459,8 @@ sub filter_snapshot_fmts {
        @fmts = map {
                exists $known_snapshot_format_aliases{$_} ?
                       $known_snapshot_format_aliases{$_} : $_} @fmts;
        @fmts = map {
                exists $known_snapshot_format_aliases{$_} ?
                       $known_snapshot_format_aliases{$_} : $_} @fmts;

-       @fmts = grep(exists $known_snapshot_formats{$_}, @fmts);
-
+       @fmts = grep {
+               exists $known_snapshot_formats{$_} } @fmts;

 }
 
 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
 }
 
 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";


@@ -689,11 +689,12 @@ sub evaluate_path_info {
                # extensions. Allowed extensions are both the defined suffix
                # (which includes the initial dot already) and the snapshot
                # format key itself, with a prepended dot
                # extensions. Allowed extensions are both the defined suffix
                # (which includes the initial dot already) and the snapshot
                # format key itself, with a prepended dot

-               while (my ($fmt, %opt) = each %known_snapshot_formats) {
+               while (my ($fmt, $opt) = each %known_snapshot_formats) {

                        my $hash = $refname;
                        my $hash = $refname;

-                       my $sfx;
-                       $hash =~ s/(\Q$opt{'suffix'}\E|\Q.$fmt\E)$//;
-                       next unless $sfx = $1;
+                       unless ($hash =~ s/(\Q$opt->{'suffix'}\E|\Q.$fmt\E)$//) {
+                               next;
+                       }
+                       my $sfx = $1;

                        # a valid suffix was found, so set the snapshot format
                        # and reset the hash parameter
                        $input_params{'snapshot_format'} = $fmt;
                        # a valid suffix was found, so set the snapshot format
                        # and reset the hash parameter
                        $input_params{'snapshot_format'} = $fmt;


@@ -829,7 +830,7 @@ if (!defined $action) {
 if (!defined($actions{$action})) {
        die_error(400, "Unknown action");
 }
 if (!defined($actions{$action})) {
        die_error(400, "Unknown action");
 }

-if ($action !~ m/^(opml|project_list|project_index)$/ &&
+if ($action !~ m/^(?:opml|project_list|project_index)$/ &&

     !$project) {
        die_error(400, "Project needed");
 }
     !$project) {
        die_error(400, "Project needed");
 }


@@ -839,7 +840,7 @@ exit;
 ## ======================================================================
 ## action links
 
 ## ======================================================================
 ## action links
 

-sub href (%) {
+sub href {

        my %params = @_;
        # default is to use -absolute url() i.e. $my_uri
        my $href = $params{-full} ? $my_url : $my_uri;
        my %params = @_;
        # default is to use -absolute url() i.e. $my_uri
        my $href = $params{-full} ? $my_url : $my_uri;


@@ -1037,7 +1038,7 @@ sub esc_url {
 }
 
 # replace invalid utf8 character with SUBSTITUTION sequence
 }
 
 # replace invalid utf8 character with SUBSTITUTION sequence

-sub esc_html ($;%) {
+sub esc_html {

        my $str = shift;
        my %opts = @_;
 
        my $str = shift;
        my %opts = @_;
 


@@ -1297,7 +1298,7 @@ use constant {
 };
 
 # submodule/subproject, a commit object reference
 };
 
 # submodule/subproject, a commit object reference

-sub S_ISGITLINK($) {
+sub S_ISGITLINK {

        my $mode = shift;
 
        return (($mode & S_IFMT) == S_IFGITLINK)
        my $mode = shift;
 
        return (($mode & S_IFMT) == S_IFGITLINK)


@@ -1385,13 +1386,11 @@ sub format_log_line_html {
        my $line = shift;
 
        $line = esc_html($line, -nbsp=>1);
        my $line = shift;
 
        $line = esc_html($line, -nbsp=>1);

-       if ($line =~ m/\b([0-9a-fA-F]{8,40})\b/) {
-               my $hash_text = $1;
-               my $link =
-                       $cgi->a({-href => href(action=>"object", hash=>$hash_text),
-                               -class => "text"}, $hash_text);
-               $line =~ s/$hash_text/$link/;
-       }
+       $line =~ s{\b([0-9a-fA-F]{8,40})\b}{
+               $cgi->a({-href => href(action=>"object", hash=>$1),
+                                       -class => "text"}, $1);
+       }eg;
+

        return $line;
 }
 
        return $line;
 }
 


@@ -1841,7 +1840,7 @@ sub git_cmd {
 # Try to avoid using this function wherever possible.
 sub quote_command {
        return join(' ',
 # Try to avoid using this function wherever possible.
 sub quote_command {
        return join(' ',

-                   map( { my $a = $_; $a =~ s/(['!])/'\\$1'/g; "'$a'" } @_ ));
+               map { my $a = $_; $a =~ s/(['!])/'\\$1'/g; "'$a'" } @_ );

 }
 
 # get HEAD ref of given project as hash
 }
 
 # get HEAD ref of given project as hash


@@ -1915,18 +1914,19 @@ sub git_parse_project_config {
        return %config;
 }
 
        return %config;
 }
 

-# convert config value to boolean, 'true' or 'false'
+# convert config value to boolean: 'true' or 'false'

 # no value, number > 0, 'true' and 'yes' values are true
 # rest of values are treated as false (never as error)
 sub config_to_bool {
        my $val = shift;
 
 # no value, number > 0, 'true' and 'yes' values are true
 # rest of values are treated as false (never as error)
 sub config_to_bool {
        my $val = shift;
 

+       return 1 if !defined $val;             # section.key
+

        # strip leading and trailing whitespace
        $val =~ s/^\s+//;
        $val =~ s/\s+$//;
 
        # strip leading and trailing whitespace
        $val =~ s/^\s+//;
        $val =~ s/\s+$//;
 

-       return (!defined $val ||               # section.key
-               ($val =~ /^\d+$/ && $val) ||   # section.key = 1
+       return (($val =~ /^\d+$/ && $val) ||   # section.key = 1

                ($val =~ /^(?:true|yes)$/i));  # section.key = true
 }
 
                ($val =~ /^(?:true|yes)$/i));  # section.key = true
 }
 


@@ -1979,6 +1979,9 @@ sub git_get_project_config {
                $config_file = "$git_dir/config";
        }
 
                $config_file = "$git_dir/config";
        }
 

+       # check if config variable (key) exists
+       return unless exists $config{"gitweb.$key"};
+

        # ensure given type
        if (!defined $type) {
                return $config{"gitweb.$key"};
        # ensure given type
        if (!defined $type) {
                return $config{"gitweb.$key"};


@@ -2049,7 +2052,7 @@ sub git_get_project_description {
        my $path = shift;
 
        $git_dir = "$projectroot/$path";
        my $path = shift;
 
        $git_dir = "$projectroot/$path";

-       open my $fd, "$git_dir/description"
+       open my $fd, '<', "$git_dir/description"

                or return git_get_project_config('description');
        my $descr = <$fd>;
        close $fd;
                or return git_get_project_config('description');
        my $descr = <$fd>;
        close $fd;


@@ -2064,18 +2067,17 @@ sub git_get_project_ctags {
        my $ctags = {};
 
        $git_dir = "$projectroot/$path";
        my $ctags = {};
 
        $git_dir = "$projectroot/$path";

-       unless (opendir D, "$git_dir/ctags") {
-               return $ctags;
-       }
-       foreach (grep { -f $_ } map { "$git_dir/ctags/$_" } readdir(D)) {
-               open CT, $_ or next;
-               my $val = <CT>;
+       opendir my $dh, "$git_dir/ctags"
+               or return $ctags;
+       foreach (grep { -f $_ } map { "$git_dir/ctags/$_" } readdir($dh)) {
+               open my $ct, '<', $_ or next;
+               my $val = <$ct>;

                chomp $val;
                chomp $val;

-               close CT;
+               close $ct;

                my $ctag = $_; $ctag =~ s#.*/##;
                $ctags->{$ctag} = $val;
        }
                my $ctag = $_; $ctag =~ s#.*/##;
                $ctags->{$ctag} = $val;
        }

-       closedir D;
+       closedir $dh;

        $ctags;
 }
 
        $ctags;
 }
 


@@ -2128,7 +2130,7 @@ sub git_get_project_url_list {
        my $path = shift;
 
        $git_dir = "$projectroot/$path";
        my $path = shift;
 
        $git_dir = "$projectroot/$path";

-       open my $fd, "$git_dir/cloneurl"
+       open my $fd, '<', "$git_dir/cloneurl"

                or return wantarray ?
                @{ config_to_multi(git_get_project_config('url')) } :
                   config_to_multi(git_get_project_config('url'));
                or return wantarray ?
                @{ config_to_multi(git_get_project_config('url')) } :
                   config_to_multi(git_get_project_config('url'));


@@ -2186,7 +2188,7 @@ sub git_get_projects_list {
                # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
                # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
                my %paths;
                # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
                # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
                my %paths;

-               open my ($fd), $projects_list or return;
+               open my $fd, '<', $projects_list or return;

        PROJECT:
                while (my $line = <$fd>) {
                        chomp $line;
        PROJECT:
                while (my $line = <$fd>) {
                        chomp $line;


@@ -2249,7 +2251,7 @@ sub git_get_project_list_from_file {
        # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
        # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
        if (-f $projects_list) {
        # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
        # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
        if (-f $projects_list) {

-               open (my $fd , $projects_list);
+               open(my $fd, '<', $projects_list);

                while (my $line = <$fd>) {
                        chomp $line;
                        my ($pr, $ow) = split ' ', $line;
                while (my $line = <$fd>) {
                        chomp $line;
                        my ($pr, $ow) = split ' ', $line;


@@ -2614,7 +2616,7 @@ sub parsed_difftree_line {
 }
 
 # parse line of git-ls-tree output
 }
 
 # parse line of git-ls-tree output

-sub parse_ls_tree_line ($;%) {
+sub parse_ls_tree_line {

        my $line = shift;
        my %opts = @_;
        my %res;
        my $line = shift;
        my %opts = @_;
        my %res;


@@ -2803,18 +2805,18 @@ sub mimetype_guess_file {
        -r $mimemap or return undef;
 
        my %mimemap;
        -r $mimemap or return undef;
 
        my %mimemap;

-       open(MIME, $mimemap) or return undef;
-       while (<MIME>) {
+       open(my $mh, '<', $mimemap) or return undef;
+       while (<$mh>) {

                next if m/^#/; # skip comments
                next if m/^#/; # skip comments

-               my ($mime, $exts) = split(/\t+/);
+               my ($mimetype, $exts) = split(/\t+/);

                if (defined $exts) {
                        my @exts = split(/\s+/, $exts);
                        foreach my $ext (@exts) {
                if (defined $exts) {
                        my @exts = split(/\s+/, $exts);
                        foreach my $ext (@exts) {

-                               $mimemap{$ext} = $mime;
+                               $mimemap{$ext} = $mimetype;

                        }
                }
        }
                        }
                }
        }

-       close(MIME);
+       close($mh);

 
        $filename =~ /\.([^.]*)$/;
        return $mimemap{$1};
 
        $filename =~ /\.([^.]*)$/;
        return $mimemap{$1};


@@ -3212,7 +3214,6 @@ sub git_print_header_div {
              "\n</div>\n";
 }
 
              "\n</div>\n";
 }
 

-#sub git_print_authorship (\%) {

 sub git_print_authorship {
        my $co = shift;
 
 sub git_print_authorship {
        my $co = shift;
 


@@ -3268,8 +3269,7 @@ sub git_print_page_path {
        print "<br/></div>\n";
 }
 
        print "<br/></div>\n";
 }
 

-# sub git_print_log (\@;%) {
-sub git_print_log ($;%) {
+sub git_print_log {

        my $log = shift;
        my %opts = @_;
 
        my $log = shift;
        my %opts = @_;
 


@@ -3327,7 +3327,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


@@ -3992,7 +3992,7 @@ sub fill_project_list_info {
                            ($pname !~ /\/$/) &&
                            (-d "$projectroot/$pname")) {
                                $pr->{'forks'} = "-d $projectroot/$pname";
                            ($pname !~ /\/$/) &&
                            (-d "$projectroot/$pname")) {
                                $pr->{'forks'} = "-d $projectroot/$pname";

-                       }       else {
+                       } else {

                                $pr->{'forks'} = 0;
                        }
                }
                                $pr->{'forks'} = 0;
                        }
                }


@@ -4802,11 +4802,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;
 }
 


@@ -4908,12 +4907,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);


@@ -5808,7 +5811,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' : ());


@@ -5878,7 +5881,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'};


@@ -6281,7 +6284,7 @@ XML
        # end of feed
        if ($format eq 'rss') {
                print "</channel>\n</rss>\n";
        # end of feed
        if ($format eq 'rss') {
                print "</channel>\n</rss>\n";

-       }       elsif ($format eq 'atom') {
+       } elsif ($format eq 'atom') {

                print "</feed>\n";
        }
 }
                print "</feed>\n";
        }
 }