=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.13 retrieving revision 1.1.1.22 diff -u -p -r1.1.1.13 -r1.1.1.22 --- cvsweb/cvsweb.cgi 2000/12/07 12:45:50 1.1.1.13 +++ cvsweb/cvsweb.cgi 2001/01/14 08:49:27 1.1.1.22 @@ -1,4 +1,4 @@ -#!/usr/bin/perl5 -ws +#!/usr/bin/perl -wT # # cvsweb - a CGI interface to CVS trees. # @@ -18,7 +18,7 @@ # Copyright (c) 1996-1998 Bill Fenner # (c) 1998-1999 Henner Zeller # (c) 1999 Henrik Nordstrom -# (c) 2000 Akinori MUSHA +# (c) 2000-2001 Akinori MUSHA # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -42,21 +42,25 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ -# $kId: cvsweb.cgi,v 1.41 2000/12/06 18:19:12 knu Exp $ +# $zId: cvsweb.cgi,v 1.105 2000/11/26 01:51:04 jumager Exp $ +# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $ # ### +require 5.000; + use strict; use vars qw ( - $config $allow_version_select $verbose - %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES + $cvsweb_revision + $mydir $uname $config $allow_version_select $verbose + @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr + %MIRRORS %DEFAULTVALUE %ICONS %MTYPES @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS %alltags @tabcolors %fileinfo %tags @branchnames %nameprinted %symrev %revsym @allrevisions %date %author @revdisplayorder @revisions %state %difflines %log %branchpoint @revorder - $prcgi @prcategories $prcategories $mancgi + $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi $checkoutMagic $doCheckout $scriptname $scriptwhere $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp $is_mod_perl @@ -64,7 +68,8 @@ use vars qw ( %input $query $barequery $sortby $bydate $byrev $byauthor $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot $mimetype $charset $defaultTextPlain $defaultViewable - $allow_compress $GZIPBIN $backicon $diricon $fileicon + $command_path %CMD $allow_compress + $backicon $diricon $fileicon $fullname $newname $cvstreedefault $body_tag $body_tag_for_src $logo $defaulttitle $address $long_intro $short_instruction $shortLogLen @@ -75,11 +80,12 @@ use vars qw ( $difffontsize $inputTextSize $mime_types $allow_annotate $allow_markup $use_java_script $open_extern_window $extern_window_width $extern_window_height $edit_option_form - $show_subdir_lastmod $show_log_in_markup $v + $show_subdir_lastmod $show_log_in_markup $preformat_in_markup $v $navigationHeaderColor $tableBorderColor $markupLogColor $tabstop $state $annTable $sel $curbranch @HideModules $module $use_descriptions %descriptions @mytz $dwhere $moddate $use_moddate $has_zlib $gzip_open + $allow_tar @tar_options @gzip_options @cvs_options $LOG_FILESEPARATOR $LOG_REVSEPARATOR ); @@ -95,6 +101,7 @@ sub revcmp($$); sub fatal($$); sub redirect($); sub safeglob($); +sub search_path($); sub getMimeTypeFromSuffix($); sub head($;$); sub scan_directives(@); @@ -122,6 +129,7 @@ sub toggleQuery($$); sub urlencode($); sub htmlquote($); sub htmlunquote($); +sub hrefquote($); sub http_header(;$); sub html_header($); sub html_footer(); @@ -129,16 +137,26 @@ sub link_tags($); sub forbidden_module($); ##### Start of Configuration Area ######## -use Cwd; +delete $ENV{PATH}; +$cvsweb_revision = join('.', '1.105', (split(/ /, + q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $ +))[2]); + +use File::Basename; + +($mydir) = (dirname($0) =~ /(.*)/); # untaint + # == EDIT this == # Locations to search for user configuration, in order: for ( - $ENV{CVSWEB_CONFIG}, - '/usr/local/etc/cvsweb.conf', - getcwd() . '/cvsweb.conf' + "$mydir/cvsweb.conf", + '/usr/local/etc/cvsweb/cvsweb.conf' ) { - $config = $_ if defined($_) && -r $_; + if (defined($_) && -r $_) { + $config = $_; + last; + } } # == Configuration defaults == @@ -150,7 +168,8 @@ $allow_version_select = 1; ######## Configuration variables ######### # These are defined to allow checking with perl -cw -%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = +@CVSrepositories = @CVSROOT = %CVSROOT = +%MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = %tags = %alltags = @tabcolors = (); $cvstreedefault = $body_tag = $body_tag_for_src = $logo = $defaulttitle = $address = @@ -228,23 +247,29 @@ $verbose = $v; $checkoutMagic = "~checkout~"; $pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; $where = $pathinfo; -$doCheckout = ($where =~ /^\/$checkoutMagic/); -$where =~ s|^/($checkoutMagic)?||; -$where =~ s|/+$||; +$doCheckout = ($where =~ m|^/$checkoutMagic/|); +$where =~ s|^/$checkoutMagic/|/|; +$where =~ s|^/||; $scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : ''; -$scriptname =~ s|^/?|/|; -$scriptname =~ s|/+$||; -$scriptwhere = $scriptname; -if ($where) { - $scriptwhere .= '/' . urlencode($where); +$scriptname =~ s|^/*|/|; + +# Let's workaround thttpd's stupidity.. +if ($scriptname =~ m|/$|) { + $pathinfo .= '/'; + my $re = quotemeta $pathinfo; + $scriptname =~ s/$re$//; } +$scriptwhere = $scriptname; +$scriptwhere .= '/' . urlencode($where); +$where = '/' if ($where eq ''); + $is_mod_perl = defined($ENV{MOD_PERL}); # in lynx, it it very annoying to have two links # per file, so disable the link at the icon # in this case: -$Browser = $ENV{HTTP_USER_AGENT}; +$Browser = $ENV{HTTP_USER_AGENT} || ''; $is_links = ($Browser =~ m`^Links `); $is_lynx = ($Browser =~ m`^Lynx/`i); $is_w3m = ($Browser =~ m`^w3m/`i); @@ -277,7 +302,7 @@ $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag); if (-f $config) { - do $config + require $config || &fatal("500 Internal Error", sprintf('Error in loading configuration file: %s

%s
', $config, &htmlify($@))); @@ -294,6 +319,7 @@ $query = $ENV{QUERY_STRING}; if (defined($query) && $query ne '') { foreach (split(/&/, $query)) { + y/+/ /; s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted if (/(\S+)=(.*)/) { $input{$1} = $2 if ($2 ne ""); @@ -352,6 +378,10 @@ else { } undef @barequery; +if (defined($input{path})) { + redirect("$scriptname/$input{path}$query"); +} + # get actual parameters $sortby = $input{"sortby"}; $bydate = 0; @@ -379,7 +409,22 @@ $defaultDiffType = $input{'f'}; $logsort = $input{'logsort'}; +my @tmp = @CVSrepositories; +my @pair; +while (@pair = splice(@tmp, 0, 2)) { + my($key, $val) = @pair; + my($descr, $cvsroot) = @$val; + + next if !-d $cvsroot; + + $CVSROOTdescr{$key} = $descr; + $CVSROOT{$key} = $cvsroot; + push @CVSROOT, $key; +} +undef @tmp; +undef @pair; + ## Default CVS-Tree if (!defined($CVSROOT{$cvstreedefault})) { &fatal("500 Internal Error", @@ -404,7 +449,7 @@ foreach $k (keys %ICONS) { my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; if ($ipath) { ${"${k}icon"} = sprintf('%s', - htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight) + hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight) } else { ${"${k}icon"} = $itxt; @@ -416,49 +461,45 @@ my $config_cvstree = "$config-$cvstree"; # Do some special configuration for cvstrees if (-f $config_cvstree) { - do $config_cvstree + require $config_cvstree || &fatal("500 Internal Error", sprintf('Error in loading configuration file: %s

%s
', $config_cvstree, &htmlify($@))); } undef $config_cvstree; -$prcategories = '(?:' . join('|', @prcategories) . ')'; +$re_prcategories = '(?:' . join('|', @prcategories) . ')' if @prcategories; +$re_prkeyword = quotemeta($prkeyword) if defined($prkeyword); $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; -$fullname = $cvsroot . '/' . $where; +$fullname = "$cvsroot/$where"; $mimetype = &getMimeTypeFromSuffix ($fullname); $defaultTextPlain = ($mimetype eq "text/plain"); $defaultViewable = $allow_markup && viewable($mimetype); -# search for GZIP if compression allowed -# We've to find out if the GZIP-binary exists .. otherwise -# ge get an Internal Server Error if we try to pipe the -# output through the nonexistent gzip .. -# any more elegant ways to prevent this are welcome! -if ($allow_compress && $maycompress && !$has_zlib) { - foreach (split(/:/, $ENV{PATH})) { - if (-x "$_/gzip") { - $GZIPBIN = "$_/gzip"; - last; - } - } +my $rewrite = 0; + +if ($pathinfo =~ m|//|) { + $pathinfo =~ y|/|/|s; + $rewrite = 1; } -if (-d $fullname) { - # - # ensure, that directories always end with (exactly) one '/' - # to allow relative URL's. If they're not, make a redirect. - ## - if (!($pathinfo =~ m|/$|) || ($pathinfo =~ m |/{2,}$|)) { - redirect ($scriptwhere . '/' . $query); - } - else { - $where .= '/'; - $scriptwhere .= '/'; - } +if (-d $fullname && $pathinfo !~ m|/$|) { + $pathinfo .= '/'; + $rewrite = 1; } +if (!-d $fullname && $pathinfo =~ m|/$|) { + chop $pathinfo; + $rewrite = 1; +} + +if ($rewrite) { + redirect($scriptname . urlencode($pathinfo) . $query); +} + +undef $rewrite; + if (!-d $cvsroot) { &fatal("500 Internal Error",'$CVSROOT not found!

The server on which the CVS tree lives is probably down. Please try again in a few minutes.'); } @@ -471,10 +512,58 @@ $module = $1; if ($module && &forbidden_module($module)) { &fatal("403 Forbidden", "Access to $where forbidden."); } + +# +# Handle tarball downloads before any headers are output. +# +if ($input{tarball}) { + &fatal("403 Forbidden", "Downloading tarballs is prohibited.") + unless $allow_tar; + my($module) = ($where =~ m,^/?(.*),); # untaint + $module =~ s,/[^/]*$,,; + my($basedir) = ($module =~ m,([^/]+)$,); + + if ($basedir eq '' || $module eq '') { + &fatal("500 Internal Error", "You cannot download the top level directory."); + } + + my $tmpdir = "/tmp/.cvsweb.$$." . int(time); + + mkdir($tmpdir, 0700) + or &fatal("500 Internal Error", "Unable to make temporary directory: $!"); + + my $fatal = ''; + + while (1) { + my $tag = (exists $input{only_with_tag} && length $input{only_with_tag}) + ? $input{only_with_tag} : "HEAD"; + + system $CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', $tag, '-d', "$tmpdir/$basedir", $module + and $fatal = "500 Internal Error","cvs co failure: $!: $module" + && last; + + $| = 1; # Essential to get the buffering right. + + print "Content-type: application/x-gzip\r\n\r\n"; + + system "$CMD{tar} @tar_options -cf - -C $tmpdir $basedir | $CMD{gzip} @gzip_options -c" + and $fatal = "500 Internal Error","tar zc failure: $!: $basedir" + && last; + + last; + } + + system $CMD{rm}, '-rf', $tmpdir if -d $tmpdir; + + &fatal($fatal) if $fatal; + + exit; +} + ############################## # View a directory ############################### -elsif (-d $fullname) { +if (-d $fullname) { my $dh = do {local(*DH);}; opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!"); my @dir = readdir($dh); @@ -649,7 +738,8 @@ elsif (-d $fullname) { if ($_ eq '..' || -d "$fullname/$_") { next if ($_ eq '..' && $where eq '/'); - my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} + my ($rev,$date,$log,$author,$filename); + ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} if (defined($fileinfo{$_})); printf '', $tabcolors[$dirrow % 2] if $dirtable; if ($_ eq '..') { @@ -809,9 +899,27 @@ elsif (-d $fullname) { ">$tag\n"; } print "\n"; + print " Module path or alias:\n"; + printf "\n", htmlquote($where); print "\n"; print "\n"; } + + if ($allow_tar) { + my($basefile) = ($where =~ m,(?:.*/)?([^/]+),); + + if (defined($basefile) && $basefile ne '') { + print "


\n", + "
", + &link("Download this directory in tarball", + # Mangle the filename so browsers show a reasonable + # filename to download. + "$basefile.tar.gz$query". + ($query ? "&" : "?")."tarball=1"), + "
"; + } + } + my $formwhere = $scriptwhere; $formwhere =~ s|Attic/?$|| if ($input{'hideattic'}); @@ -895,7 +1003,7 @@ elsif (-d $fullname) { # The file has been removed and is in the Attic. # Send a redirect pointing to the file in the Attic. (my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|; - &redirect($newplace); + redirect("$newplace$query"); exit; } elsif (0 && (my @files = &safeglob($fullname . ",v"))) { @@ -909,13 +1017,13 @@ elsif (-d $fullname) { my $fh = do {local(*FH);}; my ($xtra, $module); # Assume it's a module name with a potential path following it. - $xtra = $& if (($module = $where) =~ s|/.*||); + $xtra = (($module = $where) =~ s|/.*||) ? $& : ''; # Is there an indexed version of modules? - if (open($fh, "$cvsroot/CVSROOT/modules")) { + if (open($fh, "< $cvsroot/CVSROOT/modules")) { while (<$fh>) { if (/^(\S+)\s+(\S+)/o && $module eq $1 - && -d "${cvsroot}/$2" && $module ne $2) { - &redirect($scriptname . '/' . $2 . $xtra); + && -d "$cvsroot/$2" && $module ne $2) { + redirect("$scriptname/$2$xtra$query"); } } } @@ -1036,7 +1144,7 @@ sub htmlify($;$) { if ($extra) { # get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn" - if (defined($prcgi)) { + if (defined($prcgi) && defined($re_prcategories) && defined($re_prkeyword)) { my $prev; do { @@ -1044,7 +1152,7 @@ sub htmlify($;$) { $_ = htmlify_sub { s{ - (\bPR[:\#]?\s* + (\b$re_prkeyword[:\#]?\s* (?: \#? \d+[,\s]\s* @@ -1052,16 +1160,16 @@ sub htmlify($;$) { \#?) (\d+)\b }{ - $1 . &link($2, sprintf($prcgi, $2)) . $3 + $1 . &link($2, sprintf($prcgi, $2)) }egix; } $_; } while ($_ ne $prev); $_ = htmlify_sub { s{ - (\b$prcategories/(\d+)\b) + (\b$re_prcategories/(\d+)\b) }{ - &link($1, sprintf($prcgi, $2)) . $3 + &link($1, sprintf($prcgi, $2)) }egox; } $_; } @@ -1070,7 +1178,7 @@ sub htmlify($;$) { if (defined($mancgi)) { $_ = htmlify_sub { s{ - (\b([a-zA-Z][\w_.]+) + (\b([a-zA-Z][\w.]+) (?: \( ([0-9n]) \)\B | @@ -1078,7 +1186,7 @@ sub htmlify($;$) { ) ) }{ - &link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5 + &link($1, sprintf($mancgi, defined($3) ? $3 : $4, $2)) }egx; } $_; } @@ -1118,9 +1226,9 @@ sub spacedHtmlText($;$) { } sub link($$) { - my($name, $where) = @_; + my($name, $url) = @_; - sprintf '%s', htmlquote($where), $name; + sprintf '%s', hrefquote($url), $name; } sub revcmp($$) { @@ -1202,6 +1310,17 @@ sub safeglob($) { @results; } +sub search_path($) { + my($command) = @_; + my $d; + + for $d (split(/:/, $command_path)) { + return "$d/$command" if -x "$d/$command"; + } + + $command; +} + sub getMimeTypeFromSuffix($) { my ($fullname) = @_; my ($mimetype, $suffix); @@ -1275,7 +1394,7 @@ sub doAnnotate($$) { my $reader = do {local(*FH);}; my $writer = do {local(*FH);}; - # make sure the revisions a wellformed, for security + # make sure the revisions are wellformed, for security # reasons .. if ($rev =~ /[^\w.]/) { &fatal("404 Not Found", @@ -1294,8 +1413,8 @@ sub doAnnotate($$) { # the public domain. # we could abandon the use of rlog, rcsdiff and co using # the cvsserver in a similiar way one day (..after rewrite) - $pid = open2($reader, $writer, "cvs -Rl server") || fatal ("500 Internal Error", - "Fatal Error - unable to open cvs for annotation"); + $pid = open2($reader, $writer, "cvs", @cvs_options, "server") + || fatal ("500 Internal Error", "Fatal Error - unable to open cvs for annotation"); # OK, first send the request to the server. A simplified example is: # Root /home/kingdon/zwork/cvsroot @@ -1486,8 +1605,8 @@ sub doCheckout($$) { # # Safely for a child process to read from. if (! open($fh, "-|")) { # child - open(STDERR, ">&STDOUT"); # Redirect stderr to stdout - exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where); + open(STDERR, ">&STDOUT"); # Redirect stderr to stdout + exec($CMD{cvs}, @cvs_options, '-d', $cvsroot, 'co', '-p', $revopt, $where); } if (eof($fh)) { @@ -1564,12 +1683,12 @@ sub cvswebMarkup($$$) { my $url = download_url($fileurl, $revision, $mimetype); print "
"; if ($mimetype =~ /^image/) { - printf '
', htmlquote("$url$barequery"); + printf '
', hrefquote("$url$barequery"); } elsif ($mimetype =~ m%^application/pdf%) { - printf '
', htmlquote("$url$barequery"); + printf '
', hrefquote("$url$barequery"); } - else { + elsif ($preformat_in_markup) { print "
";
 
 	# prefetch several lines
@@ -1584,6 +1703,9 @@ sub cvswebMarkup($$$) {
 	}
 	print "
"; } + else { + print "\n", <$filehandle>; + } } sub viewable($) { @@ -1664,7 +1786,7 @@ sub doDiff($$$$$$) { } if (! open($fh, "-|")) { # child open(STDERR, ">&STDOUT"); # Redirect stderr to stdout - exec("rcsdiff",@difftype,"-r$rev1","-r$rev2",$fullname); + exec($CMD{rcsdiff}, @difftype, "-r$rev1", "-r$rev2", $fullname); } if ($human_readable) { http_header(); @@ -1745,32 +1867,30 @@ sub getDirLogs($$@) { return; } - if ($tag) { + if (defined($tag)) { #can't use -r<tag> as - is allowed in tagnames, but misinterpreated by rlog.. if (! open($fh, "-|")) { - open(STDERR, '>/dev/null'); # rlog may complain; ignore. - exec('rlog', @files); + open(STDERR, '>/dev/null'); # rlog may complain; ignore. + exec($CMD{rlog}, @files); } } else { - my $kidpid = open($fh, "-|"); - if (! $kidpid) { - open(STDERR, '>/dev/null'); # rlog may complain; ignore. - exec('rlog', '-r', @files); + if (! open($fh, "-|")) { + open(STDERR, '>/dev/null'); # rlog may complain; ignore. + exec($CMD{rlog}, '-r', @files); } } $state = "start"; while (<$fh>) { if ($state eq "start") { #Next file. Initialize file variables - $rev = undef; - $revwanted = undef; - $branch = undef; - $branchpoint = undef; - $filename = undef; - $log = undef; - $revision = undef; - $branch = undef; + $rev = ''; + $revwanted = ''; + $branch = ''; + $branchpoint = ''; + $filename = ''; + $log = ''; + $revision = ''; %symrev = (); @filetags = (); #jump to head state @@ -1789,8 +1909,8 @@ again: $branch = $1 } elsif (/^symbolic names:/) { $state = "tags"; - ($branch = $head) =~ s/\.\d+$// if (!defined($branch)); - $branch =~ s/(\.?)(\d+)$/${1}0.$2/; + ($branch = $head) =~ s/\.\d+$// if $branch eq ''; + $branch =~ s/(\d+)$/0.$1/; $symrev{MAIN} = $branch; $symrev{HEAD} = $branch; $alltags{MAIN} = 1; @@ -1798,9 +1918,9 @@ again: push (@filetags, "MAIN", "HEAD"); } elsif (/$LOG_REVSEPARATOR/o) { $state = "log"; - $rev = undef; - $date = undef; - $log = ""; + $rev = ''; + $date = ''; + $log = ''; # Try to reconstruct the relative filename if RCS spits out a full path $filename =~ s%^\Q$DirName\E/%%; } @@ -1816,10 +1936,9 @@ again: if (defined($tag)) { if(defined($symrev{$tag}) || $tag eq "HEAD") { $revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag}; - ($branch = $revwanted) =~ s/\.0\././; + ($branch = $revwanted) =~ s/\b0\.//; ($branchpoint = $branch) =~ s/\.?\d+$//; - $revwanted = undef if ($revwanted ne $branch); -#print "\n[revwanted=$revwanted]"; + $revwanted = '' if ($revwanted ne $branch); } elsif ($tag ne "HEAD") { print "Tag not found, skip this file" if ($verbose); $state = "skip"; @@ -1836,19 +1955,19 @@ again: if ($state eq "log") { if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) { # End of a log entry. - my $revbranch; - ($revbranch = $rev) =~ s/\.\d+$//; + my $revbranch = $rev; + $revbranch =~ s/\.\d+$//; print "$filename $rev Wanted: $revwanted ", "Revbranch: $revbranch Branch: $branch ", "Branchpoint: $branchpoint\n" if ($verbose); - if (!defined($revwanted) && defined($branch) + if ($revwanted eq '' && $branch ne '' && $branch eq $revbranch || !defined($tag)) { print "File revision $rev found for branch $branch\n" if ($verbose); $revwanted = $rev; } - if (defined($revwanted) ? $rev eq $revwanted : - defined($branchpoint) ? $rev eq $branchpoint : + if ($revwanted ne '' ? $rev eq $revwanted : + $branchpoint ne '' ? $rev eq $branchpoint : 0 && ($rev eq $head)) { # Don't think head is needed here.. print "File info $rev found for $filename\n" if ($verbose); my @finfo = ($rev,$date,$log,$author,$filename); @@ -1857,11 +1976,11 @@ again: $fileinfo{$name} = [ @finfo ]; $state = "done" if ($rev eq $revwanted); } - $rev = undef; - $date = undef; - $log = ""; + $rev = ''; + $date = ''; + $log = ''; } - elsif (!defined($date) && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) { + elsif ($date eq '' && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) { my $yr = $1; # damn 2-digit year routines :-) if ($yr > 100) { @@ -1873,7 +1992,7 @@ again: $log = ''; next; } - elsif (!defined($rev) && m/^revision (.*)$/) { + elsif ($rev eq '' && /^revision (.*)$/) { $rev = $1; next; } @@ -1888,7 +2007,7 @@ again: } if ($. == 0) { fatal("500 Internal Error", - "Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>did you set the <b>\$ENV{PATH}</b> in your configuration file correctly ?"); + "Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>Did you set the <b>\$command_path</b> in your configuration file correctly ? (Currently '$command_path'"); } close($fh); } @@ -1916,12 +2035,12 @@ sub readLog($;$) { print("Going to rlog '$fullname'\n") if ($verbose); if (! open($fh, "-|")) { # child - if ($revision ne '') { - exec("rlog",$revision,$fullname); - } - else { - exec("rlog",$fullname); - } + if ($revision ne '') { + exec($CMD{rlog}, $revision, $fullname); + } + else { + exec($CMD{rlog}, $fullname); + } } while (<$fh>) { print if ($verbose); @@ -2015,7 +2134,7 @@ sub readLog($;$) { # is the first commit listed on the appropriate branch. # This is not neccesary the same revision as marked as head in the RCS file. my $headrev = $curbranch || "1"; - ($symrev{"MAIN"} = $headrev) =~ s/(\.?)(\d+)$/${1}0.$2/; + ($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/; foreach $rev (@revorder) { if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) { $symrev{"HEAD"} = $rev; @@ -2037,7 +2156,7 @@ sub readLog($;$) { foreach (reverse sort keys %symrev) { $rev = $symrev{$_}; - if ($rev =~ /^((.*)\.)0\.(\d+)$/) { + if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) { push(@branchnames, $_); # # A revision number of A.B.0.D really translates into @@ -2051,9 +2170,8 @@ sub readLog($;$) { # it has no head to translate to if there is nothing on # the branch, but I guess this can never happen? # - # Since some stupid people actually import/check in - # files with version 0.X we assume that the above cannot - # happen, and regard 0.X(.*) as a revision and not a branch. + # (the code below gracefully forgets about the branch + # if it should happen) # $head = defined($2) ? $2 : ""; $branch = $3; @@ -2083,7 +2201,7 @@ sub readLog($;$) { my ($onlyonbranch, $onlybranchpoint); if ($onlyonbranch = $input{'only_with_tag'}) { $onlyonbranch = $symrev{$onlyonbranch}; - if ($onlyonbranch =~ s/\.0\././) { + if ($onlyonbranch =~ s/\b0\.//) { ($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//; } else { @@ -2282,18 +2400,18 @@ sub printLog($;$) { if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) { my ($i,$nextmain); for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++){} - my (@tmp2) = split(/\./, $_); + my @tmp2 = split(/\./, $_); for ($nextmain = ""; $i > 0; $i--) { - my ($next) = $revorder[$i-1]; - my (@tmp1) = split(/\./, $next); - if ($#tmp1 < $#tmp2) { + my $next = $revorder[$i-1]; + my @tmp1 = split(/\./, $next); + if (@tmp1 < @tmp2) { $nextmain = $next; last; } # Only the highest version on a branch should have # a diff for the "next main". - last if (join(".",@tmp1[0..$#tmp1-1]) - eq join(".",@tmp2[0..$#tmp1-1])); + last if (@tmp1 - 1 <= @tmp2 && + join(".",@tmp1[0..$#tmp1-1]) eq join(".",@tmp2[0..$#tmp1-1])); } if (!defined($diffrev{$nextmain})) { $diffrev{$nextmain} = 1; @@ -2640,13 +2758,19 @@ sub navigateHeader($$$$$) { my ($swhere,$path,$filename,$rev,$title) = @_; $swhere = "" if ($swhere eq $scriptwhere); $swhere = urlencode($filename) if ($swhere eq ""); - print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"; - print "<HTML>\n<HEAD>\n"; - print '<!-- CVSweb $zRevision: 1.104 $ $kRevision: 1.41 $ -->'; - print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n"; - print "$body_tag_for_src\n"; - print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">"; - print "<tr valign=bottom><td>"; + + print <<EOF; +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<HTML> +<HEAD> +<META name="robots" content="nofollow"> +<!-- knu-cvsweb $cvsweb_revision --> +<TITLE>$path$filename - $title - $rev</TITLE></HEAD> +$body_tag_for_src +<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="$navigationHeaderColor"> +<tr valign=bottom><td> +EOF + print &link($backicon, "$swhere$query#rev$rev"); print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log"; print "</b> $fileicon</td>"; @@ -2756,13 +2880,7 @@ sub clickablePath($$) { } sub chooseCVSRoot() { - my @foo; - foreach (sort keys %CVSROOT) { - if (-d $CVSROOT{$_}) { - push(@foo, $_); - } - } - if (@foo > 1) { + if (2 <= @CVSROOT) { my ($k); print "<form method=\"GET\" action=\"${scriptwhere}\">\n"; foreach $k (keys %input) { @@ -2777,19 +2895,26 @@ sub chooseCVSRoot() { print "<td>\n<select name=\"cvsroot\""; print " onchange=\"submit()\"" if ($use_java_script); print ">\n"; - foreach $k (@foo) { + foreach $k (@CVSROOT) { print "<option value=\"$k\""; print " selected" if ($k eq $cvstree); print ">", ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : $k), "</option>\n"; } print "</select>\n</td>"; - print "<td><input type=submit value=\"Go\"></td>"; - print "</tr></table></form>"; + print "<td>"; } else { # no choice .. print "CVS Root: <b>[$cvstree]</b>"; } + + print " Module path or alias:\n"; + print "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"\" SIZE=15>\n"; + print "<input type=submit value=\"Go\">"; + + if (2 <= @CVSROOT) { + print "</td></tr></table></form>"; + } } sub chooseMirror() { @@ -2845,7 +2970,7 @@ sub fileSortCmp() { sub download_url($$;$) { my ($url,$revision,$mimetype) = @_; - $revision =~ s/\.0\././; + $revision =~ s/\b0\.//; if (defined($checkoutMagic) && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { @@ -2865,7 +2990,7 @@ sub download_link($$$;$) { my ($url, $revision, $textlink, $mimetype) = @_; my ($fullurl) = download_url($url, $revision, $mimetype); - printf '<A HREF="%s"', htmlquote("$fullurl$barequery"); + printf '<A HREF="%s"', hrefquote("$fullurl$barequery"); if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { print ' target="cvs_checkout"'; @@ -2899,7 +3024,7 @@ sub download_link($$$;$) { if (defined($extern_window_height)); printf q` onClick="window.open('%s','cvs_checkout','%s');"`, - htmlquote($fullurl), join(',', @attr); + hrefquote($fullurl), join(',', @attr); } } print "><b>$textlink</b></A>"; @@ -2939,8 +3064,7 @@ sub urlencode($) { s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge; - - $_; + $_; } sub htmlquote($) { @@ -2967,8 +3091,20 @@ sub htmlunquote($) { $_; } +sub hrefquote($) { + local($_) = @_; + + y/ /+/; + + htmlquote($_) +} + sub http_header(;$) { my $content_type = shift || "text/html"; + + $content_type .= "; charset=$charset" + if $content_type =~ m,^text/, && defined($charset) && $charset; + if (defined($moddate)) { if ($is_mod_perl) { Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT"); @@ -2984,7 +3120,7 @@ sub http_header(;$) { print "Content-type: $content_type\r\n"; } if ($allow_compress && $maycompress) { - if ($has_zlib || (defined($GZIPBIN) && open(GZIP, "|$GZIPBIN -1 -c"))) { + if ($has_zlib || (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c"))) { if ($is_mod_perl) { Apache->request->content_encoding("x-gzip"); Apache->request->header_out(Vary => "Accept-Encoding"); @@ -3010,7 +3146,7 @@ sub http_header(;$) { else { print "\r\n"; # Close headers } - print "<font size=-1>Unable to find gzip binary in the \$PATH to compress output</font><br>"; + print "<font size=-1>Unable to find gzip binary in the <b>\$command_path</b> ($command_path) to compress output</font><br>"; } } else { @@ -3025,15 +3161,15 @@ sub http_header(;$) { sub html_header($) { my ($title) = @_; - my $version = '$zRevision: 1.104 $ $kRevision: 1.41 $'; #' - http_header($charset ne "" ? "text/html; charset=$charset" : "text/html"); + http_header("text/html"); print <<EOH; <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> +<meta name="robots" content="nofollow"> <title>$title</title> -<!-- CVSweb $version --> +<!-- knu-cvsweb $cvsweb_revision --> </head> $body_tag $logo <h1 align="center">$title</h1>