=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.32 retrieving revision 3.39 diff -u -p -r1.1.1.32 -r3.39 --- cvsweb/cvsweb.cgi 2002/07/07 04:31:41 1.1.1.32 +++ cvsweb/cvsweb.cgi 2000/11/04 15:32:17 3.39 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wT +#!/usr/bin/perl5 -ws # # cvsweb - a CGI interface to CVS trees. # @@ -10,7 +10,6 @@ # Dick Balaska # Akinori MUSHA # Jens-Uwe Mager -# Ville Skyttä # # Based on: # * Bill Fenners cvsweb.cgi revision 1.28 available from: @@ -18,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 Ville Skyttä +# (c) 1999 Henrik Nordstrom +# (c) 2000 Akinori MUSHA # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -44,56 +42,45 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: projects/cvsweb/cvsweb.cgi,v 1.112 2002/07/06 18:15:19 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.104 2000/11/01 22:05:12 hnordstrom Exp $ +# $Id: cvsweb.cgi,v 3.39 2000/11/04 15:32:17 knu Exp $ # ### -require 5.000; - use strict; use vars qw ( - $cvsweb_revision - $mydir $uname $config $allow_version_select $verbose - @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr - %MIRRORS %DEFAULTVALUE %ICONS %MTYPES + $config $allow_version_select $verbose + %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS %alltags @tabcolors %fileinfo %tags @branchnames %nameprinted %symrev %revsym @allrevisions %date %author @revdisplayorder @revisions %state %difflines %log %branchpoint @revorder - $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi + $prcgi @prcategories $prcategories $mancgi $checkoutMagic $doCheckout $scriptname $scriptwhere - $where $pathinfo $Browser $nofilelinks $maycompress - @stickyvars @unsafevars + $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp $is_mod_perl $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased %input $query $barequery $sortby $bydate $byrev $byauthor $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot - $mimetype $charset $output_filter $defaultTextPlain $defaultViewable - $command_path %CMD $allow_compress - $backicon $diricon $fileicon - $fullname $newname $cvstreedefault - $body_tag $body_tag_for_src $logo $defaulttitle $address + $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 - $allow_log_extra $allow_dir_extra $allow_source_extra - $use_java_script $open_extern_window + $difffontsize $inputTextSize $mime_types $allow_annotate + $allow_markup $use_java_script $open_extern_window $extern_window_width $extern_window_height $edit_option_form - $show_subdir_lastmod $show_log_in_markup $preformat_in_markup $v + $show_subdir_lastmod $show_log_in_markup $v $navigationHeaderColor $tableBorderColor $markupLogColor - $tabstop $state $annTable $sel $curbranch @HideModules @ForbiddenFiles + $tabstop $state $annTable $sel $curbranch @HideModules $module $use_descriptions %descriptions @mytz $dwhere $moddate $use_moddate $has_zlib $gzip_open - $allow_tar @tar_options @gzip_options @zip_options @cvs_options $LOG_FILESEPARATOR $LOG_REVSEPARATOR - $tmpdir $HTML_DOCTYPE $HTML_META ); sub printDiffSelect($); @@ -105,14 +92,12 @@ sub htmlify($;$); sub spacedHtmlText($;$); sub link($$); sub revcmp($$); -sub fatal($$@); +sub fatal($$); sub redirect($); sub safeglob($); -sub search_path($); sub getMimeTypeFromSuffix($); sub head($;$); sub scan_directives(@); -sub openOutputFilter(); sub doAnnotate($$); sub doCheckout($$); sub cvswebMarkup($$$); @@ -137,154 +122,133 @@ sub toggleQuery($$); sub urlencode($); sub htmlquote($); sub htmlunquote($); -sub hrefquote($); sub http_header(;$); sub html_header($); sub html_footer(); sub link_tags($); -sub forbidden_file($); sub forbidden_module($); ##### Start of Configuration Area ######## -delete $ENV{PATH}; +use Cwd; -$cvsweb_revision = '2.0.4'; - -use File::Basename (); - -($mydir) = (File::Basename::dirname($0) =~ /(.*)/); # untaint - # == EDIT this == # Locations to search for user configuration, in order: -for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') { - if (defined($_) && -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; -$allow_log_extra = 1; ##### End of Configuration Area ######## ######## Configuration variables ######### # These are defined to allow checking with perl -cw -@CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = - %MTYPES = %tags = %alltags = @tabcolors = %fileinfo = (); -$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 = - $show_subdir_lastmod = $show_log_in_markup = $v = $navigationHeaderColor = - $tableBorderColor = $markupLogColor = $tabstop = $use_moddate = $moddate = - $gzip_open = $HTML_DOCTYPE = $HTML_META = undef; -$tmpdir = defined($ENV{TMPDIR}) ? $ENV{TMPDIR} : "/var/tmp"; +%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 = +$show_subdir_lastmod = $show_log_in_markup = $v = +$navigationHeaderColor = $tableBorderColor = $markupLogColor = +$tabstop = $use_moddate = $moddate = $gzip_open = undef; $LOG_FILESEPARATOR = q/^={77}$/; -$LOG_REVSEPARATOR = q/^-{28}$/; +$LOG_REVSEPARATOR = q/^-{28}$/; @DIFFTYPES = qw(h H u c s); @DIFFTYPES{@DIFFTYPES} = ( - { - 'descr' => 'colored', - 'opts' => ['-u'], - 'colored' => 1, - }, - { - 'descr' => 'long colored', - 'opts' => ['--unified=15'], - 'colored' => 1, - }, - { - 'descr' => 'unified', - 'opts' => ['-u'], - 'colored' => 0, - }, - { - 'descr' => 'context', - 'opts' => ['-c'], - 'colored' => 0, - }, - { - 'descr' => 'side by side', - 'opts' => ['--side-by-side', '--width=164'], - 'colored' => 0, - }, -); + { + 'descr' => 'colored', + 'opts' => [ '-u' ], + 'colored' => 1, + }, + { + 'descr' => 'long colored', + 'opts' => [ '--unified=15' ], + 'colored' => 1, + }, + { + 'descr' => 'unified', + 'opts' => [ '-u' ], + 'colored' => 0, + }, + { + 'descr' => 'context', + 'opts' => [ '-c' ], + 'colored' => 0, + }, + { + 'descr' => 'side by side', + 'opts' => [ '--side-by-side', '--width=164' ], + 'colored' => 0, + }, + ); @LOGSORTKEYS = qw(cvs date rev); @LOGSORTKEYS{@LOGSORTKEYS} = ( - { - 'descr' => 'Not sorted', - }, - { - 'descr' => 'Commit date', - }, - { - 'descr' => 'Revision', - }, -); + { + 'descr' => 'Not sorted', + }, + { + 'descr' => 'Commit date', + }, + { + 'descr' => 'Revision', + }, + ); -$HTML_DOCTYPE = - ''; -$HTML_META = < - - - -EOM - ##### End of configuration variables ##### -use Time::Local (); -use IPC::Open2 qw(open2); +use Time::Local; +use IPC::Open2; # Check if the zlib C library interface is installed, and if yes # we can avoid using the extra gzip process. -eval { require Compress::Zlib; }; +eval { + require Compress::Zlib; +}; $has_zlib = !$@; -$verbose = $v; +$verbose = $v; $checkoutMagic = "~checkout~"; -$pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; -$where = $pathinfo; -$doCheckout = ($where =~ m|^/$checkoutMagic/|); -$where =~ s|^/$checkoutMagic/|/|; -$where =~ s|^/||; +$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|^/*|/|; - -# Let's workaround thttpd's stupidity.. -if ($scriptname =~ m|/$|) { - $pathinfo .= '/'; - my $re = quotemeta $pathinfo; - $scriptname =~ s/$re$//; +$scriptname =~ s|^/?|/|; +$scriptname =~ s|/+$||; +$scriptwhere = $scriptname; +if ($where) { + $scriptwhere .= '/' . urlencode($where); } -$scriptwhere = $scriptname; -$scriptwhere .= '/' . urlencode($where); -$where = '/' if ($where eq ''); - $is_mod_perl = defined($ENV{MOD_PERL}); # in lynx, it it very annoying to have two links # per file, so disable the link at the icon # in this case: -$Browser = $ENV{HTTP_USER_AGENT} || ''; -$is_links = ($Browser =~ m`^Links `); -$is_lynx = ($Browser =~ m`^Lynx/`i); -$is_w3m = ($Browser =~ m`^w3m/`i); -$is_msie = ($Browser =~ m`MSIE`); +$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); @@ -300,167 +264,135 @@ $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} =~ m`gzip`) || $is_mozilla3) && !$is_msie - && !($is_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)); # 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); -@unsafevars = qw(logsort only_with_tag r1 r2 rev sortby tr1 tr2); if (-f $config) { - do "$config" or fatal("500 Internal Error", - 'Error in loading configuration file: %s

%s
', - $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 variable $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.'); } undef %input; $query = $ENV{QUERY_STRING}; if (defined($query) && $query ne '') { - foreach (split (/&/, $query)) { - y/+/ /; - s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted - if (/(\S+)=(.*)/) { - $input{$1} = $2 if ($2 ne ""); - } else { - $input{$_}++; - } + foreach (split(/&/, $query)) { + s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted + if (/(\S+)=(.*)/) { + $input{$1} = $2 if ($2 ne ""); } + else { + $input{$_}++; + } + } } # 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})); -# Prevent cross-site scripting -foreach (@unsafevars) { - if (defined($input{$_}) && $input{$_} =~ /[^\w\-.]/) { - fatal("500 Internal Error", - 'Malformed query (%s=%s)', - $_, $input{$_}); - } -} - -if (defined($input{"content-type"})) { - fatal("500 Internal Error", "Unsupported content-type") - if ($input{"content-type"} !~ /^[-0-9A-Za-z]+\/[-0-9A-Za-z]+$/); -} - $DEFAULTVALUE{'cvsroot'} = $cvstreedefault; -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")); - } +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")); + } + } } $barequery = ""; my @barequery; foreach (@stickyvars) { - - # construct a query string with the sticky non default parameters set - if (defined($input{$_}) && $input{$_} ne '' - && !(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) - { - push @barequery, - join ('=', urlencode($_), urlencode($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{$_})); + } } - # 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 -$sortby = $input{"sortby"}; -$bydate = 0; -$byrev = 0; +$sortby = $input{"sortby"}; +$bydate = 0; +$byrev = 0; $byauthor = 0; -$bylog = 0; -$byfile = 0; +$bylog = 0; +$byfile = 0; if ($sortby eq "date") { - $bydate = 1; -} elsif ($sortby eq "rev") { - $byrev = 1; -} elsif ($sortby eq "author") { - $byauthor = 1; -} elsif ($sortby eq "log") { - $bylog = 1; -} else { - $byfile = 1; + $bydate = 1; } +elsif ($sortby eq "rev") { + $byrev = 1; +} +elsif ($sortby eq "author") { + $byauthor = 1; +} +elsif ($sortby eq "log") { + $bylog = 1; +} +else { + $byfile = 1; +} $defaultDiffType = $input{'f'}; $logsort = $input{'logsort'}; -{ - my @tmp = @CVSrepositories; - my @pair; - while (@pair = splice(@tmp, 0, 2)) { - my ($key, $val) = @pair; - my ($descr, $cvsroot) = @$val; - - next if !-d $cvsroot; - - $CVSROOTdescr{$key} = $descr; - $CVSROOT{$key} = $cvsroot; - push @CVSROOT, $key; - } -} - ## Default CVS-Tree if (!defined($CVSROOT{$cvstreedefault})) { - fatal("500 Internal Error", - '$cvstreedefault points to a repository (%s) not defined in %%CVSROOT (edit your configuration file %s)', - $cvstreedefault, $config); + &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'}; + $cvstree = $input{'cvsroot'}; } else { - $cvstree = $cvstreedefault; + $cvstree = $cvstreedefault; } $cvsroot = $CVSROOT{$cvstree}; @@ -468,16 +400,15 @@ $cvsroot = $CVSROOT{$cvstree}; # create icons out of description my $k; foreach $k (keys %ICONS) { - no strict 'refs'; - my ($itxt, $ipath, $iwidth, $iheight) = @{$ICONS{$k}}; - if ($ipath) { - ${"${k}icon"} = - sprintf( - '%s', - hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight) - } else { - ${"${k}icon"} = $itxt; - } + no strict 'refs'; + my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; + if ($ipath) { + ${"${k}icon"} = sprintf('%s', + htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight) + } + else { + ${"${k}icon"} = $itxt; + } } undef $k; @@ -485,48 +416,51 @@ 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); +$prcategories = '(?:' . join('|', @prcategories) . ')'; $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; -$fullname = "$cvsroot/$where"; -$mimetype = &getMimeTypeFromSuffix($fullname); +$fullname = $cvsroot . '/' . $where; +$mimetype = &getMimeTypeFromSuffix ($fullname); $defaultTextPlain = ($mimetype eq "text/plain"); -$defaultViewable = $allow_markup && viewable($mimetype); +$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 && $pathinfo !~ m|/$|) { - $pathinfo .= '/'; - $rewrite = 1; +if (-d $fullname) { + # + # ensure, that directories always end with (exactly) one '/' + # to allow relative URL's. If they're not, make a redirect. + ## + if (!($pathinfo =~ m|/$|) || ($pathinfo =~ m |/{2,}$|)) { + redirect ($scriptwhere . '/' . $query); + } + else { + $where .= '/'; + $scriptwhere .= '/'; + } } -if (!-d $fullname && $pathinfo =~ m|/$|) { - chop $pathinfo; - $rewrite = 1; -} - -if ($rewrite) { - redirect($scriptname . urlencode($pathinfo) . $query); -} - -undef $rewrite; - if (!-d $cvsroot) { - fatal("500 Internal Error", - '$CVSROOT not found!

The server on which the CVS tree lives is probably down. Please try again in a few minutes.'); + &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.'); } # @@ -535,271 +469,151 @@ if (!-d $cvsroot) { $where =~ m:([^/]*):; $module = $1; if ($module && &forbidden_module($module)) { - fatal("403 Forbidden", - 'Access to %s forbidden.', - $where); + &fatal("403 Forbidden", "Access to $where forbidden."); } - -# -# Handle tarball downloads before any headers are output. -# -if ($input{tarball}) { - fatal("403 Forbidden", - 'Downloading tarballs is prohibited.') - unless $allow_tar; - my ($module) = ($where =~ m,^/?(.*),); # untaint - $module =~ s,/([^/]*)$,,; - my ($ext) = ($1 =~ /(\.tar\.gz|\.zip)$/); - my ($basedir) = ($module =~ m,([^/]+)$,); - - if ($basedir eq '' || $module eq '') { - fatal("500 Internal Error", - 'You cannot download the top level directory.'); - } - - my $tmpexportdir = "$tmpdir/.cvsweb.$$." . int(time); - - mkdir($tmpexportdir, 0700) - or fatal("500 Internal Error", - 'Unable to make temporary directory: %s', - $!); - - my @fatal; - - my $tag = - (exists $input{only_with_tag} && length $input{only_with_tag}) ? - $input{only_with_tag} : "HEAD"; - - if ($tag eq 'MAIN') { - $tag = 'HEAD'; - } - - if (system $CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', - $tag, '-d', "$tmpexportdir/$basedir", $module) - { - @fatal = ("500 Internal Error", - 'cvs co failure: %s: %s', - $!, $module); - } else { - $| = 1; # Essential to get the buffering right. - - if ($ext eq '.tar.gz') { - print "Content-Type: application/x-gzip\r\n\r\n"; - - system - "$CMD{tar} @tar_options -cf - -C $tmpexportdir $basedir | $CMD{gzip} @gzip_options -c" - and @fatal = - ("500 Internal Error", - 'tar zc failure: %s: %s', - $!, $basedir); - } elsif ($ext eq '.zip' && $CMD{zip}) { - print "Content-Type: application/zip\r\n\r\n"; - - system - "cd $tmpexportdir && $CMD{zip} @zip_options -r - $basedir" - and @fatal = - ("500 Internal Error", - 'zip failure: %s: %s', - $!, $basedir); - } else { - @fatal = - ("500 Internal Error", - 'unsupported file type'); - } - } - - system $CMD{rm}, '-rf', $tmpexportdir if -d $tmpexportdir; - - &fatal(@fatal) if @fatal; - - exit; -} - ############################## # View a directory ############################### -if (-d $fullname) { - my $dh = do { local (*DH); }; - opendir($dh, $fullname) or fatal("404 Not Found", - '%s: %s', - $where, $!); +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); + 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; + html_header($defaulttitle); + $long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g; + print $long_intro; } + else { + html_header($where); + print $short_instruction; + } - if ($use_descriptions && open(DESC, "<$cvsroot/CVSROOT/descriptions")) - { - while () { - chomp; - my ($dir, $description) = /(\S+)\s+(.*)/; - $descriptions{$dir} = $description; - } - close(DESC); + my $descriptions; + if (($use_descriptions) && open (DESC, "<$cvsroot/CVSROOT/descriptions")) { + while () { + chomp; + my ($dir,$description) = /(\S+)\s+(.*)/; + $descriptions{$dir} = $description; + } } - print "

\n"; - + print "

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

Current directory: ", &clickablePath($where, 0), - "

\n"; + chooseMirror(); + chooseCVSRoot(); + } + else { + print "

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

Current tag: ", $input{only_with_tag},"

\n" - if $input{only_with_tag}; + print "

Current tag: ", $input{only_with_tag}, "\n" if + $input{only_with_tag}; } - print "

\n"; - # Using in this manner violates the HTML2.0 spec but + 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 = 0; if ($dirtable) { - print "\n"; + if (defined($tableBorderColor)) { + # Can't this be done by defining the border for the inner table? + print "
"; + } + print "\n"; + $infocols++; + printf '"; + # do not display the other column-headers, if we do not have any files + # with revision information: + if (scalar(%fileinfo)) { $infocols++; - printf "\n\n"; - - # do not display the other column-headers, if we do not have any files - # with revision information: - if (scalar(%fileinfo)) { - $infocols++; - printf '\n"; - $infocols++; - printf '\n"; - - if ($show_author) { - $infocols++; - printf '\n"; - } - $infocols++; - printf '\n"; - } elsif ($use_descriptions) { - printf '\n"; - $infocols++; + print ""; + $infocols++; + printf '\n"; - } else { - print "\n"; + print ""; + if ($show_author) { + $infocols++; + printf '"; + } + $infocols++; + printf '"; + } + elsif ($use_descriptions) { + printf '\n"; } + else { + print "\n"; + } my $dirrow = 0; my $i; lookingforattic: - for ($i = 0 ; $i <= $#dir ; $i++) { + for ($i = 0; $i <= $#dir; $i++) { if ($dir[$i] eq "Attic") { - last lookingforattic; + last lookingforattic; } } - - if (!$input{'hideattic'} && ($i <= $#dir) - && opendir($dh, $fullname . "/Attic")) - { - splice(@dir, $i, 1, grep((s|^|Attic/|, !m|/\.|), readdir($dh))); - closedir($dh); + if (!$input{'hideattic'} && ($i <= $#dir) && + opendir($dh, $fullname . "/Attic")) { + splice(@dir, $i, 1, + grep((s|^|Attic/|,!m|/\.|), readdir($dh))); + closedir($dh); } - my $hideAtticToggleLink = - $input{'hideattic'} ? '' : - &link('[Hide]', sprintf('./%s#dirlist', &toggleQuery("hideattic"))); + my $hideAtticToggleLink = $input{'hideattic'} ? '' : + &link('[Hide]', sprintf('./%s#dirlist', + &toggleQuery ("hideattic"))); # Sort without the Attic/ pathname. # place directories first @@ -811,330 +625,257 @@ if (-d $fullname) { my $filesfound; foreach (sort { &fileSortCmp } @dir) { - if ($_ eq '.') { - next; - } + if ($_ eq '.') { + next; + } + # ignore CVS lock and stale NFS files + next if (/^#cvs\.|^,|^\.nfs/); - # ignore CVS lock and stale NFS files - next if (/^#cvs\.|^,|^\.nfs/); + # Check whether to show the CVSROOT path + next if ($input{'hidecvsroot'} && ($_ eq 'CVSROOT')); - # Check whether to show the CVSROOT path - next if ($input{'hidecvsroot'} && ($_ eq 'CVSROOT')); + # Check whether the module is in the restricted list + next if ($_ && &forbidden_module($_)); - # Check whether the module is in the restricted list - next if ($_ && &forbidden_module($_)); + # Ignore non-readable files + next if ($input{'hidenonreadable'} && !(-r "$fullname/$_")); - # Ignore non-readable files - next if ($input{'hidenonreadable'} && !(-r "$fullname/$_")); + if (s|^Attic/||) { + $attic = " (in the Attic) " . $hideAtticToggleLink; + } + else { + $attic = ""; + } - if (s|^Attic/||) { - $attic = " (in the Attic) " . $hideAtticToggleLink; - } else { - $attic = ""; + if ($_ eq '..' || -d "$fullname/$_") { + next if ($_ eq '..' && $where eq '/'); + my ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} + if (defined($fileinfo{$_})); + printf '\n\n\n\n\n\n\n\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++; - printf "\n\n\n\n\n\n" if ($dirtable); - print(($dirtable) ? "" : "
"); - $dirrow++; + } } - print "\n"; + if ($dirtable) { + 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++; + printf '" if ($dirtable); + print (($dirtable) ? "" : "
"); + $dirrow++; + } + print "\n"; } + if ($dirtable && defined($tableBorderColor)) { + print "
', + $byfile ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($byfile) { + print 'File'; + } else { + print &link('File', sprintf('./%s#dirlist', + &toggleQuery("sortby", "file"))); + } + print "
", - $byfile ? $columnHeaderColorSorted : - $columnHeaderColorDefault; - - if ($byfile) { - print 'File'; + printf '', + $byrev ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($byrev) { + print 'Rev.'; } else { - print &link( - 'File', - sprintf( - './%s#dirlist', - &toggleQuery("sortby", "file") - ) - ); + print &link('Rev.', sprintf('./%s#dirlist', + &toggleQuery("sortby", "rev"))); } - print "', - $byrev ? $columnHeaderColorSorted : - $columnHeaderColorDefault; - - if ($byrev) { - print 'Rev.'; - } else { - print &link( - 'Rev.', - sprintf( - './%s#dirlist', - &toggleQuery("sortby", "rev") - ) - ); - } - print "', - $bydate ? $columnHeaderColorSorted : - $columnHeaderColorDefault; - - if ($bydate) { - print 'Age'; - } else { - print &link( - 'Age', - sprintf( - './%s#dirlist', - &toggleQuery("sortby", "date") - ) - ); - } - print "', - $byauthor ? $columnHeaderColorSorted : - $columnHeaderColorDefault; - - if ($byauthor) { - print 'Author'; - } else { - print &link( - 'Author', - sprintf( - './%s#dirlist', - &toggleQuery( - "sortby", - "author" - ) - ) - ); - } - print "', - $bylog ? $columnHeaderColorSorted : - $columnHeaderColorDefault; - - if ($bylog) { - print 'Last log entry'; - } else { - print &link( - 'Last log entry', - sprintf( - './%s#dirlist', - &toggleQuery("sortby", "log") - ) - ); - } - print "', - $columnHeaderColorDefault; - print "Description', + $bydate ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($bydate) { + print 'Age'; + } else { + print &link('Age', sprintf('./%s#dirlist', + &toggleQuery("sortby", "date"))); } - print "
', + $byauthor ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($byauthor) { + print 'Author'; + } else { + print &link('Author', sprintf('./%s#dirlist', + &toggleQuery("sortby", "author"))); + } + print "', + $bylog ? $columnHeaderColorSorted : $columnHeaderColorDefault; + if ($bylog) { + print 'Last log entry'; + } else { + print &link('Last log entry', sprintf('./%s#dirlist', + &toggleQuery("sortby", "log"))); + } + print "', $columnHeaderColorDefault; + print "Description"; + $infocols++; + } + print "
', $tabcolors[$dirrow % 2] if $dirtable; + if ($_ eq '..') { + $url = "../$query"; + if ($nofilelinks) { + print $backicon; + } + else { + print &link($backicon, $url); + } + print " ", &link("Previous Directory", $url); } - - if ($_ eq '..' || -d "$fullname/$_") { - next if ($_ eq '..' && $where eq '/'); - my ($rev, $date, $log, $author, $filename); - ($rev, $date, $log, $author, $filename) = - @{$fileinfo{$_}} - if (defined($fileinfo{$_})); - printf "
", - $tabcolors[$dirrow % 2] if $dirtable; - - if ($_ eq '..') { - $url = "../$query"; - if ($nofilelinks) { - print $backicon; - } else { - print &link($backicon, $url); - } - print ' ', &link("Parent Directory", $url); - } else { - $url = './' . urlencode($_) . "/$query"; - print ""; - - if ($nofilelinks) { - print $diricon; - } else { - print &link($diricon, $url); - } - print ' ', &link("$_/", $url), $attic; - - if ($_ eq "Attic") { - print "  "; - print &link( - "[Don't hide]", - sprintf( - './%s#dirlist', - &toggleQuery( - "hideattic") - ) - ); - } + else { + $url = urlencode($_) . "/$query"; + print ""; + if ($nofilelinks) { + print $diricon; + } + else { + print &link($diricon, $url); + } + print " ", &link("$_/", $url), $attic; + if ($_ eq "Attic") { + print "  "; + print &link("[Don't hide]", sprintf('./%s#dirlist', + &toggleQuery ("hideattic"))); + } + } + # 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 "..."; } - - # 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), $allow_dir_extra); - 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--; - } - } + 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 "
", - $tabcolors[$dirrow % 2] 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), $allow_dir_extra); - if (length $log > 80) { - print "..."; - } - print ""; - } - print "
', $tabcolors[$dirrow % 2] 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" : "\n" ); - print($dirtable ? "\n" : "\n"); - if ($filesexists && !$filesfound) { - print - "

NOTE: There are $filesexists files, but none matches the current tag ($input{only_with_tag}).

\n"; + 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 ($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} + || $edit_option_form + || defined($input{"options"})) { + print "
"; } if (scalar %tags || $input{only_with_tag}) { - print "
\n"; - foreach my $var (@stickyvars) { - print - "\n" - if (defined($input{$var}) - && (!defined($DEFAULTVALUE{$var}) + 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 "

\n"; - print "\n"; - print " \n"; - printf "\n", - htmlquote($where); - print "

\n"; - print "
\n"; + && $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'}); - if ($allow_tar) { - my ($basefile) = ($where =~ m,(?:.*/)?([^/]+),); - - if (defined($basefile) && $basefile ne '') { - print "
\n", - "
Download this directory in "; - - # Mangle the filename so browsers show a reasonable - # filename to download. - print &link("tarball", "./$basefile.tar.gz$query" - . ($query ? "&" : "?") . "tarball=1"); - if ($CMD{zip}) { - print " or ", - &link("zip archive", "./$basefile.zip$query" - . ($query ? "&" : "?") . "tarball=1"); - } - print "
\n"; - } - } - if ($edit_option_form || defined($input{"options"})) { - - my $formwhere = $scriptwhere; - $formwhere =~ s|Attic/?$|| if ($input{'hideattic'}); - - print "
\n"; - print "\n"; - if ($cvstree ne $cvstreedefault) { - print - "\n"; - } - print "
\n"; - print "\n\n"; - print "\n\n"; - print "\n\n"; - print "\n\n"; - print "\n\n"; - print "\n\n"; - print "\n\n\n
Preferences
"; - print "\n"; - printLogSortSelect(0); - print "
"; - printDiffSelect(0); - print ""; - print "
"; - print ""; - print "
\n
\n
\n"; + print "
\n"; + print "\n"; + if ($cvstree ne $cvstreedefault) { + print "\n"; + } + print "
"; + print ""; + print ""; + print ""; + print ""; + print "\n"; + print "
Preferences
Sort files by Sort log by: "; + printLogSortSelect(0); + print "
Diff format: "; + printDiffSelect(0); + print "Show Attic files: "; + print "
"; + print "
\n"; } - html_footer(); -} + print &html_footer; + print "\n"; + } ############################### # View Files ############################### -elsif (-f $fullname . ',v') { + elsif (-f $fullname . ',v') { if (defined($input{'rev'}) || $doCheckout) { - &doCheckout($fullname, $input{'rev'}); - gzipclose(); - exit; + &doCheckout($fullname, $input{'rev'}); + gzipclose(); + exit; } - if (defined($input{'annotate'}) && $allow_annotate) { - &doAnnotate($input{'annotate'}); - gzipclose(); - exit; + &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; + &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'}) { - ############################## - # View Diff - ############################## -} 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 @@ -1144,176 +885,166 @@ elsif (-f $fullname . ',v') { # 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'} - ); + &doDiff($fullname, $input{'r1'}, $input{'tr1'}, + $input{'r2'}, $input{'tr2'}, $input{'f'}); gzipclose(); exit; -} elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| && -f $newname . ",v") -{ - + } + 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|; - if ($ENV{QUERY_STRING} ne "") { - redirect("${newplace}?$ENV{QUERY_STRING}"); - } else { - redirect($newplace); - } + &redirect($newplace); exit; -} elsif (0 && (my @files = &safeglob($fullname . ",v"))) { + } + elsif (0 && (my @files = &safeglob($fullname . ",v"))) { http_header("text/plain"); print "You matched the following files:\n"; - print join ("\n", @files); - + print join("\n", @files); # Find the tags from each file # Display a form offering diffs between said tags -} else { - my $fh = do { local (*FH); }; + } + else { + my $fh = do {local(*FH);}; my ($xtra, $module); - # Assume it's a module name with a potential path following it. - $xtra = (($module = $where) =~ s|/.*||) ? $& : ''; - + $xtra = $& if (($module = $where) =~ s|/.*||); # Is there an indexed version of modules? - if (open($fh, "< $cvsroot/CVSROOT/modules")) { - while (<$fh>) { - if (/^(\S+)\s+(\S+)/o && $module eq $1 - && -d "$cvsroot/$2" && $module ne $2) - { - redirect("$scriptname/$2$xtra$query"); - } + 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", - '%s: no such file or directory', - $where); -} + &fatal("404 Not Found","$where: no such file or directory"); + } gzipclose(); - ## End MAIN sub printDiffSelect($) { - my ($use_java_script) = @_; - my $f = $input{'f'}; + my ($use_java_script) = @_; + my $f = $input{'f'}; - print ''; - local $_; - for (@DIFFTYPES) { - printf("\n", $_, - $f eq $_ ? ' selected' : '', "\u$DIFFTYPES{$_}{'descr'}"); - } + local $_; + for (@DIFFTYPES) { + printf('\n", $_, - $logsort eq $_ ? ' selected' : '', - "\u$LOGSORTKEYS{$_}{'descr'}"); - } + local $_; + for (@LOGSORTKEYS) { + printf('