===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.23
retrieving revision 3.33
diff -u -p -r3.23 -r3.33
--- cvsweb/cvsweb.cgi 2000/09/19 19:57:58 3.23
+++ cvsweb/cvsweb.cgi 2000/10/07 07:44:12 3.33
@@ -42,8 +42,8 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $zId: cvsweb.cgi,v 1.101 2000/09/13 22:44:05 jumager Exp $
-# $Id: cvsweb.cgi,v 3.23 2000/09/19 19:57:58 knu Exp $
+# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
+# $Id: cvsweb.cgi,v 3.33 2000/10/07 07:44:12 knu Exp $
#
###
@@ -64,8 +64,9 @@ use vars qw (
$bylog $byfile $hr_default $logsort $cvstree $cvsroot
$mimetype $defaultTextPlain $defaultViewable $allow_compress
$GZIPBIN $backicon $diricon $fileicon $fullname $newname
- $cvstreedefault $body_tag $logo $defaulttitle $address
- $backcolor $long_intro $short_instruction $shortLogLen
+ $cvstreedefault $body_tag $body_tag_for_src
+ $logo $defaulttitle $address
+ $long_intro $short_instruction $shortLogLen
$show_author $dirtable $tablepadding $columnHeaderColorDefault
$columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite
$hr_ignkeysubst $diffcolorHeading $diffcolorEmpty $diffcolorRemove
@@ -78,6 +79,7 @@ use vars qw (
$tabstop $state $annTable $sel $curbranch @HideModules
$module $use_descriptions %descriptions @mytz $dwhere $moddate
$use_moddate $has_zlib $gzip_open
+ $LOG_FILESEPARATOR $LOG_REVSEPARATOR
);
sub printDiffSelect($);
@@ -90,6 +92,8 @@ sub fatal($$);
sub redirect($);
sub safeglob($);
sub getMimeTypeFromSuffix($);
+sub head($;$);
+sub scan_directives(@);
sub doAnnotate($$);
sub doCheckout($$);
sub cvswebMarkup($$$);
@@ -122,14 +126,13 @@ sub forbidden_module($);
use Cwd;
# == EDIT this ==
-# User configuration is stored in
-$config = undef;
-
-for ($ENV{CVSWEB_CONFIG},
-# '/home/knu/etc/cvsweb.conf',
+# Locations to search for user configuration, in order:
+for (
+ $ENV{CVSWEB_CONFIG},
'/usr/local/etc/cvsweb.conf',
- getcwd . '/cvsweb.conf') {
- $config = $_ if defined($_) && -r $_;
+ getcwd() . '/cvsweb.conf'
+ ) {
+ $config = $_ if defined($_) && -r $_;
}
# == Configuration defaults ==
@@ -143,8 +146,9 @@ $allow_version_select = 1;
# These are defined to allow checking with perl -cw
%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =
%tags = %alltags = @tabcolors = ();
-$cvstreedefault = $body_tag = $logo = $defaulttitle = $address =
-$backcolor = $long_intro = $short_instruction = $shortLogLen =
+$cvstreedefault = $body_tag = $body_tag_for_src =
+$logo = $defaulttitle = $address =
+$long_intro = $short_instruction = $shortLogLen =
$show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =
$columnHeaderColorSorted = $hr_breakable = $showfunc = $hr_ignwhite =
$hr_ignkeysubst = $diffcolorHeading = $diffcolorEmpty = $diffcolorRemove =
@@ -154,8 +158,11 @@ $allow_markup = $use_java_script = $open_extern_window
$extern_window_width = $extern_window_height = $edit_option_form =
$checkout_magic = $show_subdir_lastmod = $show_log_in_markup = $v =
$navigationHeaderColor = $tableBorderColor = $markupLogColor =
-$tabstop = $use_moddate = $moddate = undef;
+$tabstop = $use_moddate = $moddate = $gzip_open = undef;
+$LOG_FILESEPARATOR = q/^={77}$/;
+$LOG_REVSEPARATOR = q/^-{28}$/;
+
##### End of configuration variables #####
use Time::Local;
@@ -207,7 +214,8 @@ $nofilelinks = $is_textbased;
# display garbage then :-/
# Turn off gzip if running under mod_perl and no zlib is available,
# piping does not work as expected inside the server.
-$maycompress = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
+$maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
+ && $ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`)
|| $is_mozilla3)
&& !$is_msie
&& !($is_mod_perl && !$has_zlib));
@@ -219,9 +227,11 @@ $maycompress = (($ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`
@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
if (-f $config) {
- do $config;
-}
-else {
+ do $config
+ || &fatal("500 Internal Error",
+ sprintf('Error in loading configuration file: %s
%s
',
+ $config, &htmlify($@)));
+} else {
&fatal("500 Internal Error",
'Configuration not found. Set the variable $config
'
. 'in cvsweb.cgi, or the environment variable '
@@ -273,25 +283,24 @@ foreach (keys %DEFAULTVALUE)
}
$barequery = "";
+my @barequery;
foreach (@stickyvars) {
# construct a query string with the sticky non default parameters set
if (defined($input{$_}) && $input{$_} ne '' &&
!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) {
- if ($barequery) {
- $barequery = $barequery . "&";
- }
- my $thisval = urlencode($_) . "=" . urlencode($input{$_});
- $barequery .= $thisval;
+ push @barequery, join('=', urlencode($_), urlencode($input{$_}));
}
}
# is there any query ?
-if ($barequery) {
+if (@barequery) {
+ $barequery = join('&', @barequery);
$query = "?$barequery";
- $barequery = "&" . $barequery;
+ $barequery = "&$barequery";
}
else {
$query = "";
}
+undef @barequery;
# get actual parameters
$sortby = $input{"sortby"};
@@ -339,7 +348,8 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}})
$cvsroot = $CVSROOT{$cvstree};
# create icons out of description
-foreach my $k (keys %ICONS) {
+my $k;
+foreach $k (keys %ICONS) {
no strict 'refs';
my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};
if ($ipath) {
@@ -349,9 +359,18 @@ foreach my $k (keys %ICONS) {
${"${k}icon"} = $itxt;
}
}
+undef $k;
+my $config_cvstree = "$config-$cvstree";
+
# Do some special configuration for cvstrees
-do "$config-$cvstree" if (-f "$config-$cvstree");
+if (-f $config_cvstree) {
+ do $config_cvstree
+ || &fatal("500 Internal Error",
+ sprintf('Error in loading configuration file: %s
%s
',
+ $config_cvstree, &htmlify($@)));
+}
+undef $config_cvstree;
$prcategories = '(?:' . join('|', @prcategories) . ')';
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
@@ -780,18 +799,18 @@ elsif (-d $fullname) {
elsif (-f $fullname . ',v') {
if (defined($input{'rev'}) || $doCheckout) {
&doCheckout($fullname, $input{'rev'});
- close(GZIP) if ($gzip_open);
+ gzipclose();
exit;
}
if (defined($input{'annotate'}) && $allow_annotate) {
&doAnnotate($input{'annotate'});
- close(GZIP) if ($gzip_open);
+ gzipclose();
exit;
}
if (defined($input{'r1'}) && defined($input{'r2'})) {
&doDiff($fullname, $input{'r1'}, $input{'tr1'},
$input{'r2'}, $input{'tr2'}, $input{'f'});
- close(GZIP) if ($gzip_open);
+ gzipclose();
exit;
}
print("going to dolog($fullname)\n") if ($verbose);
@@ -814,7 +833,7 @@ elsif (-d $fullname) {
# e.g. foo.c
&doDiff($fullname, $input{'r1'}, $input{'tr1'},
$input{'r2'}, $input{'tr2'}, $input{'f'});
- close(GZIP) if ($gzip_open);
+ gzipclose();
exit;
}
elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| &&
@@ -849,7 +868,7 @@ elsif (-d $fullname) {
&fatal("404 Not Found","$where: no such file or directory");
}
-close(GZIP) if ($gzip_open);
+gzipclose();
## End MAIN
sub printDiffSelect($) {
@@ -917,13 +936,13 @@ sub htmlify($;$) {
if ($extra) {
# get PR #'s as link ..
if (defined($prcgi)) {
- 1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1 . &link($2, sprintf($prcgi, $2))`ie; # `
- $string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo; # `
+ 1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1 . &link($2, sprintf($prcgi, $2))`ie; # `;
+ $string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo; # `;
}
# get manpage specs as link ..
if (defined($mancgi)) {
- $string =~ s`\b([a-zA-Z]\w+)\(([0-9n])\)\B`&link($&, sprintf($mancgi, $2, $1))`ge; # `
+ $string =~ s`\b([a-zA-Z]\w+)(?:\(([0-9n])\)\B|\.([0-9n])\b)`&link($&, sprintf($mancgi, $2 ne '' ? $2 : $3, $1))`ge; # `x;
}
}
@@ -963,7 +982,7 @@ sub spacedHtmlText($;$) {
sub link($$) {
my($name, $where) = @_;
- return "$name\n";
+ return "$name";
}
sub revcmp($$) {
@@ -1075,6 +1094,40 @@ sub getMimeTypeFromSuffix($) {
}
###############################
+# read first lines like head(1)
+###############################
+sub head($;$) {
+ my $fh = $_[0];
+ my $linecount = $_[1] || 10;
+
+ my @buf;
+
+ if ($linecount > 0) {
+ my $i;
+ for ($i = 0; !eof($fh) && $i < $linecount; $i++) {
+ push @buf, scalar <$fh>;
+ }
+ } else {
+ @buf = <$fh>;
+ }
+
+ @buf;
+}
+
+###############################
+# scan vim and Emacs directives
+###############################
+sub scan_directives(@) {
+ my $ts = undef;
+
+ for (@_) {
+ $ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/;
+ }
+
+ ('tabstop' => $ts);
+}
+
+###############################
# show Annotation
###############################
sub doAnnotate($$) {
@@ -1094,11 +1147,6 @@ sub doAnnotate($$) {
($pathname = $where) =~ s/(Attic\/)?[^\/]*$//;
($filename = $where) =~ s/^.*\///;
- http_header();
-
- navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");
- print "
"; } - while (<$reader>) { + + # prefetch several lines + my @buf = head($reader); + + my %d = scan_directives(@buf); + + while (@buf || !eof($reader)) { + $_ = @buf ? shift @buf : <$reader>; + my @words = split; # Adding one is for the (single) space which follows $words[0]. my $rest = substr ($_, length ($words[0]) + 1); @@ -1184,33 +1245,41 @@ sub doAnnotate($$) { } elsif ($words[0] eq "M") { $lineNr++; - my $lrev = substr ($_, 2, 13); - my $lusr = substr ($_, 16, 9); - my $line = substr ($_, 36); + (my $lrev = substr($_, 2, 13)) =~ y/ //d; + (my $lusr = substr($_, 16, 9)) =~ y/ //d; + my $line = substr($_, 36); + my $isCurrentRev = ($rev eq $lrev); # we should parse the date here .. if ($lrev eq $oldLrev) { - $revprint = " "; + $revprint = sprintf('%-8s', ''); } else { - $revprint = $lrev; $oldLusr = ""; - $revprint =~ s`^(\S+)`$1`; # ` + $revprint = sprintf('%-8s', $lrev); + $revprint =~ s`\S+`$&`; # ` + $oldLusr = ''; } if ($lusr eq $oldLusr) { - $usrprint = " "; + $usrprint = ''; } else { $usrprint = $lusr; } $oldLrev = $lrev; $oldLusr = $lusr; - # is there a less timeconsuming way to strip spaces ? - ($lrev = $lrev) =~ s/\s+//g; - my $isCurrentRev = ($rev eq $lrev); - print "" if ($isCurrentRev); - printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr); - print spacedHtmlText($line); - print "" if ($isCurrentRev); + # Set bold for text-based browsers only - graphical + # browsers show bold fonts a bit wider than regular fonts, + # so it looks irregular. + print "" if ($isCurrentRev && $is_textbased); + + printf "%s%s %-8s %4d:", + $revprint, + $isCurrentRev ? '!' : ' ', + $usrprint, + $lineNr; + print spacedHtmlText($line, $d{'tabstop'}); + + print "" if ($isCurrentRev && $is_textbased); } elsif ($words[0] eq "ok") { # We could complain about any text received after this, like the @@ -1352,7 +1421,6 @@ sub cvswebMarkup($$$) { $input{only_with_tag}; } print ""; - my @content = <$filehandle>; my $url = download_url($fileurl, $revision, $mimetype); print "
"; if ($mimetype =~ /^image/) { @@ -1363,8 +1431,16 @@ sub cvswebMarkup($$$) { } else { print ""; - foreach (@content) { - print spacedHtmlText($_); + + # prefetch several lines + my @buf = head($filehandle); + + my %d = scan_directives(@buf); + + while (@buf || !eof($filehandle)) { + $_ = @buf ? shift @buf : <$filehandle>; + + print spacedHtmlText($_, $d{'tabstop'}); } print ""; } @@ -1471,7 +1547,7 @@ sub doDiff($$$$$$) { if ($human_readable) { http_header(); &human_readable_diff($fh, $rev2); - close(GZIP) if ($gzip_open); + gzipclose(); exit; } else { @@ -1622,7 +1698,7 @@ again: $state = "head"; goto again; } - if ($state eq "head" && /^----------------------------$/) { + if ($state eq "head" && /$LOG_REVSEPARATOR/o) { $state = "log"; $rev = undef; $date = undef; @@ -1632,8 +1708,7 @@ again: next; } if ($state eq "log") { - if (/^----------------------------$/ - || /^=============================/) { + if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) { # End of a log entry. my $revbranch; ($revbranch = $rev) =~ s/\.\d+$//; @@ -1680,7 +1755,7 @@ again: $log = $log . $_; } } - if (/^===============/) { + if (/$LOG_FILESEPARATOR/o) { $state = "start"; next; } @@ -1754,7 +1829,7 @@ sub readLog($;$) { # log info # ---------------------------- logentry: - while (!/^=========/) { + while (!/$LOG_FILESEPARATOR/o) { $_ = <$fh>; last logentry if (!defined($_)); # EOF print "R:", $_ if ($verbose); @@ -1762,7 +1837,7 @@ sub readLog($;$) { $rev = $1; unshift(@allrevisions,$rev); } - elsif (/^========/ || /^----------------------------$/) { + elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) { next logentry; } else { @@ -1796,7 +1871,7 @@ sub readLog($;$) { while (<$fh>) { print "L:", $_ if ($verbose); next line if (/^branches:\s/); - last line if (/^----------------------------$/ || /^=========/); + last line if (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o); $log{$rev} .= $_; } print "E:", $_ if ($verbose); @@ -2254,7 +2329,7 @@ sub flush_diff_rows($$$$) { # human_readable_diff(String revision_to_return_to); ## sub human_readable_diff($){ - my ($i,$difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd); + my ($difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd); my ($fh, $rev) = @_; my ($date1, $date2, $r1d, $r2d, $r1r, $r2r, $rev1, $rev2, $sym1, $sym2); my (@rightCol, @leftCol); @@ -2308,9 +2383,15 @@ sub human_readable_diff($){ # cascading style sheets because we've to set the # font and color for each row. anyone ...? #### - while (<$fh>) { - $difftxt = $_; + # prefetch several lines + my @buf = head($fh); + + my %d = scan_directives(@buf); + + while (@buf || !eof($fh)) { + $difftxt = @buf ? shift @buf : <$fh>; + if ($difftxt =~ /^@@/) { ($oldline,$newline,$funname) = $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/; print ""; @@ -2326,7 +2407,7 @@ sub human_readable_diff($){ } else { ($diffcode,$rest) = $difftxt =~ /^([-+ ])(.*)/; - $_ = spacedHtmlText ($rest); + $_ = spacedHtmlText($rest, $d{'tabstop'}); # Add fontface, size $_ = "$fs $_$fe"; @@ -2410,9 +2491,9 @@ sub navigateHeader($$$$$) { $swhere = urlencode($filename) if ($swhere eq ""); print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"; print "\n\n"; - print ''; + print ''; print "\n $path$filename - $title - $rev \n"; - print "\n"; + print "$body_tag_for_src\n"; print "