=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.37 retrieving revision 3.34 diff -u -p -r1.1.1.37 -r3.34 --- cvsweb/cvsweb.cgi 2007/03/17 21:52:33 1.1.1.37 +++ cvsweb/cvsweb.cgi 2000/10/10 18:48:59 3.34 @@ -1,17 +1,15 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl5 -ws # # cvsweb - a CGI interface to CVS trees. # # Written in their spare time by -# Bill Fenner (original work) -# extended by Henner Zeller , -# Henrik Nordstrom -# Ken Coar -# Dick Balaska -# Akinori MUSHA -# Jens-Uwe Mager -# Ville Skyttä -# Vassilii Khachaturov +# Bill Fenner (original work) +# extended by Henner Zeller , +# Henrik Nordstrom +# Ken Coar +# Dick Balaska +# Akinori MUSHA +# Jens-Uwe Mager # # Based on: # * Bill Fenners cvsweb.cgi revision 1.28 available from: @@ -19,9 +17,8 @@ # # Copyright (c) 1996-1998 Bill Fenner # (c) 1998-1999 Henner Zeller -# (c) 1999 Henrik Nordstrom -# (c) 2000-2002 Akinori MUSHA -# (c) 2002-2005 Ville Skyttä +# (c) 1999 Henrik Nordstrom +# (c) 2000 Akinori MUSHA # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -45,140 +42,70 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: projects/cvsweb/cvsweb.cgi,v 1.295 2005/09/25 20:28:51 scop Exp $ -# $zId: cvsweb.cgi,v 1.112 2001/07/24 13:03:16 hzeller Exp $ -# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $ +# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $ +# $Id: cvsweb.cgi,v 3.34 2000/10/10 18:48:59 knu Exp $ # ### -require 5.006; - use strict; -use warnings; -use filetest qw(access); - use vars qw ( - $VERSION $CheckoutMagic $MimeTypes $DEBUG - $config $allow_version_select - @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr - %MIRRORS %DEFAULTVALUE %ICONS %MTYPES - %DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS - %alltags %fileinfo %tags @branchnames %nameprinted - %symrev %revsym @allrevisions %date %author @revdisplayorder - @revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution - $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi - $doCheckout $scriptname $scriptwhere - $where $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp - $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 - $charset $output_filter - @command_path %CMD $allow_compress $backicon $diricon $fileicon $graphicon - $fullname $cvstreedefault $logo $defaulttitle $address $binfileicon - $long_intro $short_instruction $shortLogLen $show_author - $tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst - $inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos - $allow_log_extra $allow_dir_extra $allow_source_extra - $allow_cvsgraph $cvsgraph_config $use_java_script $edit_option_form - $show_subdir_lastmod $show_log_in_markup $preformat_in_markup - $tabstop $state $annTable $sel @ForbiddenFiles - $use_descriptions %descriptions @mytz $dwhere - $use_moddate $gzip_open $file_list_len - $allow_tar @tar_options @gzip_options @zip_options @cvs_options - @annotate_options @rcsdiff_options - $HTML_DOCTYPE $HTML_META $cssurl $CSS $cvshistory_url - $allow_enscript @enscript_options %enscript_types + $config $allow_version_select $verbose + %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 $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 $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 + $hr_ignkeysubst $diffcolorHeading $diffcolorEmpty $diffcolorRemove + $diffcolorChange $diffcolorAdd $diffcolorDarkChange $difffontface + $difffontsize $inputTextSize $mime_types $allow_annotate + $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 $state $annTable $sel $curbranch @HideModules + $module $use_descriptions %descriptions @mytz $dwhere $moddate + $use_moddate $has_zlib $gzip_open + $LOG_FILESEPARATOR $LOG_REVSEPARATOR ); -use Cwd qw(abs_path); -use File::Basename qw(dirname); -use File::Path qw(rmtree); -use File::Spec::Functions qw(canonpath catdir catfile curdir devnull rootdir - tmpdir updir); -use File::Temp qw(tempdir tempfile); -use IPC::Run qw(); -use Time::Local qw(timegm); -use URI::Escape qw(uri_escape uri_unescape); - -use constant VALID_PATH => qr/^([[:^cntrl:]]+)$/o; -use constant VALID_TAG1 => qr/^([a-zA-Z][[:graph:]]*)$/o; -use constant VALID_TAG2 => qr/^([^\$,.:;@]+)$/o; -use constant CVSWEBMARKUP => qr{^text/(x-cvsweb|vnd\.viewcvs)-markup$}io; -use constant LOG_FILESEPR => qr/^={77}$/o; -use constant LOG_REVSEPR => qr/^-{28}$/o; - -use constant HAS_ZLIB => eval { require Compress::Zlib; }; -use constant HAS_EDIFF => eval { require String::Ediff; }; - -# ----------------------------------------------------------------------------- - -# All global initialization that can be done in compile time should go to -# the BEGIN block. Persistent environments, such as mod_perl, will benefit -# from this. - -BEGIN -{ - $VERSION = '3.0.6'; - - $HTML_DOCTYPE = - ''; - - $HTML_META = < - - - -EOM - - # Use MIME::Types for MIME type lookups if it's available. - eval { - require MIME::Types; - $MimeTypes = MIME::Types->new(only_complete => 1); - }; - $MimeTypes = undef if $@; - - $CheckoutMagic = '~checkout~'; -} - -# ----------------------------------------------------------------------------- - sub printDiffSelect($); -sub printDiffSelectStickyVars(); -sub getDiffLinks($$$); -sub printLogSortSelect($); sub findLastModifiedSubdirs(@); -sub htmlify_sub(&$); sub htmlify($;$); sub spacedHtmlText($;$); sub link($$); sub revcmp($$); -sub fatal($$@); -sub config_error($$); -sub redirect($;$); +sub fatal($$); +sub redirect($); sub safeglob($); -sub search_path($); -sub getEnscriptHL($); -sub getMimeType($;$); +sub getMimeTypeFromSuffix($); sub head($;$); sub scan_directives(@); -sub openOutputFilter(); sub doAnnotate($$); -sub doCheckout($$$); -sub doEnscript($$$;$); -sub doGraph(); -sub doGraphView(); -sub cvswebMarkup($$$$$$;$); +sub doCheckout($$); +sub cvswebMarkup($$$); sub viewable($); sub doDiff($$$$$$); sub getDirLogs($$@); sub readLog($;$); -sub printLog($$$;$$); +sub printLog($;$); sub doLog($); sub flush_diff_rows($$$$); -sub human_readable_diff($$); -sub navigateHeader($$$$$;$); +sub human_readable_diff($); +sub navigateHeader($$$$$); sub plural_write($$); sub readableTime($$); sub clickablePath($$); @@ -187,142 +114,92 @@ sub chooseMirror(); sub fileSortCmp(); sub download_url($$;$); sub download_link($$$;$); -sub display_url($$;$); -sub display_link($$;$$); -sub graph_link($;$); -sub history_link($$;$); -sub toggleQuery($;$); -sub htmlquote($); -sub htmlunquote($); -sub uri_escape_path($); -sub http_header(;$$); -sub html_header($;$); +sub toggleQuery($$); +sub urlencode($); +sub http_header(;$); +sub html_header($); sub html_footer(); sub link_tags($); -sub forbidden($); -sub startproc(@); -sub runproc(@); -sub checkout_to_temp($$$); +sub forbidden_module($); -# Get rid of unsafe environment vars. Don't do this in the BEGIN block -# (think mod_perl)... -delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)}); - -my ($mydir) = (dirname($0) =~ /(.*)/); # untaint - ##### Start of Configuration Area ######## +use Cwd; # == EDIT this == # Locations to search for user configuration, in order: -for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') { - if (-r $_) { - $config = $_; - last; - } +for ( + $ENV{CVSWEB_CONFIG}, + '/usr/local/etc/cvsweb.conf', + getcwd() . '/cvsweb.conf' + ) { + $config = $_ if defined($_) && -r $_; } +# == Configuration defaults == +# Defaults for configuration variables that shouldn't need +# to be configured.. +$allow_version_select = 1; + ##### End of Configuration Area ######## -undef $mydir; +######## Configuration variables ######### +# These are defined to allow checking with perl -cw +%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = +%tags = %alltags = @tabcolors = (); +$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 = +$diffcolorChange = $diffcolorAdd = $diffcolorDarkChange = $difffontface = +$difffontsize = $inputTextSize = $mime_types = $allow_annotate = +$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 = $gzip_open = undef; -######## Configuration parameters ######### +$LOG_FILESEPARATOR = q/^={77}$/; +$LOG_REVSEPARATOR = q/^-{28}$/; -@CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = - %MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = (); +##### End of configuration variables ##### -$cvstreedefault = $logo = $defaulttitle = - $address = $long_intro = $short_instruction = $shortLogLen = $show_author = - $tablepadding = $hr_breakable = $showfunc = $hr_ignwhite = - $hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate = - $allow_markup = $allow_compress = $use_java_script = $edit_option_form = - $show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup = - $tabstop = $use_moddate = $gzip_open = $DEBUG = $allow_cvsgraph = - $cvsgraph_config = $cvshistory_url = $allow_tar = undef; +use Time::Local; +use IPC::Open2; -$allow_version_select = $allow_mailtos = $allow_log_extra = 1; +# Check if the zlib C library interface is installed, and if yes +# we can avoid using the extra gzip process. +eval { + require Compress::Zlib; +}; +$has_zlib = !$@; -@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', - # width=168 should be enough to support 80 character line lengths - 'opts' => ['--side-by-side', '--width=168'], - 'colored' => 0, - }, -); - -@LOGSORTKEYS = qw(cvs date rev); -@LOGSORTKEYS{@LOGSORTKEYS} = ( - { descr => 'Not sorted', }, - { descr => 'Commit date', }, - { descr => 'Revision', }, -); - -##### End of configuration parameters ##### - -my $pathinfo = ''; -if (defined($ENV{PATH_INFO}) && $ENV{PATH_INFO} ne '') { - ($pathinfo) = ($ENV{PATH_INFO} =~ VALID_PATH) - or fatal('500 Internal Error', - 'Illegal PATH_INFO in environment: %s', - $ENV{PATH_INFO}); +$verbose = $v; +$checkoutMagic = "~checkout~"; +$pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; +$where = $pathinfo; +$doCheckout = ($where =~ /^\/$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); } -if ($ENV{SCRIPT_NAME}) { - ($scriptname) = ($ENV{SCRIPT_NAME} =~ VALID_PATH) - or fatal('500 Internal Error', - 'Illegal SCRIPT_NAME in environment: %s', - $ENV{SCRIPT_NAME}); -} -$scriptname = '' unless defined($scriptname); +$is_mod_perl = defined($ENV{MOD_PERL}); -$where = $pathinfo; -$doCheckout = $where =~ s|^/$CheckoutMagic/|/|o; -$where =~ s|^/||; -$scriptname =~ s|^/*|/|; - -# Let's workaround thttpd's stupidity.. -if ($scriptname =~ m|/$|) { - $pathinfo .= '/'; - my $re = quotemeta $pathinfo; - $scriptname =~ s/$re$//; -} - -# $scriptname : the URI escaped path to this script -# $where : the path in the CVS repository (without leading /, or only /) -# $scriptwhere: the URI escaped $scriptname + '/' + $where -$scriptname = uri_escape_path($scriptname); -$scriptwhere = join('/', $scriptname, uri_escape_path($where)); -$where = '/' if ($where eq ''); - -# In text-based browsers, it's very annoying to have two links per file; -# skip linking the image for them. - -$Browser = $ENV{HTTP_USER_AGENT} || ''; -$is_links = ($Browser =~ m`^E?Links `); -$is_lynx = ($Browser =~ m`^Lynx/`i); -$is_w3m = ($Browser =~ m`^w3m/`i); -$is_msie = ($Browser =~ m`MSIE`); +# 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}; +$is_links = ($Browser =~ m`^Links `); +$is_lynx = ($Browser =~ m`^Lynx/`i); +$is_w3m = ($Browser =~ m`^w3m/`i); +$is_msie = ($Browser =~ m`MSIE`); $is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`); $is_textbased = ($is_links || $is_lynx || $is_w3m); @@ -338,4185 +215,2760 @@ $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 = ( - ((defined($ENV{HTTP_ACCEPT_ENCODING}) - && $ENV{HTTP_ACCEPT_ENCODING} =~ /gzip/) - || $is_mozilla3) - && !$is_msie - && !(defined($ENV{MOD_PERL}) && !HAS_ZLIB) -); +$maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) + && $ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`) + || $is_mozilla3) + && !$is_msie + && !($is_mod_perl && !$has_zlib)); -# Parameters that will be sticky in all constructed links/query strings. -@stickyvars = - qw(cvsroot hideattic ignorecase sortby logsort f only_with_tag ln - hidecvsroot hidenonreadable); +# put here the variables we need in order +# to hold our state - they will be added (with +# their current value) to any link/query string +# you construct +@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag); -# -# Load configuration. -# if (-f $config) { - do "$config" or config_error($config, $@); + 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 parameter $config in cvsweb.cgi to your cvsweb.conf configuration file first.'); + &fatal("500 Internal Error", + 'Configuration not found. Set the variable $config ' + . 'in cvsweb.cgi, or the environment variable ' + . 'CVSWEB_CONFIG, to your cvsweb.conf ' + . 'configuration file first.'); } -# Try to find a readable dir where we can cd into. Some abs_path() -# implementations as well as various cvs operations require such a dir to -# work properly. -{ - local $^W = 0; - for my $dir (tmpdir(), rootdir()) { - last if (-r $dir && chdir($dir)); - } -} - -$CSS = $cssurl ? - sprintf("\n", - htmlquote($cssurl)) : ''; - -# --- input parameters - -my %query = (); -if (defined($ENV{QUERY_STRING})) { - for my $p (split(/[;&]+/, $ENV{QUERY_STRING})) { - next unless $p; - $p =~ y/+/ /; - my ($key, $val) = split(/=/, $p, 2); - next unless defined($key); - $val = 1 unless defined($val); - ($key = uri_unescape($key)) =~ /[[:graph:]]/ or next; - ($val = uri_unescape($val)) =~ /[[:graph:]]/ or next; - $query{$key} = $val; - } -} - undef %input; +$query = $ENV{QUERY_STRING}; -my $t; -for my $p (qw(graph hideattic hidecvsroot hidenonreadable ignorecase ln copt - makeimage options tarball)) { - $t = $query{$p}; - if (defined($t)) { - ($input{$p}) = ($t =~ /^([01]|on)$/) - or fatal('500 Internal Error', - 'Invalid boolean value: %s=%s', $p, $t); - } -} -for my $p (qw(annotate r1 r2 rev tr1 tr2)) { - $t = $query{$p}; - if (defined($t)) { - if (($p eq 'r1' || $p eq 'r2') && $t eq 'text') { - # Special case for the "Use text field" option in the log view diff form. - $input{$p} = $t; - next; - } elsif (($p eq 'rev' || $p eq 'annotate') && ($t eq '.' || $t eq 'HEAD')){ - # Another special case, allow linking to latest revision using these. - $input{$p} = '.'; - next; +if (defined($query) && $query ne '') { + foreach (split(/&/, $query)) { + s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted + if (/(\S+)=(.*)/) { + $input{$1} = $2 if ($2 ne ""); + } + else { + $input{$_}++; + } } - my ($rev, $tag) = split(/:/, $t, 2); - ($input{$p}) = ($rev =~ /^(\d+(?:\.\d+)*)$/) - or fatal('500 Internal Error', - 'Invalid revision: %s=%s', $p, $t); - if (defined($tag)) { - ($tag) = ($tag =~ VALID_TAG1) - or fatal('500 Internal Error', - 'Invalid tag/branch name in revision: %s=%s', - $p, $t); - ($tag) = ($tag =~ VALID_TAG2) - or fatal('500 Internal Error', - 'Invalid tag/branch name in revision: %s=%s', - $p, $t); - $input{$p} .= ':' . $tag; - } - } } -$t = defined($query{only_with_tag}) ? - $query{only_with_tag} : $query{only_on_branch}; # Backwards compatibility. -if (defined($t)) { - ($input{only_with_tag}) = ($t =~ VALID_TAG1) - or fatal('500 Internal Error', - 'Invalid tag/branch name: %s', $t); - ($input{only_with_tag}) = ($t =~ VALID_TAG2) - or fatal('500 Internal Error', - 'Invalid tag/branch name: %s', $t); -} -$t = $query{logsort}; -if (defined($t)) { - ($input{logsort}) = ($t =~ /^(cvs|date|rev)$/) - or fatal('500 Internal Error', - 'Unsupported log sort key: %s', $t); -} -$t = $query{f}; -if (defined($t)) { - ($input{f}) = ($t =~ /^(([hH]|[ucs]c?)|ext\d*)$/) - or fatal('500 Internal Error', - 'Unsupported diff format: %s', $t); -} -$t = $query{sortby}; -if (defined($t)) { - ($input{sortby}) = ($t =~ /^(file|date|rev|author|log)$/) - or fatal('500 Internal Error', - 'Unsupported dir sort key: %s', $t); -} -$t = $query{'content-type'}; -if (defined($t)) { - ($input{'content-type'}) = ($t =~ m|^([-0-9A-Za-z]+/[-0-9A-Za-z\.\+]+)$|) - or fatal('500 Internal Error', - 'Unsupported content type: %s', $t); -} -$t = $query{cvsroot}; -if (defined($t)) { - ($input{cvsroot}) = ($t =~ /^([[:print:]]+)$/) - or fatal('500 Internal Error', - 'Invalid symbolic CVS root name: %s', $t); -} -$t = $query{path}; -if (defined($t)) { - ($input{path}) = ($t =~ VALID_PATH) - or fatal('500 Internal Error', - 'Invalid path: %s', $t); -} -undef($t); -undef(%query); -# --- end input parameters +# For backwards compability, set only_with_tag to only_on_branch if set. +$input{only_with_tag} = $input{only_on_branch} + if (defined($input{only_on_branch})); -# -# CVS roots -# -my $rootfound = 0; -for (my $i = 0; $i < scalar(@CVSrepositories); $i += 2) { - my $key = $CVSrepositories[$i]; - my ($descr, $root) = @{$CVSrepositories[$i+1]}; - $root = canonpath($root); - unless (-d $root) { - warn("Root '$root' defined in \@CVSrepositories is not a directory, " . - 'entry ignored'); - next; - } - $rootfound ||= 1; - $cvstreedefault = $key unless defined($cvstreedefault); - $CVSROOTdescr{$key} = $descr; - $CVSROOT{$key} = $root; - push(@CVSROOT, $key); -} -unless ($rootfound) { - fatal('500 Internal Error', - 'No valid CVS roots found! See @CVSrepositories in ' . - 'the configuration file (%s).', - $config); -} -undef $rootfound; +$DEFAULTVALUE{'cvsroot'} = $cvstreedefault; -# -# Default CVS root -# -if (!defined($CVSROOT{$cvstreedefault})) { - fatal("500 Internal Error", - '$cvstreedefault points to a repository (%s) not ' . - 'defined in @CVSrepositories in your configuration ' . - 'file (%s).', - $cvstreedefault, - $config); +foreach (keys %DEFAULTVALUE) +{ + # replace not given parameters with the default parameters + if (!defined($input{$_}) || $input{$_} eq "") { + # Empty Checkboxes in forms return -- nothing. So we define a helper + # variable in these forms (copt) which indicates that we just set + # parameters with a checkbox + if (!defined($input{"copt"})) { + # 'copt' isn't defined --> empty input is not the result + # of empty input checkbox --> set default + $input{$_} = $DEFAULTVALUE{$_} if (defined($DEFAULTVALUE{$_})); + } + else { + # 'copt' is defined -> the result of empty input checkbox + # -> set to zero (disable) if default is a boolean (0|1). + $input{$_} = 0 + if (defined($DEFAULTVALUE{$_}) + && ($DEFAULTVALUE{$_} eq "0" || $DEFAULTVALUE{$_} eq "1")); + } + } } -$DEFAULTVALUE{cvsroot} = $cvstreedefault; - -while (my ($key, $defval) = each %DEFAULTVALUE) { - - # Replace not given parameters with defaults. - next unless (defined($defval) && $defval =~ /\S/ && !defined($input{$key})); - - # Empty checkboxes in forms return nothing, so we define a helper parameter - # in these forms (copt) which indicates that we just set parameters with a - # checkbox. - if ($input{copt}) { - - # 'copt' is set -> the result of empty input checkbox - # -> set to zero (disable) if default is a boolean (0|1). - $input{$key} = 0 if ($defval eq '0' || $defval eq '1'); - - } else { - - # 'copt' isn't set --> empty input is not the result - # of empty input checkbox --> set default. - $input{$key} = $defval; - } -} - $barequery = ""; my @barequery; foreach (@stickyvars) { - - # construct a query string with the sticky non default parameters set - if (defined($input{$_}) - && !(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) - { - push(@barequery, join('=', uri_escape($_), uri_escape($input{$_}))); - } + # construct a query string with the sticky non default parameters set + if (defined($input{$_}) && $input{$_} ne '' && + !(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) { + push @barequery, join('=', urlencode($_), urlencode($input{$_})); + } } - -if ($allow_enscript) { - push(@DIFFTYPES, qw(uc cc sc)); - @DIFFTYPES{qw(uc cc sc)} = ( - { - 'descr' => 'unified, colored', - 'opts' => ['-u'], - 'colored' => 0, - }, - { - 'descr' => 'context, colored', - 'opts' => ['-c'], - 'colored' => 0, - }, - { - 'descr' => 'side by side, colored', - # width=168 should be enough to support 80 character line lengths - 'opts' => ['--side-by-side', '--width=168'], - 'colored' => 0, - }, - ); -} else { - # No Enscript -> respect difftype, but don't offer colorization. - if ($input{f} && $input{f} =~ /^([ucs])c$/) { - $input{f} = $1; - } -} - # is there any query ? if (@barequery) { - $barequery = join (';', @barequery); - $query = "?$barequery"; - $barequery = ";$barequery"; -} else { - $query = ""; + $barequery = join('&', @barequery); + $query = "?$barequery"; + $barequery = "&$barequery"; } +else { + $query = ""; +} undef @barequery; -if (defined($input{path})) { - redirect("$scriptname/$input{path}$query"); -} - # get actual parameters -{ - my $sortby = $input{sortby} || 'file'; - $bydate = 0; - $byrev = 0; - $byauthor = 0; - $bylog = 0; - $byfile = 0; - if ($sortby eq 'date') { +$sortby = $input{"sortby"}; +$bydate = 0; +$byrev = 0; +$byauthor = 0; +$bylog = 0; +$byfile = 0; +if ($sortby eq "date") { $bydate = 1; - } elsif ($sortby eq 'rev') { +} +elsif ($sortby eq "rev") { $byrev = 1; - } elsif ($sortby eq 'author') { +} +elsif ($sortby eq "author") { $byauthor = 1; - } elsif ($sortby eq 'log') { +} +elsif ($sortby eq "log") { $bylog = 1; - } else { +} +else { $byfile = 1; - } } -$defaultDiffType = $input{f}; +$hr_default = $input{'f'} eq 'h'; -$logsort = $input{logsort}; +$logsort = $input{'logsort'}; + +## Default CVS-Tree +if (!defined($CVSROOT{$cvstreedefault})) { + &fatal("500 Internal Error", + "\$cvstreedefault points to a repository " + . "not defined in %CVSROOT " + . "(edit your configuration file $config)"); +} + # alternate CVS-Tree, configured in cvsweb.conf -if ($input{cvsroot} && $CVSROOT{$input{cvsroot}}) { - $cvstree = $input{cvsroot}; +if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) { + $cvstree = $input{'cvsroot'}; } else { - $cvstree = $cvstreedefault; + $cvstree = $cvstreedefault; } $cvsroot = $CVSROOT{$cvstree}; # create icons out of description -foreach my $k (keys %ICONS) { - my ($itxt, $ipath, $iwidth, $iheight) = @{$ICONS{$k}}; - no strict 'refs'; - if ($ipath) { - ${"${k}icon"} = - sprintf('%s', - htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight); - } else { - ${"${k}icon"} = $itxt; - } +my $k; +foreach $k (keys %ICONS) { + no strict 'refs'; + my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; + if ($ipath) { + ${"${k}icon"} = "\"$itxt\""; + } + else { + ${"${k}icon"} = $itxt; + } } +undef $k; my $config_cvstree = "$config-$cvstree"; # Do some special configuration for cvstrees if (-f $config_cvstree) { - do "$config_cvstree" - or fatal("500 Internal Error", - 'Error in loading configuration file: %s

%s
', - $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); -$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; +$prcategories = '(?:' . join('|', @prcategories) . ')'; +$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; -$fullname = catfile($cvsroot, $where); +$fullname = $cvsroot . '/' . $where; +$mimetype = &getMimeTypeFromSuffix ($fullname); +$defaultTextPlain = ($mimetype eq "text/plain"); +$defaultViewable = $allow_markup && viewable($mimetype); -my $rewrite = 0; -if ($pathinfo =~ m|//|) { - $pathinfo =~ y|/|/|s; - $rewrite = 1; +# 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; + } + } } + if (-d $fullname) { - if ($pathinfo !~ m|/$|) { - $pathinfo .= '/'; - $rewrite = 1; - } -} elsif ($pathinfo =~ m|/$|) { - chop $pathinfo; - $rewrite = 1; + # + # 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 ($rewrite) { - redirect($scriptname . uri_escape_path($pathinfo) . $query, 1); -} -undef $rewrite; -undef $pathinfo; - 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.'); + &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.'); } # -# Short-circuit forbidden things. Note that $fullname should not change -# after this, because the rest of the code assumes this check has already -# been done. +# See if the module is in our forbidden list. # -fatal('403 Forbidden', 'Access to %s forbidden.', $where) - if forbidden($fullname); - -# -# 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 ($ext) = ($1 =~ /(\.t(?:ar\.)?gz|\.zip)$/); - my ($basedir) = ($module =~ m,([^/]+)$,); - - if ($basedir eq '' || $module eq '') { - fatal('500 Internal Error', - 'You cannot download the top level directory.'); - } - - my $istar = ($ext eq '.tar.gz' || $ext eq '.tgz'); - if ($istar) { - fatal('500 Internal Error', 'tar command not found.') unless $CMD{tar}; - fatal('500 Internal Error', 'gzip command not found.') unless $CMD{gzip}; - } - my $iszip = ($ext eq '.zip'); - if ($iszip && !$CMD{zip}) { - fatal('500 Internal Error', 'zip command not found.'); - } - if (!$istar && !$iszip) { - fatal('500 Internal Error', 'Unsupported archive type.'); - } - - my $tmpexportdir; - eval { - local $SIG{__DIE__}; - # Don't use the CLEANUP argument to tempdir() here, since we might be under - # mod_perl (the process runs for a long time), unlink explicitly later. - $tmpexportdir = tempdir('.cvsweb.XXXXXXXX', TMPDIR => 1); - }; - if ($@) { - fatal('500 Internal Error', 'Unable to make temporary directory: %s', $@); - } - if (!chdir($tmpexportdir)) { - fatal('500 Internal Error', - "Can't cd to temporary directory %s: %s", $tmpexportdir, $!); - } - - my @fatal; - my $tag = $input{only_with_tag} || 'HEAD'; - $tag = 'HEAD' if ($tag eq 'MAIN'); - - my @cmd = - ($CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', $tag, - '-d', $basedir, $module); - my $export_err; - my ($errcode, $err) = runproc(\@cmd, '2>', \$export_err); - if ($errcode) { - @fatal = - ('500 Internal Error', - 'Export failure (exit status %s), output: 

%s
', - $errcode, $err || $export_err); - - } else { - - $| = 1; # Essential to get the buffering right. - local (*TAR_OUT); - - my (@cmd, $ctype); - if ($istar) { - my @tar = ($CMD{tar}, @tar_options, '-cf', '-', $basedir); - my @gzip = ($CMD{gzip}, @gzip_options, '-c'); - push(@cmd, \@tar, '|', \@gzip); - $ctype = 'application/x-gzip'; - } elsif ($iszip) { - my @zip = ($CMD{zip}, @zip_options, '-r', '-', $basedir); - push(@cmd, \@zip, \''); - $ctype = 'application/zip'; - } - push(@cmd, '>pipe', \*TAR_OUT); - - my ($h, $err) = startproc(@cmd); - if ($h) { - print "Content-Type: $ctype\r\n\r\n"; - local $/ = undef; - print ; - $h->finish(); - } else { - @fatal = ('500 Internal Error', - '%s failure (exit status %s), output: 
%s
', - $istar ? 'Tar' : 'Zip', $? >> 8 || -1, $err); - } - } - - # Clean up. - rmtree($tmpexportdir); - - &fatal(@fatal) if @fatal; - - exit; +$where =~ m:([^/]*):; +$module = $1; +if ($module && &forbidden_module($module)) { + &fatal("403 Forbidden", "Access to $where forbidden."); } - ############################## # 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); + closedir($dh); + my @subLevelFiles = findLastModifiedSubdirs(@dir) + if ($show_subdir_lastmod); + getDirLogs($cvsroot,$where,@subLevelFiles); - my $dh = do { local (*DH); }; - opendir($dh, $fullname) or fatal("404 Not Found", '%s: %s', $where, $!); - my @dir = grep(!forbidden(catfile($fullname, $_)), readdir($dh)); - closedir($dh); - my @subLevelFiles = findLastModifiedSubdirs(@dir) if $show_subdir_lastmod; - my @unreadable = getDirLogs($cvsroot, $where, @subLevelFiles); + if ($where eq '/') { + html_header($defaulttitle); + $long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g; + print $long_intro; + } + else { + html_header($where); + print $short_instruction; + } - if ($where eq '/') { - html_header($defaulttitle); - $long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g; - print $long_intro; - } else { - html_header($where); - my $html = (-f catfile($fullname, 'README.cvs.html,v') || - -f catfile($fullname, 'Attic', 'README.cvs.html,v')); - my $text = (!$html && - (-f catfile($fullname, 'README.cvs,v') || - -f catfile($fullname, 'Attic', 'README.cvs,v'))); - if ($html || $text) { - my $rev = $input{only_with_tag} || 'HEAD'; - my $cr = abs_path($cvsroot) || $cvsroot; - my $co = "$where/README.cvs.html" if $html; - $co ||= "$where/README.cvs" if $text; - # abs_path() taints when run as a CGI... - if ($cr =~ VALID_PATH) { - $cr = $1; - } else { - fatal('500 Internal Error', 'Illegal CVS root: %s', $cr); - } - my @cmd = ($CMD{cvs}, @cvs_options, '-d', $cr, 'co', '-p', "-r$rev",$co); - local (*CVS_OUT, *CVS_ERR); - my ($h, $err) = startproc(\@cmd, \"", '>pipe', \*CVS_OUT, - '2>pipe', \*CVS_ERR); - fatal('500 Internal Error', $err) unless $h; - if ($html) { - local $/ = undef; - print ; - } else { - print "

\n"; - while () { - chomp; - print htmlquote($_), '
'; - } - print "

"; - } - $h->finish(); - } - print $short_instruction; - } + my $descriptions; + if (($use_descriptions) && open (DESC, "<$cvsroot/CVSROOT/descriptions")) { + while () { + chomp; + my ($dir,$description) = /(\S+)\s+(.*)/; + $descriptions{$dir} = $description; + } + } - if ($use_descriptions && - open(DESC, catfile($cvsroot, 'CVSROOT', 'descriptions'))) { - while () { - chomp; - my ($dir, $description) = /(\S+)\s+(.*)/; - $descriptions{$dir} = $description; - } - close(DESC); - } + print "

\n"; + # give direct access to dirs + if ($where eq '/') { + chooseMirror(); + chooseCVSRoot(); + } + else { + print "

Current directory: ", &clickablePath($where,0), "\n"; - print "

\n"; + print "

Current tag: ", $input{only_with_tag}, "\n" if + $input{only_with_tag}; - # give direct access to dirs - if ($where eq '/') { - chooseMirror(); - chooseCVSRoot(); + } - } else { - print '

Current directory: ', clickablePath($where, 0), ''; - if ($cvshistory_url) { - (my $d = $where) =~ s|^/*(.*?)/*$|$1|; - print ' - ', history_link($d, ''); - } - print "

\n"; - print "

Current tag: ", htmlquote($input{only_with_tag}), "

\n" - if $input{only_with_tag}; - } - print "
\n"; + print "
\n"; + # Using in this manner violates the HTML2.0 spec but + # provides the results that I want in most browsers. Another + # case of layout spooging up HTML. - my $infocols = 1; + my $infocols = 0; + if ($dirtable) { + if (defined($tableBorderColor)) { + # Can't this be done by defining the border for the inner table? + print "
"; + } + print "\n"; + $infocols++; + print ""; + # do not display the other column-headers, if we do not have any files + # with revision information: + if (scalar(%fileinfo)) { + $infocols++; + print ""; + $infocols++; + print ""; + if ($show_author) { + $infocols++; + print ""; + } + $infocols++; + print ""; + } + elsif ($use_descriptions) { + print "\n"; + } + else { + print "\n"; + } + my $dirrow = 0; - printf(< - -EOF - printf('\n"; + my $hideAtticToggleLink = "[Hide]" if (!$input{'hideattic'}); - # Do not display the other column headers if we do not have any files - # with revision information. - if (scalar(%fileinfo)) { - $infocols++; - printf('', ($byrev ? ' class="sorted"' : '')); + # Sort without the Attic/ pathname. + # place directories first - if ($byrev) { - print 'Rev.'; - } else { - print &link('Rev.', - sprintf('./%s#dirlist', toggleQuery('sortby', 'rev'))); - } - print "\n"; - $infocols++; - printf('', ($bydate ? ' class="sorted"' : '')); + my $attic; + my $url; + my $fileurl; + my $filesexists; + my $filesfound; - if ($bydate) { - print 'Age'; - } else { - print &link('Age', - sprintf('./%s#dirlist', toggleQuery('sortby', 'date'))); - } - print "\n"; + foreach (sort { &fileSortCmp } @dir) { + if ($_ eq '.') { + next; + } + # ignore CVS lock and stale NFS files + next if (/^#cvs\.|^,|^\.nfs/); - if ($show_author) { - $infocols++; - printf('', ($byauthor ? ' class="sorted"' : '')); + # Check whether to show the CVSROOT path + next if ($input{'hidecvsroot'} && ($_ eq 'CVSROOT')); - if ($byauthor) { - print 'Author'; - } else { - print - &link('Author', - sprintf('./%s#dirlist', toggleQuery('sortby', 'author'))); - } - print "\n"; - } - $infocols++; - printf('', ($bylog ? ' class="sorted"' : '')); + # Check whether the module is in the restricted list + next if ($_ && &forbidden_module($_)); - if ($bylog) { - print 'Last log entry'; - } else { - print &link('Last log entry', - sprintf('./%s#dirlist', toggleQuery('sortby', 'log'))); - } - print "\n"; - } elsif ($use_descriptions) { - print "\n"; - $infocols++; - } - print "\n"; + # Ignore non-readable files + next if ($input{'hidenonreadable'} && !(-r "$fullname/$_")); - my $dirrow = 0; + if (s|^Attic/||) { + $attic = " (in the Attic) " . $hideAtticToggleLink; + } + else { + $attic = ""; + } - my $i; - lookingforattic: - for ($i = 0; $i <= $#dir; $i++) { - if ($dir[$i] eq "Attic") { - last lookingforattic; - } - } + if ($_ eq '..' || -d "$fullname/$_") { + next if ($_ eq '..' && $where eq '/'); + my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} + if (defined($fileinfo{$_})); + print "\n"; + } + else { + print "
\n"; + } + $dirrow++; + } + elsif (s/,v$//) { + $fileurl = ($attic ? "Attic/" : "") . urlencode($_); + $url = $fileurl . $query; + my $rev = ''; + my $date = ''; + my $log = ''; + my $author = ''; + $filesexists++; + next if (!defined($fileinfo{$_})); + ($rev,$date,$log,$author) = @{$fileinfo{$_}}; + $filesfound++; + print "" if ($dirtable); + print (($dirtable) ? "" : "
"); + $dirrow++; + } + print "\n"; + } + if ($dirtable && defined($tableBorderColor)) { + print "
"; + print "" if (!$byfile); + print "File"; + print "" if (!$byfile); + print ""; + print "" if (!$byrev); + print "Rev."; + print "" if (!$byrev); + print ""; + print "" if (!$bydate); + print "Age"; + print "" if (!$bydate); + print ""; + print "" if (!$byauthor); + print "Author"; + print "" if (!$byauthor); + print ""; + print "" if (!$bylog); + print "Last log entry"; + print "" if (!$bylog); + print ""; + print "Description"; + $infocols++; + } + print "
', ($byfile ? ' class="sorted"' : '')); + my $i; + lookingforattic: + for ($i = 0; $i <= $#dir; $i++) { + if ($dir[$i] eq "Attic") { + last lookingforattic; + } + } + if (!$input{'hideattic'} && ($i <= $#dir) && + opendir($dh, $fullname . "/Attic")) { + splice(@dir, $i, 1, + grep((s|^|Attic/|,!m|/\.|), readdir($dh))); + closedir($dh); + } - if ($byfile) { - print 'File'; - } else { - print &link('File', - sprintf('./%s#dirlist', toggleQuery('sortby', 'file'))); - } - print "Description
" if ($dirtable); + if ($_ eq '..') { + $url = "../" . $query; + if ($nofilelinks) { + print $backicon; + } + else { + print &link($backicon,$url); + } + print " ", &link("Previous Directory",$url); + } + else { + $url = urlencode($_) . '/' . $query; + print ""; + if ($nofilelinks) { + print $diricon; + } + else { + print &link($diricon,$url); + } + print " ", &link($_ . "/", $url), $attic; + if ($_ eq "Attic") { + print "  [Don't hide]"; + } + } + # Show last change in dir + if ($filename) { + print "  " if ($dirtable); + if ($date) { + print " " . readableTime(time() - $date,0) . ""; + } + if ($show_author) { + print " " if ($dirtable); + print $author; + } + print " " if ($dirtable); + $filename =~ s%^[^/]+/%%; + print "$filename/$rev"; + print "
" if ($dirtable); + if ($log) { + print " " + . &htmlify(substr($log,0,$shortLogLen)); + if (length $log > 80) { + print "..."; + } + print ""; + } + } + else { + my ($dwhere) = ($where ne "/" ? $where : "") . $_; + if ($use_descriptions && defined $descriptions{$dwhere}) { + print "		 " if $dirtable; + print $descriptions{$dwhere}; + } elsif ($dirtable && $infocols > 1) { + # close the row with the appropriate number of + # columns, so that the vertical seperators are visible + my($cols) = $infocols; + while ($cols > 1) { + print " "; + $cols--; + } + } + } + if ($dirtable) { + print "
" if ($dirtable); + print ""; + if ($nofilelinks) { + print $fileicon; + } + else { + print &link($fileicon,$url); + } + print " ", &link($_, $url), $attic; + print " " if ($dirtable); + download_link($fileurl, + $rev, $rev, + $defaultViewable ? "text/x-cvsweb-markup" : undef); + print " " if ($dirtable); + if ($date) { + print " " . readableTime(time() - $date,0) . ""; + } + if ($show_author) { + print " " if ($dirtable); + print $author; + } + print " " if ($dirtable); + if ($log) { + print " " . &htmlify(substr($log,0,$shortLogLen)); + if (length $log > 80) { + print "..."; + } + print ""; + } + print "
"; + } + print "". ($dirtable == 1) ? "
" : "" . "\n"; - if (!$input{hideattic} - && ($i <= $#dir) - && opendir($dh, $fullname . '/Attic')) - { - splice(@dir, $i, 1, grep((s|^|Attic/|, !m|/\.|), readdir($dh))); - closedir($dh); - } + if ($filesexists && !$filesfound) { + print "

NOTE: There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n"; + } + if ($input{only_with_tag} && (!%tags || !$tags{$input{only_with_tag}})) { + %tags = %alltags + } + if (scalar %tags + || $input{only_with_tag} + || $edit_option_form + || defined($input{"options"})) { + print "

"; + } - my $hideAtticToggleLink = - $input{hideattic} - ? '' - : &link('[hide]', sprintf('./%s#dirlist', &toggleQuery('hideattic'))); + if (scalar %tags || $input{only_with_tag}) { + print "
\n"; + foreach my $var (@stickyvars) { + print "\n" + if (defined($input{$var}) + && (!defined($DEFAULTVALUE{$var}) + || $input{$var} ne $DEFAULTVALUE{$var}) + && $input{$var} ne "" + && $var ne "only_with_tag"); + } + print "Show only files with tag:\n"; + print "\n"; + print "\n"; + print "
\n"; + } + my $formwhere = $scriptwhere; + $formwhere =~ s|Attic/?$|| if ($input{'hideattic'}); - # Sort without the Attic/ pathname. - # place directories first - - my $filesexists; - my $filesfound; - - foreach my $file (sort { &fileSortCmp } @dir) { - - next if ($file eq curdir()); - - # ignore CVS lock and stale NFS files - next if ($file =~ /^\#cvs\.|^,|^\.nfs/); # \# for XEmacs cperl-mode... - - # Check whether to show the CVSROOT path - next if ($input{hidecvsroot} && $where eq '/' && $file eq 'CVSROOT'); - - # Is it a directory? - my $isdir = -d catdir($fullname, $file); - - # Ignore non-readable files and directories? - next if ($input{hidenonreadable} && (! -r _ || ($isdir && ! -x _))); - - my $attic = ''; - if ($file =~ s|^Attic/||) { - $attic = ' (in the Attic) ' . - $hideAtticToggleLink . ''; + if ($edit_option_form || defined($input{"options"})) { + print "
\n"; + print "\n"; + if ($cvstree ne $cvstreedefault) { + print "\n"; + } + print "
"; + print ""; + print ""; + print ""; + print ""; + print "\n"; + print "
Preferences
Sort files by revisions by: \n"; + print "
Diff format: "; + printDiffSelect(0); + print "Show Attic files: "; + print "
"; + print "
\n"; + } + print &html_footer; + print "\n"; } - if ($file eq updir() || $isdir) { - next if ($file eq updir() && $where eq '/'); - my ($rev, $date, $log, $author, $filename, $keywordsubst) = - @{$fileinfo{$file}} if (defined($fileinfo{$file})); - printf "\n", - ($dirrow % 2) ? 'even' : 'odd'; - - if ($file eq updir()) { - my $url = "../$query"; - print $nofilelinks ? $backicon : &link($backicon, $url); - print ' ', &link("Parent Directory", $url); - - } else { - my $url = './' . uri_escape_path($file) . "/$query"; - print ''; - print $nofilelinks ? $diricon : &link($diricon, $url); - print ' ', &link(htmlquote("$file/"), $url), $attic; - if ($file eq "Attic") { - print ' ', - &link('[show]', - sprintf('./%s#dirlist', &toggleQuery('hideattic'))), - ''; - } - } - - # Show last change in dir - if ($filename) { - print "\n \n"; - print readableTime(time() - $date, 0) if $date; - print "\n", htmlquote($author) - if $show_author; - print "\n"; - $filename =~ s%^[^/]+/%%; - print &link(htmlquote("$filename/$rev"), - sprintf('%s/%s%s#rev%s', - uri_escape($file), uri_escape($filename), - $query, $rev)), '
'; - if ($log) { - print htmlify(substr($log, 0, $shortLogLen), $allow_dir_extra); - print '...' if (length($log) > 80); - } - - } else { - my $dwhere = ($where ne '/' ? $where : '') . $file; - - if ($use_descriptions && defined $descriptions{$dwhere}) { - print ''; - print $descriptions{$dwhere}; - - } elsif ($infocols > 1) { - - # close the row with the appropriate number of - # columns, so that the vertical seperators are visible - my ($cols) = $infocols; - while ($cols > 1) { - print "\n "; - $cols--; - } - } - } - - print "\n\n"; - $dirrow++; - - } elsif ($file =~ s/,v$//) { - - my $fileurl = ($attic ? 'Attic/' : '') . uri_escape_path($file); - my $url = './' . $fileurl . $query; - $filesexists++; - next if (!defined($fileinfo{$file})); - my ($rev, $date, $log, $author, $filename, $keywordsubst) = - @{$fileinfo{$file}}; - my $isbinary = $keywordsubst eq 'b' ? 1 : 0; - $filesfound++; - - printf "\n", ($dirrow % 2) ? 'even' : 'odd'; - printf '', $allow_cvsgraph ? '' : ' colspan="2"'; - - my $icon = $isbinary ? $binfileicon : $fileicon; - print $nofilelinks ? $icon : &link($icon, $url); - print ' ', &link(htmlquote($file), $url), $attic; - print '', graph_link($fileurl) if $allow_cvsgraph; - print "\n", display_link($fileurl, $rev); - print "\n"; - print readableTime(time() - $date, 0) if $date; - print "\n", htmlquote($author) if $show_author; - print "\n"; - - if ($log) { - print htmlify(substr($log, 0, $shortLogLen), $allow_dir_extra); - print '...' if (length $log > 80); - } - print "\n"; - $dirrow++; - } - print "\n"; - } - - print "\n"; - - if ((my $num = scalar(@unreadable)) && ! $input{hidenonreadable}) { - printf(< - NOTE: The following %d unreadable files were ignored:
- %s -

-EOF - } - - if ($filesexists && !$filesfound) { - my $currtag = defined($input{only_with_tag}) ? - sprintf(' (%s)', htmlquote($input{only_with_tag})) : ''; - printf(< - NOTE: There are %d files, but none matches the current tag%s. -

-EOF - } - - if ($input{only_with_tag} && (!%tags || !$tags{$input{only_with_tag}})) { - %tags = %alltags; - } - - if (scalar %tags - || $input{only_with_tag} - || $edit_option_form - || defined($input{options})) - { - print "
\n"; - } - - if (scalar %tags || $input{only_with_tag}) { - print "
\n

\n"; - foreach my $var (@stickyvars) { - printf("\n", - htmlquote($input{$var})) - if (defined($input{$var}) - && (!defined($DEFAULTVALUE{$var}) - || $input{$var} ne $DEFAULTVALUE{$var}) - && $var ne 'only_with_tag'); - } - printf(< - - - -

-
-EOF - } - - if ($allow_tar && $filesfound) { - my ($basefile) = ($where =~ m,(?:.*/)?([^/]+),); - my $havetar = $CMD{tar} && $CMD{gzip}; - my $havezip = $CMD{zip}; - if (defined($basefile) && $basefile ne '' && ($havetar || $havezip)) { - my $q = ($query ? "$query;" : '?') . 'tarball=1'; - print "
\n", - '
Download this directory in '; - # Mangle the filename so browsers show a reasonable filename to download. - my @types = (); - $basefile = uri_escape($basefile); - push(@types, &link('tarball', "$basefile.tar.gz$q")) if $havetar; - push(@types, &link('zip archive', "$basefile.zip$q")) if $havezip; - print join(' or ', @types), "
\n"; - } - } - - if ($edit_option_form || defined($input{options})) { - - print < -
-General options - -EOF - for my $v qw(hidecvsroot hidenonreadable) { - printf(qq{\n}, - $v, $input{$v} || 0); - } - if ($cvstree ne $cvstreedefault) { - print "\n"; - } - print < - - - - - -\n"; - print < - - - - -EOF - print ''; - print < - - - - - - -EOF - printLogSortSelect(0); - print < - - - - -EOF - print '\n"; - print < - - - - - - -EOF - printDiffSelect(0); - print < - - - - - -
- -EOF - } - html_footer(); -} - ############################### # View Files ############################### -elsif (-f $fullname . ',v') { - - if (defined($input{rev}) || $doCheckout) { - &doCheckout($fullname, $input{rev}, $input{only_with_tag}); - gzipclose(); - exit; - } - - if (defined($input{annotate}) && $allow_annotate) { - &doAnnotate($input{annotate}, $input{only_with_tag}); - gzipclose(); - exit; - } - - if (defined($input{r1}) && defined($input{r2})) { - &doDiff($fullname, $input{r1}, $input{tr1}, - $input{r2}, $input{tr2}, $input{f}); - gzipclose(); - exit; - } - - if ($allow_cvsgraph && $input{graph}) { - if ($input{makeimage}) { - doGraph(); - } else { - doGraphView(); - } - gzipclose(); - exit; - } - - &doLog($fullname); -} - + elsif (-f $fullname . ',v') { + if (defined($input{'rev'}) || $doCheckout) { + &doCheckout($fullname, $input{'rev'}); + gzipclose(); + exit; + } + if (defined($input{'annotate'}) && $allow_annotate) { + &doAnnotate($input{'annotate'}); + gzipclose(); + exit; + } + if (defined($input{'r1'}) && defined($input{'r2'})) { + &doDiff($fullname, $input{'r1'}, $input{'tr1'}, + $input{'r2'}, $input{'tr2'}, $input{'f'}); + gzipclose(); + exit; + } + print("going to dolog($fullname)\n") if ($verbose); + &doLog($fullname); ############################## # View Diff ############################## -elsif ($fullname =~ s/\.diff$// - && -f $fullname . ',v' && $input{r1} && $input{r2}) -{ + } + elsif ($fullname =~ s/\.diff$// && -f $fullname . ",v" && + $input{'r1'} && $input{'r2'}) { - # $where-diff-removal if 'cvs rdiff' is used - # .. but 'cvs rdiff'doesn't support some options - # rcsdiff does (-w and -p), so it is disabled - # $where =~ s/\.diff$//; + # $where-diff-removal if 'cvs rdiff' is used + # .. but 'cvs rdiff'doesn't support some options + # rcsdiff does (-w and -p), so it is disabled + # $where =~ s/\.diff$//; - # Allow diffs using the ".diff" extension so that browsers that default - # to the filename in the URL when saving don't save diffs as eg. foo.c. - &doDiff($fullname, $input{r1}, $input{tr1}, - $input{r2}, $input{tr2}, $input{f}); - gzipclose(); - exit; - -} - -elsif (do { (my $tmp = $fullname) =~ s|/([^/]+)$|/Attic/$1|; -f "$tmp,v" }) { - # 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|; - if ($ENV{QUERY_STRING} ne "") { - redirect("$newplace?$ENV{QUERY_STRING}"); - } else { - redirect($newplace); - } - exit; - -} - -elsif (0 && (my @files = &safeglob($fullname . ",v"))) { - http_header("text/plain"); - print "You matched the following files:\n"; - print join ("\n", @files); - - # TODO: - # Find the tags from each file - # Display a form offering diffs between said tags -} - -else { - # Assume it's a module name with a potential path following it. - my $module; - my $xtra = (($module = $where) =~ s|(/.*)||) ? $1 : ''; - - # Is there an indexed version of modules? - my $fh = do { local (*FH); }; - if (open($fh, catfile($cvsroot, 'CVSROOT', 'modules'))) { - while (<$fh>) { - if (/^(\S+)\s+(\S+)/o - && $module eq $1 - && $module ne $2 - && -d "$cvsroot/$2") - { - close($fh); - redirect("$scriptname/$2$xtra$query"); - } + # Allow diffs using the ".diff" extension + # so that browsers that default to the URL + # for a save filename don't save diff's as + # e.g. foo.c + &doDiff($fullname, $input{'r1'}, $input{'tr1'}, + $input{'r2'}, $input{'tr2'}, $input{'f'}); + gzipclose(); + exit; } - close($fh); - } - fatal("404 Not Found", '%s: no such file or directory', $where); -} + elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| && + -f $newname . ",v") { + # 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); + exit; + } + elsif (0 && (my @files = &safeglob($fullname . ",v"))) { + http_header("text/plain"); + print "You matched the following files:\n"; + print join("\n", @files); + # Find the tags from each file + # Display a form offering diffs between said tags + } + else { + 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|/.*||); + # 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); + } + } + } + &fatal("404 Not Found","$where: no such file or directory"); + } gzipclose(); - ## End MAIN - -sub printDiffSelect($) -{ - my ($use_java_script) = @_; - - print '"; +sub printDiffSelect($) { + my ($use_java_script) = @_; + my ($f) = $input{'f'}; + print ""; } +sub findLastModifiedSubdirs(@) { + my (@dirs) = @_; + my ($dirname, @files); -sub printDiffSelectStickyVars() -{ - while (my ($key, $val) = each %input) { - next if ($key eq 'f'); - next if (defined($DEFAULTVALUE{$key}) && $DEFAULTVALUE{$key} eq $val); - print "\n"; - } -} + foreach $dirname (@dirs) { + next if ($dirname eq "."); + next if ($dirname eq ".."); + my ($dir) = "$fullname/$dirname"; + next if (!-d $dir); + my ($lastmod) = undef; + my ($lastmodtime) = undef; + my $dh = do {local(*DH);}; -sub printLogSortSelect($) -{ - my ($use_java_script) = @_; + opendir($dh,$dir) || next; + my (@filenames) = readdir($dh); + closedir($dh); - print '"; -} - - -# -# Find the last modified, version controlled files in the given directories. -# Compares solely based on modification timestamps. Files in the returned list -# are without the ,v suffix, and unreadable files have been filtered out. -# -sub findLastModifiedSubdirs(@) -{ - my (@dirs) = @_; - - my @files; - foreach my $dirname (@dirs) { - next if ($dirname eq curdir() || $dirname eq updir()); - my $dir = catdir($fullname, $dirname); - next if (!-d $dir); - - my $dh = do { local (*DH); }; - opendir($dh, $dir) or next; - my (@filenames) = grep(!forbidden(catfile($dir, $_)), readdir($dh)); - closedir($dh); - - my $lastmod = undef; - my $lastmodtime = undef; - foreach my $filename (@filenames) { - ($filename) = - (catfile($dirname, $filename) =~ VALID_PATH) or next; # untaint - my ($file) = catfile($fullname, $filename); - next if ($filename !~ /,v$/o || !-f $file || !-r _); - my $modtime = -M _; - if (!defined($lastmod) || $modtime < $lastmodtime) { - ($lastmod = $filename) =~ s/,v$//; - $lastmodtime = $modtime; - } + foreach my $filename (@filenames) { + $filename = "$dirname/$filename"; + my ($file) = "$fullname/$filename"; + next if ($filename !~ /,v$/ || !-f $file); + $filename =~ s/,v$//; + my $modtime = -M $file; + if (!defined($lastmod) || $modtime < $lastmodtime) { + $lastmod = $filename; + $lastmodtime = $modtime; + } + } + push(@files, $lastmod) if (defined($lastmod)); } - push(@files, $lastmod) if (defined($lastmod)); - } - return @files; + return @files; } +sub htmlify($;$) { + my($string, $extra) = @_; -sub htmlify_sub(&$) -{ - (my $proc, local $_) = @_; - my @a = split(m|(]+>[^<]*)|i); - my $linked; - my $result = ''; + # Special Characters; RFC 1866 + $string =~ s/&/&/g; + $string =~ s/\"/"/g; + $string =~ s//>/g; - while (($_, $linked) = splice(@a, 0, 2)) { - &$proc(); - $result .= $_ if defined($_); - $result .= $linked if defined($linked); - } + # get URL's as link .. + $string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`$1$2$3`g; # ` + # get e-mails as link + $string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`$1`g; # ` - return $result; -} + 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; # `; + } + # get manpage specs as link .. + if (defined($mancgi)) { + $string =~ s`\b([a-zA-Z]\w+)(?:\(([0-9n])\)\B|\.([0-9n])\b)`&link($&, sprintf($mancgi, $2 ne '' ? $2 : $3, $1))`ge; # `x; + } + } -sub htmlify($;$) -{ - (local $_, my $extra) = @_; - - $_ = htmlquote($_); - - # get URL's as link - s{ - ((https?|ftp)://.+?)([\s\']|&(quot|[lg]t);) - }{ - &link($1, htmlunquote($1)) . $3 - }egx; - - if ($allow_mailtos) { - # Make mailto: links from email addresses. - $_ = htmlify_sub { - s< - ([\w+=\-.!]+@[\w\-]+(?:\.[\w\-]+)+) - >< - &link($1, "mailto:$1") - >egix; - } $_; - } - - if ($extra) { - - # get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn" - if (defined($prcgi) && defined($re_prkeyword)) { - my $prev; - - do { - $prev = $_; - - $_ = htmlify_sub { - s{ - (\b$re_prkeyword[:\#]?\s* - (?: - \#? - \d+[,\s]\s* - )* - \#?) - (\d+)\b - }{ - $1 . &link($2, sprintf($prcgi, $2)) - }egix; - } $_; - } while ($_ ne $prev); - - if (defined($re_prcategories)) { - $_ = htmlify_sub { - s{ - (\b$re_prcategories/(\d+)\b) - }{ - &link($1, sprintf($prcgi, $2)) - }egox; - } $_; - } - } - - # get manpage specs as link: "foo.1" "foo(1)" - if (defined($mancgi)) { - $_ = htmlify_sub { - s{ - ( - \b ( \w[\w+\-.]* (?: ::\w[\w+\-.]*)* ) - (?: - \( ([0-9n]) \) \B - | - \. ([0-9n]) \b - ) - ) - }{ - my($text, $name, $section) = ($1, $2, defined($3) ? $3 : $4); - ($name =~ /[A-Za-z]/ && $name !~ /\.(:|$)/) - ? &link($text, sprintf($mancgi, $section, uri_escape($name))) - : $text; - }egx; - } $_; - } - } - - return $_; + return $string; } +sub spacedHtmlText($;$) { + local $_ = $_[0]; + my $ts = $_[1] || $tabstop; -sub spacedHtmlText($;$) -{ - (local $_, my $ts) = @_; - return '' unless defined($_); - $ts ||= $tabstop || 8; + # Cut trailing spaces and tabs + s/[ \t]+$//; - # Expand tabs - 1 while s/(.*?)(\t+)/$1 . ' ' x (length($2) * $ts - length($1) % $ts)/e; + if (defined($ts)) { + # Expand tabs + 1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e + } - if ($hr_breakable) { - s/^ /\001nbsp;/; # protect leading and... - s/ $/\001nbsp;/; # ...trailing whitespace (mostly for String::Ediff), - s/ / \001nbsp;/g; # ...and leave every other space 'breakable' - } else { - s/ /\001nbsp;/g; - } + # replace and (\001 is to protect us from htmlify) + # gzip can make excellent use of this repeating pattern :-) + if ($hr_breakable) { + # make every other space 'breakable' + s/ / \001nbsp;/g; # 2 * + # leave single space as it is + } else { + s/ /\001nbsp;/g; + } - $_ = htmlify($_, $allow_source_extra); + $_ = htmlify($_); - # unescape - y/\001/&/; + # unescape + y/\001/&/; - return $_; + return $_; } +sub link($$) { + my($name, $where) = @_; -# Note that this doesn't htmlquote the first argument... -sub link($$) -{ - my ($name, $url) = @_; - return sprintf('%s', htmlquote($url), $name); + return "$name"; } +sub revcmp($$) { + my($rev1, $rev2) = @_; -sub revcmp($$) -{ - my ($rev1, $rev2) = @_; + # make no comparison for a tag or a branch + return 0 if $rev1 =~ /[^\d.]/ || $rev2 =~ /[^\d.]/; - # make no comparison for a tag or a branch - return 0 if $rev1 =~ /[^\d.]/ || $rev2 =~ /[^\d.]/; + my(@r1) = split(/\./, $rev1); + my(@r2) = split(/\./, $rev2); + my($a,$b); - my (@r1) = split(/\./, $rev1); - my (@r2) = split(/\./, $rev2); - my ($a, $b); - - while (($a = shift(@r1)) && ($b = shift(@r2))) { - return $a <=> $b unless ($a == $b); - } - if (@r1) { return 1; } - if (@r2) { return -1; } - return 0; + while (($a = shift(@r1)) && ($b = shift(@r2))) { + if ($a != $b) { + return $a <=> $b; + } + } + if (@r1) { return 1; } + if (@r2) { return -1; } + return 0; } - -# -# Signal a fatal error. -# -sub fatal($$@) -{ - my ($errcode, $format, @args) = @_; - print "Status: $errcode\r\n"; - html_header('Error'); - print '
Error: ', - sprintf($format, map(htmlquote($_), @args)), "
\n"; - html_footer(); - exit(1); +sub fatal($$) { + my($errcode, $errmsg) = @_; + if ($is_mod_perl) { + Apache->request->status((split(/ /, $errcode))[0]); + } + else { + print "Status: $errcode\r\n"; + } + html_header("Error"); + print "Error: $errmsg\n"; + print &html_footer; + exit(1); } - -# -# Signal a (fatal) configuration error. -# -sub config_error($$) -{ - fatal('500 Internal Error', - 'Error loading configuration file "%s":

' . - '%s
', @_); +sub redirect($) { + my($url) = @_; + if ($is_mod_perl) { + Apache->request->status(301); + Apache->request->header_out(Location => $url); + } + else { + print "Status: 301 Moved\r\n"; + print "Location: $url\r\n"; + } + html_header("Moved"); + print "This document is located here.\n"; + print &html_footer; + exit(1); } +sub safeglob($) { + my ($filename) = @_; + my ($dirname); + my (@results); + my $dh = do {local(*DH);}; -# -# Sends a redirect to the given URL. -# -sub redirect($;$) -{ - my ($url, $permanent) = @_; - my ($status, $text); - if ($permanent) { - $status = '301'; - $text = 'Moved Permanently'; - } else { - $status = '302'; - $text = 'Found'; - } - print "Status: $status $text\r\n", "Location: $url\r\n"; - html_header($text); - print "

This document has moved ", &link('here', $url), ".

\n"; - html_footer(); - exit(1); -} + ($dirname = $filename) =~ s|/[^/]+$||; + $filename =~ s|.*/||; + if (opendir($dh, $dirname)) { + my $glob = $filename; + my $t; + # transform filename from glob to regex. Deal with: + # [, {, ?, * as glob chars + # make sure to escape all other regex chars + $glob =~ s/([\.\(\)\|\+])/\\$1/g; + $glob =~ s/\*/.*/g; + $glob =~ s/\?/./g; + $glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg; + foreach (readdir($dh)) { + if (/^${glob}$/) { + push(@results, $dirname . "/" .$_); + } + } + } -sub safeglob($) -{ - my ($filename) = @_; - - (my $dirname = $filename) =~ s|/[^/]+$||; - $filename =~ s|.*/||; - - my @results; - my $dh = do { local (*DH); }; - if (opendir($dh, $dirname)) { - my $glob = $filename; - my $t; - - # transform filename from glob to regex. Deal with: - # [, {, ?, * as glob chars - # make sure to escape all other regex chars - $glob =~ s/([\.\(\)\|\+])/\\$1/g; - $glob =~ s/\*/.*/g; - $glob =~ s/\?/./g; - $glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg; - $glob = qr/^$glob$/; - - foreach (readdir($dh)) { - if ($_ =~ $glob && $_ =~ VALID_PATH) { - push(@results, catfile($dirname, $1)); # untaint - } - } - closedir($dh); - } - - return @results; + @results; } +sub getMimeTypeFromSuffix($) { + my ($fullname) = @_; + my ($mimetype, $suffix); + my $fh = do {local(*FH);}; -# -# Searches @command_path for the given executable file. -# -sub search_path($) -{ - my ($command) = @_; - for my $d (@command_path) { - my $cmd = catfile($d, $command); - return $cmd if (-x $cmd && !-d _); - } - return ''; -} + ($suffix = $fullname) =~ s/^.*\.([^.]*)$/$1/; + $mimetype = $MTYPES{$suffix}; + $mimetype = $MTYPES{'*'} if (!$mimetype); - -# -# Gets the enscript(1) highlight mode corresponding to the given filename, -# or undef if unsupported. -# -sub getEnscriptHL($) -{ - return undef unless $allow_enscript; - my ($filename) = @_; - while (my ($hl, $regex) = each %enscript_types) { - return $hl if ($filename =~ $regex); - } - return undef; -} - - -# -# Gets the MIME type for the given file name. -# -sub getMimeType($;$) -{ - my ($fullname, $binary) = @_; - $binary = ($keywordsubstitution && $keywordsubstitution =~ /b/) - unless defined($binary); - - (my $suffix = $fullname) =~ s/^.*\.([^.]*)$/$1/; - - my $mimetype = $MTYPES{$suffix}; - $mimetype ||= $MimeTypes->mimeTypeOf($fullname) if defined($MimeTypes); - - if (!$mimetype && $suffix ne '*' && -f $mime_types && -r _) { - my $fh = do { local (*FH); }; - if (open($fh, $mime_types)) { - my $re = sprintf('^\s*(\S+\/\S+)\s.+\b%s\b', quotemeta($suffix)); - $re = qr/$re/; - while (my $line = <$fh>) { - if ($line =~ $re) { - $mimetype = $1; - $MTYPES{$suffix} = $mimetype; - last; - } - } - close($fh); - } else { - warn("Can't open MIME types file $mime_types for reading: $!"); + if (!$mimetype && -f $mime_types) { + # okey, this is something special - search the + # mime.types database + open ($fh, "<$mime_types"); + while (<$fh>) { + if ($_ =~ /^\s*(\S+\/\S+).*\b$suffix\b/) { + $mimetype = $1; + last; + } + } + close ($fh); } - } - $mimetype ||= $MTYPES{'*'}; - $mimetype ||= $binary ? 'application/octet-stream' : 'text/plain'; - return $mimetype; +# okey, didn't find anything useful .. + if (!($mimetype =~ /\S\/\S/)) { + $mimetype = "text/plain"; + } + return $mimetype; } - ############################### # read first lines like head(1) ############################### -sub head($;$) -{ - my ($fh, $linecount) = @_; - $linecount ||= 10; +sub head($;$) { + my $fh = $_[0]; + my $linecount = $_[1] || 10; - my @buf; - if ($linecount > 0) { - for (my $i = 0; !eof($fh) && $i < $linecount; $i++) { - push @buf, scalar <$fh>; + my @buf; + + if ($linecount > 0) { + my $i; + for ($i = 0; !eof($fh) && $i < $linecount; $i++) { + push @buf, scalar <$fh>; + } + } else { + @buf = <$fh>; } - } else { - @buf = <$fh>; - } - return @buf; + + @buf; } - ############################### # scan vim and Emacs directives ############################### -sub scan_directives(@) -{ - my $ts = undef; +sub scan_directives(@) { + my $ts = undef; - for (@_) { - $ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/; - } + for (@_) { + $ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/; + } - ('tabstop' => $ts); + ('tabstop' => $ts); } - -sub openOutputFilter() -{ - return unless $output_filter; - - open(STDOUT, "|-") and return; - - # child of child - open(STDERR, '>', devnull()) unless $DEBUG; - exec($output_filter) or exit -1; -} - - ############################### # show Annotation ############################### -sub doAnnotate($$) -{ - my ($rev, $tag) = @_; - $rev = $tag || 'HEAD' if ($rev eq '.'); - (my $pathname = $where) =~ s|((?<=/)Attic/)?[^/]*$||; - (my $filename = $where) =~ s|^.*/||; +sub doAnnotate($$) { + my ($rev) = @_; + my ($pid); + my ($pathname, $filename); + my $reader = do {local(*FH);}; + my $writer = do {local(*FH);}; - # This annotate version is based on the cvs annotate-demo Perl script by - # Cyclic Software. It was written by Cyclic Software, - # http://www.cyclic.com/, and is in the public domain. - # We could abandon the use of rlog, rcsdiff and co using - # the cvs server in a similiar way one day (..after rewrite). - - local (*CVS_IN, *CVS_OUT); - my $annotate_err; - my ($h, $err) = - startproc([ $CMD{cvs}, @annotate_options, 'server' ], - 'pipe', \*CVS_OUT, - '2>', \$annotate_err); - fatal('500 Internal Error', - 'Annotate failure (exit status %s), output: 
%s
', - $? >> 8 || -1, $err) - unless $h; - - # OK, first send the request to the server. A simplified example is: - # Root /home/kingdon/zwork/cvsroot - # Argument foo/xx - # Directory foo - # /home/kingdon/zwork/cvsroot/foo - # Directory . - # /home/kingdon/zwork/cvsroot - # annotate - # although as you can see there are a few more details. - - print CVS_IN "Root $cvsroot\n"; - print CVS_IN - "Valid-responses ok error Valid-requests Checked-in Updated Merged Removed M E\n"; - - # Don't worry about sending valid-requests, the server just needs to - # support "annotate" and if it doesn't, there isn't anything to be done. - print CVS_IN "UseUnchanged\n"; - print CVS_IN "Argument -r\n"; - print CVS_IN "Argument $rev\n"; - print CVS_IN "Argument $where\n"; - - # The protocol requires us to fully fake a working directory (at - # least to the point of including the directories down to the one - # containing the file in question). - # So if $where is "dir/sdir/file", then dirs will be ("dir","sdir","file") - my $path = ''; - foreach my $dir (split('/', $where)) { - - if ($path eq "") { - # In our example, $dir is "dir". - $path = $dir; - } else { - print CVS_IN "Directory $path\n"; - print CVS_IN "$cvsroot/$path\n"; - - # In our example, $_ is "sdir" and $path becomes "dir/sdir" - # And the next time, "file" and "dir/sdir/file" (which then gets - # ignored, because we don't need to send Directory for the file). - $path .= "/$dir"; + # make sure the revisions a wellformed, for security + # reasons .. + if ($rev =~ /[^\w.]/) { + &fatal("404 Not Found", + "Malformed query \"$ENV{QUERY_STRING}\""); } - } - undef $path; - # And the last "Directory" before "annotate" is the top level. - print CVS_IN "Directory .\n"; - print CVS_IN "$cvsroot\n"; + ($pathname = $where) =~ s/(Attic\/)?[^\/]*$//; + ($filename = $where) =~ s/^.*\///; - print CVS_IN "annotate\n"; + # this seems to be necessary + $| = 1; $| = 0; # Flush - # OK, we've sent our command to the server. Thing to do is to - # close the writer side and get all the responses. - if (!close(CVS_IN)) { - $h->finish(); - fatal('500 Internal Error', - 'Annotate failure (exit status %s): %s, output: ' . - '
%s
', $? >> 8, $!, $annotate_err); - } + # this annotate version is based on the + # cvs annotate-demo Perl script by Cyclic Software + # It was written by Cyclic Software, http://www.cyclic.com/, and is in + # 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"); - navigateHeader($scriptwhere, $pathname, $filename, $rev, 'annotate'); + # OK, first send the request to the server. A simplified example is: + # Root /home/kingdon/zwork/cvsroot + # Argument foo/xx + # Directory foo + # /home/kingdon/zwork/cvsroot/foo + # Directory . + # /home/kingdon/zwork/cvsroot + # annotate + # although as you can see there are a few more details. - my $revtype = ($rev =~ /\./) ? 'revision' : 'tag'; # TODO: tag -> branch/tag? - print '

Annotation of ', - htmlquote("$pathname$filename"), ", $revtype $rev

\n"; + print $writer "Root $cvsroot\n"; + print $writer "Valid-responses ok error Valid-requests Checked-in Updated Merged Removed M E\n"; + # Don't worry about sending valid-requests, the server just needs to + # support "annotate" and if it doesn't, there isn't anything to be done. + print $writer "UseUnchanged\n"; + print $writer "Argument -r\n"; + print $writer "Argument $rev\n"; + print $writer "Argument $where\n"; - # Ready to get the responses from the server. - # For example: - # E Annotations for foo/xx - # E *************** - # M 1.3 (kingdon 06-Sep-97): hello - # ok - my ($lineNr) = 0; - my ($oldLrev, $oldLusr) = ("", ""); - my ($revprint, $usrprint); - - if ($annTable) { - print < -EOF - } else { - print "
";
-  }
-
-  # prefetch several lines
-  my @buf = head(*CVS_OUT);
-
-  my %d = scan_directives(@buf);
-
-  while (@buf || !eof(*CVS_OUT)) {
-
-    $_ = @buf ? shift @buf : ;
-    my @words = split;
-
-    # Adding one is for the (single) space which follows $words[0].
-    my $rest = substr($_, length($words[0]) + 1);
-    if ($words[0] eq "E") {
-      next;
-    } elsif ($words[0] eq "M") {
-      $lineNr++;
-      (my $lrev = substr($_, 2,  13)) =~ y/ //d;
-      (my $lusr = substr($_, 16, 9))  =~ y/ //d;
-      my $line = substr($_, 36);
-      # TODO: this does not work for branch/tag revisions.
-      my $isCurrentRev = ($rev eq $lrev);
-
-      # we should parse the date here ..
-      if ($lrev eq $oldLrev) {
-        $revprint = sprintf('%-8s', '');
-      } else {
-        $revprint = sprintf('%-8s', $lrev);
-        $revprint =~ s|(\S+)|&link($1, uri_escape($filename)."$query#rev$1")|e;
-        $oldLusr = '';
-      }
-
-      $usrprint = ($lusr eq $oldLusr) ? '' : $lusr;
-      $oldLrev = $lrev;
-      $oldLusr = $lusr;
-
-      print $is_textbased ? '' : ''
-        if $isCurrentRev;
-
-      $usrprint = sprintf('%-8s', $usrprint);
-      printf '%s%s %s %4d:', $revprint, $isCurrentRev ? '!' : ' ',
-        htmlquote($usrprint), $lineNr;
-      print spacedHtmlText($line, $d{tabstop});
-
-      print $is_textbased ? '' : '' if $isCurrentRev;
-
-    } elsif ($words[0] eq "ok") {
-      # We could complain about any text received after this, like the
-      # CVS command line client.  But for simplicity, we don't.
-
-    } elsif ($words[0] eq "error") {
-      fatal("500 Internal Error",
-            'Error occured during annotate: %s', $_);
+    # The protocol requires us to fully fake a working directory (at
+    # least to the point of including the directories down to the one
+    # containing the file in question).
+    # So if $where is "dir/sdir/file", then @dirs will be ("dir","sdir","file")
+    my @dirs = split('/', $where);
+    my $path = "";
+    foreach (@dirs) {
+	if ($path eq "") {
+	    # In our example, $_ is "dir".
+	    $path = $_;
+	}
+	else {
+	    print $writer "Directory $path\n";
+	    print $writer "$cvsroot/$path\n";
+	    # In our example, $_ is "sdir" and $path becomes "dir/sdir"
+	    # And the next time, "file" and "dir/sdir/file" (which then gets
+	    # ignored, because we don't need to send Directory for the file).
+            $path .= "/$_";
+	}
     }
-  }
-  $h->finish();
+    # And the last "Directory" before "annotate" is the top level.
+    print $writer "Directory .\n";
+    print $writer "$cvsroot\n";
 
-  if ($annTable) {
-    print "";
-  } else {
-    print "
"; - } - html_footer(); -} + print $writer "annotate\n"; + # OK, we've sent our command to the server. Thing to do is to + # close the writer side and get all the responses. If "cvs server" + # were nicer about buffering, then we could just leave it open, I think. + close ($writer) || die "cannot close: $!"; -############################### -# make Checkout -############################### -sub doCheckout($$$) -{ - my ($fullname, $rev, $tag) = @_; - $rev = $tag || undef if (!$rev || $rev eq '.'); + http_header(); - # Start resolving whether we will do a markup view or not. - my $do_markup = undef; - my $want_type = $input{'content-type'}; + navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate"); + print "

Annotation of $pathname$filename, Revision $rev

\n"; - # No markup if markup disallowed. - $do_markup = 0 unless $allow_markup; - - # No markup if checkout magic cookie in URL. - $do_markup = 0 if (!defined($do_markup) && $doCheckout); - - # Do markup if explicitly asked using cvsweb-markup content type. If the - # asked content type is anything else, no markup. - if (!defined($do_markup) && $want_type) { - if ($want_type =~ CVSWEBMARKUP) { - $want_type = undef; - $do_markup = 1; - } else { - $do_markup = 0; + # Ready to get the responses from the server. + # For example: + # E Annotations for foo/xx + # E *************** + # M 1.3 (kingdon 06-Sep-97): hello + # ok + my ($lineNr) = 0; + my ($oldLrev, $oldLusr) = ("", ""); + my ($revprint, $usrprint); + if ($annTable) { + print "\n"; } - } - - # Ok, if $do_markup is still undefined, we know that a download has not been - # explicitly asked. For the last check further down below we'll need to - # know if the file is binary, and possibly run a log on it. - my $needlog = $do_markup || $use_moddate; - - my $moddate = undef; - my $revopt; - if (defined($rev)) { - $revopt = "-r$rev"; - if ($needlog) { - readLog($fullname, $rev); - $moddate = $date{$rev}; - # TODO: even this does not work for branch tags, but only normal tags :( - $moddate ||= $date{$symrev{$rev}} if defined($symrev{$rev}); + else { + print "
";
     }
-  } else {
-    $revopt = "-rHEAD";
-    if ($needlog) {
-      readLog($fullname);
-      $moddate = $date{$symrev{HEAD}};
-    }
-  }
 
-  my $cr = abs_path($cvsroot) || $cvsroot;
-  # abs_path() taints when run as a CGI...
-  if ($cr =~ VALID_PATH) {
-    $cr = $1;
-  } else {
-    fatal('500 Internal Error', 'Illegal CVS root: %s', $cr);
-  }
-  # Use abs_path() to work around a bug of cvs -p; expand symlinks if we can.
-  my @cmd = ($CMD{cvs}, @cvs_options, '-d', $cr, 'co', '-p', $revopt, $where);
+    # prefetch several lines
+    my @buf = head($reader);
 
-  local (*CVS_OUT, *CVS_ERR);
-  my ($h, $err) =
-    startproc(\@cmd, \"", '>pipe', \*CVS_OUT, '2>pipe', \*CVS_ERR);
-  fatal('500 Internal Error',
-        'Checkout failure (exit status %s), output: 
%s
',
-        $? >> 8 || -1, $err)
-    unless $h;
+    my %d = scan_directives(@buf);
 
-  if (eof(CVS_ERR)) {
-    $h->finish();
-    fatal("404 Not Found", '%s is not (any longer) pertinent', $where);
-  }
+    while (@buf || !eof($reader)) {
+	$_ = @buf ? shift @buf : <$reader>;
 
-  #===================================================================
-  #Checking out squid/src/ftp.c
-  #RCS:  /usr/src/CVS/squid/src/ftp.c,v
-  #VERS: 1.1.1.28.6.2
-  #***************
+	my @words = split;
+	# Adding one is for the (single) space which follows $words[0].
+	my $rest = substr ($_, length ($words[0]) + 1);
+	if ($words[0] eq "E") {
+	    next;
+	}
+	elsif ($words[0] eq "M") {
+	    $lineNr++;
+	    (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 = sprintf('%-8s', '');
+	    }
+	    else {
+		$revprint = sprintf('%-8s', $lrev);
+		$revprint =~ s`\S+`$&`;	# `
+		$oldLusr = '';
+	    }
+	    if ($lusr eq $oldLusr) {
+		$usrprint = '';
+	    }
+	    else {
+		$usrprint = $lusr;
+	    }
+	    $oldLrev = $lrev;
+	    $oldLusr = $lusr;
 
-  # Parse CVS header
-  my ($revision, $filename, $cvsheader);
-  $filename = "";
-  while () {
-    last if (/^\*\*\*\*/);
-    $revision = $1 if (/^VERS: (.*)$/);
+	    # 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);
 
-    if (/^Checking out (.*)$/) {
-      ($filename = $1) =~ s|^\./+||;
-    }
-    $cvsheader .= $_;
-  }
-  close(CVS_ERR);
+	    printf "%s%s %-8s %4d:",
+		    $revprint,
+		    $isCurrentRev ? '!' : ' ',
+		    $usrprint,
+		    $lineNr;
+	    print spacedHtmlText($line, $d{'tabstop'});
 
-  if ($filename ne $where) {
-    $h->finish();
-    fatal("500 Internal Error",
-          'Unexpected output from cvs co: 
%s
 ' .
-          '(expected "%s" but got "%s")',
-          $cvsheader, $where, $filename);
-  }
-
-  # Last checks whether we'll do markup or not.
-  my $isbin = $keywordsubstitution && $keywordsubstitution =~ /b/;
-  my $mimetype = getMimeType($fullname, $isbin);
-
-  # If we still are not sure whether to do markup or not:
-  # if the MIME type is "viewable" or this is not a binary file, do.
-  $do_markup = !$isbin || viewable($mimetype) unless defined($do_markup);
-
-  if ($do_markup) {
-
-    # If this is something we'll be linking to in the markup view, we are
-    # done with this particular output from "cvs co" and must discard it.
-    my $linked = $mimetype =~ m{^image/|application/pdf$}i;
-    if ($linked) {
-      close(CVS_OUT);
-      $h->finish();
+	    print "" if ($isCurrentRev && $is_textbased);
+	}
+	elsif ($words[0] eq "ok") {
+	    # We could complain about any text received after this, like the
+	    # CVS command line client.  But for simplicity, we don't.
+	}
+	elsif ($words[0] eq "error") {
+	    fatal ("500 Internal Error", "Error occured during annotate: $_");
+	}
     }
-
-    # Here we know the last modified date, but don't know if tags have been
-    # added afterwards (those are shown in the markup view): no last-modified.
-    cvswebMarkup(\*CVS_OUT, $fullname, $revision, $isbin, $mimetype, $needlog);
-
-    $h->finish() unless $linked;
-
-  } else {
-    http_header($want_type || $mimetype, $moddate);
-    local $/ = undef;
-    print ;
-    $h->finish();
-  }
-}
-
-
-sub cvswebMarkup($$$$$$;$)
-{
-  my ($filehandle, $fullname, $rev, $isbin, $mimetype, $logged, $mod) = @_;
-
-  (my $pathname = $where) =~ s|((?<=/)Attic/)?[^/]*$||;
-  (my $filename = $where) =~ s|^.*/||;
-
-  navigateHeader($scriptwhere, $pathname, $filename, $rev, 'view', $mod);
-
-  print <
-

-File: 
-EOF
-  print &clickablePath($where, 1), "
\n";
-
-  if ($show_log_in_markup) {
-    readLog($fullname) unless $logged; #,$rev);
-    printLog($rev, $mimetype, $isbin);
-  } else {
-    print "Revision: $rev
\n";
-    print 'Tag: ', htmlquote($input{only_with_tag}), "
\n"
-      if $input{only_with_tag};
-  }
-  print "
\n
";
-  my $url = download_url(uri_escape($filename), $rev, $mimetype);
-
-  if ($mimetype =~ m|^image/|i) {
-    printf '%s
',
-      $url . $barequery, htmlquote($filename);
-  } elsif (lc($mimetype) eq 'application/pdf') {
-    printf '
',
-      $url . $barequery;
-  } else {
-
-    print "
\n";
-    my $linenumbers = $input{ln} || 0;
-
-    if (my $enscript_hl = getEnscriptHL($filename)) {
-      doEnscript($filehandle, $enscript_hl, $linenumbers);
-
-    } else {
-      my $ln  = 0;
-      my @buf = ();
-      my $ts  = undef;
-
-      if ($preformat_in_markup) {
-        # prefetch several lines
-        @buf = head($filehandle);
-        my %d = scan_directives(@buf);
-        $ts = $d{tabstop};
-      }
-
-      while (@buf || !eof($filehandle)) {
-        $_ = @buf ? shift @buf : <$filehandle>;
-        if ($linenumbers) {
-          $ln++;
-          printf '%5d: ', ($ln) x 2;
-        }
-        print $preformat_in_markup ? spacedHtmlText($_, $ts) : htmlquote($_);
-      }
+    if ($annTable) {
+	print "
"; } - - print "\n"; - } - html_footer(); + else { + print ""; + } + close ($reader) || warn "cannot close: $!"; + wait; } - -sub viewable($) -{ - return shift =~ m{^((text|image)/|application/pdf)}i; -} - - ############################### -# Show Colored Diff +# make Checkout ############################### -sub doDiff($$$$$$) -{ - my ($fullname, $r1, $tr1, $r2, $tr2, $f) = @_; +sub doCheckout($$) { + my ($fullname, $rev) = @_; + my ($mimetype,$revopt); + my $fh = do {local(*FH);}; - if (forbidden($fullname)) { - fatal('403 Forbidden', 'Access to %s forbidden.', $where); - } - - my ($rev1, $sym1); - if ($r1 =~ /([^:]+)(:(.+))?/) { - $rev1 = $1; - $sym1 = $3; - } - if ($r1 eq 'text') { - $rev1 = $tr1; - $sym1 = ""; - } - - my ($rev2, $sym2); - if ($r2 =~ /([^:]+)(:(.+))?/) { - $rev2 = $1; - $sym2 = $3; - } - if ($r2 eq 'text') { - $rev2 = $tr2; - $sym2 = ""; - } - - # - # rev1 and rev2 are now both numeric revisions. - # Thus we do a DWIM here and swap them if rev1 is after rev2. - # XXX should we warn about the fact that we do this? - if (&revcmp($rev1, $rev2) > 0) { - my ($tmp1, $tmp2) = ($rev1, $sym1); - ($rev1, $sym1) = ($rev2, $sym2); - ($rev2, $sym2) = ($tmp1, $tmp2); - } - - my $mimetype = getMimeType($fullname); - - # - # Check for per-MIME type diff commands. - # - my $diffcmd = undef; - if (my $diffcmds = $DIFF_COMMANDS{lc($mimetype)}) { - if ($f =~ /^ext(\d*)$/) { - my $n = $1 || 0; - $diffcmd = $diffcmds->[$n]; + if ($rev eq 'HEAD' || $rev eq '.') { + $rev = undef; } - } - if ($diffcmd && $diffcmd->{cmd} && $diffcmd->{name}) { - if ($diffcmd->{args} && ref($diffcmd->{args}) ne 'ARRAY') { - fatal('500 Internal Error', - 'Configuration error: arguments to external diff tools must ' . - 'be given as array refs. See "%s" in ' . - '%%DIFF_COMMANDS.', - $diffcmd->{name}); + # make sure the revisions a wellformed, for security + # reasons .. + if (defined($rev) && $rev =~ /[^\w.]/) { + &fatal("404 Not Found", + "Malformed query \"$ENV{QUERY_STRING}\""); } - (my $cvsname = $where) =~ s/\.diff$//; - - # Create two temporary files with the two revisions - my $temp_fn1 = checkout_to_temp($cvsroot, $cvsname, $rev1); - my $temp_fn2 = checkout_to_temp($cvsroot, $cvsname, $rev2); - - # Execute chosen diff binary. - local (*DIFF_OUT); - my @cmd = ($diffcmd->{cmd}); - push(@cmd, @{$diffcmd->{args}}) if $diffcmd->{args}; - push(@cmd, $temp_fn1, $temp_fn2); - my ($h, $err) = startproc(\@cmd, \"", '>pipe', \*DIFF_OUT); - if (!$h) { - unlink($temp_fn1); - unlink($temp_fn2); - fatal('500 Internal Error', - 'Diff failure (exit status %s), output: 
%s
', - $? >> 8 || -1, $err); + # get mimetype + if (defined($input{"content-type"}) && ($input{"content-type"} =~ /\S\/\S/)) { + $mimetype = $input{"content-type"} } - - http_header($diffcmd->{type} || 'text/plain'); - local $/ = undef; - print ; - $h->finish(); - unlink($temp_fn1); - unlink($temp_fn2); - - exit; - } - - # - # Normal CVS diff. - # - - $f = $DEFAULTVALUE{f} || 'u' if ($f =~ /^ext\d*$/); - my $difftype = $DIFFTYPES{$f}; - if (!$difftype) { - fatal("400 Bad arguments", 'Diff format %s not understood', $f); - } - - my @difftype = @{$difftype->{opts}}; - my $human_readable = $difftype->{colored}; - - # Apply special diff options. -p and -F are not available with side by side - # diffs and may cause problems with older (< 2.8) versions of diffutils if - # used with --side-by-side. - if ($showfunc && $f !~ /^s/) { - push(@difftype, '-p'); - while (my ($re1, $re2) = each %funcline_regexp) { - if ($fullname =~ $re1) { - push(@difftype, '-F', $re2); - last; - } + else { + $mimetype = &getMimeTypeFromSuffix($fullname); } - } - if ($human_readable) { - push(@difftype, '-w') if $hr_ignwhite; - push(@difftype, '-kk') if $hr_ignkeysubst; - } - - my $fh = do { local (*FH); }; - if (!open($fh, "-|")) { # child - open(STDERR, ">&STDOUT"); # Redirect stderr to stdout - openOutputFilter(); - exec($CMD{rcsdiff}, @rcsdiff_options, @difftype, "-r$rev1", "-r$rev2", - $fullname) or exit -1; - } - - if ($human_readable) { - # - # Human readable diff. - # - human_readable_diff($fh, $rev2); - html_footer(); - gzipclose(); - exit; - - } elsif ($f =~ /^([ucs])c$/) { - # - # Enscript colored diff. - # - my $hl = 'diff'; - $hl .= $1 if ($1 eq 'u' || $1 eq 's'); - (my $where_nd = $where) =~ s/\.diff$//; - (my $pathname = $where_nd) =~ s|((?<=/)Attic/)?[^/]*$||; - (my $filename = $where_nd) =~ s|^.*/||; - (my $swhere = $scriptwhere) =~ s|\.diff$||; - navigateHeader($swhere, $pathname, $filename, $rev2, 'diff'); - printf(<Diff for /%s between versions %s and %s -
-EOF
-    doEnscript(\$fh, $hl, 0, 'cvsweb_diff');
-    print <
-

-

-EOF
-    printDiffSelectStickyVars();
-    print 'Diff format: ';
-    printDiffSelect($use_java_script);
-    print "\n
\n";
-    html_footer();
-    gzipclose();
-    exit;
-
-  } else {
-    #
-    # Plain diff.
-    #
-    http_header("text/plain");
-  }
-
-  #
-  #===================================================================
-  #RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
-  #retrieving revision 1.16
-  #retrieving revision 1.17
-  #diff -c -r1.16 -r1.17
-  #*** /home/ncvs/src/sys/netinet/tcp_output.c     1995/11/03 22:08:08     1.16
-  #--- /home/ncvs/src/sys/netinet/tcp_output.c     1995/12/05 17:46:35     1.17
-  #
-  # Ideas:
-  # - nuke the stderr output if it's what we expect it to be
-  # - Add "no differences found" if the diff command supplied no output.
-  #
-  #*** src/sys/netinet/tcp_output.c     1995/11/03 22:08:08     1.16
-  #--- src/sys/netinet/tcp_output.c     1995/12/05 17:46:35     1.17 RELENG_2_1_0
-  # (bogus example, but...)
-  #
-  my ($f1, $f2);
-  if (grep { $_ eq '-u' } @difftype) {
-    $f1 = '---';
-    $f2 = '\+\+\+';
-  } else {
-    $f1 = '\*\*\*';
-    $f2 = '---';
-  }
-
-  while (<$fh>) {
-    if (m|^$f1 $cvsroot|o) {
-      s|$cvsroot/||o;
-      if ($sym1) {
-        chop;
-        $_ .= " $sym1\n";
-      }
-    } elsif (m|^$f2 $cvsroot|o) {
-      s|$cvsroot/||o;
-
-      if ($sym2) {
-        chop;
-        $_ .= " $sym2\n";
-      }
+    if (defined($rev)) {
+	$revopt = "-r$rev";
+	if ($use_moddate) {
+	    readLog($fullname,$rev);
+	    $moddate=$date{$rev};
+	}
     }
-    print $_;
-  }
-  close($fh);
-}
-
-
-###############################
-# Show Logs ..
-###############################
-sub getDirLogs($$@)
-{
-  my ($cvsroot, $dirname, @otherFiles) = @_;
-  my $tag = $input{only_with_tag};
-  my $DirName = catdir($cvsroot, $where);
-
-  my @files = &safeglob("$DirName/*,v");
-  push (@files, &safeglob("$DirName/Attic/*,v")) unless $input{hideattic};
-  foreach my $file (@otherFiles) {
-    push(@files, catfile($DirName, $file));
-  }
-
-  # Weed out unreadable files.
-  my $i = 0;
-  my @unreadable = ();
-  while ($i < scalar(@files)) {
-    # Note: last modified files from subdirs returned by
-    # findLastModifiedSubdirs() come without the ,v suffix so they're not
-    # found here, but have already been checked for readability.  *cough*
-    if (-r $files[$i] || !-e _) {
-      $i++;
-    } else {
-      push(@unreadable, splice(@files, $i, 1));
+    else {
+	$revopt = "-rHEAD";
+	if ($use_moddate) {
+	    readLog($fullname);
+	    $moddate=$date{$symrev{HEAD}};
+	}
     }
-  }
 
-  # If there are no files, we're done.
-  return @unreadable unless @files;
-
-  my @cmd = ($CMD{rlog});
-  # Can't use -r as '-' is allowed in tagnames,
-  # but misinterpreted by rlog.
-  push(@cmd, '-r') unless defined($tag);
-
-  my $fh = do { local (*FH); };
-  if (!open($fh, '-|')) {                       # Child
-    open(STDERR, '>', devnull()) unless $DEBUG; # Ignore rlog's complaints.
-    openOutputFilter();
-    if ($file_list_len && $file_list_len > 1) {
-      while (scalar(@files) > $file_list_len) {  # Process files in chunks.
-        system(@cmd, splice(@files, 0, $file_list_len)) == 0 or exit -1;
-      }
+    ### just for the record:
+    ### 'cvs co' seems to have a bug regarding single checkout of
+    ### directories/files having spaces in it;
+    ### this is an issue that should be resolved on cvs's side
+    #
+    # 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);
     }
-    exec(@cmd, @files) or exit -1;
-  }
-  undef @cmd;
+#===================================================================
+#Checking out squid/src/ftp.c
+#RCS:  /usr/src/CVS/squid/src/ftp.c,v
+#VERS: 1.1.1.28.6.2
+#***************
 
-  my $state = 'start';
-  my ($date, $branchpoint, $branch, $log, @filetags);
-  my ($rev, $revision, $revwanted, $filename, $head, $author, $keywordsubst);
-
-  while (<$fh>) {
-    if ($state eq "start") {
-
-      #Next file. Initialize file variables
-      $rev         = '';
-      $revwanted   = '';
-      $branch      = '';
-      $branchpoint = '';
-      $filename    = '';
-      $log         = '';
-      $revision    = '';
-      %symrev      = ();
-      @filetags    = ();
-      $keywordsubst= '';
-
-      #jump to head state
-      $state = "head";
+    # Parse CVS header
+    my ($revision, $filename, $cvsheader);
+    while(<$fh>) {
+	last if (/^\*\*\*\*/);
+	$revision = $1 if (/^VERS: (.*)$/);
+	if (/^Checking out (.*)$/) {
+		$filename = $1;
+		$filename =~ s/^\.\/*//;
+	}
+	$cvsheader .= $_;
     }
-
-    again:
-
-    if ($state eq "head") {
-
-      #$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet)
-
-      if (/^Working file: (.+)$/) {
-        $filename = $1;
-      } elsif (/^head: (.+)$/) {
-        $head = $1;
-      } elsif (/^branch: (.+)$/) {
-        $branch = $1;
-      } elsif (/^keyword substitution: (.+)$/) {
-        $keywordsubst = $1;
-      } elsif (/^symbolic names:/) {
-        $state = "tags";
-        ($branch = $head) =~ s/\.\d+$//
-          if $branch eq '';
-        $branch =~ s/(\d+)$/0.$1/;
-        $symrev{MAIN}  = $branch;
-        $symrev{HEAD}  = $branch;
-        $alltags{MAIN} = 1;
-        $alltags{HEAD} = 1;
-        push (@filetags, "MAIN", "HEAD");
-      } elsif ($_ =~ LOG_REVSEPR) {
-        $state = "log";
-        $rev   = '';
-        $date  = '';
-        $log   = '';
-
-        # Try to reconstruct the relative filename if RCS spits out a full path
-        $filename =~ s%^\Q$DirName\E/%%;
-      }
-      next;
+    if ($filename ne $where) {
+	&fatal("500 Internal Error",
+	       "Unexpected output from cvs co: $cvsheader"
+	       . "
Check whether the directory $cvsroot/CVSROOT exists "
+	       . "and the script has write-access to the CVSROOT/history "
+	       . "file if it exists."
+	       . "
The script needs to place lock files in the "
+	       . "directory the file is in as well.");
     }
+    $| = 1;
 
-    if ($state eq "tags") {
-      if (/^\s+([^:]+):\s+([\d\.]+)\s*$/) {
-        push (@filetags, $1);
-        $symrev{$1}  = $2;
-        $alltags{$1} = 1;
-        next;
-      } elsif (/^\S/) {
-
-        if (defined($tag)) {
-          if (defined($symrev{$tag}) || $tag eq "HEAD") {
-            $revwanted    = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};
-            ($branch      = $revwanted) =~ s/\b0\.//;
-            ($branchpoint = $branch)    =~ s/\.?\d+$//;
-            $revwanted    = '' if ($revwanted ne $branch);
-          } elsif ($tag ne "HEAD") {
-            $state = "skip";
-            next;
-          }
-        }
-
-        foreach my $tagfound (@filetags) {
-          $tags{$tagfound} = 1;
-        }
-        $state = "head";
-        goto again;
-      }
+    if ($mimetype eq "text/x-cvsweb-markup") {
+	&cvswebMarkup($fh,$fullname,$revision);
     }
-
-    if ($state eq "log") {
-      if ($_ =~ LOG_REVSEPR || $_ =~ LOG_FILESEPR) {
-
-        # End of a log entry.
-        my $revbranch = $rev;
-        $revbranch =~ s/\.\d+$//;
-
-        if ($revwanted eq '' && $branch ne '' && $branch eq $revbranch
-            || !defined($tag))
-        {
-          $revwanted = $rev;
-        }
-
-        if ($revwanted ne ''
-            ? $rev eq $revwanted
-            : $branchpoint ne ''
-              ? $rev eq $branchpoint
-              : 0
-            && ($rev eq $head))
-        {    # Don't think head is needed here..
-          my @finfo = ($rev, $date, $log, $author, $filename, $keywordsubst);
-          (my $name = $filename) =~ s%/.*%%;
-          $fileinfo{$name} = [@finfo];
-          $state = "done" if ($rev eq $revwanted);
-        }
-        $rev  = '';
-        $date = '';
-        $log  = '';
-      } elsif ($date eq ''
-               && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|)
-      {
-        my $yr    = $1;
-        $yr      -= 1900 if ($yr > 100); # Damn 2-digit year routines :-)
-        $date     = timegm($6, $5, $4, $3, $2 - 1, $yr);
-        ($author) = /author: ([^;]+)/;
-        $state    = 'log';
-        $log      = '';
-        next;
-      } elsif ($rev eq '' && /^revision (\d+(?:\.\d+)+).*$/) {
-        $rev = $1;    # .*$ eats up the locker(lockers?) info, if any
-        next;
-      } else {
-        $log .= $_;
-      }
+    else {
+	http_header($mimetype);
+	print <$fh>;
     }
-
-    if ($_ =~ LOG_FILESEPR) {
-      $state = "start";
-      next;
-    }
-  }
-
-  my $linesread = $. || 0;
-  close($fh);
-
-  if ($linesread == 0) {
-    fatal('500 Internal Error',
-          'Failed to spawn GNU rlog on "%s".

Did you set the @command_path in your configuration file correctly? (Currently: "%s")',
-          htmlquote(join(', ', @files)), join(':', @command_path));
-  }
-
-  return @unreadable;
+    close($fh);
 }
 
+sub cvswebMarkup($$$) {
+    my ($filehandle,$fullname,$revision) = @_;
+    my ($pathname, $filename);
 
-sub readLog($;$)
-{
-  my ($fullname, $revision) = @_;
-  my ($symnames, $head, $rev, $br, $brp, $branch, $branchrev);
+    ($pathname = $where) =~ s/(Attic\/)?[^\/]*$//;
+    ($filename = $where) =~ s/^.*\///;
+    my ($fileurl) = urlencode($filename);
 
-  undef %symrev;
-  undef %revsym;
-  undef @allrevisions;
-  undef %date;
-  undef %author;
-  undef %state;
-  undef %difflines;
-  undef %log;
-  $keywordsubstitution = '';
+    http_header();
 
-  my $fh = do { local (*FH); };
-  if (!open($fh, "-|")) {    # child
-    openOutputFilter();
-    $revision = defined($revision) ? "-r$revision" : '';
-    if ($revision =~ /\./) {
-      # Normal revision, not a branch/tag name.
-      exec($CMD{rlog}, $revision, $fullname) or exit -1;
-    } else {
-      exec($CMD{rlog}, $fullname) or exit -1;
+    navigateHeader($scriptwhere, $pathname, $filename, $revision, "view");
+    print "
";
+    print "
";
+    print "File: ", &clickablePath($where, 1);
+    print " ";
+    &download_link(urlencode($fileurl), $revision, "(download)");
+    if (!$defaultTextPlain) {
+	print " ";
+	&download_link(urlencode($fileurl), $revision, "(as text)",
+	       "text/plain");
     }
-  }
-
-  my $curbranch = undef;
-  while (<$fh>) {
-    if ($symnames) {
-      if (/^\s+([^:]+):\s+([\d\.]+)/) {
-        $symrev{$1} = $2;
-        next;
-      } else {
-        $symnames = 0;
-      }
+    print "
\n";
+    if ($show_log_in_markup) {
+	readLog($fullname); #,$revision);
+	printLog($revision,0);
     }
-    if (/^head:\s+([\d\.]+)/) {
-      $head = $1;
-    } elsif (/^branch:\s+([\d\.]+)/) {
-      $curbranch = $1;
-    } elsif (/^symbolic names/) {
-      $symnames = 1;
-    } elsif (/^keyword substitution: (.+)$/) {
-      $keywordsubstitution = $1;
-    } elsif (/^-----/) {
-      last;
+    else {
+	print "Version: $revision
\n";
+	print "Tag: ", $input{only_with_tag}, "
\n" if
+	    $input{only_with_tag};
     }
-  }
-  ($curbranch = $head) =~ s/\.\d+$// if (!defined($curbranch));
-
-  # each log entry is of the form:
-  # ----------------------------
-  # revision 3.7.1.1
-  # date: 1995/11/29 22:15:52;  author: fenner;  state: Exp;  lines: +5 -3
-  # log info
-  # ----------------------------
-
-  # For a locked revision, the first line after the separator 
-  # becomes smth like
-  # revision 9.19       locked by: vassilii;
-
-  logentry:
-
-  while ($_ !~ LOG_FILESEPR) {
-    $_ = <$fh>;
-    last logentry if (!defined($_));    # EOF
-    if (/^revision (\d+(?:\.\d+)+)/) {
-      $rev = $1;
-      unshift(@allrevisions, $rev);
-    } elsif ($_ =~ LOG_FILESEPR || $_ =~ LOG_REVSEPR) {
-      next logentry;
-    } else {
-
-      # The rlog output is syntactically ambiguous.  We must
-      # have guessed wrong about where the end of the last log
-      # message was.
-      # Since this is likely to happen when people put rlog output
-      # in their commit messages, don't even bother keeping
-      # these lines since we don't know what revision they go with
-      # any more.
-      next logentry;
+    print "
";
+    my $url = download_url($fileurl, $revision, $mimetype);
+    print "
";
+    if ($mimetype =~ /^image/) {
+	print "
";
     }
-    $_ = <$fh>;
-    if (
-      m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);\s+state:\s+(\S+);\s+(lines:\s+([0-9\s+-]+))?|
-      )
-    {
-      my $yr           = $1;
-      $yr             -= 1900 if ($yr > 100); # Damn 2-digit year routines :-)
-      $date{$rev}      = timegm($6, $5, $4, $3, $2 - 1, $yr);
-      $author{$rev}    = $7;
-      $state{$rev}     = $8;
-      $difflines{$rev} = $10;
-    } else {
-      fatal("500 Internal Error", 'Error parsing RCS output: %s', $_);
+    elsif ($mimetype =~ m%^application/pdf%) {
+	print "
";
     }
+    else {
+	print "
";
 
-  line:
-    while (<$fh>) {
-      next line if (/^branches:\s/);
-      last line if ($_ =~ LOG_FILESEPR || $_ =~ LOG_REVSEPR);
-      $log{$rev} .= $_;
-    }
-  }
-  close($fh);
+	# prefetch several lines
+	my @buf = head($filehandle);
 
-  @revorder = reverse sort { revcmp($a, $b) } @allrevisions;
+	my %d = scan_directives(@buf);
 
-  #
-  # HEAD is an artificial tag which is simply the highest tag number on the main
-  # branch, unless there is a branch tag in the RCS file in which case it's the
-  # highest revision on that branch.  Find it by looking through @revorder; it
-  # 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+)$/0.$1/;
+	while (@buf || !eof($filehandle)) {
+	    $_ = @buf ? shift @buf : <$filehandle>;
 
-  foreach $rev (@revorder) {
-    if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
-      $symrev{HEAD} = $rev;
-      last;
+	    print spacedHtmlText($_, $d{'tabstop'});
+	}
+	print "
";
     }
-  }
-  ($symrev{HEAD} = $headrev) =~ s/\.\d+$// unless defined($symrev{HEAD});
+}
 
-  #
-  # Now that we know all of the revision numbers, we can associate
-  # absolute revision numbers with all of the symbolic names, and
-  # pass them to the form so that the same association doesn't have
-  # to be built then.
-  #
-  undef @branchnames;
-  undef %branchpoint;
-  undef $sel;
+sub viewable($) {
+    my ($mimetype) = @_;
 
-  foreach (reverse sort keys %symrev) {
-    $rev = $symrev{$_};
-    if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
-      push (@branchnames, $_);
+    $mimetype =~ m%^((text|image)/|application/pdf)% ;
+}
 
-      #
-      # A revision number of A.B.0.D really translates into
-      # "the highest current revision on branch A.B.D".
-      #
-      # If there is no branch A.B.D, then it translates into
-      # the head A.B .
-      #
-      # This reasoning also applies to the main branch A.B,
-      # with the branch number 0.A, with the exception that
-      # it has no head to translate to if there is nothing on
-      # the branch, but I guess this can never happen?
-      #
-      # (the code below gracefully forgets about the branch
-      # if it should happen)
-      #
-      $head = defined($2) ? $2 : "";
-      $branch = $3;
-      $branchrev = $head . ($head ne "" ? "." : "") . $branch;
-      $rev = $head;
+###############################
+# Show Colored Diff
+###############################
+sub doDiff($$$$$$) {
+	my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
+        my $fh = do {local(*FH);};
+	my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2);
 
-      my $regex = '^' . quotemeta($branchrev) . '\b';
-      $regex = qr/$regex/;
+	if ($r1 =~ /([^:]+)(:(.+))?/) {
+	    $rev1 = $1;
+	    $sym1 = $3;
+	}
+	if ($r1 eq 'text') {
+	    $rev1 = $tr1;
+	    $sym1 = "";
+	}
+	if ($r2 =~ /([^:]+)(:(.+))?/) {
+	    $rev2 = $1;
+	    $sym2 = $3;
+	}
+	if ($r2 eq 'text') {
+	    $rev2 = $tr2;
+	    $sym2 = "";
+	}
 
-      foreach my $r (@revorder) {
-        if ($r =~ $regex) {
-          $rev = $branchrev;
-          last;
-        }
-      }
-      next if ($rev eq "");
+	# make sure the revisions a wellformed, for security
+	# reasons ..
+	if ($rev1 =~ /[^\w.]/ || $rev2 =~ /[^\w.]/) {
+	    &fatal("404 Not Found",
+		    "Malformed query \"$ENV{QUERY_STRING}\"");
+	}
+#
+# rev1 and rev2 are now both numeric revisions.
+# Thus we do a DWIM here and swap them if rev1 is after rev2.
+# XXX should we warn about the fact that we do this?
+	if (&revcmp($rev1,$rev2) > 0) {
+	    my ($tmp1, $tmp2) = ($rev1, $sym1);
+	    ($rev1, $sym1) = ($rev2, $sym2);
+	    ($rev2, $sym2) = ($tmp1, $tmp2);
+	}
+	my $human_readable = 0;
+	if ($f eq 'c') {
+	    @difftype = qw{-c};
+	    $diffname = "Context diff";
+	}
+	elsif ($f eq 's') {
+	    @difftype = qw{--side-by-side --width=164};
+	    $diffname = "Side by Side";
+	}
+	elsif ($f eq 'H') {
+	    $human_readable = 1;
+	    @difftype = qw{--unified=15};
+	    $diffname = "Long Human readable";
+	}
+	elsif ($f eq 'h') {
+	    @difftype =qw{-u};
+	    $human_readable = 1;
+	    $diffname = "Human readable";
+	}
+	elsif ($f eq 'u') {
+	    @difftype = qw{-u};
+	    $diffname = "Unidiff";
+	}
+	else {
+	    fatal ("400 Bad arguments", "Diff format $f not understood");
+	}
 
-      if ($rev ne $head && $head ne "") {
-        $branchpoint{$head} .= ', ' if ($branchpoint{$head});
-        $branchpoint{$head} .= $_;
-      }
-    }
-    $revsym{$rev} .= ", " if ($revsym{$rev});
-    $revsym{$rev} .= $_;
-    $sel .= sprintf("\n",
-                    htmlquote($rev), (htmlquote($_)) x 2);
-  }
+	# apply special options
+	if ($showfunc) {
+	    push @difftype, '-p' if $f =~ /^[cHhu]$/;
 
-  my ($onlyonbranch, $onlybranchpoint);
-  if ($onlyonbranch = $input{only_with_tag}) {
-    $onlyonbranch = $symrev{$onlyonbranch};
-    if ($onlyonbranch && $onlyonbranch =~ s/\b0\.//) {
-      ($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
-    } else {
-      $onlybranchpoint = $onlyonbranch;
-    }
+	    my($re1, $re2);
 
-    if (!defined($onlyonbranch) || $onlybranchpoint eq "") {
-      fatal("404 Tag not found", 'Tag "%s" is not defined.',
-            $input{only_with_tag});
-    }
-  }
-
-  undef @revisions;
-
-  foreach (@allrevisions) {
-    ($br  = $_)  =~ s/\.\d+$//;
-    ($brp = $br) =~ s/\.\d+$//;
-    next if ($onlyonbranch
-             && $br ne $onlyonbranch
-             && $_  ne $onlybranchpoint);
-    unshift(@revisions, $_);
-  }
-
-  if ($logsort eq "date") {
-
-    # Sort the revisions in commit order an secondary sort on revision
-    # (secondary sort needed for imported sources, or the first main
-    # revision gets before the same revision on the 1.1.1 branch)
-    @revdisplayorder =
-      sort { $date{$b} <=> $date{$a} || -revcmp($a, $b) } @revisions;
-  } elsif ($logsort eq "rev") {
-
-    # Sort the revisions in revision order, highest first
-    @revdisplayorder = reverse sort { revcmp($a, $b) } @revisions;
-  } else {
-
-    # No sorting. Present in the same order as rlog / cvs log
-    @revdisplayorder = @revisions;
-  }
-
-  return $curbranch;
+	    while (($re1, $re2) = each %funcline_regexp) {
+		if ($fullname =~ /$re1/) {
+		    push @difftype, '-F', '$re2';
+		    last;
+		}
+	    }
+	}
+	if ($human_readable) {
+	    if ($hr_ignwhite) {
+	    	push @difftype, '-w';
+	    }
+	    if ($hr_ignkeysubst) {
+	    	push @difftype, '-kk';
+	    }
+	}
+	if (! open($fh, "-|")) { # child
+	    open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
+	    exec("rcsdiff",@difftype,"-r$rev1","-r$rev2",$fullname);
+	}
+	if ($human_readable) {
+	    http_header();
+	    &human_readable_diff($fh, $rev2);
+	    gzipclose();
+	    exit;
+	}
+	else {
+	    http_header("text/plain");
+	}
+#
+#===================================================================
+#RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
+#retrieving revision 1.16
+#retrieving revision 1.17
+#diff -c -r1.16 -r1.17
+#*** /home/ncvs/src/sys/netinet/tcp_output.c     1995/11/03 22:08:08     1.16
+#--- /home/ncvs/src/sys/netinet/tcp_output.c     1995/12/05 17:46:35     1.17
+#
+# Ideas:
+# - nuke the stderr output if it's what we expect it to be
+# - Add "no differences found" if the diff command supplied no output.
+#
+#*** src/sys/netinet/tcp_output.c     1995/11/03 22:08:08     1.16
+#--- src/sys/netinet/tcp_output.c     1995/12/05 17:46:35     1.17 RELENG_2_1_0
+# (bogus example, but...)
+#
+	if (grep { $_ eq '-u'} @difftype) {
+	    $f1 = '---';
+	    $f2 = '\+\+\+';
+	}
+	else {
+	    $f1 = '\*\*\*';
+	    $f2 = '---';
+	}
+	while (<$fh>) {
+	    if (m|^$f1 $cvsroot|o) {
+		s|$cvsroot/||o;
+		if ($sym1) {
+		    chop;
+		    $_ .= " " . $sym1 . "\n";
+		}
+	    }
+	    elsif (m|^$f2 $cvsroot|o) {
+		s|$cvsroot/||o;
+		if ($sym2) {
+		    chop;
+		    $_ .= " " . $sym2 . "\n";
+		}
+	    }
+	    print $_;
+	}
+	close($fh);
 }
 
+###############################
+# Show Logs ..
+###############################
+sub getDirLogs($$@) {
+    my ($cvsroot,$dirname,@otherFiles) = @_;
+    my ($state,$otherFiles,$tag, $file, $date, $branchpoint, $branch, $log);
+    my ($rev, $revision, $revwanted, $filename, $head, $author);
 
-sub getDiffLinks($$$)
-{
-  my ($url, $mimetype, $isbin) = @_;
+    $tag = $input{only_with_tag};
 
-  my @links = ();
-  if (!$isbin) { # Offer ordinary diff only for non-binary files.
-    push(@links, &link('preferred', $url));
-    for my $difftype ($DIFFTYPES{$defaultDiffType}{colored} ? qw(u) : qw(h)) {
-      my $f = $difftype eq $defaultDiffType ? '' : $difftype;
-      push(@links,
-           &link(htmlquote(lc($DIFFTYPES{$difftype}{descr})), "$url;f=$f"));
-    }
-  }
-  if (my $extdiffs = $DIFF_COMMANDS{lc($mimetype)}) {
-    for my $i (0 .. scalar(@$extdiffs)-1) {
-      my $extdiff = $extdiffs->[$i];
-      push(@links, &link(htmlquote($extdiff->{name}), "$url;f=ext$i"))
-        if ($extdiff->{cmd} && $extdiff->{name});
-    }
-  }
-  return @links;
-}
+    my ($DirName) = "$cvsroot/$where";
+    my (@files, @filetags);
+    my $fh = do {local(*FH);};
 
-
-sub printLog($$$;$$)
-{
-  # inlogview: 1 if in log view, otherwise in markup view.
-  ($_, my $mimetype, my $isbin, my $inlogview, my $isSelected) = @_;
-  (my $br  = $_)  =~ s/\.\d+$//;
-  (my $brp = $br) =~ s/\.?\d+$//;
-
-  print "";
-  if (defined($revsym{$_})) {
-    foreach my $sym (split(", ", $revsym{$_})) {
-      print '';
+    push(@files, &safeglob("$DirName/*,v"));
+    push(@files, &safeglob("$DirName/Attic/*,v")) if (!$input{'hideattic'});
+    foreach $file (@otherFiles) {
+	push(@files, "$DirName/$file");
     }
-  }
-  if ($revsym{$br} && !defined($nameprinted{$br})) {
-    foreach my $sym (split(", ", $revsym{$br})) {
-      print '';
-    }
-    $nameprinted{$br} = 1;
-  }
 
-  print "\n Revision $_";
-  if (/^1\.1\.1\.\d+$/) {
-    print " (vendor branch)";
-  }
-
-  (my $filename = $where) =~ s|^.*/||;
-  my $fileurl   = uri_escape($filename);
-  undef $filename;
-
-  my $isDead = ($state{$_} eq 'dead');
-  if (!$isDead) {
-
-    print ': ', download_link($fileurl, $_, 'download', $mimetype);
-
-    my @vlinks = ();
-    push(@vlinks, display_link($fileurl, $_, 'text', 'text/plain'))
-      unless $isbin;
-    push(@vlinks, display_link($fileurl, $_, 'markup', 'text/x-cvsweb-markup'))
-      if ($allow_markup && $inlogview && (!$isbin || viewable($mimetype)));
-    if (!$isbin && $allow_annotate) {
-      push(@vlinks,
-           &link('annotated',
-                 sprintf('%s?annotate=%s%s', $fileurl, $_, $barequery)));
+    # just execute rlog if there are any files
+    if ($#files < 0) {
+	return;
     }
-    print ' - view: ', join(', ', @vlinks) if @vlinks;
-    undef @vlinks;
 
-    if (!$isbin && $allow_version_select) {
-      print ' - ';
-      if ($isSelected) {
-        print '[selected for diffs]';
-      } else {
-        print &link('select for diffs',
-                    sprintf('%s?r1=%s%s#rev%s',
-                            $fileurl, $_, $barequery, $_));
-      }
+    if ($tag) {
+	#can't use -r as - is allowed in tagnames, but misinterpreated by rlog..
+	if (! open($fh, "-|")) {
+		open(STDERR, '>/dev/null'); # rlog may complain; ignore.
+		exec('rlog', @files);
+	}
     }
-    print ' - ', graph_link('', 'revision graph')
-      if (!$inlogview && $allow_cvsgraph);
-  }
-  print "
\n";
-
-  print '';
-  if (defined @mytz) {
-    my ($est) = $mytz[(localtime($date{$_}))[8]];
-    print scalar localtime($date{$_}), " $est (";
-  } else {
-    print scalar gmtime($date{$_}), " UTC (";
-  }
-  print readableTime(time() - $date{$_}, 1), ' ago)';
-  print ' by ', htmlquote($author{$_}), "
\n";
-
-  printf("Branches: %s
\n", link_tags($revsym{$br})) if $revsym{$br};
-  printf("CVS tags: %s
\n", link_tags($revsym{$_}))  if $revsym{$_};
-  printf("Branch point for: %s
\n", link_tags($branchpoint{$_}))
-    if $branchpoint{$_};
-
-  # Find the previous revision
-  my $prev;
-  my @prevrev = split(/\./, $_);
-  do {
-    if (--$prevrev[$#prevrev] <= 0) {
-
-      # If it was X.Y.Z.1, just make it X.Y
-      pop (@prevrev);
-      pop (@prevrev);
+    else {
+    	my $kidpid = open($fh, "-|");
+	if (! $kidpid) {
+		open(STDERR, '>/dev/null'); # rlog may complain; ignore.
+		exec('rlog', '-r', @files);
+	}
     }
-    $prev = join (".", @prevrev);
-  } until (defined($date{$prev}) || $prev eq "");
-
-  if ($isDead) {
-    print "FILE REMOVED
\n";
-  } else {
-    my %diffrev = ();
-    $diffrev{$_} = 1;
-    $diffrev{""} = 1;
-    my $diff = 'Diff to:';
-    my $printed = 0;
-
-    #
-    # Offer diff to previous revision
-    if ($prev) {
-      $diffrev{$prev} = 1;
-      my $url =
-        sprintf('%s.diff?r1=%s;r2=%s%s', $fileurl, $prev, $_, $barequery);
-      if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
-        print $diff, ' previous ', $prev, ': ', join(', ', @dlinks);
-        $diff = ';'; $printed = 1;
-      }
+    $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;
+	    %symrev = ();
+	    @filetags = ();
+	    #jump to head state
+	    $state = "head";
+	}
+	print "$state:$_" if ($verbose);
+again:
+	if ($state eq "head") {
+	    #$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet)
+	    $filename = $1 if (/^Working file: (.+)$/);
+	    $head = $1 if (/^head: (.+)$/);
+	    $branch = $1 if (/^branch: (.+)$/);
+	}
+	if ($state eq "head" && /^symbolic names/) {
+	    $state = "tags";
+	    ($branch = $head) =~ s/\.\d+$// if (!defined($branch));
+	    $branch =~ s/(\.?)(\d+)$/${1}0.$2/;
+	    $symrev{MAIN} = $branch;
+	    $symrev{HEAD} = $branch;
+	    $alltags{MAIN} = 1;
+	    $alltags{HEAD} = 1;
+	    push (@filetags, "MAIN", "HEAD");
+	    next;
+	}
+	if ($state eq "tags" &&
+			    /^\s+(.+):\s+([\d\.]+)\s+$/) {
+	    push (@filetags, $1);
+	    $symrev{$1} = $2;
+	    $alltags{$1} = 1;
+	    next;
+	}
+	if ($state eq "tags" && /^\S/) {
+	    if (defined($tag) && (defined($symrev{$tag}) || $tag eq "HEAD")) {
+		$revwanted = $tag eq "HEAD" ? $symrev{"MAIN"} : $symrev{$tag};
+		($branch = $revwanted) =~ s/\b0\.//;
+		($branchpoint = $branch) =~ s/\.?\d+$//;
+		$revwanted = undef if ($revwanted ne $branch);
+	    }
+	    elsif (defined($tag) && $tag ne "HEAD") {
+		print "Tag not found, skip this file" if ($verbose);
+		$state = "skip";
+		next;
+	    }
+	    foreach my $tagfound (@filetags) {
+		$tags{$tagfound} = 1;
+	    }
+	    $state = "head";
+	    goto again;
+	}
+	if ($state eq "head" && /$LOG_REVSEPARATOR/o) {
+	    $state = "log";
+	    $rev = undef;
+	    $date = undef;
+	    $log = "";
+	    # Try to reconstruct the relative filename if RCS spits out a full path
+	    $filename =~ s%^\Q$DirName\E/%%;
+	    next;
+	}
+	if ($state eq "log") {
+	    if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {
+		# End of a log entry.
+		my $revbranch;
+		($revbranch = $rev) =~ s/\.\d+$//;
+		print "$filename $rev Wanted: $revwanted "
+		    . "Revbranch: $revbranch Branch: $branch "
+		    . "Branchpoint: $branchpoint\n" if ($verbose);
+		if (!defined($revwanted) && defined($branch)
+		    && $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 :
+		    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);
+		    my ($name);
+		    ($name = $filename) =~ s%/.*%%;
+		    $fileinfo{$name} = [ @finfo ];
+		    $state = "done" if ($rev eq $revwanted);
+		}
+		$rev = undef;
+		$date = undef;
+		$log = "";
+	    }
+	    elsif (!defined($date) && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) {
+		my $yr = $1;
+		# damn 2-digit year routines :-)
+		if ($yr > 100) {
+		    $yr -= 1900;
+		}
+		$date = &Time::Local::timegm($6,$5,$4,$3,$2 - 1,$yr);
+		($author) = /author: ([^;]+)/;
+		$state = "log";
+		$log = '';
+		next;
+	    }
+	    elsif (!defined($rev) && m/^revision (.*)$/) {
+		$rev = $1;
+		next;
+	    }
+	    else {
+		$log = $log . $_;
+	    }
+	}
+	if (/$LOG_FILESEPARATOR/o) {
+	    $state = "start";
+	    next;
+	}
     }
-
-    #
-    # Plus, if it's on a branch, and it's not a vendor branch,
-    # offer a diff with the branch point.
-    if ($revsym{$brp}
-      && !/^1\.1\.1\.\d+$/
-      && !defined($diffrev{$brp}))
-    {
-      my $url =
-        sprintf('%s.diff?r1=%s;r2=%s%s', $fileurl, $brp, $_, $barequery);
-      if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
-        print $diff, ' branchpoint ', $brp, ': ', join(', ', @dlinks);
-        $diff = ';'; $printed = 1;
-      }
+    if ($. == 0) {
+	fatal("500 Internal Error",
+	      "Failed to spawn GNU rlog on '".join(", ", @files)."'
did you set the \$ENV{PATH} in your configuration file correctly ?");
     }
+    close($fh);
+}
 
-    #
-    # Plus, if it's on a branch, and it's not a vendor branch,
-    # offer to diff with the next revision of the higher branch.
-    # (e.g. change gets committed and then brought
-    # over to -stable)
-    if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) {
-      my ($i, $nextmain);
+sub readLog($;$) {
+	my($fullname,$revision) = @_;
+	my ($symnames, $head, $rev, $br, $brp, $branch, $branchrev);
+	my $fh = do {local(*FH);};
 
-      for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++) {
-      }
-      my @tmp2 = split(/\./, $_);
-      for ($nextmain = ""; $i > 0; $i--) {
-        my $next = $revorder[$i - 1];
-        my @tmp1 = split(/\./, $next);
+	if (defined($revision)) {
+	    $revision = "-r$revision";
+	}
+	else {
+	    $revision = "";
+	}
 
-        if (@tmp1 < @tmp2) {
-          $nextmain = $next;
-          last;
-        }
+	undef %symrev;
+	undef %revsym;
+	undef @allrevisions;
+	undef %date;
+	undef %author;
+	undef %state;
+	undef %difflines;
+	undef %log;
 
-        # Only the highest version on a branch should have
-        # a diff for the "next MAIN".
-        last
-          if (@tmp1 - 1 <= @tmp2
-          && join (".", @tmp1[0 .. $#tmp1 - 1]) eq
-          join (".", @tmp2[0 .. $#tmp1 - 1]));
-      }
+	print("Going to rlog '$fullname'\n") if ($verbose);
+	if (! open($fh, "-|")) { # child
+		if ($revision ne '') {
+			exec("rlog",$revision,$fullname);
+		}
+		else {
+			exec("rlog",$fullname);
+		}
+	}
+	while (<$fh>) {
+	    print if ($verbose);
+	    if ($symnames) {
+		if (/^\s+([^:]+):\s+([\d\.]+)/) {
+		    $symrev{$1} = $2;
+		}
+		else {
+		    $symnames = 0;
+		}
+	    }
+	    elsif (/^head:\s+([\d\.]+)/) {
+		$head = $1;
+	    }
+	    elsif (/^branch:\s+([\d\.]+)/) {
+		$curbranch = $1;
+	    }
+	    elsif (/^symbolic names/) {
+		$symnames = 1;
+	    }
+	    elsif (/^-----/) {
+		last;
+	    }
+	}
+	($curbranch = $head) =~ s/\.\d+$// if (!defined($curbranch));
 
-      if (!defined($diffrev{$nextmain})) {
-        $diffrev{$nextmain} = 1;
-        my $url = sprintf('%s.diff?r1=%s;r2=%s%s',
-          $fileurl, $nextmain, $_, $barequery);
-        if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
-          print $diff, ' next MAIN ', $nextmain, ': ', join(', ', @dlinks);
-          $diff = ';'; $printed = 1;
-        }
-      }
-    }
+# each log entry is of the form:
+# ----------------------------
+# revision 3.7.1.1
+# date: 1995/11/29 22:15:52;  author: fenner;  state: Exp;  lines: +5 -3
+# log info
+# ----------------------------
+	logentry:
+	while (!/$LOG_FILESEPARATOR/o) {
+	    $_ = <$fh>;
+	    last logentry if (!defined($_));	# EOF
+	    print "R:", $_ if ($verbose);
+	    if (/^revision ([\d\.]+)/) {
+		$rev = $1;
+		unshift(@allrevisions,$rev);
+	    }
+	    elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {
+		next logentry;
+	    }
+	    else {
+		# The rlog output is syntactically ambiguous.  We must
+		# have guessed wrong about where the end of the last log
+		# message was.
+		# Since this is likely to happen when people put rlog output
+		# in their commit messages, don't even bother keeping
+		# these lines since we don't know what revision they go with
+		# any more.
+		next logentry;
+#		&fatal("500 Internal Error","Error parsing RCS output: $_");
+	    }
+	    $_ = <$fh>;
+	    print "D:", $_ if ($verbose);
+	    if (m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);\s+state:\s+(\S+);\s+(lines:\s+([0-9\s+-]+))?|) {
+		my $yr = $1;
+                # damn 2-digit year routines :-)
+                if ($yr > 100) {
+                    $yr -= 1900;
+                }
+		$date{$rev} = &Time::Local::timegm($6,$5,$4,$3,$2 - 1,$yr);
+		$author{$rev} = $7;
+		$state{$rev} = $8;
+		$difflines{$rev} = $10;
+	    }
+	    else {
+		&fatal("500 Internal Error", "Error parsing RCS output: $_");
+	    }
+	    line:
+	    while (<$fh>) {
+		print "L:", $_ if ($verbose);
+		next line if (/^branches:\s/);
+		last line if (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o);
+		$log{$rev} .= $_;
+	    }
+	    print "E:", $_ if ($verbose);
+	}
+	close($fh);
+	print "Done reading RCS file\n" if ($verbose);
 
-    # Plus if user has selected only r1, then present a link
-    # to make a diff to that revision
-    if (defined($input{r1}) && !defined($diffrev{$input{r1}})) {
-      $diffrev{$input{r1}} = 1;
-      my $url = sprintf('%s.diff?r1=%s;r2=%s%s',
-        $fileurl, $input{r1}, $_, $barequery);
-      if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
-        print $diff, ' selected ', $input{r1}, ': ', join(', ', @dlinks);
-        $diff = ';'; $printed = 1;
-      }
-    }
+	@revorder = reverse sort {revcmp($a,$b)} @allrevisions;
+	print "Done sorting revisions",join(" ",@revorder),"\n" if ($verbose);
 
-    print "
\n" if $printed;
-  }
-
-  if ($prev ne "" && $difflines{$_}) {
-    printf "Changes since revision %s: %s lines
\n",
-      htmlquote($prev), htmlquote($difflines{$_});
-  }
-
-  print "
\n";
-  print &htmlify($log{$_}, $allow_log_extra);
-  print "
\n";
-}
-
-
 #
-# Generates the HTML view for CvsGraph.
+# HEAD is an artificial tag which is simply the highest tag number on the main
+# branch, unless there is a branch tag in the RCS file in which case it's the
+# highest revision on that branch.  Find it by looking through @revorder; it
+# 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/;
+	revision:
+	foreach $rev (@revorder) {
+	    if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
+		$symrev{"HEAD"} = $rev;
+		last revision;
+	    }
+	}
+	($symrev{"HEAD"} = $headrev) =~ s/\.\d+$//
+            if (!defined($symrev{"HEAD"}));
+	print "Done finding HEAD\n" if ($verbose);
 #
-sub doGraphView()
-{
-  (my $pathname = $where) =~ s|[^/]*$||;
-  (my $filename = $where) =~ s|^.*/||;
+# Now that we know all of the revision numbers, we can associate
+# absolute revision numbers with all of the symbolic names, and
+# pass them to the form so that the same association doesn't have
+# to be built then.
+#
+	undef @branchnames;
+	undef %branchpoint;
+	undef $sel;
 
-  navigateHeader($scriptwhere, $pathname, $filename, undef, 'graph');
+	foreach (reverse sort keys %symrev) {
+	    $rev = $symrev{$_};
+	    if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
+		push(@branchnames, $_);
+		#
+		# A revision number of A.B.0.D really translates into
+		# "the highest current revision on branch A.B.D".
+		#
+		# If there is no branch A.B.D, then it translates into
+		# the head A.B .
+		#
+		# This reasoning also applies to the main branch A.B,
+		# with the branch number 0.A, with the exception that
+		# it has no head to translate to if there is nothing on
+		# the branch, but I guess this can never happen?
+		# (the code below gracefully forgets about the branch
+		# if it should happen)
+		#
+		$head = defined($2) ? $2 : "";
+		$branch = $3;
+		$branchrev = $head . ($head ne "" ? "." : "") . $branch;
+		my $regex;
+		($regex = $branchrev) =~ s/\./\\./g;
+		$rev = $head;
 
-  my $title = 'Revision graph of ' . htmlquote($pathname . $filename);
-  my $mapname = 'CvsGraphMap';
+		revision:
+		foreach my $r (@revorder) {
+		    if ($r =~ /^${regex}\b/) {
+			$rev = $branchrev;
+			last revision;
+		    }
+		}
+		next if ($rev eq "");
+		if ($rev ne $head && $head ne "") {
+		    $branchpoint{$head} .= ", " if ($branchpoint{$head});
+		    $branchpoint{$head} .= $_;
+		}
+	    }
+	    $revsym{$rev} .= ", " if ($revsym{$rev});
+	    $revsym{$rev} .= $_;
+	    $sel .= "