X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/5b7d7f42ef266362176d08d8ae7b565ed5af93ff222f45d8231347b3376f8771..f2077f0053f3705a10e237d87e8f68bceaa55941e23f5d84a737ae66c5cdf89e:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index 9bcb890..7da50c8 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -14,7 +14,7 @@ use CGI::Carp qw(fatalsToBrowser); my $cgi = new CGI; -my $version = "078"; +my $version = "085"; my $projectroot = "/pub/scm"; my $home_link = "/git"; my $gitbin = "/usr/bin"; @@ -22,113 +22,116 @@ my $gittmp = "/tmp/gitweb"; my $logo_link = "/pub/software/scm/cogito"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); +my $rss_link = ""; -# remove # -my $projectroot = "/home/kay/public_html/pub/scm"; -my $home_link = "/~kay/git"; -my $logo_link = "/~kay/pub/software/scm/cogito"; -# remove # - -mkdir($gittmp, 0700); my $project = $cgi->param('p'); -my $action = $cgi->param('a'); -my $hash = $cgi->param('h'); -my $hash_parent = $cgi->param('hp'); -my $file_name = $cgi->param('f'); -my $time_back = $cgi->param('t'); -$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects"; - -# validate input if (defined($project)) { if ($project =~ /(^|\/)(|\.|\.\.)($|\/)/) { + $project = ""; die_error("", "Invalid project parameter."); } if (!(-d "$projectroot/$project")) { + $project = ""; die_error("", "No such project."); } + $rss_link = ""; } + +my $file_name = $cgi->param('f'); if (defined($file_name) && $file_name =~ /(^|\/)(|\.|\.\.)($|\/)/) { + $file_name = ""; die_error("", "Invalid file parameter."); } -if (defined($action) && !$action =~ m/^[0-9a-zA-Z\.\-]+$/) { + +my $action = $cgi->param('a'); +if (defined($action) && $action =~ m/[^0-9a-zA-Z\.\-]+$/) { + $action = ""; die_error("", "Invalid action parameter."); } + +my $hash = $cgi->param('h'); if (defined($hash) && !($hash =~ m/^[0-9a-fA-F]{40}$/)) { + $hash = ""; die_error("", "Invalid hash parameter."); } + +my $hash_parent = $cgi->param('hp'); if (defined($hash_parent) && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) { + $hash_parent = ""; die_error("", "Invalid parent hash parameter."); } + +my $time_back = $cgi->param('t'); if (defined($time_back) && !($time_back =~ m/^[0-9]+$/)) { + $time_back = ""; die_error("", "Invalid time parameter."); } +$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects"; +mkdir($gittmp, 0700); + sub git_header_html { my $status = shift || "200 OK"; print $cgi->header(-type=>'text/html', -charset => 'utf-8', -status=> $status); print < + - git - $project $action - - +git - $project +$rss_link + EOF @@ -146,13 +149,18 @@ EOF } sub git_footer_html { - print "
"; - print "
version $version
"; - if ($project ne '') { + print "
\n"; + if ($project ne "") { + if (-e "$projectroot/$project/description") { + open(my $fd, "$projectroot/$project/description"); + my $descr = <$fd>; + print "
" . escapeHTML($descr) . "
\n"; + close $fd; + } print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "XML") . "\n"; } - print "
" . - "" . + print "
\n" . + "\n" . ""; } @@ -160,12 +168,10 @@ sub die_error { my $status = shift || "403 Forbidden"; my $error = shift || "Malformed query, file missing or permission denied"; - $project = ""; - $action = ""; git_header_html($status); print "
\n" . "

\n"; - print "$error\n"; + print "$status - $error\n"; print "
\n"; git_footer_html(); exit 0; @@ -173,7 +179,7 @@ sub die_error { sub git_head { my $path = shift; - open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory.");; + open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory."); my $head = <$fd>; close $fd; chomp $head; @@ -185,7 +191,7 @@ sub git_commit { my %co; my @parents; - open my $fd, "-|", "$gitbin/git-cat-file commit $commit"; + open my $fd, "-|", "$gitbin/cat-file commit $commit"; while (my $line = <$fd>) { chomp($line); last if $line eq ""; @@ -257,7 +263,7 @@ sub git_diff_html { if ($from ne "") { $from_tmp = "$gittmp/gitweb_" . $$ . "_from"; open(my $fd2, "> $from_tmp"); - open my $fd, "-|", "$gitbin/git-cat-file blob $from"; + open my $fd, "-|", "$gitbin/cat-file blob $from"; my @file = <$fd>; print $fd2 @file; close $fd2; @@ -269,7 +275,7 @@ sub git_diff_html { if ($to ne "") { $to_tmp = "$gittmp/gitweb_" . $$ . "_to"; open my $fd2, "> $to_tmp"; - open my $fd, "-|", "$gitbin/git-cat-file blob $to"; + open my $fd, "-|", "$gitbin/cat-file blob $to"; my @file = <$fd>; print $fd2 @file; close $fd2; @@ -387,7 +393,7 @@ if ($action eq "blob") { print "

\n"; print "
$hash
\n"; print "
\n";
-	open(my $fd, "-|", "$gitbin/git-cat-file blob $hash");
+	open(my $fd, "-|", "$gitbin/cat-file blob $hash");
 	my $nr;
 	while (my $line = <$fd>) {
 		$nr++;
@@ -401,7 +407,7 @@ if ($action eq "blob") {
 	if ($hash eq "") {
 		$hash = git_head($project);
 	}
-	open my $fd, "-|", "$gitbin/git-ls-tree $hash";
+	open my $fd, "-|", "$gitbin/ls-tree $hash";
 	my (@entries) = map { chomp; $_ } <$fd>;
 	close $fd;
 
@@ -409,12 +415,13 @@ if ($action eq "blob") {
 	my %co = git_commit($hash);
 	if (defined(%co)) {
 		print "
 view\n" .
-		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" .
-		      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | \n" .
-		      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\n" .
-		      "

\n";
+		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | " .
+		      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | " .
+		      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") .
+		      "

\n" .
+		      "
\n"; print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; } else { print "
\n"; @@ -440,7 +447,7 @@ if ($action eq "blob") { print "
"; git_footer_html(); } elsif ($action eq "log" || $action eq "rss") { - open my $fd, "-|", "$gitbin/git-rev-list " . git_head($project); + open my $fd, "-|", "$gitbin/rev-list " . git_head($project); my (@revlist) = map { chomp; $_ } <$fd>; close $fd; @@ -448,10 +455,10 @@ if ($action eq "blob") { git_header_html(); print "
\n"; print "view "; - print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | \n" . + print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "
\n"; print "

\n" . "
\n"; @@ -478,15 +485,15 @@ if ($action eq "blob") { last; } print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "log_title"}, + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"}, "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" . "
\n"; - print "
\n" . + print "
\n" . "
\n" . "view " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "diff") . "
\n" . "
\n" . - escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n" . + "" . escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n" . "
\n" . "
\n"; my $comment = $co{'comment'}; @@ -522,10 +529,18 @@ if ($action eq "blob") { } my %ad = date_str($co{'author_epoch'}, $co{'author_tz'}); my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'}); - open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash"; - my (@difftree) = map { chomp; $_ } <$fd>; - close $fd; + my @difftree; + if (defined($co{'parent'})) { + open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash"; + @difftree = map { chomp; $_ } <$fd>; + close $fd; + } else { + # fake git-diff-tree output for initial revision + open my $fd, "-|", "$gitbin/ls-tree -r $hash"; + @difftree = map { chomp; "+" . $_ } <$fd>; + close $fd; + } git_header_html(); print "
view\n" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" . @@ -533,37 +548,44 @@ if ($action eq "blob") { $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\n" . "

\n"; print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "log_title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; - print "
\n"; - print "author      " . escapeHTML($co{'author'}) . "
\n"; - print "author-time " . $ad{'rfc2822'}; - if ($ad{'hour_local'} < 6) { print ""; } + print "
\n" . + ""; + print "\n"; + print "\n"; + print "\n"; + print "\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { - print "parent      " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n"; + print "\n"; } - print "\n"; + print "
author" . escapeHTML($co{'author'}) . "
" . + " " . $ad{'rfc2822'}; + if ($ad{'hour_local'} < 6) { + print ""; + } printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}); - if ($ad{'hour_local'} < 6 ) { print ""; } - print "
\n"; - print "committer   " . escapeHTML($co{'committer'}) . "
\n"; - print "commit-time " . $cd{'rfc2822'}; - printf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}); - print "
\n"; - print "commit      $hash
\n"; - print "tree        " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, $co{'tree'}) . "
\n"; + if ($ad{'hour_local'} < 6 ) { + print ""; + } + print "\n" . + "
committer" . escapeHTML($co{'committer'}) . "
" . + " " . $cd{'rfc2822'} . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "\n" . + "
commit$hash
tree" . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, $co{'tree'}) . "
parent" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n"; print "
\n"; my $comment = $co{'comment'}; foreach my $line (@$comment) { if ($line =~ m/(signed-off|acked)-by:/i) { - print "" . escapeHTML($line) . "
\n"; + print "" . escapeHTML($line) . "
\n"; } else { print escapeHTML($line) . "
\n"; } } - print "

\n" . - "
\n"; + print "
\n"; + if ($#difftree > 10) { + print "
" . ($#difftree + 1) . " files changed:
\n"; + } foreach my $line (@difftree) { # '*100644->100644 blob 9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596 net/ipv4/route.c' # '+100644 blob 4a83ab6cd565d21ab0385bac6643826b83c2fcd4 arch/arm/lib/bitops.h' @@ -578,23 +600,23 @@ if ($action eq "blob") { my $mode_chng = ""; if ($type eq "blob") { if ($op eq "+") { - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id", -class => "list"}, + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, escapeHTML($file) . " [new]") . "\n" . "
"; print "
\n" . "view " . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "

\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "
\n" . "
\n"; } elsif ($op eq "-") { - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id", -class => "list"}, + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, escapeHTML($file) . " [removed]") . "\n" . "
"; print "
\n" . "view " . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . " | " . - $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "

\n" . + $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "
\n" . "
\n"; } elsif ($op eq "*") { $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/; @@ -605,19 +627,25 @@ if ($action eq "blob") { my $to_mode = $2; my $mode_chnge = ""; if ($from_mode != $to_mode) { - $mode_chnge = " [chmod $mode]\n"; + $mode_chnge = " [chmod $mode]\n"; + } + print "
\n"; + if ($to_id ne $from_id) { + print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id"}, + escapeHTML($file) . $mode_chnge) . "\n" . + "
\n"; + } else { + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"}, + escapeHTML($file) . $mode_chnge) . "\n" . + "
\n"; } - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id", -class => "list"}, - escapeHTML($file) . $mode_chnge) . "\n" . - "
\n"; print "
\n" . "view "; if ($to_id ne $from_id) { print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id"}, "diff") . " | "; } print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"}, "file") . " | " . - $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "

\n" . + $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "
\n" . "
\n"; } } @@ -639,7 +667,7 @@ if ($action eq "blob") { if (!defined(%co)) { die_error("", "Unknown commit object."); } - open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash"; + open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash"; my (@difftree) = map { chomp; $_ } <$fd>; close $fd; @@ -650,7 +678,7 @@ if ($action eq "blob") { $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\n" . "

\n"; print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; print "
\n" . "
\n";
@@ -682,7 +710,7 @@ if ($action eq "blob") {
 	if (!(defined($hash))) {
 		$hash = git_head($project);
 	}
-	open my $fd, "-|", "$gitbin/git-rev-list $hash";
+	open my $fd, "-|", "$gitbin/rev-list $hash";
 	my (@revlist) = map { chomp; $_ } <$fd>;
 	close $fd;
 
@@ -690,17 +718,14 @@ if ($action eq "blob") {
 	print "
\n";
 	print "

\n";
 	print "
\n" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, escapeHTML($file_name)) . "\n" .
-	      "
\n";
-	print "
\n" .
-	      "
\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($file_name)) . "\n" .
 	      "
\n";
 	foreach my $rev (@revlist) {
 		my %co = git_commit($rev);
 		my $parents  = $co{'parents'};
 		my $found = 0;
 		foreach my $parent (@$parents) {
-			open $fd, "-|", "$gitbin/git-diff-tree -r $parent $rev $file_name";
+			open $fd, "-|", "$gitbin/diff-tree -r $parent $rev $file_name";
 			my (@difftree) = map { chomp; $_ } <$fd>;
 			close $fd;
 
@@ -717,15 +742,16 @@ if ($action eq "blob") {
 			print "
\n" .
 			      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$rev"},
 			      "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" .
-			      "
\n" .
+			      "
\n";
+			print "
\n" .
 			      "view " .
 			      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$rev"}, "commit") . " | " .
-			      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$rev"}, "tree") . "

\n" . 
-			      "
\n" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$rev"}, "tree") . "

\n" .
 			      "
\n";
 		}
 	}
 	git_footer_html();
 } else {
-	die_error("", "unknown action");
+	$action = "";
+	die_error("", "Unknown action.");
 }