=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.20 retrieving revision 3.35 diff -u -p -r1.1.1.20 -r3.35 --- cvsweb/cvsweb.cgi 2001/01/03 03:36:03 1.1.1.20 +++ cvsweb/cvsweb.cgi 2000/10/10 21:14:05 3.35 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wT +#!/usr/bin/perl5 -ws # # cvsweb - a CGI interface to CVS trees. # @@ -42,34 +42,30 @@ # 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.57 2001/01/03 02:55:30 knu Exp $ +# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $ +# $Id: cvsweb.cgi,v 3.35 2000/10/10 21:14:05 knu Exp $ # ### -require 5.000; - use strict; use vars qw ( $config $allow_version_select $verbose - @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr - %MIRRORS %DEFAULTVALUE %ICONS %MTYPES - @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS + %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES %alltags @tabcolors %fileinfo %tags @branchnames %nameprinted %symrev %revsym @allrevisions %date %author @revdisplayorder @revisions %state %difflines %log %branchpoint @revorder - $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi + $prcgi @prcategories $prcategories $mancgi $checkoutMagic $doCheckout $scriptname $scriptwhere $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp $is_mod_perl $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased %input $query $barequery $sortby $bydate $byrev $byauthor - $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot - $mimetype $charset $defaultTextPlain $defaultViewable - $allow_compress $GZIPBIN $backicon $diricon $fileicon - $fullname $newname $cvstreedefault - $body_tag $body_tag_for_src $logo $defaulttitle $address + $bylog $byfile $hr_default $logsort $cvstree $cvsroot + $mimetype $defaultTextPlain $defaultViewable $allow_compress + $GZIPBIN $backicon $diricon $fileicon $fullname $newname + $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 @@ -78,19 +74,16 @@ 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 $preformat_in_markup $v + $show_subdir_lastmod $show_log_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 @cvs_options + $use_moddate $has_zlib $gzip_open $LOG_FILESEPARATOR $LOG_REVSEPARATOR ); sub printDiffSelect($); -sub printDiffLinks($$); -sub printLogSortSelect($); sub findLastModifiedSubdirs(@); -sub htmlify_sub(&$); sub htmlify($;$); sub spacedHtmlText($;$); sub link($$); @@ -124,8 +117,6 @@ sub download_link($$$;$); sub toggleQuery($$); sub urlencode($); sub htmlquote($); -sub htmlunquote($); -sub hrefquote($); sub http_header(;$); sub html_header($); sub html_footer(); @@ -133,18 +124,16 @@ sub link_tags($); sub forbidden_module($); ##### Start of Configuration Area ######## -use File::Basename; +use Cwd; # == EDIT this == # Locations to search for user configuration, in order: for ( - (dirname $0) . '/cvsweb.conf', - '/usr/local/etc/cvsweb/cvsweb.conf' + $ENV{CVSWEB_CONFIG}, + '/usr/local/etc/cvsweb.conf', + getcwd() . '/cvsweb.conf' ) { - if (defined($_) && -r $_) { - ($config) = /(.*)/; # untaint - last; - } + $config = $_ if defined($_) && -r $_; } # == Configuration defaults == @@ -156,8 +145,7 @@ $allow_version_select = 1; ######## Configuration variables ######### # These are defined to allow checking with perl -cw -@CVSrepositories = @CVSROOT = %CVSROOT = -%MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = +%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = %tags = %alltags = @tabcolors = (); $cvstreedefault = $body_tag = $body_tag_for_src = $logo = $defaulttitle = $address = @@ -176,49 +164,6 @@ $tabstop = $use_moddate = $moddate = $gzip_open = unde $LOG_FILESEPARATOR = q/^={77}$/; $LOG_REVSEPARATOR = q/^-{28}$/; -@DIFFTYPES = qw(h H u c s); -@DIFFTYPES{@DIFFTYPES} = ( - { - 'descr' => 'colored', - 'opts' => [ '-u' ], - 'colored' => 1, - }, - { - 'descr' => 'long colored', - 'opts' => [ '--unified=15' ], - 'colored' => 1, - }, - { - 'descr' => 'unified', - 'opts' => [ '-u' ], - 'colored' => 0, - }, - { - 'descr' => 'context', - 'opts' => [ '-c' ], - 'colored' => 0, - }, - { - 'descr' => 'side by side', - 'opts' => [ '--side-by-side', '--width=164' ], - 'colored' => 0, - }, - ); - -@LOGSORTKEYS = qw(cvs date rev); -@LOGSORTKEYS{@LOGSORTKEYS} = ( - { - 'descr' => 'Not sorted', - }, - { - 'descr' => 'Commit date', - }, - { - 'descr' => 'Revision', - }, - ); - - ##### End of configuration variables ##### use Time::Local; @@ -235,10 +180,9 @@ $verbose = $v; $checkoutMagic = "~checkout~"; $pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; $where = $pathinfo; -$where =~ tr|/|/|s; $doCheckout = ($where =~ /^\/$checkoutMagic/); $where =~ s|^/($checkoutMagic)?||; -$where =~ s|/$||; +$where =~ s|/+$||; $scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : ''; $scriptname =~ s|^/?|/|; $scriptname =~ s|/+$||; @@ -252,7 +196,7 @@ $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); @@ -285,7 +229,7 @@ $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag); if (-f $config) { - require $config + do $config || &fatal("500 Internal Error", sprintf('Error in loading configuration file: %s

%s
', $config, &htmlify($@))); @@ -302,7 +246,6 @@ $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 ""); @@ -361,10 +304,6 @@ else { } undef @barequery; -if (defined($input{path})) { - redirect("$scriptname/$input{path}$query"); -} - # get actual parameters $sortby = $input{"sortby"}; $bydate = 0; @@ -388,26 +327,11 @@ else { $byfile = 1; } -$defaultDiffType = $input{'f'}; +$hr_default = $input{'f'} eq 'h'; $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", @@ -432,7 +356,7 @@ foreach $k (keys %ICONS) { my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; if ($ipath) { ${"${k}icon"} = sprintf('%s', - hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight) + htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight) } else { ${"${k}icon"} = $itxt; @@ -444,18 +368,17 @@ my $config_cvstree = "$config-$cvstree"; # Do some special configuration for cvstrees if (-f $config_cvstree) { - require $config_cvstree + do $config_cvstree || &fatal("500 Internal Error", sprintf('Error in loading configuration file: %s

%s
', $config_cvstree, &htmlify($@))); } undef $config_cvstree; -$re_prcategories = '(?:' . join('|', @prcategories) . ')' if @prcategories; -$re_prkeyword = quotemeta($prkeyword) if defined($prkeyword); +$prcategories = '(?:' . join('|', @prcategories) . ')'; $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); @@ -480,7 +403,7 @@ if (-d $fullname) { # to allow relative URL's. If they're not, make a redirect. ## if (!($pathinfo =~ m|/$|) || ($pathinfo =~ m |/{2,}$|)) { - redirect("$scriptwhere/$query"); + redirect ($scriptwhere . '/' . $query); } else { $where .= '/'; @@ -500,58 +423,10 @@ $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 "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 "tar", @tar_options, "-zcf", "-", "-C", $tmpdir, $basedir - and $fatal = "500 Internal Error","tar zc failure: $!: $basedir" - && last; - - last; - } - - system "rm", "-rf", $tmpdir if -d $tmpdir; - - &fatal($fatal) if $fatal; - - exit; -} - ############################## # View a directory ############################### -if (-d $fullname) { +elsif (-d $fullname) { my $dh = do {local(*DH);}; opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!"); my @dir = readdir($dh); @@ -607,8 +482,9 @@ if (-d $fullname) { } print "\n"; $infocols++; - printf '"; $infocols++; - printf '"; if ($show_author) { $infocols++; - printf '"; } $infocols++; - printf '"; } elsif ($use_descriptions) { - printf '
', - $byfile ? $columnHeaderColorSorted : $columnHeaderColorDefault; + print "
"; if ($byfile) { print 'File'; } else { @@ -620,8 +496,9 @@ if (-d $fullname) { # with revision information: if (scalar(%fileinfo)) { $infocols++; - printf '', - $byrev ? $columnHeaderColorSorted : $columnHeaderColorDefault; + print ""; if ($byrev) { print 'Rev.'; } else { @@ -630,19 +507,21 @@ if (-d $fullname) { } print "', - $bydate ? $columnHeaderColorSorted : $columnHeaderColorDefault; + print ""; if ($bydate) { print 'Age'; } else { print &link('Age', sprintf('./%s#dirlist', - &toggleQuery("sortby", "date"))); + &toggleQuery("sortby", "date"))); } print "', - $byauthor ? $columnHeaderColorSorted : $columnHeaderColorDefault; + print ""; if ($byauthor) { print 'Author'; } else { @@ -652,18 +531,19 @@ if (-d $fullname) { print "', - $bylog ? $columnHeaderColorSorted : $columnHeaderColorDefault; + print ""; if ($bylog) { print 'Last log entry'; } else { print &link('Last log entry', sprintf('./%s#dirlist', - &toggleQuery("sortby", "log"))); + &toggleQuery("sortby", "log"))); } print "', $columnHeaderColorDefault; + print ""; print "Description"; $infocols++; } @@ -728,9 +608,9 @@ if (-d $fullname) { next if ($_ eq '..' && $where eq '/'); my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} if (defined($fileinfo{$_})); - printf '
', $tabcolors[$dirrow % 2] if $dirtable; + print "
" if ($dirtable); if ($_ eq '..') { - $url = "../$query"; + $url = "../" . $query; if ($nofilelinks) { print $backicon; } @@ -740,7 +620,7 @@ if (-d $fullname) { print " ", &link("Previous Directory", $url); } else { - $url = urlencode($_) . "/$query"; + $url = urlencode($_) . '/' . $query; print ""; if ($nofilelinks) { print $diricon; @@ -759,7 +639,7 @@ if (-d $fullname) { if ($filename) { print "  " if ($dirtable); if ($date) { - print " ", readableTime(time() - $date,0), ""; + print " " . readableTime(time() - $date,0) . ""; } if ($show_author) { print " " if ($dirtable); @@ -770,8 +650,8 @@ if (-d $fullname) { print "$filename/$rev"; print "
" if ($dirtable); if ($log) { - print " ", - &htmlify(substr($log,0,$shortLogLen)); + print " " + . &htmlify(substr($log,0,$shortLogLen)); if (length $log > 80) { print "..."; } @@ -781,7 +661,7 @@ if (-d $fullname) { else { my ($dwhere) = ($where ne "/" ? $where : "") . $_; if ($use_descriptions && defined $descriptions{$dwhere}) { - print "		 " if $dirtable; + print " " if $dirtable; print $descriptions{$dwhere}; } elsif ($dirtable && $infocols > 1) { # close the row with the appropriate number of @@ -812,7 +692,7 @@ if (-d $fullname) { next if (!defined($fileinfo{$_})); ($rev,$date,$log,$author) = @{$fileinfo{$_}}; $filesfound++; - printf '
', $tabcolors[$dirrow % 2] if $dirtable; + print "
" if ($dirtable); print ""; if ($nofilelinks) { print $fileicon; @@ -827,7 +707,7 @@ if (-d $fullname) { $defaultViewable ? "text/x-cvsweb-markup" : undef); print " " if ($dirtable); if ($date) { - print " ", readableTime(time() - $date,0), ""; + print " " . readableTime(time() - $date,0) . ""; } if ($show_author) { print " " if ($dirtable); @@ -835,7 +715,7 @@ if (-d $fullname) { } print " " if ($dirtable); if ($log) { - print " ", &htmlify(substr($log,0,$shortLogLen)); + print " " . &htmlify(substr($log,0,$shortLogLen)); if (length $log > 80) { print "..."; } @@ -850,7 +730,7 @@ if (-d $fullname) { if ($dirtable && defined($tableBorderColor)) { print "
"; } - print( $dirtable == 1 ? "\n" : "\n" ); + print "". ($dirtable == 1) ? "" : "" . "\n"; if ($filesexists && !$filesfound) { print "

NOTE: There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n"; @@ -886,27 +766,9 @@ if (-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'}); @@ -926,9 +788,12 @@ if (-d $fullname) { print "Revision"; print "Log message"; print ""; - print "Sort log by: "; - printLogSortSelect(0); - print ""; + print "revisions by: \n"; + print ""; print "Diff format: "; printDiffSelect(0); print ""; @@ -990,7 +855,7 @@ if (-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$query"); + &redirect($newplace); exit; } elsif (0 && (my @files = &safeglob($fullname . ",v"))) { @@ -1004,13 +869,13 @@ if (-d $fullname) { my $fh = do {local(*FH);}; my ($xtra, $module); # Assume it's a module name with a potential path following it. - $xtra = (($module = $where) =~ s|/.*||) ? $& : ''; + $xtra = $& if (($module = $where) =~ s|/.*||); # Is there an indexed version of 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$query"); + && -d "${cvsroot}/$2" && $module ne $2) { + &redirect($scriptname . '/' . $2 . $xtra); } } } @@ -1022,43 +887,18 @@ gzipclose(); sub printDiffSelect($) { my ($use_java_script) = @_; - my $f = $input{'f'}; - - print '\n"; + print "