| version 1.1.1.27, 2001/07/06 09:54:57 |
version 1.1.1.28, 2001/08/01 10:24:01 |
|
|
| # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| # SUCH DAMAGE. |
# SUCH DAMAGE. |
| # |
# |
| # $zId: cvsweb.cgi,v 1.110 2001/06/29 09:29:36 hnordstrom Exp $ |
# $zId: cvsweb.cgi,v 1.112 2001/07/24 13:03:16 hzeller Exp $ |
| # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.78 2001/07/06 09:49:01 knu Exp $ |
# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.82 2001/08/01 09:54:52 knu Exp $ |
| # |
# |
| ### |
### |
| |
|
|
|
| $extern_window_width $extern_window_height $edit_option_form |
$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 $preformat_in_markup $v |
| $navigationHeaderColor $tableBorderColor $markupLogColor |
$navigationHeaderColor $tableBorderColor $markupLogColor |
| $tabstop $state $annTable $sel $curbranch @HideModules |
$tabstop $state $annTable $sel $curbranch @HideModules @ForbiddenFiles |
| $module $use_descriptions %descriptions @mytz $dwhere $moddate |
$module $use_descriptions %descriptions @mytz $dwhere $moddate |
| $use_moddate $has_zlib $gzip_open |
$use_moddate $has_zlib $gzip_open |
| $allow_tar @tar_options @gzip_options @zip_options @cvs_options |
$allow_tar @tar_options @gzip_options @zip_options @cvs_options |
| $LOG_FILESEPARATOR $LOG_REVSEPARATOR |
$LOG_FILESEPARATOR $LOG_REVSEPARATOR |
| |
$tmpdir |
| ); |
); |
| |
|
| sub printDiffSelect($); |
sub printDiffSelect($); |
| Line 134 sub http_header(;$); |
|
| Line 135 sub http_header(;$); |
|
| sub html_header($); |
sub html_header($); |
| sub html_footer(); |
sub html_footer(); |
| sub link_tags($); |
sub link_tags($); |
| |
sub forbidden_file($); |
| sub forbidden_module($); |
sub forbidden_module($); |
| |
|
| ##### Start of Configuration Area ######## |
##### Start of Configuration Area ######## |
| delete $ENV{PATH}; |
delete $ENV{PATH}; |
| |
|
| $cvsweb_revision = '1.110' . '.' . (split(/ /, |
$cvsweb_revision = |
| q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.78 2001/07/06 09:49:01 knu Exp $ |
'1.112' . '.' . ( |
| |
split (/ /, |
| |
q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.82 2001/08/01 09:54:52 knu Exp $ |
| ))[2]; |
))[2]; |
| |
|
| use File::Basename; |
use File::Basename; |
| |
|
| ($mydir) = (dirname($0) =~ /(.*)/); # untaint |
($mydir) = (dirname($0) =~ /(.*)/); # untaint |
| |
|
| # == EDIT this == |
# == EDIT this == |
| # Locations to search for user configuration, in order: |
# Locations to search for user configuration, in order: |
| for ( |
for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') { |
| "$mydir/cvsweb.conf", |
if (defined($_) && -r $_) { |
| '/usr/local/etc/cvsweb/cvsweb.conf' |
$config = $_; |
| ) { |
last; |
| if (defined($_) && -r $_) { |
} |
| $config = $_; |
|
| last; |
|
| } |
|
| } |
} |
| |
|
| # == Configuration defaults == |
# == Configuration defaults == |
| Line 168 $allow_version_select = 1; |
|
| Line 169 $allow_version_select = 1; |
|
| |
|
| ######## Configuration variables ######### |
######## Configuration variables ######### |
| # These are defined to allow checking with perl -cw |
# These are defined to allow checking with perl -cw |
| @CVSrepositories = @CVSROOT = %CVSROOT = |
@CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = |
| %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = |
%MTYPES = %tags = %alltags = @tabcolors = %fileinfo = (); |
| %tags = %alltags = @tabcolors = %fileinfo = (); |
$cvstreedefault = $body_tag = $body_tag_for_src = $logo = $defaulttitle = |
| $cvstreedefault = $body_tag = $body_tag_for_src = |
$address = $long_intro = $short_instruction = $shortLogLen = $show_author = |
| $logo = $defaulttitle = $address = |
$dirtable = $tablepadding = $columnHeaderColorDefault = |
| $long_intro = $short_instruction = $shortLogLen = |
$columnHeaderColorSorted = $hr_breakable = $showfunc = $hr_ignwhite = |
| $show_author = $dirtable = $tablepadding = $columnHeaderColorDefault = |
$hr_ignkeysubst = $diffcolorHeading = $diffcolorEmpty = $diffcolorRemove = |
| $columnHeaderColorSorted = $hr_breakable = $showfunc = $hr_ignwhite = |
$diffcolorChange = $diffcolorAdd = $diffcolorDarkChange = $difffontface = |
| $hr_ignkeysubst = $diffcolorHeading = $diffcolorEmpty = $diffcolorRemove = |
$difffontsize = $inputTextSize = $mime_types = $allow_annotate = |
| $diffcolorChange = $diffcolorAdd = $diffcolorDarkChange = $difffontface = |
$allow_markup = $use_java_script = $open_extern_window = |
| $difffontsize = $inputTextSize = $mime_types = $allow_annotate = |
$extern_window_width = $extern_window_height = $edit_option_form = |
| $allow_markup = $use_java_script = $open_extern_window = |
$show_subdir_lastmod = $show_log_in_markup = $v = $navigationHeaderColor = |
| $extern_window_width = $extern_window_height = $edit_option_form = |
$tableBorderColor = $markupLogColor = $tabstop = $use_moddate = $moddate = |
| $show_subdir_lastmod = $show_log_in_markup = $v = |
$gzip_open = undef; |
| $navigationHeaderColor = $tableBorderColor = $markupLogColor = |
$tmpdir = defined($ENV{TMPDIR}) ? $ENV{TMPDIR} : "/var/tmp"; |
| $tabstop = $use_moddate = $moddate = $gzip_open = undef; |
|
| |
|
| $LOG_FILESEPARATOR = q/^={77}$/; |
$LOG_FILESEPARATOR = q/^={77}$/; |
| $LOG_REVSEPARATOR = q/^-{28}$/; |
$LOG_REVSEPARATOR = q/^-{28}$/; |
| |
|
| @DIFFTYPES = qw(h H u c s); |
@DIFFTYPES = qw(h H u c s); |
| @DIFFTYPES{@DIFFTYPES} = ( |
@DIFFTYPES{@DIFFTYPES} = ( |
| { |
{ |
| 'descr' => 'colored', |
'descr' => 'colored', |
| 'opts' => [ '-u' ], |
'opts' => ['-u'], |
| 'colored' => 1, |
'colored' => 1, |
| }, |
}, |
| { |
{ |
| 'descr' => 'long colored', |
'descr' => 'long colored', |
| 'opts' => [ '--unified=15' ], |
'opts' => ['--unified=15'], |
| 'colored' => 1, |
'colored' => 1, |
| }, |
}, |
| { |
{ |
| 'descr' => 'unified', |
'descr' => 'unified', |
| 'opts' => [ '-u' ], |
'opts' => ['-u'], |
| 'colored' => 0, |
'colored' => 0, |
| }, |
}, |
| { |
{ |
| 'descr' => 'context', |
'descr' => 'context', |
| 'opts' => [ '-c' ], |
'opts' => ['-c'], |
| 'colored' => 0, |
'colored' => 0, |
| }, |
}, |
| { |
{ |
| 'descr' => 'side by side', |
'descr' => 'side by side', |
| 'opts' => [ '--side-by-side', '--width=164' ], |
'opts' => ['--side-by-side', '--width=164'], |
| 'colored' => 0, |
'colored' => 0, |
| }, |
}, |
| ); |
); |
| |
|
| @LOGSORTKEYS = qw(cvs date rev); |
@LOGSORTKEYS = qw(cvs date rev); |
| @LOGSORTKEYS{@LOGSORTKEYS} = ( |
@LOGSORTKEYS{@LOGSORTKEYS} = ( |
| { |
{ |
| 'descr' => 'Not sorted', |
'descr' => 'Not sorted', |
| }, |
}, |
| { |
{ |
| 'descr' => 'Commit date', |
'descr' => 'Commit date', |
| }, |
}, |
| { |
{ |
| 'descr' => 'Revision', |
'descr' => 'Revision', |
| }, |
}, |
| ); |
); |
| |
|
| |
|
| ##### End of configuration variables ##### |
##### End of configuration variables ##### |
| |
|
| use Time::Local; |
use Time::Local; |
|
|
| |
|
| # Check if the zlib C library interface is installed, and if yes |
# Check if the zlib C library interface is installed, and if yes |
| # we can avoid using the extra gzip process. |
# we can avoid using the extra gzip process. |
| eval { |
eval { require Compress::Zlib; }; |
| require Compress::Zlib; |
|
| }; |
|
| $has_zlib = !$@; |
$has_zlib = !$@; |
| |
|
| $verbose = $v; |
$verbose = $v; |
| $checkoutMagic = "~checkout~"; |
$checkoutMagic = "~checkout~"; |
| $pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; |
$pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; |
| $where = $pathinfo; |
$where = $pathinfo; |
| $doCheckout = ($where =~ m|^/$checkoutMagic/|); |
$doCheckout = ($where =~ m|^/$checkoutMagic/|); |
| $where =~ s|^/$checkoutMagic/|/|; |
$where =~ s|^/$checkoutMagic/|/|; |
| $where =~ s|^/||; |
$where =~ s|^/||; |
| Line 255 $scriptname =~ s|^/*|/|; |
|
| Line 252 $scriptname =~ s|^/*|/|; |
|
| |
|
| # Let's workaround thttpd's stupidity.. |
# Let's workaround thttpd's stupidity.. |
| if ($scriptname =~ m|/$|) { |
if ($scriptname =~ m|/$|) { |
| $pathinfo .= '/'; |
$pathinfo .= '/'; |
| my $re = quotemeta $pathinfo; |
my $re = quotemeta $pathinfo; |
| $scriptname =~ s/$re$//; |
$scriptname =~ s/$re$//; |
| } |
} |
| |
|
| $scriptwhere = $scriptname; |
$scriptwhere = $scriptname; |
| Line 270 $is_mod_perl = defined($ENV{MOD_PERL}); |
|
| Line 267 $is_mod_perl = defined($ENV{MOD_PERL}); |
|
| # per file, so disable the link at the icon |
# per file, so disable the link at the icon |
| # in this case: |
# in this case: |
| $Browser = $ENV{HTTP_USER_AGENT} || ''; |
$Browser = $ENV{HTTP_USER_AGENT} || ''; |
| $is_links = ($Browser =~ m`^Links `); |
$is_links = ($Browser =~ m`^Links `); |
| $is_lynx = ($Browser =~ m`^Lynx/`i); |
$is_lynx = ($Browser =~ m`^Lynx/`i); |
| $is_w3m = ($Browser =~ m`^w3m/`i); |
$is_w3m = ($Browser =~ m`^w3m/`i); |
| $is_msie = ($Browser =~ m`MSIE`); |
$is_msie = ($Browser =~ m`MSIE`); |
| $is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`); |
$is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`); |
| |
|
| $is_textbased = ($is_links || $is_lynx || $is_w3m); |
$is_textbased = ($is_links || $is_lynx || $is_w3m); |
| Line 289 $nofilelinks = $is_textbased; |
|
| Line 286 $nofilelinks = $is_textbased; |
|
| # display garbage then :-/ |
# display garbage then :-/ |
| # Turn off gzip if running under mod_perl and no zlib is available, |
# Turn off gzip if running under mod_perl and no zlib is available, |
| # piping does not work as expected inside the server. |
# piping does not work as expected inside the server. |
| $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) |
$maycompress = |
| && $ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`) |
(((defined($ENV{HTTP_ACCEPT_ENCODING}) |
| || $is_mozilla3) |
&& $ENV{HTTP_ACCEPT_ENCODING} =~ m`gzip`) || $is_mozilla3) && !$is_msie |
| && !$is_msie |
&& !($is_mod_perl && !$has_zlib)); |
| && !($is_mod_perl && !$has_zlib)); |
|
| |
|
| # put here the variables we need in order |
# put here the variables we need in order |
| # to hold our state - they will be added (with |
# to hold our state - they will be added (with |
| Line 302 $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) |
|
| Line 298 $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) |
|
| @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag); |
@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag); |
| |
|
| if (-f $config) { |
if (-f $config) { |
| require $config |
require $config || &fatal( |
| || &fatal("500 Internal Error", |
"500 Internal Error", |
| sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>', |
sprintf( |
| $config, &htmlify($@))); |
'Error in loading configuration file: %s<BR><BR>%s<BR>', |
| |
$config, |
| |
&htmlify($@) |
| |
) |
| |
); |
| } else { |
} else { |
| &fatal("500 Internal Error", |
&fatal("500 Internal Error", |
| 'Configuration not found. Set the variable <code>$config</code> ' |
'Configuration not found. Set the variable <code>$config</code> ' |
| . 'in cvsweb.cgi to your <b>cvsweb.conf</b> configuration file first.'); |
. 'in cvsweb.cgi to your <b>cvsweb.conf</b> configuration file first.' |
| |
); |
| } |
} |
| |
|
| undef %input; |
undef %input; |
| $query = $ENV{QUERY_STRING}; |
$query = $ENV{QUERY_STRING}; |
| |
|
| if (defined($query) && $query ne '') { |
if (defined($query) && $query ne '') { |
| foreach (split(/&/, $query)) { |
foreach (split (/&/, $query)) { |
| y/+/ /; |
y/+/ /; |
| s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted |
s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted |
| if (/(\S+)=(.*)/) { |
if (/(\S+)=(.*)/) { |
| $input{$1} = $2 if ($2 ne ""); |
$input{$1} = $2 if ($2 ne ""); |
| |
} else { |
| |
$input{$_}++; |
| |
} |
| } |
} |
| else { |
|
| $input{$_}++; |
|
| } |
|
| } |
|
| } |
} |
| |
|
| # For backwards compability, set only_with_tag to only_on_branch if set. |
# For backwards compability, set only_with_tag to only_on_branch if set. |
| Line 334 $input{only_with_tag} = $input{only_on_branch} |
|
| Line 334 $input{only_with_tag} = $input{only_on_branch} |
|
| |
|
| $DEFAULTVALUE{'cvsroot'} = $cvstreedefault; |
$DEFAULTVALUE{'cvsroot'} = $cvstreedefault; |
| |
|
| foreach (keys %DEFAULTVALUE) |
foreach (keys %DEFAULTVALUE) { |
| { |
|
| # replace not given parameters with the default parameters |
# replace not given parameters with the default parameters |
| if (!defined($input{$_}) || $input{$_} eq "") { |
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 |
# Empty Checkboxes in forms return -- nothing. So we define a helper |
| # parameters with a checkbox |
# variable in these forms (copt) which indicates that we just set |
| if (!defined($input{"copt"})) { |
# parameters with a checkbox |
| # 'copt' isn't defined --> empty input is not the result |
if (!defined($input{"copt"})) { |
| # of empty input checkbox --> set default |
|
| $input{$_} = $DEFAULTVALUE{$_} if (defined($DEFAULTVALUE{$_})); |
# '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")); |
| |
} |
| } |
} |
| 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 = ""; |
$barequery = ""; |
| my @barequery; |
my @barequery; |
| foreach (@stickyvars) { |
foreach (@stickyvars) { |
| # construct a query string with the sticky non default parameters set |
|
| if (defined($input{$_}) && $input{$_} ne '' && |
# construct a query string with the sticky non default parameters set |
| !(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) { |
if (defined($input{$_}) && $input{$_} ne '' |
| push @barequery, join('=', urlencode($_), urlencode($input{$_})); |
&& !(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) |
| } |
{ |
| |
push @barequery, |
| |
join ('=', urlencode($_), urlencode($input{$_})); |
| |
} |
| } |
} |
| |
|
| # is there any query ? |
# is there any query ? |
| if (@barequery) { |
if (@barequery) { |
| $barequery = join('&', @barequery); |
$barequery = join ('&', @barequery); |
| $query = "?$barequery"; |
$query = "?$barequery"; |
| $barequery = "&$barequery"; |
$barequery = "&$barequery"; |
| |
} else { |
| |
$query = ""; |
| } |
} |
| else { |
|
| $query = ""; |
|
| } |
|
| undef @barequery; |
undef @barequery; |
| |
|
| if (defined($input{path})) { |
if (defined($input{path})) { |
| redirect("$scriptname/$input{path}$query"); |
redirect("$scriptname/$input{path}$query"); |
| } |
} |
| |
|
| # get actual parameters |
# get actual parameters |
| $sortby = $input{"sortby"}; |
$sortby = $input{"sortby"}; |
| $bydate = 0; |
$bydate = 0; |
| $byrev = 0; |
$byrev = 0; |
| $byauthor = 0; |
$byauthor = 0; |
| $bylog = 0; |
$bylog = 0; |
| $byfile = 0; |
$byfile = 0; |
| if ($sortby eq "date") { |
if ($sortby eq "date") { |
| $bydate = 1; |
$bydate = 1; |
| |
} elsif ($sortby eq "rev") { |
| |
$byrev = 1; |
| |
} elsif ($sortby eq "author") { |
| |
$byauthor = 1; |
| |
} elsif ($sortby eq "log") { |
| |
$bylog = 1; |
| |
} else { |
| |
$byfile = 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'}; |
$defaultDiffType = $input{'f'}; |
| |
|
| Line 411 my @tmp = @CVSrepositories; |
|
| Line 414 my @tmp = @CVSrepositories; |
|
| my @pair; |
my @pair; |
| |
|
| while (@pair = splice(@tmp, 0, 2)) { |
while (@pair = splice(@tmp, 0, 2)) { |
| my($key, $val) = @pair; |
my ($key, $val) = @pair; |
| my($descr, $cvsroot) = @$val; |
my ($descr, $cvsroot) = @$val; |
| |
|
| next if !-d $cvsroot; |
next if !-d $cvsroot; |
| |
|
| $CVSROOTdescr{$key} = $descr; |
$CVSROOTdescr{$key} = $descr; |
| $CVSROOT{$key} = $cvsroot; |
$CVSROOT{$key} = $cvsroot; |
| push @CVSROOT, $key; |
push @CVSROOT, $key; |
| } |
} |
| undef @tmp; |
undef @tmp; |
| undef @pair; |
undef @pair; |
| |
|
| ## Default CVS-Tree |
## Default CVS-Tree |
| if (!defined($CVSROOT{$cvstreedefault})) { |
if (!defined($CVSROOT{$cvstreedefault})) { |
| &fatal("500 Internal Error", |
&fatal("500 Internal Error", |
| "<code>\$cvstreedefault</code> points to a repository " |
"<code>\$cvstreedefault</code> points to a repository ($cvstreedefault) " |
| . "not defined in <code>%CVSROOT</code> " |
. "not defined in <code>%CVSROOT</code> " |
| . "(edit your configuration file $config)"); |
. "(edit your configuration file $config)"); |
| } |
} |
| |
|
| # alternate CVS-Tree, configured in cvsweb.conf |
# alternate CVS-Tree, configured in cvsweb.conf |
| if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) { |
if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) { |
| $cvstree = $input{'cvsroot'}; |
$cvstree = $input{'cvsroot'}; |
| } else { |
} else { |
| $cvstree = $cvstreedefault; |
$cvstree = $cvstreedefault; |
| } |
} |
| |
|
| $cvsroot = $CVSROOT{$cvstree}; |
$cvsroot = $CVSROOT{$cvstree}; |
| Line 443 $cvsroot = $CVSROOT{$cvstree}; |
|
| Line 446 $cvsroot = $CVSROOT{$cvstree}; |
|
| # create icons out of description |
# create icons out of description |
| my $k; |
my $k; |
| foreach $k (keys %ICONS) { |
foreach $k (keys %ICONS) { |
| no strict 'refs'; |
no strict 'refs'; |
| my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; |
my ($itxt, $ipath, $iwidth, $iheight) = @{$ICONS{$k}}; |
| if ($ipath) { |
if ($ipath) { |
| ${"${k}icon"} = sprintf('<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">', |
${"${k}icon"} = |
| hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight) |
sprintf( |
| } |
'<IMG SRC="%s" ALT="%s" BORDER="0" WIDTH="%d" HEIGHT="%d">', |
| else { |
hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight) |
| ${"${k}icon"} = $itxt; |
} else { |
| } |
${"${k}icon"} = $itxt; |
| |
} |
| } |
} |
| undef $k; |
undef $k; |
| |
|
| Line 459 my $config_cvstree = "$config-$cvstree"; |
|
| Line 463 my $config_cvstree = "$config-$cvstree"; |
|
| |
|
| # Do some special configuration for cvstrees |
# Do some special configuration for cvstrees |
| if (-f $config_cvstree) { |
if (-f $config_cvstree) { |
| require $config_cvstree |
require $config_cvstree || &fatal( |
| || &fatal("500 Internal Error", |
"500 Internal Error", |
| sprintf('Error in loading configuration file: %s<BR><BR>%s<BR>', |
sprintf( |
| $config_cvstree, &htmlify($@))); |
'Error in loading configuration file: %s<BR><BR>%s<BR>', |
| |
$config_cvstree, |
| |
&htmlify($@) |
| |
) |
| |
); |
| } |
} |
| undef $config_cvstree; |
undef $config_cvstree; |
| |
|
| $re_prcategories = '(?:' . join('|', @prcategories) . ')' if @prcategories; |
$re_prcategories = '(?:' . join ('|', @prcategories) . ')' if @prcategories; |
| $re_prkeyword = quotemeta($prkeyword) if defined($prkeyword); |
$re_prkeyword = quotemeta($prkeyword) if defined($prkeyword); |
| $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; |
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/; |
| |
|
| $fullname = "$cvsroot/$where"; |
$fullname = "$cvsroot/$where"; |
| $mimetype = &getMimeTypeFromSuffix ($fullname); |
$mimetype = &getMimeTypeFromSuffix($fullname); |
| $defaultTextPlain = ($mimetype eq "text/plain"); |
$defaultTextPlain = ($mimetype eq "text/plain"); |
| $defaultViewable = $allow_markup && viewable($mimetype); |
$defaultViewable = $allow_markup && viewable($mimetype); |
| |
|
| my $rewrite = 0; |
my $rewrite = 0; |
| |
|
| if ($pathinfo =~ m|//|) { |
if ($pathinfo =~ m|//|) { |
| $pathinfo =~ y|/|/|s; |
$pathinfo =~ y|/|/|s; |
| $rewrite = 1; |
$rewrite = 1; |
| } |
} |
| |
|
| if (-d $fullname && $pathinfo !~ m|/$|) { |
if (-d $fullname && $pathinfo !~ m|/$|) { |
| $pathinfo .= '/'; |
$pathinfo .= '/'; |
| $rewrite = 1; |
$rewrite = 1; |
| } |
} |
| |
|
| if (!-d $fullname && $pathinfo =~ m|/$|) { |
if (!-d $fullname && $pathinfo =~ m|/$|) { |
| chop $pathinfo; |
chop $pathinfo; |
| $rewrite = 1; |
$rewrite = 1; |
| } |
} |
| |
|
| if ($rewrite) { |
if ($rewrite) { |
| redirect($scriptname . urlencode($pathinfo) . $query); |
redirect($scriptname . urlencode($pathinfo) . $query); |
| } |
} |
| |
|
| undef $rewrite; |
undef $rewrite; |
| |
|
| if (!-d $cvsroot) { |
if (!-d $cvsroot) { |
| &fatal("500 Internal Error",'$CVSROOT not found!<P>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!<P>The server on which the CVS tree lives is probably down. Please try again in a few minutes.' |
| |
); |
| } |
} |
| |
|
| # |
# |
| Line 508 if (!-d $cvsroot) { |
|
| Line 518 if (!-d $cvsroot) { |
|
| $where =~ m:([^/]*):; |
$where =~ m:([^/]*):; |
| $module = $1; |
$module = $1; |
| if ($module && &forbidden_module($module)) { |
if ($module && &forbidden_module($module)) { |
| &fatal("403 Forbidden", "Access to $where forbidden."); |
&fatal("403 Forbidden", "Access to $where forbidden."); |
| } |
} |
| |
|
| # |
# |
| # Handle tarball downloads before any headers are output. |
# Handle tarball downloads before any headers are output. |
| # |
# |
| if ($input{tarball}) { |
if ($input{tarball}) { |
| &fatal("403 Forbidden", "Downloading tarballs is prohibited.") |
&fatal("403 Forbidden", "Downloading tarballs is prohibited.") |
| unless $allow_tar; |
unless $allow_tar; |
| my($module) = ($where =~ m,^/?(.*),); # untaint |
my ($module) = ($where =~ m,^/?(.*),); # untaint |
| $module =~ s,/([^/]*)$,,; |
$module =~ s,/([^/]*)$,,; |
| my($ext) = ($1 =~ /(\.tar\.gz|\.zip)$/); |
my ($ext) = ($1 =~ /(\.tar\.gz|\.zip)$/); |
| my($basedir) = ($module =~ m,([^/]+)$,); |
my ($basedir) = ($module =~ m,([^/]+)$,); |
| |
|
| if ($basedir eq '' || $module eq '') { |
if ($basedir eq '' || $module eq '') { |
| &fatal("500 Internal Error", "You cannot download the top level directory."); |
&fatal("500 Internal Error", |
| } |
"You cannot download the top level directory."); |
| |
} |
| |
|
| my $tmpdir = "/tmp/.cvsweb.$$." . int(time); |
my $tmpdir = "/tmp/.cvsweb.$$." . int(time); |
| |
|
| mkdir($tmpdir, 0700) |
mkdir($tmpdir, 0700) |
| or &fatal("500 Internal Error", "Unable to make temporary directory: $!"); |
or &fatal("500 Internal Error", |
| |
"Unable to make temporary directory: $!"); |
| |
|
| my @fatal; |
my @fatal; |
| |
|
| my $tag = (exists $input{only_with_tag} && length $input{only_with_tag}) |
my $tag = |
| ? $input{only_with_tag} : "HEAD"; |
(exists $input{only_with_tag} && length $input{only_with_tag}) ? |
| |
$input{only_with_tag} : "HEAD"; |
| |
|
| if (system $CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', $tag, '-d', "$tmpdir/$basedir", $module) { |
if (system $CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', |
| @fatal = ("500 Internal Error", "cvs co failure: $!: $module"); |
$tag, '-d', "$tmpdir/$basedir", $module) |
| } else { |
{ |
| $| = 1; # Essential to get the buffering right. |
@fatal = ("500 Internal Error", "cvs co failure: $!: $module"); |
| |
} else { |
| |
$| = 1; # Essential to get the buffering right. |
| |
|
| if ($ext eq '.tar.gz') { |
if ($ext eq '.tar.gz') { |
| print "Content-type: application/x-gzip\r\n\r\n"; |
print "Content-type: application/x-gzip\r\n\r\n"; |
| |
|
| system "$CMD{tar} @tar_options -cf - -C $tmpdir $basedir | $CMD{gzip} @gzip_options -c" |
system |
| and @fatal = ("500 Internal Error", "tar zc failure: $!: $basedir"); |
"$CMD{tar} @tar_options -cf - -C $tmpdir $basedir | $CMD{gzip} @gzip_options -c" |
| } elsif ($ext eq '.zip' && $CMD{zip}) { |
and @fatal = |
| print "Content-type: application/zip\r\n\r\n"; |
("500 Internal Error", |
| |
"tar zc failure: $!: $basedir"); |
| |
} elsif ($ext eq '.zip' && $CMD{zip}) { |
| |
print "Content-type: application/zip\r\n\r\n"; |
| |
|
| system "cd $tmpdir && $CMD{zip} @zip_options -r - $basedir" |
system |
| and @fatal = ("500 Internal Error", "zip failure: $!: $basedir"); |
"cd $tmpdir && $CMD{zip} @zip_options -r - $basedir" |
| } else { |
and @fatal = |
| @fatal = ("500 Internal Error", "unsupported file type"); |
("500 Internal Error", "zip failure: $!: $basedir"); |
| |
} else { |
| |
@fatal = |
| |
("500 Internal Error", "unsupported file type"); |
| |
} |
| } |
} |
| } |
|
| |
|
| system $CMD{rm}, '-rf', $tmpdir if -d $tmpdir; |
system $CMD{rm}, '-rf', $tmpdir if -d $tmpdir; |
| |
|
| &fatal(@fatal) if @fatal; |
&fatal(@fatal) if @fatal; |
| |
|
| exit; |
exit; |
| } |
} |
| |
|
| ############################## |
############################## |
| # View a directory |
# View a directory |
| ############################### |
############################### |
| if (-d $fullname) { |
if (-d $fullname) { |
| my $dh = do {local(*DH);}; |
my $dh = do { local (*DH); }; |
| opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!"); |
opendir($dh, $fullname) || &fatal("404 Not Found", "$where: $!"); |
| my @dir = readdir($dh); |
my @dir = readdir($dh); |
| closedir($dh); |
closedir($dh); |
| my @subLevelFiles = findLastModifiedSubdirs(@dir) |
my @subLevelFiles = findLastModifiedSubdirs(@dir) |
| if ($show_subdir_lastmod); |
if ($show_subdir_lastmod); |
| getDirLogs($cvsroot,$where,@subLevelFiles); |
getDirLogs($cvsroot, $where, @subLevelFiles); |
| |
|
| if ($where eq '/') { |
if ($where eq '/') { |
| html_header($defaulttitle); |
html_header($defaulttitle); |
| $long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g; |
$long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g; |
| print $long_intro; |
print $long_intro; |
| |
} else { |
| |
html_header($where); |
| |
print $short_instruction; |
| } |
} |
| else { |
|
| html_header($where); |
|
| print $short_instruction; |
|
| } |
|
| |
|
| my $descriptions; |
my $descriptions; |
| if (($use_descriptions) && open (DESC, "<$cvsroot/CVSROOT/descriptions")) { |
if (($use_descriptions) && open(DESC, "<$cvsroot/CVSROOT/descriptions")) |
| while (<DESC>) { |
{ |
| chomp; |
while (<DESC>) { |
| my ($dir,$description) = /(\S+)\s+(.*)/; |
chomp; |
| $descriptions{$dir} = $description; |
my ($dir, $description) = /(\S+)\s+(.*)/; |
| } |
$descriptions{$dir} = $description; |
| |
} |
| } |
} |
| |
|
| print "<P><a name=\"dirlist\"></a>\n"; |
print "<P><a name=\"dirlist\"></a>\n"; |
| |
|
| # give direct access to dirs |
# give direct access to dirs |
| if ($where eq '/') { |
if ($where eq '/') { |
| chooseMirror(); |
chooseMirror (); |
| chooseCVSRoot(); |
chooseCVSRoot (); |
| } |
} else { |
| else { |
print "<p>Current directory: <b>", &clickablePath($where, 0), |
| print "<p>Current directory: <b>", &clickablePath($where,0), "</b>\n"; |
"</b>\n"; |
| |
|
| print "<P>Current tag: <B>", $input{only_with_tag}, "</b>\n" if |
print "<P>Current tag: <B>", $input{only_with_tag}, "</b>\n" |
| $input{only_with_tag}; |
if $input{only_with_tag}; |
| |
|
| } |
} |
| |
|
| |
|
| print "<HR NOSHADE>\n"; |
print "<HR NOSHADE>\n"; |
| |
|
| # Using <MENU> in this manner violates the HTML2.0 spec but |
# Using <MENU> in this manner violates the HTML2.0 spec but |
| # provides the results that I want in most browsers. Another |
# provides the results that I want in most browsers. Another |
| # case of layout spooging up HTML. |
# case of layout spooging up HTML. |
| |
|
| my $infocols = 0; |
my $infocols = 0; |
| if ($dirtable) { |
if ($dirtable) { |
| if (defined($tableBorderColor)) { |
if (defined($tableBorderColor)) { |
| # Can't this be done by defining the border for the inner table? |
|
| print "<table border=0 cellpadding=0 width=\"100%\"><tr><td bgcolor=\"$tableBorderColor\">"; |
# Can't this be done by defining the border for the inner table? |
| } |
print |
| print "<table width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n"; |
"<table border=0 cellpadding=0 width=\"100%\"><tr><td bgcolor=\"$tableBorderColor\">"; |
| $infocols++; |
|
| printf '<tr><th align=left bgcolor="%s">', |
|
| $byfile ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
|
| if ($byfile) { |
|
| print 'File'; |
|
| } else { |
|
| print &link('File', sprintf('./%s#dirlist', |
|
| &toggleQuery("sortby", "file"))); |
|
| } |
|
| print "</th>"; |
|
| # do not display the other column-headers, if we do not have any files |
|
| # with revision information: |
|
| if (scalar(%fileinfo)) { |
|
| $infocols++; |
|
| printf '<th align=left bgcolor="%s">', |
|
| $byrev ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
|
| if ($byrev) { |
|
| print 'Rev.'; |
|
| } else { |
|
| print &link('Rev.', sprintf('./%s#dirlist', |
|
| &toggleQuery("sortby", "rev"))); |
|
| } |
} |
| print "</th>"; |
print |
| |
"<table width=\"100%\" border=0 cellspacing=1 cellpadding=$tablepadding>\n"; |
| $infocols++; |
$infocols++; |
| printf '<th align=left bgcolor="%s">', |
printf '<tr><th align=left bgcolor="%s">', |
| $bydate ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
$byfile ? $columnHeaderColorSorted : |
| if ($bydate) { |
$columnHeaderColorDefault; |
| print 'Age'; |
|
| |
if ($byfile) { |
| |
print 'File'; |
| } else { |
} else { |
| print &link('Age', sprintf('./%s#dirlist', |
print &link( |
| &toggleQuery("sortby", "date"))); |
'File', |
| |
sprintf( |
| |
'./%s#dirlist', |
| |
&toggleQuery("sortby", "file") |
| |
) |
| |
); |
| } |
} |
| print "</th>"; |
print "</th>"; |
| if ($show_author) { |
|
| $infocols++; |
# do not display the other column-headers, if we do not have any files |
| printf '<th align=left bgcolor="%s">', |
# with revision information: |
| $byauthor ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
if (scalar(%fileinfo)) { |
| if ($byauthor) { |
$infocols++; |
| print 'Author'; |
printf '<th align=left bgcolor="%s">', |
| } else { |
$byrev ? $columnHeaderColorSorted : |
| print &link('Author', sprintf('./%s#dirlist', |
$columnHeaderColorDefault; |
| &toggleQuery("sortby", "author"))); |
|
| } |
if ($byrev) { |
| print "</th>"; |
print 'Rev.'; |
| |
} else { |
| |
print &link( |
| |
'Rev.', |
| |
sprintf( |
| |
'./%s#dirlist', |
| |
&toggleQuery("sortby", "rev") |
| |
) |
| |
); |
| |
} |
| |
print "</th>"; |
| |
$infocols++; |
| |
printf '<th align=left bgcolor="%s">', |
| |
$bydate ? $columnHeaderColorSorted : |
| |
$columnHeaderColorDefault; |
| |
|
| |
if ($bydate) { |
| |
print 'Age'; |
| |
} else { |
| |
print &link( |
| |
'Age', |
| |
sprintf( |
| |
'./%s#dirlist', |
| |
&toggleQuery("sortby", "date") |
| |
) |
| |
); |
| |
} |
| |
print "</th>"; |
| |
|
| |
if ($show_author) { |
| |
$infocols++; |
| |
printf '<th align=left bgcolor="%s">', |
| |
$byauthor ? $columnHeaderColorSorted : |
| |
$columnHeaderColorDefault; |
| |
|
| |
if ($byauthor) { |
| |
print 'Author'; |
| |
} else { |
| |
print &link( |
| |
'Author', |
| |
sprintf( |
| |
'./%s#dirlist', |
| |
&toggleQuery( |
| |
"sortby", |
| |
"author" |
| |
) |
| |
) |
| |
); |
| |
} |
| |
print "</th>"; |
| |
} |
| |
$infocols++; |
| |
printf '<th align=left bgcolor="%s">', |
| |
$bylog ? $columnHeaderColorSorted : |
| |
$columnHeaderColorDefault; |
| |
|
| |
if ($bylog) { |
| |
print 'Last log entry'; |
| |
} else { |
| |
print &link( |
| |
'Last log entry', |
| |
sprintf( |
| |
'./%s#dirlist', |
| |
&toggleQuery("sortby", "log") |
| |
) |
| |
); |
| |
} |
| |
print "</th>"; |
| |
} elsif ($use_descriptions) { |
| |
printf '<th align=left bgcolor="%s">', |
| |
$columnHeaderColorDefault; |
| |
print "Description"; |
| |
$infocols++; |
| } |
} |
| $infocols++; |
print "</tr>\n"; |
| printf '<th align=left bgcolor="%s">', |
} else { |
| $bylog ? $columnHeaderColorSorted : $columnHeaderColorDefault; |
print "<menu>\n"; |
| if ($bylog) { |
|
| print 'Last log entry'; |
|
| } else { |
|
| print &link('Last log entry', sprintf('./%s#dirlist', |
|
| &toggleQuery("sortby", "log"))); |
|
| } |
|
| print "</th>"; |
|
| } |
|
| elsif ($use_descriptions) { |
|
| printf '<th align=left bgcolor="%s">', $columnHeaderColorDefault; |
|
| print "Description"; |
|
| $infocols++; |
|
| } |
|
| print "</tr>\n"; |
|
| } |
} |
| else { |
|
| print "<menu>\n"; |
|
| } |
|
| my $dirrow = 0; |
my $dirrow = 0; |
| |
|
| my $i; |
my $i; |
| lookingforattic: |
lookingforattic: |
| for ($i = 0; $i <= $#dir; $i++) { |
for ($i = 0 ; $i <= $#dir ; $i++) { |
| if ($dir[$i] eq "Attic") { |
if ($dir[$i] eq "Attic") { |
| last lookingforattic; |
last lookingforattic; |
| } |
} |
| } |
} |
| if (!$input{'hideattic'} && ($i <= $#dir) && |
|
| opendir($dh, $fullname . "/Attic")) { |
if (!$input{'hideattic'} && ($i <= $#dir) |
| splice(@dir, $i, 1, |
&& opendir($dh, $fullname . "/Attic")) |
| grep((s|^|Attic/|,!m|/\.|), readdir($dh))); |
{ |
| closedir($dh); |
splice(@dir, $i, 1, grep((s|^|Attic/|, !m|/\.|), readdir($dh))); |
| |
closedir($dh); |
| } |
} |
| |
|
| my $hideAtticToggleLink = $input{'hideattic'} ? '' : |
my $hideAtticToggleLink = |
| &link('[Hide]', sprintf('./%s#dirlist', |
$input{'hideattic'} ? '' : |
| &toggleQuery ("hideattic"))); |
&link('[Hide]', sprintf('./%s#dirlist', &toggleQuery("hideattic"))); |
| |
|
| # Sort without the Attic/ pathname. |
# Sort without the Attic/ pathname. |
| # place directories first |
# place directories first |
| Line 717 if (-d $fullname) { |
|
| Line 782 if (-d $fullname) { |
|
| my $filesfound; |
my $filesfound; |
| |
|
| foreach (sort { &fileSortCmp } @dir) { |
foreach (sort { &fileSortCmp } @dir) { |
| if ($_ eq '.') { |
if ($_ eq '.') { |
| next; |
next; |
| } |
} |
| # ignore CVS lock and stale NFS files |
|
| next if (/^#cvs\.|^,|^\.nfs/); |
|
| |
|
| # Check whether to show the CVSROOT path |
# ignore CVS lock and stale NFS files |
| next if ($input{'hidecvsroot'} && ($_ eq 'CVSROOT')); |
next if (/^#cvs\.|^,|^\.nfs/); |
| |
|
| # Check whether the module is in the restricted list |
# Check whether to show the CVSROOT path |
| next if ($_ && &forbidden_module($_)); |
next if ($input{'hidecvsroot'} && ($_ eq 'CVSROOT')); |
| |
|
| # Ignore non-readable files |
# Check whether the module is in the restricted list |
| next if ($input{'hidenonreadable'} && !(-r "$fullname/$_")); |
next if ($_ && &forbidden_module($_)); |
| |
|
| if (s|^Attic/||) { |
# Ignore non-readable files |
| $attic = " (in the Attic) " . $hideAtticToggleLink; |
next if ($input{'hidenonreadable'} && !(-r "$fullname/$_")); |
| } |
|
| else { |
|
| $attic = ""; |
|
| } |
|
| |
|
| if ($_ eq '..' || -d "$fullname/$_") { |
if (s|^Attic/||) { |
| next if ($_ eq '..' && $where eq '/'); |
$attic = " (in the Attic) " . $hideAtticToggleLink; |
| my ($rev,$date,$log,$author,$filename); |
} else { |
| ($rev,$date,$log,$author,$filename) = @{$fileinfo{$_}} |
$attic = ""; |
| if (defined($fileinfo{$_})); |
|
| printf '<tr bgcolor="%s"><td>', $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"; |
if ($_ eq '..' || -d "$fullname/$_") { |
| print "<A NAME=\"$_\"></A>"; |
next if ($_ eq '..' && $where eq '/'); |
| if ($nofilelinks) { |
my ($rev, $date, $log, $author, $filename); |
| print $diricon; |
($rev, $date, $log, $author, $filename) = |
| } |
@{$fileinfo{$_}} |
| else { |
if (defined($fileinfo{$_})); |
| print &link($diricon, $url); |
printf '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] |
| } |
if $dirtable; |
| print " ", &link("$_/", $url), $attic; |
|
| if ($_ eq "Attic") { |
if ($_ eq '..') { |
| print " "; |
$url = "../$query"; |
| print &link("[Don't hide]", sprintf('./%s#dirlist', |
if ($nofilelinks) { |
| &toggleQuery ("hideattic"))); |
print $backicon; |
| } |
} else { |
| } |
print &link($backicon, $url); |
| # Show last change in dir |
} |
| if ($filename) { |
print " ", &link("Parent Directory", $url); |
| print "</td><td> </td><td> " if ($dirtable); |
} else { |
| if ($date) { |
$url = './' . urlencode($_) . "/$query"; |
| print " <i>", readableTime(time() - $date,0), "</i>"; |
print "<A NAME=\"$_\"></A>"; |
| } |
|
| if ($show_author) { |
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 "</td><td> </td><td> " |
| |
if ($dirtable); |
| |
if ($date) { |
| |
print " <i>", |
| |
readableTime(time() - $date, 0), |
| |
"</i>"; |
| |
} |
| |
|
| |
if ($show_author) { |
| |
print "</td><td> " if ($dirtable); |
| |
print $author; |
| |
} |
| |
print "</td><td> " if ($dirtable); |
| |
$filename =~ s%^[^/]+/%%; |
| |
print "$filename/$rev"; |
| |
print "<BR>" if ($dirtable); |
| |
|
| |
if ($log) { |
| |
print " <font size=-1>", &htmlify( |
| |
substr($log, 0, $shortLogLen)); |
| |
if (length $log > 80) { |
| |
print "..."; |
| |
} |
| |
print "</font>"; |
| |
} |
| |
} else { |
| |
my ($dwhere) = |
| |
($where ne "/" ? $where : "") . $_; |
| |
|
| |
if ($use_descriptions |
| |
&& defined $descriptions{$dwhere}) |
| |
{ |
| |
print "<TD COLSPAN=", ($infocols - 1), |
| |
"> " |
| |
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 "</td><td> "; |
| |
$cols--; |
| |
} |
| |
} |
| |
} |
| |
|
| |
if ($dirtable) { |
| |
print "</td></tr>\n"; |
| |
} else { |
| |
print "<br>\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 '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] |
| |
if $dirtable; |
| |
print "<A NAME=\"$_\"></A>"; |
| |
|
| |
if ($nofilelinks) { |
| |
print $fileicon; |
| |
} else { |
| |
print &link($fileicon, $url); |
| |
} |
| |
print " ", &link($_, $url), $attic; |
| print "</td><td> " if ($dirtable); |
print "</td><td> " if ($dirtable); |
| print $author; |
download_link($fileurl, $rev, $rev, |
| } |
$defaultViewable ? "text/x-cvsweb-markup" : |
| print "</td><td> " if ($dirtable); |
undef); |
| $filename =~ s%^[^/]+/%%; |
print "</td><td> " if ($dirtable); |
| print "$filename/$rev"; |
|
| print "<BR>" if ($dirtable); |
if ($date) { |
| if ($log) { |
print " <i>", readableTime(time() - $date, 0), |
| print " <font size=-1>", |
"</i>"; |
| &htmlify(substr($log,0,$shortLogLen)); |
|
| if (length $log > 80) { |
|
| print "..."; |
|
| } |
} |
| print "</font>"; |
if ($show_author) { |
| } |
print "</td><td> " if ($dirtable); |
| } |
print $author; |
| else { |
|
| my ($dwhere) = ($where ne "/" ? $where : "") . $_; |
|
| if ($use_descriptions && defined $descriptions{$dwhere}) { |
|
| print "<TD COLSPAN=", ($infocols-1), "> " 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 "</td><td> "; |
|
| $cols--; |
|
| } |
} |
| } |
print "</td><td> " if ($dirtable); |
| |
|
| |
if ($log) { |
| |
print " <font size=-1>", |
| |
&htmlify(substr($log, 0, $shortLogLen)); |
| |
if (length $log > 80) { |
| |
print "..."; |
| |
} |
| |
print "</font>"; |
| |
} |
| |
print "</td>" if ($dirtable); |
| |
print(($dirtable) ? "</tr>" : "<br>"); |
| |
$dirrow++; |
| } |
} |
| if ($dirtable) { |
print "\n"; |
| print "</td></tr>\n"; |
|
| } |
|
| else { |
|
| print "<br>\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 '<tr bgcolor="%s"><td>', $tabcolors[$dirrow % 2] if $dirtable; |
|
| print "<A NAME=\"$_\"></A>"; |
|
| if ($nofilelinks) { |
|
| print $fileicon; |
|
| } |
|
| else { |
|
| print &link($fileicon,$url); |
|
| } |
|
| print " ", &link($_, $url), $attic; |
|
| print "</td><td> " if ($dirtable); |
|
| download_link($fileurl, |
|
| $rev, $rev, |
|
| $defaultViewable ? "text/x-cvsweb-markup" : undef); |
|
| print "</td><td> " if ($dirtable); |
|
| if ($date) { |
|
| print " <i>", readableTime(time() - $date,0), "</i>"; |
|
| } |
|
| if ($show_author) { |
|
| print "</td><td> " if ($dirtable); |
|
| print $author; |
|
| } |
|
| print "</td><td> " if ($dirtable); |
|
| if ($log) { |
|
| print " <font size=-1>", &htmlify(substr($log,0,$shortLogLen)); |
|
| if (length $log > 80) { |
|
| print "..."; |
|
| } |
|
| print "</font>"; |
|
| } |
|
| print "</td>" if ($dirtable); |
|
| print (($dirtable) ? "</tr>" : "<br>"); |
|
| $dirrow++; |
|
| } |
|
| print "\n"; |
|
| } |
} |
| |
|
| if ($dirtable && defined($tableBorderColor)) { |
if ($dirtable && defined($tableBorderColor)) { |
| print "</td></tr></table>"; |
print "</td></tr></table>"; |
| } |
} |
| print( $dirtable == 1 ? "</table>\n" : "</menu>\n" ); |
print($dirtable == 1 ? "</table>\n" : "</menu>\n"); |
| |
|
| if ($filesexists && !$filesfound) { |
if ($filesexists && !$filesfound) { |
| print "<P><B>NOTE:</B> There are $filesexists files, but none matches the current tag ($input{only_with_tag})\n"; |
print |
| |
"<P><B>NOTE:</B> 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}})) { |
if ($input{only_with_tag} && (!%tags || !$tags{$input{only_with_tag}})) |
| %tags = %alltags |
{ |
| |
%tags = %alltags |
| } |
} |
| if (scalar %tags |
|
| || $input{only_with_tag} |
if (scalar %tags || $input{only_with_tag} || $edit_option_form |
| || $edit_option_form |
|| defined($input{"options"})) |
| || defined($input{"options"})) { |
{ |
| print "<hr size=1 NOSHADE>"; |
print "<hr size=1 NOSHADE>"; |
| } |
} |
| |
|
| if (scalar %tags || $input{only_with_tag}) { |
if (scalar %tags || $input{only_with_tag}) { |
| print "<FORM METHOD=\"GET\" ACTION=\"./\">\n"; |
print "<FORM METHOD=\"GET\" ACTION=\"./\">\n"; |
| foreach my $var (@stickyvars) { |
foreach my $var (@stickyvars) { |
| print "<INPUT TYPE=HIDDEN NAME=\"$var\" VALUE=\"$input{$var}\">\n" |
print |
| if (defined($input{$var}) |
"<INPUT TYPE=HIDDEN NAME=\"$var\" VALUE=\"$input{$var}\">\n" |
| && (!defined($DEFAULTVALUE{$var}) |
if (defined($input{$var}) |
| |
&& (!defined($DEFAULTVALUE{$var}) |
| || $input{$var} ne $DEFAULTVALUE{$var}) |
|| $input{$var} ne $DEFAULTVALUE{$var}) |
| && $input{$var} ne "" |
&& $input{$var} ne "" && $var ne "only_with_tag"); |
| && $var ne "only_with_tag"); |
} |
| } |
print "Show only files with tag:\n"; |
| print "Show only files with tag:\n"; |
print "<SELECT NAME=only_with_tag"; |
| print "<SELECT NAME=only_with_tag"; |
print " onchange=\"submit()\"" if ($use_java_script); |
| print " onchange=\"submit()\"" if ($use_java_script); |
print ">"; |
| print ">"; |
print "<OPTION VALUE=\"\">All tags / default branch\n"; |
| print "<OPTION VALUE=\"\">All tags / default branch\n"; |
|
| foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) { |
foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) { |
| print "<OPTION",defined($input{only_with_tag}) && |
print "<OPTION", |
| $input{only_with_tag} eq $tag ? " SELECTED" : "", |
defined($input{only_with_tag}) |
| ">$tag\n"; |
&& $input{only_with_tag} eq $tag ? " SELECTED" : "", |
| } |
">$tag\n"; |
| print "</SELECT>\n"; |
} |
| print " Module path or alias:\n"; |
print "</SELECT>\n"; |
| printf "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"%s\" SIZE=15>\n", htmlquote($where); |
print " Module path or alias:\n"; |
| print "<INPUT TYPE=SUBMIT VALUE=\"Go\">\n"; |
printf "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"%s\" SIZE=15>\n", |
| print "</FORM>\n"; |
htmlquote($where); |
| |
print "<INPUT TYPE=SUBMIT VALUE=\"Go\">\n"; |
| |
print "</FORM>\n"; |
| } |
} |
| |
|
| if ($allow_tar) { |
if ($allow_tar) { |
| my($basefile) = ($where =~ m,(?:.*/)?([^/]+),); |
my ($basefile) = ($where =~ m,(?:.*/)?([^/]+),); |
| |
|
| if (defined($basefile) && $basefile ne '') { |
if (defined($basefile) && $basefile ne '') { |
| print "<HR NOSHADE>\n", |
print "<HR NOSHADE>\n", |
| "<DIV align=center>Download this directory in "; |
"<DIV align=center>Download this directory in "; |
| # Mangle the filename so browsers show a reasonable |
|
| # filename to download. |
# Mangle the filename so browsers show a reasonable |
| print &link("tarball", |
# filename to download. |
| "./$basefile.tar.gz$query". |
print &link("tarball", "./$basefile.tar.gz$query" |
| ($query ? "&" : "?")."tarball=1"); |
. ($query ? "&" : "?") . "tarball=1"); |
| if ($CMD{zip}) { |
if ($CMD{zip}) { |
| print " or ", |
print " or ", |
| &link("zip archive", |
&link("zip archive", "./$basefile.zip$query" |
| "./$basefile.zip$query". |
. ($query ? "&" : "?") . "tarball=1"); |
| ($query ? "&" : "?")."tarball=1"); |
} |
| |
print "</DIV>"; |
| } |
} |
| print "</DIV>"; |
|
| } |
|
| } |
} |
| |
|
| my $formwhere = $scriptwhere; |
my $formwhere = $scriptwhere; |
| $formwhere =~ s|Attic/?$|| if ($input{'hideattic'}); |
$formwhere =~ s|Attic/?$|| if ($input{'hideattic'}); |
| |
|
| if ($edit_option_form || defined($input{"options"})) { |
if ($edit_option_form || defined($input{"options"})) { |
| print "<FORM METHOD=\"GET\" ACTION=\"${formwhere}\">\n"; |
print "<FORM METHOD=\"GET\" ACTION=\"${formwhere}\">\n"; |
| print "<INPUT TYPE=HIDDEN NAME=\"copt\" VALUE=\"1\">\n"; |
print "<INPUT TYPE=HIDDEN NAME=\"copt\" VALUE=\"1\">\n"; |
| if ($cvstree ne $cvstreedefault) { |
if ($cvstree ne $cvstreedefault) { |
| print "<INPUT TYPE=HIDDEN NAME=\"cvsroot\" VALUE=\"$cvstree\">\n"; |
print |
| } |
"<INPUT TYPE=HIDDEN NAME=\"cvsroot\" VALUE=\"$cvstree\">\n"; |
| print "<center><table cellpadding=0 cellspacing=0>"; |
} |
| print "<tr bgcolor=\"$columnHeaderColorDefault\"><th colspan=2>Preferences</th></tr>"; |
print "<center><table cellpadding=0 cellspacing=0>"; |
| print "<tr><td>Sort files by <SELECT name=\"sortby\">"; |
print |
| print "<OPTION VALUE=\"\">File"; |
"<tr bgcolor=\"$columnHeaderColorDefault\"><th colspan=2>Preferences</th></tr>"; |
| print "<OPTION",$bydate ? " SELECTED" : ""," VALUE=date>Age"; |
print "<tr><td>Sort files by <SELECT name=\"sortby\">"; |
| print "<OPTION",$byauthor ? " SELECTED" : ""," VALUE=author>Author" |
print "<OPTION VALUE=\"\">File"; |
| if ($show_author); |
print "<OPTION", $bydate ? " SELECTED" : "", " VALUE=date>Age"; |
| print "<OPTION",$byrev ? " SELECTED" : ""," VALUE=rev>Revision"; |
print "<OPTION", $byauthor ? " SELECTED" : "", |
| print "<OPTION",$bylog ? " SELECTED" : ""," VALUE=log>Log message"; |
" VALUE=author>Author" |
| print "</SELECT></td>"; |
if ($show_author); |
| print "<td>Sort log by: "; |
print "<OPTION", $byrev ? " SELECTED" : "", |
| printLogSortSelect(0); |
" VALUE=rev>Revision"; |
| print "</td></tr>"; |
print "<OPTION", $bylog ? " SELECTED" : "", |
| print "<tr><td>Diff format: "; |
" VALUE=log>Log message"; |
| printDiffSelect(0); |
print "</SELECT></td>"; |
| print "</td>"; |
print "<td>Sort log by: "; |
| print "<td>Show Attic files: "; |
printLogSortSelect(0); |
| print "<INPUT NAME=hideattic TYPE=CHECKBOX", $input{'hideattic'} ? " CHECKED" : "", |
print "</td></tr>"; |
| "></td></tr>\n"; |
print "<tr><td>Diff format: "; |
| print "<tr><td align=center colspan=2><input type=submit value=\"Change Options\">"; |
printDiffSelect(0); |
| print "</td></tr></table></center></FORM>\n"; |
print "</td>"; |
| |
print "<td>Show Attic files: "; |
| |
print "<INPUT NAME=hideattic TYPE=CHECKBOX", |
| |
$input{'hideattic'} ? " CHECKED" : "", "></td></tr>\n"; |
| |
print |
| |
"<tr><td align=center colspan=2><input type=submit value=\"Change Options\">"; |
| |
print "</td></tr></table></center></FORM>\n"; |
| } |
} |
| print &html_footer; |
print &html_footer; |
| print "</BODY></HTML>\n"; |
print "</BODY></HTML>\n"; |
| } |
} |
| |
|
| ############################### |
############################### |
| # View Files |
# View Files |
| ############################### |
############################### |
| elsif (-f $fullname . ',v') { |
elsif (-f $fullname . ',v') { |
| if (defined($input{'rev'}) || $doCheckout) { |
if (defined($input{'rev'}) || $doCheckout) { |
| &doCheckout($fullname, $input{'rev'}); |
&doCheckout($fullname, $input{'rev'}); |
| gzipclose(); |
gzipclose(); |
| exit; |
exit; |
| } |
} |
| |
|
| if (defined($input{'annotate'}) && $allow_annotate) { |
if (defined($input{'annotate'}) && $allow_annotate) { |
| &doAnnotate($input{'annotate'}); |
&doAnnotate($input{'annotate'}); |
| gzipclose(); |
gzipclose(); |
| exit; |
exit; |
| } |
} |
| |
|
| if (defined($input{'r1'}) && defined($input{'r2'})) { |
if (defined($input{'r1'}) && defined($input{'r2'})) { |
| &doDiff($fullname, $input{'r1'}, $input{'tr1'}, |
&doDiff( |
| $input{'r2'}, $input{'tr2'}, $input{'f'}); |
$fullname, $input{'r1'}, |
| gzipclose(); |
$input{'tr1'}, $input{'r2'}, |
| exit; |
$input{'tr2'}, $input{'f'} |
| |
); |
| |
gzipclose(); |
| |
exit; |
| } |
} |
| print("going to dolog($fullname)\n") if ($verbose); |
print("going to dolog($fullname)\n") if ($verbose); |
| &doLog($fullname); |
&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 |
# $where-diff-removal if 'cvs rdiff' is used |
| # .. but 'cvs rdiff'doesn't support some options |
# .. but 'cvs rdiff'doesn't support some options |
| # rcsdiff does (-w and -p), so it is disabled |
# rcsdiff does (-w and -p), so it is disabled |
| Line 1002 if (-d $fullname) { |
|
| Line 1108 if (-d $fullname) { |
|
| # so that browsers that default to the URL |
# so that browsers that default to the URL |
| # for a save filename don't save diff's as |
# for a save filename don't save diff's as |
| # e.g. foo.c |
# e.g. foo.c |
| &doDiff($fullname, $input{'r1'}, $input{'tr1'}, |
&doDiff( |
| $input{'r2'}, $input{'tr2'}, $input{'f'}); |
$fullname, $input{'r1'}, $input{'tr1'}, $input{'r2'}, |
| |
$input{'tr2'}, $input{'f'} |
| |
); |
| gzipclose(); |
gzipclose(); |
| exit; |
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. |
# The file has been removed and is in the Attic. |
| # Send a redirect pointing to the file in the Attic. |
# Send a redirect pointing to the file in the Attic. |
| (my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|; |
(my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|; |
| redirect("$newplace$query"); |
redirect("$newplace$query"); |
| exit; |
exit; |
| } |
} elsif (0 && (my @files = &safeglob($fullname . ",v"))) { |
| elsif (0 && (my @files = &safeglob($fullname . ",v"))) { |
|
| http_header("text/plain"); |
http_header("text/plain"); |
| print "You matched the following files:\n"; |
print "You matched the following files:\n"; |
| print join("\n", @files); |
print join ("\n", @files); |
| |
|
| # Find the tags from each file |
# Find the tags from each file |
| # Display a form offering diffs between said tags |
# Display a form offering diffs between said tags |
| } |
} else { |
| else { |
my $fh = do { local (*FH); }; |
| my $fh = do {local(*FH);}; |
|
| my ($xtra, $module); |
my ($xtra, $module); |
| |
|
| # Assume it's a module name with a potential path following it. |
# Assume it's a module name with a potential path following it. |
| $xtra = (($module = $where) =~ s|/.*||) ? $& : ''; |
$xtra = (($module = $where) =~ s|/.*||) ? $& : ''; |
| |
|
| # Is there an indexed version of modules? |
# Is there an indexed version of modules? |
| if (open($fh, "< $cvsroot/CVSROOT/modules")) { |
if (open($fh, "< $cvsroot/CVSROOT/modules")) { |
| while (<$fh>) { |
while (<$fh>) { |
| if (/^(\S+)\s+(\S+)/o && $module eq $1 |
if (/^(\S+)\s+(\S+)/o && $module eq $1 |
| && -d "$cvsroot/$2" && $module ne $2) { |
&& -d "$cvsroot/$2" && $module ne $2) |
| redirect("$scriptname/$2$xtra$query"); |
{ |
| |
redirect("$scriptname/$2$xtra$query"); |
| |
} |
| } |
} |
| } |
|
| } |
} |
| &fatal("404 Not Found","$where: no such file or directory"); |
&fatal("404 Not Found", "$where: no such file or directory"); |
| } |
} |
| |
|
| gzipclose(); |
gzipclose(); |
| |
|
| ## End MAIN |
## End MAIN |
| |
|
| sub printDiffSelect($) { |
sub printDiffSelect($) { |
| my ($use_java_script) = @_; |
my ($use_java_script) = @_; |
| my $f = $input{'f'}; |
my $f = $input{'f'}; |
| |
|
| print '<SELECT NAME="f"'; |
print '<SELECT NAME="f"'; |
| print ' onchange="submit()"' if $use_java_script; |
print ' onchange="submit()"' if $use_java_script; |
| print '>'; |
print '>'; |
| |
|
| local $_; |
local $_; |
| for (@DIFFTYPES) { |
for (@DIFFTYPES) { |
| printf('<OPTION VALUE="%s"%s>%s', |
printf('<OPTION VALUE="%s"%s>%s', $_, |
| $_, |
$f eq $_ ? ' SELECTED' : '', "\u$DIFFTYPES{$_}{'descr'}"); |
| $f eq $_ ? ' SELECTED' : '', |
} |
| "\u$DIFFTYPES{$_}{'descr'}" |
|
| ); |
|
| } |
|
| |
|
| print "</SELECT>"; |
print "</SELECT>"; |
| } |
} |
| |
|
| sub printLogSortSelect($) { |
sub printLogSortSelect($) { |
| my ($use_java_script) = @_; |
my ($use_java_script) = @_; |
| |
|
| print '<SELECT NAME="logsort"'; |
print '<SELECT NAME="logsort"'; |
| print ' onchange="submit()"' if $use_java_script; |
print ' onchange="submit()"' if $use_java_script; |
| print '>'; |
print '>'; |
| |
|
| local $_; |
local $_; |
| for (@LOGSORTKEYS) { |
for (@LOGSORTKEYS) { |
| printf('<OPTION VALUE="%s"%s>%s', |
printf('<OPTION VALUE="%s"%s>%s', $_, |
| $_, |
$logsort eq $_ ? ' SELECTED' : '', |
| $logsort eq $_ ? ' SELECTED' : '', |
"\u$LOGSORTKEYS{$_}{'descr'}"); |
| "\u$LOGSORTKEYS{$_}{'descr'}" |
} |
| ); |
|
| } |
|
| |
|
| print "</SELECT>"; |
print "</SELECT>"; |
| } |
} |
| |
|
| sub findLastModifiedSubdirs(@) { |
sub findLastModifiedSubdirs(@) { |
| my (@dirs) = @_; |
my (@dirs) = @_; |
| my ($dirname, @files); |
my ($dirname, @files); |
| |
|
| foreach $dirname (@dirs) { |
foreach $dirname (@dirs) { |
| next if ($dirname eq "."); |
next if ($dirname eq "."); |
| next if ($dirname eq ".."); |
next if ($dirname eq ".."); |
| my ($dir) = "$fullname/$dirname"; |
my ($dir) = "$fullname/$dirname"; |
| next if (!-d $dir); |
next if (!-d $dir); |
| |
|
| my ($lastmod) = undef; |
my ($lastmod) = undef; |
| my ($lastmodtime) = undef; |
my ($lastmodtime) = undef; |
| my $dh = do {local(*DH);}; |
my $dh = do { local (*DH); }; |
| |
|
| opendir($dh,$dir) || next; |
opendir($dh, $dir) || next; |
| my (@filenames) = readdir($dh); |
my (@filenames) = readdir($dh); |
| closedir($dh); |
closedir($dh); |
| |
|
| foreach my $filename (@filenames) { |
foreach my $filename (@filenames) { |
| $filename = "$dirname/$filename"; |
$filename = "$dirname/$filename"; |
| my ($file) = "$fullname/$filename"; |
my ($file) = "$fullname/$filename"; |
| next if ($filename !~ /,v$/ || !-f $file); |
next if ($filename !~ /,v$/ || !-f $file); |
| $filename =~ s/,v$//; |
$filename =~ s/,v$//; |
| my $modtime = -M $file; |
my $modtime = -M $file; |
| if (!defined($lastmod) || $modtime < $lastmodtime) { |
|
| $lastmod = $filename; |
if (!defined($lastmod) || $modtime < $lastmodtime) { |
| $lastmodtime = $modtime; |
$lastmod = $filename; |
| } |
$lastmodtime = $modtime; |
| |
} |
| |
} |
| |
push (@files, $lastmod) if (defined($lastmod)); |
| } |
} |
| push(@files, $lastmod) if (defined($lastmod)); |
return @files; |
| } |
|
| return @files; |
|
| } |
} |
| |
|
| sub htmlify_sub(&$) { |
sub htmlify_sub(&$) { |
| (my $proc, local $_) = @_; |
(my $proc, local $_) = @_; |
| my @a = split(m`(<a [^>]+>[^<]*</a>)`i); |
my @a = split (m`(<a [^>]+>[^<]*</a>)`i); |
| my $linked; |
my $linked; |
| my $result = ''; |
my $result = ''; |
| |
|
| while (($_, $linked) = splice(@a, 0, 2)) { |
while (($_, $linked) = splice(@a, 0, 2)) { |
| &$proc(); |
&$proc(); |
| $result .= $_ if defined($_); |
$result .= $_ if defined($_); |
| $result .= $linked if defined($linked); |
$result .= $linked if defined($linked); |
| } |
} |
| |
|
| $result; |
$result; |
| } |
} |
| |
|
| sub htmlify($;$) { |
sub htmlify($;$) { |
| (local $_, my $extra) = @_; |
(local $_, my $extra) = @_; |
| |
|
| $_ = htmlquote($_); |
$_ = htmlquote($_); |
| |
|
| # get URL's as link |
# get URL's as link |
| s{ |
s{ |
| (http|ftp|https)://\S+ |
(http|ftp|https)://\S+ |
| }{ |
}{ |
| &link($&, htmlunquote($&)) |
&link($&, htmlunquote($&)) |
| }egx; |
}egx; |
| |
|
| # get e-mails as link |
# get e-mails as link |
| $_ = htmlify_sub { |
$_ = htmlify_sub { |
| s< |
s< |
| [\w+=\-.!]+@[\w\-]+(\.[\w\-]+)+ |
[\w+=\-.!]+@[\w\-]+(\.[\w\-]+)+ |
| >< |
>< |
| &link($&, "mailto:$&") |
&link($&, "mailto:$&") |
| >egix; |
>egix; |
| } $_; |
} |
| |
$_; |
| |
|
| if ($extra) { |
if ($extra) { |
| # get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn" |
|
| if (defined($prcgi) && defined($re_prcategories) && defined($re_prkeyword)) { |
|
| my $prev; |
|
| |
|
| do { |
# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn" |
| $prev = $_; |
if (defined($prcgi) && defined($re_prcategories) |
| |
&& defined($re_prkeyword)) |
| |
{ |
| |
my $prev; |
| |
|
| $_ = htmlify_sub { |
do { |
| s{ |
$prev = $_; |
| |
|
| |
$_ = htmlify_sub { |
| |
s{ |
| (\b$re_prkeyword[:\#]?\s* |
(\b$re_prkeyword[:\#]?\s* |
| (?: |
(?: |
| \#? |
\#? |
| Line 1171 sub htmlify($;$) { |
|
| Line 1282 sub htmlify($;$) { |
|
| }{ |
}{ |
| $1 . &link($2, sprintf($prcgi, $2)) |
$1 . &link($2, sprintf($prcgi, $2)) |
| }egix; |
}egix; |
| } $_; |
} |
| } while ($_ ne $prev); |
$_; |
| |
} while ($_ ne $prev); |
| |
|
| $_ = htmlify_sub { |
$_ = htmlify_sub { |
| s{ |
s{ |
| (\b$re_prcategories/(\d+)\b) |
(\b$re_prcategories/(\d+)\b) |
| }{ |
}{ |
| &link($1, sprintf($prcgi, $2)) |
&link($1, sprintf($prcgi, $2)) |
| }egox; |
}egox; |
| } $_; |
} |
| } |
$_; |
| |
} |
| |
|
| # get manpage specs as link: "foo.1" "foo(1)" |
# get manpage specs as link: "foo.1" "foo(1)" |
| if (defined($mancgi)) { |
if (defined($mancgi)) { |
| $_ = htmlify_sub { |
$_ = htmlify_sub { |
| s{ |
s{ |
| (\b([a-zA-Z][\w.]+) |
(\b([a-zA-Z][\w.]+) |
| (?: |
(?: |
| \( ([0-9n]) \)\B |
\( ([0-9n]) \)\B |
| Line 1197 sub htmlify($;$) { |
|
| Line 1310 sub htmlify($;$) { |
|
| }{ |
}{ |
| &link($1, sprintf($mancgi, defined($3) ? $3 : $4, $2)) |
&link($1, sprintf($mancgi, defined($3) ? $3 : $4, $2)) |
| }egx; |
}egx; |
| } $_; |
} |
| |
$_; |
| |
} |
| } |
} |
| } |
|
| |
|
| $_; |
$_; |
| } |
} |
| |
|
| sub spacedHtmlText($;$) { |
sub spacedHtmlText($;$) { |
| Line 1211 sub spacedHtmlText($;$) { |
|
| Line 1325 sub spacedHtmlText($;$) { |
|
| # Cut trailing spaces and tabs |
# Cut trailing spaces and tabs |
| s/[ \t]+$//; |
s/[ \t]+$//; |
| |
|
| if (defined($ts)) { |
if (defined($ts)) { |
| # Expand tabs |
|
| 1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e |
# Expand tabs |
| |
1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e |
| } |
} |
| |
|
| # replace <tab> and <space> (\001 is to protect us from htmlify) |
# replace <tab> and <space> (\001 is to protect us from htmlify) |
| # gzip can make excellent use of this repeating pattern :-) |
# gzip can make excellent use of this repeating pattern :-) |
| if ($hr_breakable) { |
if ($hr_breakable) { |
| # make every other space 'breakable' |
|
| s/ / \001nbsp;/g; # 2 * <space> |
# make every other space 'breakable' |
| # leave single space as it is |
s/ / \001nbsp;/g; # 2 * <space> |
| |
# leave single space as it is |
| } else { |
} else { |
| s/ /\001nbsp;/g; |
s/ /\001nbsp;/g; |
| } |
} |
| |
|
| $_ = htmlify($_); |
$_ = htmlify($_); |
| Line 1235 sub spacedHtmlText($;$) { |
|
| Line 1351 sub spacedHtmlText($;$) { |
|
| } |
} |
| |
|
| sub link($$) { |
sub link($$) { |
| my($name, $url) = @_; |
my ($name, $url) = @_; |
| |
|
| $url =~ s/:/sprintf("%%%02x", ord($&))/eg if $url =~ /^[^a-z]/; # relative |
$url =~ s/:/sprintf("%%%02x", ord($&))/eg |
| |
if $url =~ /^[^a-z]/; # relative |
| |
|
| sprintf '<A HREF="%s">%s</A>', hrefquote($url), $name; |
sprintf '<A HREF="%s">%s</A>', hrefquote($url), $name; |
| } |
} |
| |
|
| sub revcmp($$) { |
sub revcmp($$) { |
| my($rev1, $rev2) = @_; |
my ($rev1, $rev2) = @_; |
| |
|
| # make no comparison for a tag or a branch |
# make no comparison for a tag or a branch |
| return 0 if $rev1 =~ /[^\d.]/ || $rev2 =~ /[^\d.]/; |
return 0 if $rev1 =~ /[^\d.]/ || $rev2 =~ /[^\d.]/; |
| |
|
| my(@r1) = split(/\./, $rev1); |
my (@r1) = split (/\./, $rev1); |
| my(@r2) = split(/\./, $rev2); |
my (@r2) = split (/\./, $rev2); |
| my($a,$b); |
my ($a, $b); |
| |
|
| while (($a = shift(@r1)) && ($b = shift(@r2))) { |
while (($a = shift (@r1)) && ($b = shift (@r2))) { |
| if ($a != $b) { |
if ($a != $b) { |
| return $a <=> $b; |
return $a <=> $b; |
| } |
} |
| } |
} |
| if (@r1) { return 1; } |
if (@r1) { return 1; } |
| if (@r2) { return -1; } |
if (@r2) { return -1; } |
| Line 1263 sub revcmp($$) { |
|
| Line 1380 sub revcmp($$) { |
|
| } |
} |
| |
|
| sub fatal($$) { |
sub fatal($$) { |
| my($errcode, $errmsg) = @_; |
my ($errcode, $errmsg) = @_; |
| if ($is_mod_perl) { |
if ($is_mod_perl) { |
| Apache->request->status((split(/ /, $errcode))[0]); |
Apache->request->status((split (/ /, $errcode))[0]); |
| } |
} else { |
| else { |
|
| print "Status: $errcode\r\n"; |
print "Status: $errcode\r\n"; |
| } |
} |
| html_header("Error"); |
html_header("Error"); |
| Line 1277 sub fatal($$) { |
|
| Line 1393 sub fatal($$) { |
|
| } |
} |
| |
|
| sub redirect($) { |
sub redirect($) { |
| my($url) = @_; |
my ($url) = @_; |
| if ($is_mod_perl) { |
if ($is_mod_perl) { |
| Apache->request->status(301); |
Apache->request->status(301); |
| Apache->request->header_out(Location => $url); |
Apache->request->header_out(Location => $url); |
| } |
} else { |
| else { |
|
| print "Status: 301 Moved\r\n"; |
print "Status: 301 Moved\r\n"; |
| print "Location: $url\r\n"; |
print "Location: $url\r\n"; |
| } |
} |
| Line 1296 sub safeglob($) { |
|
| Line 1411 sub safeglob($) { |
|
| my ($filename) = @_; |
my ($filename) = @_; |
| my ($dirname); |
my ($dirname); |
| my (@results); |
my (@results); |
| my $dh = do {local(*DH);}; |
my $dh = do { local (*DH); }; |
| |
|
| ($dirname = $filename) =~ s|/[^/]+$||; |
($dirname = $filename) =~ s|/[^/]+$||; |
| $filename =~ s|.*/||; |
$filename =~ s|.*/||; |
| Line 1304 sub safeglob($) { |
|
| Line 1419 sub safeglob($) { |
|
| if (opendir($dh, $dirname)) { |
if (opendir($dh, $dirname)) { |
| my $glob = $filename; |
my $glob = $filename; |
| my $t; |
my $t; |
| # transform filename from glob to regex. Deal with: |
|
| # [, {, ?, * as glob chars |
# transform filename from glob to regex. Deal with: |
| # make sure to escape all other regex chars |
# [, {, ?, * as glob chars |
| |
# make sure to escape all other regex chars |
| $glob =~ s/([\.\(\)\|\+])/\\$1/g; |
$glob =~ s/([\.\(\)\|\+])/\\$1/g; |
| $glob =~ s/\*/.*/g; |
$glob =~ s/\*/.*/g; |
| $glob =~ s/\?/./g; |
$glob =~ s/\?/./g; |
| $glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg; |
$glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg; |
| foreach (readdir($dh)) { |
foreach (readdir($dh)) { |
| |
|
| if (/^${glob}$/) { |
if (/^${glob}$/) { |
| push(@results, "$dirname/" .$_); |
push (@results, "$dirname/" . $_); |
| } |
} |
| } |
} |
| closedir($dh); |
closedir($dh); |
| } |
} |
| |
|
| @results; |
@results; |
| } |
} |
| |
|
| sub search_path($) { |
sub search_path($) { |
| my($command) = @_; |
my ($command) = @_; |
| my $d; |
my $d; |
| |
|
| for $d (split(/:/, $command_path)) { |
for $d (split (/:/, $command_path)) { |
| return "$d/$command" if -x "$d/$command"; |
return "$d/$command" if -x "$d/$command"; |
| } |
} |
| |
|
| ''; |
''; |
| } |
} |
| |
|
| sub getMimeTypeFromSuffix($) { |
sub getMimeTypeFromSuffix($) { |
| my ($fullname) = @_; |
my ($fullname) = @_; |
| my ($mimetype, $suffix); |
my ($mimetype, $suffix); |
| my $fh = do {local(*FH);}; |
my $fh = do { local (*FH); }; |
| |
|
| ($suffix = $fullname) =~ s/^.*\.([^.]*)$/$1/; |
($suffix = $fullname) =~ s/^.*\.([^.]*)$/$1/; |
| $mimetype = $MTYPES{$suffix}; |
$mimetype = $MTYPES{$suffix}; |
| $mimetype = $MTYPES{'*'} if (!$mimetype); |
$mimetype = $MTYPES{'*'} if (!$mimetype); |
| |
|
| if (!$mimetype && -f $mime_types) { |
if (!$mimetype && -f $mime_types) { |
| # okey, this is something special - search the |
|
| # mime.types database |
# okey, this is something special - search the |
| open ($fh, "<$mime_types"); |
# mime.types database |
| while (<$fh>) { |
open($fh, "<$mime_types"); |
| if ($_ =~ /^\s*(\S+\/\S+).*\b$suffix\b/) { |
while (<$fh>) { |
| $mimetype = $1; |
if ($_ =~ /^\s*(\S+\/\S+).*\b$suffix\b/) { |
| last; |
$mimetype = $1; |
| } |
last; |
| |
} |
| |
} |
| |
close($fh); |
| } |
} |
| close ($fh); |
|
| } |
|
| |
|
| # okey, didn't find anything useful .. |
# okey, didn't find anything useful .. |
| if (!($mimetype =~ /\S\/\S/)) { |
if (!($mimetype =~ /\S\/\S/)) { |
| $mimetype = "text/plain"; |
$mimetype = "text/plain"; |
| } |
} |
| return $mimetype; |
return $mimetype; |
| } |
} |
| |
|
| ############################### |
############################### |
| # read first lines like head(1) |
# read first lines like head(1) |
| ############################### |
############################### |
| sub head($;$) { |
sub head($;$) { |
| my $fh = $_[0]; |
my $fh = $_[0]; |
| my $linecount = $_[1] || 10; |
my $linecount = $_[1] || 10; |
| |
|
| my @buf; |
my @buf; |
| |
|
| if ($linecount > 0) { |
if ($linecount > 0) { |
| my $i; |
my $i; |
| for ($i = 0; !eof($fh) && $i < $linecount; $i++) { |
for ($i = 0 ; !eof($fh) && $i < $linecount ; $i++) { |
| push @buf, scalar <$fh>; |
push @buf, scalar <$fh>; |
| |
} |
| |
} else { |
| |
@buf = <$fh>; |
| } |
} |
| } else { |
|
| @buf = <$fh>; |
|
| } |
|
| |
|
| @buf; |
@buf; |
| } |
} |
| |
|
| ############################### |
############################### |
| # scan vim and Emacs directives |
# scan vim and Emacs directives |
| ############################### |
############################### |
| sub scan_directives(@) { |
sub scan_directives(@) { |
| my $ts = undef; |
my $ts = undef; |
| |
|
| for (@_) { |
for (@_) { |
| $ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/; |
$ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/; |
| } |
} |
| |
|
| ('tabstop' => $ts); |
('tabstop' => $ts); |
| } |
} |
| |
|
| ############################### |
############################### |
| # show Annotation |
# show Annotation |
| ############################### |
############################### |
| sub doAnnotate($$) { |
sub doAnnotate($$) { |
| my ($rev) = @_; |
my ($rev) = @_; |
| my ($pid); |
my ($pid); |
| my ($pathname, $filename); |
my ($pathname, $filename); |
| my $reader = do {local(*FH);}; |
my $reader = do { local (*FH); }; |
| my $writer = do {local(*FH);}; |
my $writer = do { local (*FH); }; |
| |
|
| # make sure the revisions are wellformed, for security |
# make sure the revisions are wellformed, for security |
| # reasons .. |
# reasons .. |
| if ($rev =~ /[^\w.]/) { |
if ($rev =~ /[^\w.]/) { |
| &fatal("404 Not Found", |
&fatal("404 Not Found", |
| "Malformed query \"$ENV{QUERY_STRING}\""); |
"Malformed query \"$ENV{QUERY_STRING}\""); |
| } |
} |
| |
|
| ($pathname = $where) =~ s/(Attic\/)?[^\/]*$//; |
if (&forbidden_file($fullname)) { |
| ($filename = $where) =~ s/^.*\///; |
&fatal("403 Forbidden", |
| |
"Access forbidden. This file is mentioned in \@ForbiddenFiles" |
| |
); |
| |
return; |
| |
} |
| |
|
| # this seems to be necessary |
($pathname = $where) =~ s/(Attic\/)?[^\/]*$//; |
| $| = 1; $| = 0; # Flush |
($filename = $where) =~ s/^.*\///; |
| |
|
| # this annotate version is based on the |
# this seems to be necessary |
| # cvs annotate-demo Perl script by Cyclic Software |
$| = 1; |
| # It was written by Cyclic Software, http://www.cyclic.com/, and is in |
$| = 0; # Flush |
| # 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, $CMD{cvs}, @cvs_options, "server") |
|
| || fatal ("500 Internal Error", "Fatal Error - unable to open cvs for annotation"); |
|
| |
|
| # OK, first send the request to the server. A simplified example is: |
# this annotate version is based on the |
| # Root /home/kingdon/zwork/cvsroot |
# cvs annotate-demo Perl script by Cyclic Software |
| # Argument foo/xx |
# It was written by Cyclic Software, http://www.cyclic.com/, and is in |
| # Directory foo |
# the public domain. |
| # /home/kingdon/zwork/cvsroot/foo |
# we could abandon the use of rlog, rcsdiff and co using |
| # Directory . |
# the cvsserver in a similiar way one day (..after rewrite) |
| # /home/kingdon/zwork/cvsroot |
$pid = open2($reader, $writer, $CMD{cvs}, @cvs_options, "server") |
| # annotate |
|| fatal("500 Internal Error", |
| # although as you can see there are a few more details. |
"Fatal Error - unable to open cvs for annotation"); |
| |
|
| print $writer "Root $cvsroot\n"; |
# OK, first send the request to the server. A simplified example is: |
| print $writer "Valid-responses ok error Valid-requests Checked-in Updated Merged Removed M E\n"; |
# Root /home/kingdon/zwork/cvsroot |
| # Don't worry about sending valid-requests, the server just needs to |
# Argument foo/xx |
| # support "annotate" and if it doesn't, there isn't anything to be done. |
# Directory foo |
| print $writer "UseUnchanged\n"; |
# /home/kingdon/zwork/cvsroot/foo |
| print $writer "Argument -r\n"; |
# Directory . |
| print $writer "Argument $rev\n"; |
# /home/kingdon/zwork/cvsroot |
| print $writer "Argument $where\n"; |
# annotate |
| |
# although as you can see there are a few more details. |
| |
|
| # The protocol requires us to fully fake a working directory (at |
print $writer "Root $cvsroot\n"; |
| # least to the point of including the directories down to the one |
print $writer |
| # containing the file in question). |
"Valid-responses ok error Valid-requests Checked-in Updated Merged Removed M E\n"; |
| # So if $where is "dir/sdir/file", then @dirs will be ("dir","sdir","file") |
|
| my @dirs = split('/', $where); |
# Don't worry about sending valid-requests, the server just needs to |
| my $path = ""; |
# support "annotate" and if it doesn't, there isn't anything to be done. |
| foreach (@dirs) { |
print $writer "UseUnchanged\n"; |
| if ($path eq "") { |
print $writer "Argument -r\n"; |
| # In our example, $_ is "dir". |
print $writer "Argument $rev\n"; |
| $path = $_; |
print $writer "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 @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 .= "/$_"; |
| |
} |
| } |
} |
| else { |
|
| print $writer "Directory $path\n"; |
# And the last "Directory" before "annotate" is the top level. |
| print $writer "$cvsroot/$path\n"; |
print $writer "Directory .\n"; |
| # In our example, $_ is "sdir" and $path becomes "dir/sdir" |
print $writer "$cvsroot\n"; |
| # And the next time, "file" and "dir/sdir/file" (which then gets |
|
| # ignored, because we don't need to send Directory for the file). |
print $writer "annotate\n"; |
| $path .= "/$_"; |
|
| |
# 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: $!"; |
| |
|
| |
http_header(); |
| |
|
| |
navigateHeader($scriptwhere, $pathname, $filename, $rev, "annotate"); |
| |
print |
| |
"<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\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 "<table border=0 cellspacing=0 cellpadding=0>\n"; |
| |
} else { |
| |
print "<pre>"; |
| } |
} |
| } |
|
| # And the last "Directory" before "annotate" is the top level. |
|
| print $writer "Directory .\n"; |
|
| print $writer "$cvsroot\n"; |
|
| |
|
| print $writer "annotate\n"; |
# prefetch several lines |
| # OK, we've sent our command to the server. Thing to do is to |
my @buf = head($reader); |
| # 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: $!"; |
|
| |
|
| http_header(); |
my %d = scan_directives(@buf); |
| |
|
| navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate"); |
while (@buf || !eof($reader)) { |
| print "<h3 align=center>Annotation of $pathname$filename, Revision $rev</h3>\n"; |
$_ = @buf ? shift @buf : <$reader>; |
| |
|
| # Ready to get the responses from the server. |
my @words = split; |
| # 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 "<table border=0 cellspacing=0 cellpadding=0>\n"; |
|
| } |
|
| else { |
|
| print "<pre>"; |
|
| } |
|
| |
|
| # prefetch several lines |
# Adding one is for the (single) space which follows $words[0]. |
| my @buf = head($reader); |
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); |
| |
|
| my %d = scan_directives(@buf); |
# we should parse the date here .. |
| |
if ($lrev eq $oldLrev) { |
| |
$revprint = sprintf('%-8s', ''); |
| |
} else { |
| |
$revprint = sprintf('%-8s', $lrev); |
| |
$revprint =~ |
| |
s`\S+`&link($&, "$scriptwhere$query#rev$&")`e |
| |
; # ` |
| |
$oldLusr = ''; |
| |
} |
| |
|
| while (@buf || !eof($reader)) { |
if ($lusr eq $oldLusr) { |
| $_ = @buf ? shift @buf : <$reader>; |
$usrprint = ''; |
| |
} else { |
| |
$usrprint = $lusr; |
| |
} |
| |
$oldLrev = $lrev; |
| |
$oldLusr = $lusr; |
| |
|
| my @words = split; |
# Set bold for text-based browsers only - graphical |
| # Adding one is for the (single) space which follows $words[0]. |
# browsers show bold fonts a bit wider than regular fonts, |
| my $rest = substr ($_, length ($words[0]) + 1); |
# so it looks irregular. |
| if ($words[0] eq "E") { |
print "<b>" if ($isCurrentRev && $is_textbased); |
| 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+`&link($&, "$scriptwhere$query#rev$&")`e; # ` |
|
| $oldLusr = ''; |
|
| } |
|
| if ($lusr eq $oldLusr) { |
|
| $usrprint = ''; |
|
| } |
|
| else { |
|
| $usrprint = $lusr; |
|
| } |
|
| $oldLrev = $lrev; |
|
| $oldLusr = $lusr; |
|
| |
|
| # Set bold for text-based browsers only - graphical |
printf "%s%s %-8s %4d:", $revprint, |
| # browsers show bold fonts a bit wider than regular fonts, |
$isCurrentRev ? '!' : ' ', $usrprint, $lineNr; |
| # so it looks irregular. |
print spacedHtmlText($line, $d{'tabstop'}); |
| print "<b>" if ($isCurrentRev && $is_textbased); |
|
| |
|
| printf "%s%s %-8s %4d:", |
print "</b>" if ($isCurrentRev && $is_textbased); |
| $revprint, |
} elsif ($words[0] eq "ok") { |
| $isCurrentRev ? '!' : ' ', |
|
| $usrprint, |
|
| $lineNr; |
|
| print spacedHtmlText($line, $d{'tabstop'}); |
|
| |
|
| print "</b>" if ($isCurrentRev && $is_textbased); |
# 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: <b>$_</b>"); |
| |
} |
| } |
} |
| elsif ($words[0] eq "ok") { |
|
| # We could complain about any text received after this, like the |
if ($annTable) { |
| # CVS command line client. But for simplicity, we don't. |
print "</table>"; |
| |
} else { |
| |
print "</pre>"; |
| } |
} |
| elsif ($words[0] eq "error") { |
close($reader) || warn "cannot close: $!"; |
| fatal("500 Internal Error", "Error occured during annotate: <b>$_</b>"); |
wait; |
| } |
|
| } |
|
| if ($annTable) { |
|
| print "</table>"; |
|
| } |
|
| else { |
|
| print "</pre>"; |
|
| } |
|
| close ($reader) || warn "cannot close: $!"; |
|
| wait; |
|
| } |
} |
| |
|
| ############################### |
############################### |
| # make Checkout |
# make Checkout |
| ############################### |
############################### |
| sub doCheckout($$) { |
sub doCheckout($$) { |
| my ($fullname, $rev) = @_; |
my ($fullname, $rev) = @_; |
| my ($mimetype,$revopt); |
my ($mimetype, $revopt); |
| my $fh = do {local(*FH);}; |
my $fh = do { local (*FH); }; |
| |
|
| if ($rev eq 'HEAD' || $rev eq '.') { |
if ($rev eq 'HEAD' || $rev eq '.') { |
| $rev = undef; |
$rev = undef; |
| } |
} |
| |
|
| # make sure the revisions a wellformed, for security |
# make sure the revisions a wellformed, for security |
| # reasons .. |
# reasons .. |
| if (defined($rev) && $rev =~ /[^\w.]/) { |
if (defined($rev) && $rev =~ /[^\w.]/) { |
| &fatal("404 Not Found", |
&fatal("404 Not Found", |
| "Malformed query \"$ENV{QUERY_STRING}\""); |
"Malformed query \"$ENV{QUERY_STRING}\""); |
| } |
} |
| |
|
| # get mimetype |
if (&forbidden_file($fullname)) { |
| if (defined($input{"content-type"}) && ($input{"content-type"} =~ /\S\/\S/)) { |
&fatal("403 Forbidden", |
| $mimetype = $input{"content-type"} |
"Access forbidden. This file is mentioned in \@ForbiddenFiles" |
| } |
); |
| else { |
return; |
| $mimetype = &getMimeTypeFromSuffix($fullname); |
} |
| } |
|
| |
|
| if (defined($rev)) { |
# get mimetype |
| $revopt = "-r$rev"; |
if (defined($input{"content-type"}) |
| if ($use_moddate) { |
&& ($input{"content-type"} =~ /\S\/\S/)) |
| readLog($fullname,$rev); |
{ |
| $moddate=$date{$rev}; |
$mimetype = $input{"content-type"} |
| |
} else { |
| |
$mimetype = &getMimeTypeFromSuffix($fullname); |
| } |
} |
| } |
|
| else { |
if (defined($rev)) { |
| $revopt = "-rHEAD"; |
$revopt = "-r$rev"; |
| if ($use_moddate) { |
if ($use_moddate) { |
| readLog($fullname); |
readLog($fullname, $rev); |
| $moddate=$date{$symrev{HEAD}}; |
$moddate = $date{$rev}; |
| |
} |
| |
} else { |
| |
$revopt = "-rHEAD"; |
| |
|
| |
if ($use_moddate) { |
| |
readLog($fullname); |
| |
$moddate = $date{$symrev{HEAD}}; |
| |
} |
| } |
} |
| } |
|
| |
|
| ### just for the record: |
### just for the record: |
| ### 'cvs co' seems to have a bug regarding single checkout of |
### 'cvs co' seems to have a bug regarding single checkout of |
| ### directories/files having spaces in it; |
### directories/files having spaces in it; |
| ### this is an issue that should be resolved on cvs's side |
### this is an issue that should be resolved on cvs's side |
| # |
# |
| # Safely for a child process to read from. |
# Safely for a child process to read from. |
| if (! open($fh, "-|")) { # child |
if (!open($fh, "-|")) { # child |
| open(STDERR, ">&STDOUT"); # Redirect stderr to stdout |
# chdir to $tmpdir before to avoid non-readable cgi-bin directories |
| exec($CMD{cvs}, @cvs_options, '-d', $cvsroot, 'co', '-p', $revopt, $where); |
chdir($tmpdir); |
| } |
open(STDERR, ">&STDOUT"); # Redirect stderr to stdout |
| |
exec($CMD{cvs}, @cvs_options, '-d', $cvsroot, 'co', '-p', |
| |
$revopt, $where); |
| |
} |
| |
|
| if (eof($fh)) { |
if (eof($fh)) { |
| &fatal("404 Not Found", |
&fatal("404 Not Found", "$where is not (any longer) pertinent"); |
| "$where is not (any longer) pertinent"); |
} |
| } |
|
| #=================================================================== |
|
| #Checking out squid/src/ftp.c |
|
| #RCS: /usr/src/CVS/squid/src/ftp.c,v |
|
| #VERS: 1.1.1.28.6.2 |
|
| #*************** |
|
| |
|
| # Parse CVS header |
#=================================================================== |
| my ($revision, $filename, $cvsheader); |
#Checking out squid/src/ftp.c |
| $filename = ""; |
#RCS: /usr/src/CVS/squid/src/ftp.c,v |
| while(<$fh>) { |
#VERS: 1.1.1.28.6.2 |
| last if (/^\*\*\*\*/); |
#*************** |
| $revision = $1 if (/^VERS: (.*)$/); |
|
| if (/^Checking out (.*)$/) { |
# Parse CVS header |
| $filename = $1; |
my ($revision, $filename, $cvsheader); |
| $filename =~ s/^\.\/*//; |
$filename = ""; |
| |
while (<$fh>) { |
| |
last if (/^\*\*\*\*/); |
| |
$revision = $1 if (/^VERS: (.*)$/); |
| |
|
| |
if (/^Checking out (.*)$/) { |
| |
$filename = $1; |
| |
$filename =~ s/^\.\/*//; |
| |
} |
| |
$cvsheader .= $_; |
| } |
} |
| $cvsheader .= $_; |
|
| } |
|
| if ($filename ne $where) { |
|
| &fatal("500 Internal Error", |
|
| "Unexpected output from cvs co: $cvsheader"); |
|
| } |
|
| $| = 1; |
|
| |
|
| if ($mimetype eq "text/x-cvsweb-markup") { |
if ($filename ne $where) { |
| &cvswebMarkup($fh,$fullname,$revision); |
&fatal("500 Internal Error", |
| } |
"Unexpected output from cvs co: $cvsheader"); |
| else { |
} |
| http_header($mimetype); |
$| = 1; |
| print <$fh>; |
|
| } |
if ($mimetype eq "text/x-cvsweb-markup") { |
| close($fh); |
&cvswebMarkup($fh, $fullname, $revision); |
| |
} else { |
| |
http_header($mimetype); |
| |
print <$fh>; |
| |
} |
| |
close($fh); |
| } |
} |
| |
|
| sub cvswebMarkup($$$) { |
sub cvswebMarkup($$$) { |
| my ($filehandle,$fullname,$revision) = @_; |
my ($filehandle, $fullname, $revision) = @_; |
| my ($pathname, $filename); |
my ($pathname, $filename); |
| |
|
| ($pathname = $where) =~ s/(Attic\/)?[^\/]*$//; |
($pathname = $where) =~ s/(Attic\/)?[^\/]*$//; |
| ($filename = $where) =~ s/^.*\///; |
($filename = $where) =~ s/^.*\///; |
| my ($fileurl) = urlencode($filename); |
my ($fileurl) = urlencode($filename); |
| |
|
| http_header(); |
http_header(); |
| |
|
| navigateHeader($scriptwhere, $pathname, $filename, $revision, "view"); |
navigateHeader($scriptwhere, $pathname, $filename, $revision, "view"); |
| print "<HR noshade>"; |
print "<HR noshade>"; |
| print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">"; |
print "<table width=\"100%\"><tr><td bgcolor=\"$markupLogColor\">"; |
| print "File: ", &clickablePath($where, 1); |
print "File: ", &clickablePath($where, 1); |
| print " ("; |
|
| &download_link($fileurl, $revision, "download"); |
|
| print ")"; |
|
| if (!$defaultTextPlain) { |
|
| print " ("; |
print " ("; |
| &download_link($fileurl, $revision, "as text", |
&download_link($fileurl, $revision, "download"); |
| "text/plain"); |
|
| print ")"; |
print ")"; |
| } |
|
| print "<BR>\n"; |
|
| if ($show_log_in_markup) { |
|
| readLog($fullname); #,$revision); |
|
| printLog($revision,0); |
|
| } |
|
| else { |
|
| print "Version: <B>$revision</B><BR>\n"; |
|
| print "Tag: <B>", $input{only_with_tag}, "</b><br>\n" if |
|
| $input{only_with_tag}; |
|
| } |
|
| print "</td></tr></table>"; |
|
| my $url = download_url($fileurl, $revision, $mimetype); |
|
| print "<HR noshade>"; |
|
| if ($mimetype =~ /^image/) { |
|
| printf '<IMG SRC="%s"><BR>', hrefquote("$url$barequery"); |
|
| } |
|
| elsif ($mimetype =~ m%^application/pdf%) { |
|
| printf '<EMBED SRC="%s" WIDTH="100%"><BR>', hrefquote("$url$barequery"); |
|
| } |
|
| elsif ($preformat_in_markup) { |
|
| print "<PRE>"; |
|
| |
|
| # prefetch several lines |
if (!$defaultTextPlain) { |
| my @buf = head($filehandle); |
print " ("; |
| |
&download_link($fileurl, $revision, "as text", "text/plain"); |
| |
print ")"; |
| |
} |
| |
print "<BR>\n"; |
| |
|
| my %d = scan_directives(@buf); |
if ($show_log_in_markup) { |
| |
readLog($fullname); #,$revision); |
| |
printLog($revision, 0); |
| |
} else { |
| |
print "Version: <B>$revision</B><BR>\n"; |
| |
print "Tag: <B>", $input{only_with_tag}, "</b><br>\n" |
| |
if $input{only_with_tag}; |
| |
} |
| |
print "</td></tr></table>"; |
| |
my $url = download_url($fileurl, $revision, $mimetype); |
| |
print "<HR noshade>"; |
| |
|
| while (@buf || !eof($filehandle)) { |
if ($mimetype =~ /^image/) { |
| $_ = @buf ? shift @buf : <$filehandle>; |
printf '<IMG SRC="%s"><BR>', hrefquote("$url$barequery"); |
| |
} elsif ($mimetype =~ m%^application/pdf%) { |
| |
printf '<EMBED SRC="%s" WIDTH="100%"><BR>', |
| |
hrefquote("$url$barequery"); |
| |
} elsif ($preformat_in_markup) { |
| |
print "<PRE>"; |
| |
|
| print spacedHtmlText($_, $d{'tabstop'}); |
# prefetch several lines |
| |
my @buf = head($filehandle); |
| |
|
| |
my %d = scan_directives(@buf); |
| |
|
| |
while (@buf || !eof($filehandle)) { |
| |
$_ = @buf ? shift @buf : <$filehandle>; |
| |
|
| |
print spacedHtmlText($_, $d{'tabstop'}); |
| |
} |
| |
print "</PRE>"; |
| |
} else { |
| |
print "<PRE>"; |
| |
|
| |
while (<$filehandle>) { |
| |
print htmlquote($_); |
| |
} |
| |
print "</PRE>"; |
| } |
} |
| print "</PRE>"; |
|
| } |
|
| else { |
|
| print "<PRE>"; |
|
| while (<$filehandle>) { |
|
| print htmlquote($_); |
|
| } |
|
| print "</PRE>"; |
|
| } |
|
| } |
} |
| |
|
| sub viewable($) { |
sub viewable($) { |
| my ($mimetype) = @_; |
my ($mimetype) = @_; |
| |
|
| $mimetype =~ m%^((text|image)/|application/pdf)% ; |
$mimetype =~ m%^((text|image)/|application/pdf)%; |
| } |
} |
| |
|
| ############################### |
############################### |
| # Show Colored Diff |
# Show Colored Diff |
| ############################### |
############################### |
| sub doDiff($$$$$$) { |
sub doDiff($$$$$$) { |
| my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_; |
my ($fullname, $r1, $tr1, $r2, $tr2, $f) = @_; |
| my $fh = do {local(*FH);}; |
my $fh = do { local (*FH); }; |
| my ($rev1, $rev2, $sym1, $sym2, $f1, $f2); |
my ($rev1, $rev2, $sym1, $sym2, $f1, $f2); |
| |
|
| |
if (&forbidden_file($fullname)) { |
| |
&fatal("403 Forbidden", |
| |
"Access forbidden. This file is mentioned in \@ForbiddenFiles" |
| |
); |
| |
return; |
| |
} |
| |
|
| if ($r1 =~ /([^:]+)(:(.+))?/) { |
if ($r1 =~ /([^:]+)(:(.+))?/) { |
| $rev1 = $1; |
$rev1 = $1; |
| $sym1 = $3; |
$sym1 = $3; |
| } |
} |
| if ($r1 eq 'text') { |
if ($r1 eq 'text') { |
| $rev1 = $tr1; |
$rev1 = $tr1; |
| $sym1 = ""; |
$sym1 = ""; |
| } |
} |
| |
|
| if ($r2 =~ /([^:]+)(:(.+))?/) { |
if ($r2 =~ /([^:]+)(:(.+))?/) { |
| $rev2 = $1; |
$rev2 = $1; |
| $sym2 = $3; |
$sym2 = $3; |
| } |
} |
| if ($r2 eq 'text') { |
if ($r2 eq 'text') { |
| $rev2 = $tr2; |
$rev2 = $tr2; |
| $sym2 = ""; |
$sym2 = ""; |
| } |
} |
| |
|
| # make sure the revisions a wellformed, for security |
# make sure the revisions a wellformed, for security |
| # reasons .. |
# reasons .. |
| if ($rev1 =~ /[^\w.]/ || $rev2 =~ /[^\w.]/) { |
if ($rev1 =~ /[^\w.]/ || $rev2 =~ /[^\w.]/) { |
| &fatal("404 Not Found", |
&fatal("404 Not Found", |
| "Malformed query \"$ENV{QUERY_STRING}\""); |
"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. |
# rev1 and rev2 are now both numeric revisions. |
| # XXX should we warn about the fact that we do this? |
# Thus we do a DWIM here and swap them if rev1 is after rev2. |
| if (&revcmp($rev1,$rev2) > 0) { |
# XXX should we warn about the fact that we do this? |
| my ($tmp1, $tmp2) = ($rev1, $sym1); |
if (&revcmp($rev1, $rev2) > 0) { |
| ($rev1, $sym1) = ($rev2, $sym2); |
my ($tmp1, $tmp2) = ($rev1, $sym1); |
| ($rev2, $sym2) = ($tmp1, $tmp2); |
($rev1, $sym1) = ($rev2, $sym2); |
| |
($rev2, $sym2) = ($tmp1, $tmp2); |
| } |
} |
| my $difftype = $DIFFTYPES{$f}; |
my $difftype = $DIFFTYPES{$f}; |
| |
|
| if (!$difftype) { |
if (!$difftype) { |
| fatal ("400 Bad arguments", "Diff format $f not understood"); |
fatal("400 Bad arguments", "Diff format $f not understood"); |
| } |
} |
| |
|
| my @difftype = @{$difftype->{'opts'}}; |
my @difftype = @{$difftype->{'opts'}}; |
| Line 1782 sub doDiff($$$$$$) { |
|
| Line 1936 sub doDiff($$$$$$) { |
|
| |
|
| # apply special options |
# apply special options |
| if ($showfunc) { |
if ($showfunc) { |
| push @difftype, '-p' if $f ne 's'; |
push @difftype, '-p' if $f ne 's'; |
| |
|
| my($re1, $re2); |
my ($re1, $re2); |
| |
|
| while (($re1, $re2) = each %funcline_regexp) { |
while (($re1, $re2) = each %funcline_regexp) { |
| if ($fullname =~ /$re1/) { |
if ($fullname =~ /$re1/) { |
| push @difftype, '-F', $re2; |
push @difftype, '-F', $re2; |
| last; |
last; |
| |
} |
| } |
} |
| } |
|
| } |
} |
| |
|
| if ($human_readable) { |
if ($human_readable) { |
| if ($hr_ignwhite) { |
if ($hr_ignwhite) { |
| push @difftype, '-w'; |
push @difftype, '-w'; |
| } |
} |
| if ($hr_ignkeysubst) { |
if ($hr_ignkeysubst) { |
| push @difftype, '-kk'; |
push @difftype, '-kk'; |
| } |
} |
| } |
} |
| if (! open($fh, "-|")) { # child |
|
| open(STDERR, ">&STDOUT"); # Redirect stderr to stdout |
if (!open($fh, "-|")) { # child |
| exec($CMD{rcsdiff}, @difftype, "-r$rev1", "-r$rev2", $fullname); |
open(STDERR, ">&STDOUT"); # Redirect stderr to stdout |
| |
exec($CMD{rcsdiff}, @difftype, "-r$rev1", "-r$rev2", $fullname); |
| } |
} |
| if ($human_readable) { |
if ($human_readable) { |
| http_header(); |
http_header(); |
| &human_readable_diff($fh, $rev2); |
&human_readable_diff($fh, $rev2); |
| gzipclose(); |
gzipclose(); |
| exit; |
exit; |
| |
} else { |
| |
http_header("text/plain"); |
| } |
} |
| 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 = '---'; |
| } |
} |
| # |
|
| #=================================================================== |
|
| #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>) { |
while (<$fh>) { |
| if (m|^$f1 $cvsroot|o) { |
if (m|^$f1 $cvsroot|o) { |
| s|$cvsroot/||o; |
s|$cvsroot/||o; |
| if ($sym1) { |
if ($sym1) { |
| chop; |
chop; |
| $_ .= " $sym1\n"; |
$_ .= " $sym1\n"; |
| |
} |
| |
} elsif (m|^$f2 $cvsroot|o) { |
| |
s|$cvsroot/||o; |
| |
|
| |
if ($sym2) { |
| |
chop; |
| |
$_ .= " $sym2\n"; |
| |
} |
| } |
} |
| } |
print $_; |
| elsif (m|^$f2 $cvsroot|o) { |
|
| s|$cvsroot/||o; |
|
| if ($sym2) { |
|
| chop; |
|
| $_ .= " $sym2\n"; |
|
| } |
|
| } |
|
| print $_; |
|
| } |
} |
| close($fh); |
close($fh); |
| } |
} |
| Line 1863 sub doDiff($$$$$$) { |
|
| Line 2019 sub doDiff($$$$$$) { |
|
| # Show Logs .. |
# Show Logs .. |
| ############################### |
############################### |
| sub getDirLogs($$@) { |
sub getDirLogs($$@) { |
| my ($cvsroot,$dirname,@otherFiles) = @_; |
my ($cvsroot, $dirname, @otherFiles) = @_; |
| my ($state,$otherFiles,$tag, $file, $date, $branchpoint, $branch, $log); |
my ($state, $otherFiles, $tag, $file, $date, $branchpoint, $branch, |
| my ($rev, $revision, $revwanted, $filename, $head, $author); |
$log); |
| |
my ($rev, $revision, $revwanted, $filename, $head, $author); |
| |
|
| $tag = $input{only_with_tag}; |
$tag = $input{only_with_tag}; |
| |
|
| my ($DirName) = "$cvsroot/$where"; |
my ($DirName) = "$cvsroot/$where"; |
| my (@files, @filetags); |
my (@files, @filetags); |
| my $fh = do {local(*FH);}; |
my $fh = do { local (*FH); }; |
| |
|
| push(@files, &safeglob("$DirName/*,v")); |
push (@files, &safeglob("$DirName/*,v")); |
| push(@files, &safeglob("$DirName/Attic/*,v")) if (!$input{'hideattic'}); |
push (@files, &safeglob("$DirName/Attic/*,v")) |
| foreach $file (@otherFiles) { |
if (!$input{'hideattic'}); |
| push(@files, "$DirName/$file"); |
foreach $file (@otherFiles) { |
| } |
push (@files, "$DirName/$file"); |
| |
|
| # just execute rlog if there are any files |
|
| if ($#files < 0) { |
|
| return; |
|
| } |
|
| |
|
| if (defined($tag)) { |
|
| #can't use -r<tag> as - is allowed in tagnames, but misinterpreated by rlog.. |
|
| if (! open($fh, "-|")) { |
|
| open(STDERR, '>/dev/null'); # rlog may complain; ignore. |
|
| exec($CMD{rlog}, @files); |
|
| } |
} |
| } |
|
| else { |
|
| if (! open($fh, "-|")) { |
|
| open(STDERR, '>/dev/null'); # rlog may complain; ignore. |
|
| exec($CMD{rlog}, '-r', @files); |
|
| } |
|
| } |
|
| $state = "start"; |
|
| while (<$fh>) { |
|
| if ($state eq "start") { |
|
| #Next file. Initialize file variables |
|
| $rev = ''; |
|
| $revwanted = ''; |
|
| $branch = ''; |
|
| $branchpoint = ''; |
|
| $filename = ''; |
|
| $log = ''; |
|
| $revision = ''; |
|
| %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) |
|
| |
|
| if (/^Working file: (.+)$/) { |
# just execute rlog if there are any files |
| $filename = $1; |
if ($#files < 0) { |
| } elsif (/^head: (.+)$/) { |
return; |
| $head = $1; |
|
| } elsif (/^branch: (.+)$/) { |
|
| $branch = $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_REVSEPARATOR/o) { |
|
| $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 ($state eq "tags") { |
|
| if (/^\s+(.+):\s+([\d\.]+)\s+$/) { |
if (defined($tag)) { |
| push (@filetags, $1); |
|
| $symrev{$1} = $2; |
#can't use -r<tag> as - is allowed in tagnames, but misinterpreated by rlog.. |
| $alltags{$1} = 1; |
if (!open($fh, "-|")) { |
| next; |
open(STDERR, '>/dev/null'); # rlog may complain; ignore. |
| } elsif (/^\S/) { |
exec($CMD{rlog}, @files); |
| 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") { |
|
| print "Tag not found, skip this file" if ($verbose); |
|
| $state = "skip"; |
|
| next; |
|
| } |
|
| } |
} |
| foreach my $tagfound (@filetags) { |
} else { |
| $tags{$tagfound} = 1; |
|
| |
if (!open($fh, "-|")) { |
| |
open(STDERR, '>/dev/null'); # rlog may complain; ignore. |
| |
exec($CMD{rlog}, '-r', @files); |
| } |
} |
| $state = "head"; |
|
| goto again; |
|
| } |
|
| } |
} |
| if ($state eq "log") { |
$state = "start"; |
| if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) { |
|
| # End of a log entry. |
while (<$fh>) { |
| my $revbranch = $rev; |
if ($state eq "start") { |
| $revbranch =~ s/\.\d+$//; |
|
| print "$filename $rev Wanted: $revwanted ", |
#Next file. Initialize file variables |
| "Revbranch: $revbranch Branch: $branch ", |
$rev = ''; |
| "Branchpoint: $branchpoint\n" if ($verbose); |
$revwanted = ''; |
| if ($revwanted eq '' && $branch ne '' |
$branch = ''; |
| && $branch eq $revbranch || !defined($tag)) { |
$branchpoint = ''; |
| print "File revision $rev found for branch $branch\n" |
$filename = ''; |
| if ($verbose); |
$log = ''; |
| $revwanted = $rev; |
$revision = ''; |
| |
%symrev = (); |
| |
@filetags = (); |
| |
|
| |
#jump to head state |
| |
$state = "head"; |
| } |
} |
| if ($revwanted ne '' ? $rev eq $revwanted : |
print "$state:$_" if ($verbose); |
| $branchpoint ne '' ? $rev eq $branchpoint : |
again: |
| 0 && ($rev eq $head)) { # Don't think head is needed here.. |
|
| print "File info $rev found for $filename\n" if ($verbose); |
if ($state eq "head") { |
| my @finfo = ($rev,$date,$log,$author,$filename); |
|
| my ($name); |
#$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet) |
| ($name = $filename) =~ s%/.*%%; |
|
| $fileinfo{$name} = [ @finfo ]; |
if (/^Working file: (.+)$/) { |
| $state = "done" if ($rev eq $revwanted); |
$filename = $1; |
| |
} elsif (/^head: (.+)$/) { |
| |
$head = $1; |
| |
} elsif (/^branch: (.+)$/) { |
| |
$branch = $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_REVSEPARATOR/o) { |
| |
$state = "log"; |
| |
$rev = ''; |
| |
$date = ''; |
| |
$log = ''; |
| |
|
| |
# Try to reconstruct the relative filename if RCS spits out a full path |
| |
$filename =~ s%^\Q$DirName\E/%%; |
| |
} |
| |
next; |
| } |
} |
| $rev = ''; |
|
| $date = ''; |
if ($state eq "tags") { |
| $log = ''; |
if (/^\s+(.+):\s+([\d\.]+)\s+$/) { |
| } |
push (@filetags, $1); |
| elsif ($date eq '' && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|) { |
$symrev{$1} = $2; |
| my $yr = $1; |
$alltags{$1} = 1; |
| # damn 2-digit year routines :-) |
next; |
| if ($yr > 100) { |
} elsif (/^\S/) { |
| $yr -= 1900; |
|
| |
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") { |
| |
print |
| |
"Tag not found, skip this file" |
| |
if ($verbose); |
| |
$state = "skip"; |
| |
next; |
| |
} |
| |
} |
| |
|
| |
foreach my $tagfound (@filetags) { |
| |
$tags{$tagfound} = 1; |
| |
} |
| |
$state = "head"; |
| |
goto again; |
| |
} |
| } |
} |
| $date = &Time::Local::timegm($6,$5,$4,$3,$2 - 1,$yr); |
|
| ($author) = /author: ([^;]+)/; |
if ($state eq "log") { |
| $state = "log"; |
if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) { |
| $log = ''; |
|
| next; |
# End of a log entry. |
| } |
my $revbranch = $rev; |
| elsif ($rev eq '' && /^revision (.*)$/) { |
$revbranch =~ s/\.\d+$//; |
| $rev = $1; |
print "$filename $rev Wanted: $revwanted ", |
| next; |
"Revbranch: $revbranch Branch: $branch ", |
| } |
"Branchpoint: $branchpoint\n" |
| else { |
if ($verbose); |
| $log .= $_; |
|
| } |
if ($revwanted eq '' && $branch ne '' |
| |
&& $branch eq $revbranch || !defined($tag)) |
| |
{ |
| |
print |
| |
"File revision $rev found for branch $branch\n" |
| |
if ($verbose); |
| |
$revwanted = $rev; |
| |
} |
| |
|
| |
if ($revwanted ne '' ? $rev eq $revwanted : |
| |
$branchpoint ne '' ? $rev eq $branchpoint : |
| |
0 && ($rev eq $head)) |
| |
{ # Don't think head is needed here.. |
| |
print |
| |
"File info $rev found for $filename\n" |
| |
if ($verbose); |
| |
my @finfo = |
| |
($rev, $date, $log, $author, |
| |
$filename); |
| |
my ($name); |
| |
($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; |
| |
|
| |
# 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 ($rev eq '' && /^revision (.*)$/) { |
| |
$rev = $1; |
| |
next; |
| |
} else { |
| |
$log .= $_; |
| |
} |
| |
} |
| |
|
| |
if (/$LOG_FILESEPARATOR/o) { |
| |
$state = "start"; |
| |
next; |
| |
} |
| } |
} |
| if (/$LOG_FILESEPARATOR/o) { |
|
| $state = "start"; |
if ($. == 0) { |
| next; |
fatal("500 Internal Error", "Failed to spawn GNU rlog on <em>'" |
| |
. join (", ", @files) |
| |
. "'</em><p>Did you set the <b>\$command_path</b> in your configuration file correctly ? (Currently '$command_path'" |
| |
); |
| } |
} |
| } |
close($fh); |
| if ($. == 0) { |
|
| fatal("500 Internal Error", |
|
| "Failed to spawn GNU rlog on <em>'".join(", ", @files)."'</em><p>Did you set the <b>\$command_path</b> in your configuration file correctly ? (Currently '$command_path'"); |
|
| } |
|
| close($fh); |
|
| } |
} |
| |
|
| sub readLog($;$) { |
sub readLog($;$) { |
| my($fullname,$revision) = @_; |
my ($fullname, $revision) = @_; |
| my ($symnames, $head, $rev, $br, $brp, $branch, $branchrev); |
my ($symnames, $head, $rev, $br, $brp, $branch, $branchrev); |
| my $fh = do {local(*FH);}; |
my $fh = do { local (*FH); }; |
| |
|
| if (defined($revision)) { |
if (defined($revision)) { |
| $revision = "-r$revision"; |
$revision = "-r$revision"; |
| |
} else { |
| |
$revision = ""; |
| } |
} |
| else { |
|
| $revision = ""; |
|
| } |
|
| |
|
| undef %symrev; |
undef %symrev; |
| undef %revsym; |
undef %revsym; |
| Line 2051 sub readLog($;$) { |
|
| Line 2247 sub readLog($;$) { |
|
| undef %log; |
undef %log; |
| |
|
| print("Going to rlog '$fullname'\n") if ($verbose); |
print("Going to rlog '$fullname'\n") if ($verbose); |
| if (! open($fh, "-|")) { # child |
if (!open($fh, "-|")) { # child |
| if ($revision ne '') { |
if ($revision ne '') { |
| exec($CMD{rlog}, $revision, $fullname); |
exec($CMD{rlog}, $revision, $fullname); |
| } |
} else { |
| else { |
exec($CMD{rlog}, $fullname); |
| exec($CMD{rlog}, $fullname); |
} |
| } |
|
| } |
} |
| |
|
| while (<$fh>) { |
while (<$fh>) { |
| print if ($verbose); |
print if ($verbose); |
| if ($symnames) { |
if ($symnames) { |
| if (/^\s+([^:]+):\s+([\d\.]+)/) { |
if (/^\s+([^:]+):\s+([\d\.]+)/) { |
| $symrev{$1} = $2; |
$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; |
| } |
} |
| 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)); |
($curbranch = $head) =~ s/\.\d+$// if (!defined($curbranch)); |
| |
|
| # each log entry is of the form: |
# each log entry is of the form: |
| # ---------------------------- |
# ---------------------------- |
| # revision 3.7.1.1 |
# revision 3.7.1.1 |
| # date: 1995/11/29 22:15:52; author: fenner; state: Exp; lines: +5 -3 |
# date: 1995/11/29 22:15:52; author: fenner; state: Exp; lines: +5 -3 |
| # log info |
# log info |
| # ---------------------------- |
# ---------------------------- |
| logentry: |
logentry: |
| |
|
| while (!/$LOG_FILESEPARATOR/o) { |
while (!/$LOG_FILESEPARATOR/o) { |
| $_ = <$fh>; |
$_ = <$fh>; |
| last logentry if (!defined($_)); # EOF |
last logentry if (!defined($_)); # EOF |
| print "R:", $_ if ($verbose); |
print "R:", $_ if ($verbose); |
| if (/^revision ([\d\.]+)/) { |
if (/^revision ([\d\.]+)/) { |
| $rev = $1; |
$rev = $1; |
| unshift(@allrevisions,$rev); |
unshift (@allrevisions, $rev); |
| } |
} elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) { |
| elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) { |
next logentry; |
| next logentry; |
} else { |
| } |
|
| else { |
# The rlog output is syntactically ambiguous. We must |
| # The rlog output is syntactically ambiguous. We must |
# have guessed wrong about where the end of the last log |
| # have guessed wrong about where the end of the last log |
# message was. |
| # message was. |
# Since this is likely to happen when people put rlog output |
| # Since this is likely to happen when people put rlog output |
# in their commit messages, don't even bother keeping |
| # in their commit messages, don't even bother keeping |
# these lines since we don't know what revision they go with |
| # these lines since we don't know what revision they go with |
# any more. |
| # any more. |
next logentry; |
| next logentry; |
|
| # &fatal("500 Internal Error","Error parsing RCS output: $_"); |
# &fatal("500 Internal Error","Error parsing RCS output: $_"); |
| } |
} |
| $_ = <$fh>; |
$_ = <$fh>; |
| print "D:", $_ if ($verbose); |
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+-]+))?|) { |
if ( |
| my $yr = $1; |
m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);\s+state:\s+(\S+);\s+(lines:\s+([0-9\s+-]+))?| |
| # damn 2-digit year routines :-) |
) |
| if ($yr > 100) { |
{ |
| $yr -= 1900; |
my $yr = $1; |
| } |
|
| $date{$rev} = &Time::Local::timegm($6,$5,$4,$3,$2 - 1,$yr); |
# damn 2-digit year routines :-) |
| $author{$rev} = $7; |
if ($yr > 100) { |
| $state{$rev} = $8; |
$yr -= 1900; |
| $difflines{$rev} = $10; |
} |
| } |
$date{$rev} = |
| else { |
&Time::Local::timegm($6, $5, $4, $3, $2 - 1, $yr); |
| &fatal("500 Internal Error", "Error parsing RCS output: $_"); |
$author{$rev} = $7; |
| } |
$state{$rev} = $8; |
| line: |
$difflines{$rev} = $10; |
| while (<$fh>) { |
} else { |
| print "L:", $_ if ($verbose); |
&fatal("500 Internal Error", |
| next line if (/^branches:\s/); |
"Error parsing RCS output: $_"); |
| last line if (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o); |
} |
| $log{$rev} .= $_; |
line: |
| } |
|
| print "E:", $_ if ($verbose); |
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); |
close($fh); |
| print "Done reading RCS file\n" if ($verbose); |
print "Done reading RCS file\n" if ($verbose); |
| |
|
| @revorder = reverse sort {revcmp($a,$b)} @allrevisions; |
@revorder = reverse sort { revcmp($a, $b) } @allrevisions; |
| print "Done sorting revisions",join(" ",@revorder),"\n" if ($verbose); |
print "Done sorting revisions", join (" ", @revorder), "\n" |
| |
if ($verbose); |
| |
|
| # |
# |
| # HEAD is an artificial tag which is simply the highest tag number on the main |
# 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 |
# 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 |
# highest revision on that branch. Find it by looking through @revorder; it |
| # is the first commit listed on the appropriate branch. |
# is the first commit listed on the appropriate branch. |
| # This is not neccesary the same revision as marked as head in the RCS file. |
# This is not neccesary the same revision as marked as head in the RCS file. |
| my $headrev = $curbranch || "1"; |
my $headrev = $curbranch || "1"; |
| ($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/; |
($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/; |
| |
|
| foreach $rev (@revorder) { |
foreach $rev (@revorder) { |
| if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) { |
if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) { |
| $symrev{"HEAD"} = $rev; |
$symrev{"HEAD"} = $rev; |
| last; |
last; |
| } |
} |
| } |
} |
| ($symrev{"HEAD"} = $headrev) =~ s/\.\d+$// |
($symrev{"HEAD"} = $headrev) =~ s/\.\d+$// |
| if (!defined($symrev{"HEAD"})); |
if (!defined($symrev{"HEAD"})); |
| print "Done finding HEAD\n" if ($verbose); |
print "Done finding HEAD\n" if ($verbose); |
| # |
|
| # Now that we know all of the revision numbers, we can associate |
# |
| # absolute revision numbers with all of the symbolic names, and |
# Now that we know all of the revision numbers, we can associate |
| # pass them to the form so that the same association doesn't have |
# absolute revision numbers with all of the symbolic names, and |
| # to be built then. |
# pass them to the form so that the same association doesn't have |
| # |
# to be built then. |
| |
# |
| undef @branchnames; |
undef @branchnames; |
| undef %branchpoint; |
undef %branchpoint; |
| undef $sel; |
undef $sel; |
| |
|
| foreach (reverse sort keys %symrev) { |
foreach (reverse sort keys %symrev) { |
| $rev = $symrev{$_}; |
$rev = $symrev{$_}; |
| if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) { |
if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) { |
| push(@branchnames, $_); |
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 = quotemeta $branchrev; |
|
| $rev = $head; |
|
| |
|
| foreach my $r (@revorder) { |
# |
| if ($r =~ /^${regex}\b/) { |
# A revision number of A.B.0.D really translates into |
| $rev = $branchrev; |
# "the highest current revision on branch A.B.D". |
| last; |
# |
| } |
# 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 = quotemeta $branchrev; |
| |
$rev = $head; |
| |
|
| |
foreach my $r (@revorder) { |
| |
if ($r =~ /^${regex}\b/) { |
| |
$rev = $branchrev; |
| |
last; |
| |
} |
| |
} |
| |
next if ($rev eq ""); |
| |
|
| |
if ($rev ne $head && $head ne "") { |
| |
$branchpoint{$head} .= ", " |
| |
if ($branchpoint{$head}); |
| |
$branchpoint{$head} .= $_; |
| |
} |
| } |
} |
| next if ($rev eq ""); |
$revsym{$rev} .= ", " if ($revsym{$rev}); |
| if ($rev ne $head && $head ne "") { |
$revsym{$rev} .= $_; |
| $branchpoint{$head} .= ", " if ($branchpoint{$head}); |
$sel .= "<OPTION VALUE=\"${rev}:${_}\">$_\n"; |
| $branchpoint{$head} .= $_; |
|
| } |
|
| } |
|
| $revsym{$rev} .= ", " if ($revsym{$rev}); |
|
| $revsym{$rev} .= $_; |
|
| $sel .= "<OPTION VALUE=\"${rev}:${_}\">$_\n"; |
|
| } |
} |
| print "Done associating revisions with branches\n" if ($verbose); |
print "Done associating revisions with branches\n" if ($verbose); |
| |
|
| my ($onlyonbranch, $onlybranchpoint); |
my ($onlyonbranch, $onlybranchpoint); |
| if ($onlyonbranch = $input{'only_with_tag'}) { |
if ($onlyonbranch = $input{'only_with_tag'}) { |
| $onlyonbranch = $symrev{$onlyonbranch}; |
$onlyonbranch = $symrev{$onlyonbranch}; |
| if ($onlyonbranch =~ s/\b0\.//) { |
if ($onlyonbranch =~ s/\b0\.//) { |
| ($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//; |
($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//; |
| } |
} else { |
| else { |
$onlybranchpoint = $onlyonbranch; |
| $onlybranchpoint = $onlyonbranch; |
} |
| } |
|
| if (!defined($onlyonbranch) || $onlybranchpoint eq "") { |
if (!defined($onlyonbranch) || $onlybranchpoint eq "") { |
| fatal("404 Tag not found","Tag $input{'only_with_tag'} not defined"); |
fatal("404 Tag not found", |
| } |
"Tag $input{'only_with_tag'} not defined"); |
| |
} |
| } |
} |
| |
|
| undef @revisions; |
undef @revisions; |
| |
|
| foreach (@allrevisions) { |
foreach (@allrevisions) { |
| ($br = $_) =~ s/\.\d+$//; |
($br = $_) =~ s/\.\d+$//; |
| ($brp = $br) =~ s/\.\d+$//; |
($brp = $br) =~ s/\.\d+$//; |
| next if ($onlyonbranch && $br ne $onlyonbranch && |
next |
| $_ ne $onlybranchpoint); |
if ($onlyonbranch && $br ne $onlyonbranch |
| unshift(@revisions,$_); |
&& $_ ne $onlybranchpoint); |
| |
unshift (@revisions, $_); |
| } |
} |
| |
|
| if ($logsort eq "date") { |
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 |
# Sort the revisions in commit order an secondary sort on revision |
| # revision gets before the same revision on the 1.1.1 branch) |
# (secondary sort needed for imported sources, or the first main |
| @revdisplayorder = sort {$date{$b} <=> $date{$a} || -revcmp($a, $b)} @revisions; |
# 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; |
| } |
} |
| 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; |
|
| } |
|
| |
|
| } |
} |
| |
|
| sub printDiffLinks($$) { |
sub printDiffLinks($$) { |
| my($text, $url) = @_; |
my ($text, $url) = @_; |
| my @extra; |
my @extra; |
| |
|
| local $_; |
local $_; |
| for ($DIFFTYPES{$defaultDiffType}{'colored'} ? qw(u) : qw(h)) { |
for ($DIFFTYPES{$defaultDiffType}{'colored'} ? qw(u) : qw(h)) { |
| my $f = $_ eq $defaultDiffType ? '' : $_; |
my $f = $_ eq $defaultDiffType ? '' : $_; |
| |
|
| push @extra, &link(lc $DIFFTYPES{$_}{'descr'}, "$url&f=$f"); |
push @extra, &link(lc $DIFFTYPES{$_}{'descr'}, "$url&f=$f"); |
| } |
} |
| |
|
| print &link($text, $url), ' (', join(', ', @extra), ')'; |
print &link($text, $url), ' (', join (', ', @extra), ')'; |
| } |
} |
| |
|
| sub printLog($;$) { |
sub printLog($;$) { |
| my ($link, $br, $brp); |
my ($link, $br, $brp); |
| ($_,$link) = @_; |
($_, $link) = @_; |
| ($br = $_) =~ s/\.\d+$//; |
($br = $_) =~ s/\.\d+$//; |
| ($brp = $br) =~ s/\.?\d+$//; |
($brp = $br) =~ s/\.?\d+$//; |
| my ($isDead, $prev); |
my ($isDead, $prev); |
| |
|
| Line 2281 sub printLog($;$) { |
|
| Line 2491 sub printLog($;$) { |
|
| $isDead = ($state{$_} eq "dead"); |
$isDead = ($state{$_} eq "dead"); |
| |
|
| if ($link && !$isDead) { |
if ($link && !$isDead) { |
| my ($filename); |
my ($filename); |
| ($filename = $where) =~ s/^.*\///; |
($filename = $where) =~ s/^.*\///; |
| my ($fileurl) = urlencode($filename); |
my ($fileurl) = urlencode($filename); |
| print "<a NAME=\"rev$_\"></a>"; |
print "<a NAME=\"rev$_\"></a>"; |
| if (defined($revsym{$_})) { |
|
| foreach my $sym (split(", ", $revsym{$_})) { |
if (defined($revsym{$_})) { |
| print "<a NAME=\"$sym\"></a>"; |
foreach my $sym (split (", ", $revsym{$_})) { |
| |
print "<a NAME=\"$sym\"></a>"; |
| |
} |
| } |
} |
| } |
|
| if (defined($revsym{$br}) && $revsym{$br} && !defined($nameprinted{$br})) { |
if (defined($revsym{$br}) && $revsym{$br} |
| foreach my $sym (split(", ", $revsym{$br})) { |
&& !defined($nameprinted{$br})) |
| print "<a NAME=\"$sym\"></a>"; |
{ |
| |
foreach my $sym (split (", ", $revsym{$br})) { |
| |
print "<a NAME=\"$sym\"></a>"; |
| |
} |
| |
$nameprinted{$br} = 1; |
| } |
} |
| $nameprinted{$br} = 1; |
print "\n Revision "; |
| } |
&download_link($fileurl, $_, $_, |
| print "\n Revision "; |
$defaultViewable ? "text/x-cvsweb-markup" : undef); |
| &download_link($fileurl, $_, $_, |
|
| $defaultViewable ? "text/x-cvsweb-markup" : undef); |
if ($defaultViewable) { |
| if ($defaultViewable) { |
print " / ("; |
| print " / ("; |
&download_link($fileurl, $_, "download", $mimetype); |
| &download_link($fileurl, $_, "download", $mimetype); |
print ")"; |
| print ")"; |
|
| } |
|
| if (not $defaultTextPlain) { |
|
| print " / ("; |
|
| &download_link($fileurl, $_, "as text", "text/plain"); |
|
| print ")"; |
|
| } |
|
| if (!$defaultViewable) { |
|
| print " / ("; |
|
| &download_link($fileurl, $_, "view", "text/x-cvsweb-markup"); |
|
| print ")"; |
|
| } |
|
| if ($allow_annotate) { |
|
| print " - "; |
|
| print &link('annotate', |
|
| sprintf('%s/%s?annotate=%s%s', |
|
| $scriptname, |
|
| urlencode($where), |
|
| $_, |
|
| $barequery)); |
|
| } |
|
| # Plus a select link if enabled, and this version isn't selected |
|
| if ($allow_version_select) { |
|
| if ((!defined($input{"r1"}) || $input{"r1"} ne $_)) { |
|
| print " - "; |
|
| print &link('[select for diffs]', |
|
| sprintf('%s?r1=%s%s', |
|
| $scriptwhere, |
|
| $_, |
|
| $barequery)); |
|
| } |
} |
| else { |
|
| print " - <b>[selected]</b>"; |
if (not $defaultTextPlain) { |
| |
print " / ("; |
| |
&download_link($fileurl, $_, "as text", "text/plain"); |
| |
print ")"; |
| } |
} |
| } |
|
| |
if (!$defaultViewable) { |
| |
print " / ("; |
| |
&download_link($fileurl, $_, "view", |
| |
"text/x-cvsweb-markup"); |
| |
print ")"; |
| |
} |
| |
|
| |
if ($allow_annotate) { |
| |
print " - "; |
| |
print &link( |
| |
'annotate', |
| |
sprintf( |
| |
'%s/%s?annotate=%s%s', $scriptname, |
| |
urlencode($where), $_, |
| |
$barequery |
| |
) |
| |
); |
| |
} |
| |
|
| |
# Plus a select link if enabled, and this version isn't selected |
| |
if ($allow_version_select) { |
| |
if ((!defined($input{"r1"}) || $input{"r1"} ne $_)) { |
| |
print " - "; |
| |
print &link( |
| |
'[select for diffs]', |
| |
sprintf( |
| |
'%s?r1=%s%s', $scriptwhere, |
| |
$_, $barequery |
| |
) |
| |
); |
| |
} else { |
| |
print " - <b>[selected]</b>"; |
| |
} |
| |
} |
| |
} else { |
| |
print "Revision <B>$_</B>"; |
| } |
} |
| else { |
|
| print "Revision <B>$_</B>"; |
|
| } |
|
| if (/^1\.1\.1\.\d+$/) { |
if (/^1\.1\.1\.\d+$/) { |
| print " <i>(vendor branch)</i>"; |
print " <i>(vendor branch)</i>"; |
| } |
} |
| if (defined @mytz) { |
if (defined @mytz) { |
| my ($est) = $mytz[(localtime($date{$_}))[8]]; |
my ($est) = $mytz[(localtime($date{$_}))[8]]; |
| print ", <i>", scalar localtime($date{$_}), " $est</i> ("; |
print ", <i>", scalar localtime($date{$_}), " $est</i> ("; |
| } else { |
} else { |
| print ", <i>", scalar gmtime($date{$_}), " UTC</i> ("; |
print ", <i>", scalar gmtime($date{$_}), " UTC</i> ("; |
| } |
} |
| print readableTime(time() - $date{$_},1), " ago)"; |
print readableTime(time() - $date{$_}, 1), " ago)"; |
| print " by "; |
print " by "; |
| print "<i>", $author{$_}, "</i>\n"; |
print "<i>", $author{$_}, "</i>\n"; |
| print "<BR>Branch: <b>",$link?link_tags($revsym{$br}):$revsym{$br},"</b>\n" |
print "<BR>Branch: <b>", $link ? link_tags($revsym{$br}) : $revsym{$br}, |
| |
"</b>\n" |
| if ($revsym{$br}); |
if ($revsym{$br}); |
| print "<BR>CVS Tags: <b>",$link?link_tags($revsym{$_}):$revsym{$_},"</b>" |
print "<BR>CVS Tags: <b>", $link ? link_tags($revsym{$_}) : $revsym{$_}, |
| |
"</b>" |
| if ($revsym{$_}); |
if ($revsym{$_}); |
| print "<BR>Branch point for: <b>",$link?link_tags($branchpoint{$_}):$branchpoint{$_},"</b>\n" |
print "<BR>Branch point for: <b>", |
| |
$link ? link_tags($branchpoint{$_}) : $branchpoint{$_}, "</b>\n" |
| if ($branchpoint{$_}); |
if ($branchpoint{$_}); |
| |
|
| # Find the previous revision |
# Find the previous revision |
| my @prevrev = split(/\./, $_); |
my @prevrev = split (/\./, $_); |
| do { |
do { |
| if (--$prevrev[$#prevrev] <= 0) { |
if (--$prevrev[$#prevrev] <= 0) { |
| # If it was X.Y.Z.1, just make it X.Y |
|
| pop(@prevrev); |
# If it was X.Y.Z.1, just make it X.Y |
| pop(@prevrev); |
pop (@prevrev); |
| } |
pop (@prevrev); |
| $prev = join(".", @prevrev); |
} |
| |
$prev = join (".", @prevrev); |
| } until (defined($date{$prev}) || $prev eq ""); |
} until (defined($date{$prev}) || $prev eq ""); |
| |
|
| if ($prev ne "") { |
if ($prev ne "") { |
| if ($difflines{$_}) { |
if ($difflines{$_}) { |
| print "<BR>Changes since <b>$prev: $difflines{$_} lines</b>"; |
print |
| } |
"<BR>Changes since <b>$prev: $difflines{$_} lines</b>"; |
| |
} |
| } |
} |
| |
|
| if ($isDead) { |
if ($isDead) { |
| print "<BR><B><I>FILE REMOVED</I></B>\n"; |
print "<BR><B><I>FILE REMOVED</I></B>\n"; |
| } |
} elsif ($link) { |
| elsif ($link) { |
my %diffrev = (); |
| my %diffrev = (); |
$diffrev{$_} = 1; |
| $diffrev{$_} = 1; |
$diffrev{""} = 1; |
| $diffrev{""} = 1; |
print "<BR>Diff"; |
| print "<BR>Diff"; |
|
| # |
|
| # Offer diff to previous revision |
|
| if ($prev) { |
|
| $diffrev{$prev} = 1; |
|
| |
|
| my $url = sprintf('%s.diff?r1=%s&r2=%s%s', |
# |
| $scriptwhere, |
# Offer diff to previous revision |
| $prev, |
if ($prev) { |
| $_, |
$diffrev{$prev} = 1; |
| $barequery); |
|
| |
|
| print " to previous "; |
my $url = |
| printDiffLinks($prev, $url); |
sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, |
| } |
$prev, $_, $barequery); |
| # |
|
| # 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', |
|
| $scriptwhere, |
|
| $brp, |
|
| $_, |
|
| $barequery); |
|
| |
|
| print " to branchpoint "; |
print " to previous "; |
| printDiffLinks($brp, $url); |
printDiffLinks($prev, $url); |
| } |
|
| # |
|
| # 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); |
|
| 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 (@tmp1 < @tmp2) { |
|
| $nextmain = $next; |
|
| last; |
|
| } |
|
| # 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])); |
|
| } |
} |
| if (!defined($diffrev{$nextmain})) { |
|
| $diffrev{$nextmain} = 1; |
|
| |
|
| my $url = sprintf('%s.diff?r1=%s&r2=%s%s', |
# |
| $scriptwhere, |
# Plus, if it's on a branch, and it's not a vendor branch, |
| $nextmain, |
# offer a diff with the branch point. |
| $_, |
if ($revsym{$brp} && !/^1\.1\.1\.\d+$/ |
| $barequery); |
&& !defined($diffrev{$brp})) |
| |
{ |
| |
my $url = |
| |
sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, $brp, |
| |
$_, $barequery); |
| |
|
| print " next main "; |
print " to branchpoint "; |
| printDiffLinks($nextmain, $url); |
printDiffLinks($brp, $url); |
| } |
} |
| } |
|
| # 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', |
# |
| $scriptwhere, |
# Plus, if it's on a branch, and it's not a vendor branch, |
| $input{'r1'}, |
# offer to diff with the next revision of the higher branch. |
| $_, |
# (e.g. change gets committed and then brought |
| $barequery); |
# over to -stable) |
| |
if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) { |
| |
my ($i, $nextmain); |
| |
|
| print " to selected "; |
for ($i = 0 ; $i < $#revorder && $revorder[$i] ne $_ ; |
| printDiffLinks($input{'r1'}, $url); |
$i++) |
| } |
{ |
| |
} |
| |
my @tmp2 = split (/\./, $_); |
| |
for ($nextmain = "" ; $i > 0 ; $i--) { |
| |
my $next = $revorder[$i - 1]; |
| |
my @tmp1 = split (/\./, $next); |
| |
|
| |
if (@tmp1 < @tmp2) { |
| |
$nextmain = $next; |
| |
last; |
| |
} |
| |
|
| |
# Only the highest version on a branch should have |
| |
# a diff for the "next main". |
| |
last |
| |
if (@tmp1 - 1 <= @tmp2 |
| |
&& join (".", @tmp1[0 .. $#tmp1 - 1]) eq |
| |
join (".", @tmp2[0 .. $#tmp1 - 1])); |
| |
} |
| |
|
| |
if (!defined($diffrev{$nextmain})) { |
| |
$diffrev{$nextmain} = 1; |
| |
|
| |
my $url = |
| |
sprintf('%s.diff?r1=%s&r2=%s%s', |
| |
$scriptwhere, $nextmain, $_, |
| |
$barequery); |
| |
|
| |
print " next main "; |
| |
printDiffLinks($nextmain, $url); |
| |
} |
| |
} |
| |
|
| |
# 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', $scriptwhere, |
| |
$input{'r1'}, $_, $barequery); |
| |
|
| |
print " to selected "; |
| |
printDiffLinks($input{'r1'}, $url); |
| |
} |
| } |
} |
| print "<PRE>\n"; |
print "<PRE>\n"; |
| print &htmlify($log{$_}, 1); |
print &htmlify($log{$_}, 1); |
| Line 2464 sub printLog($;$) { |
|
| Line 2702 sub printLog($;$) { |
|
| } |
} |
| |
|
| sub doLog($) { |
sub doLog($) { |
| my($fullname) = @_; |
my ($fullname) = @_; |
| my ($diffrev, $upwhere, $filename, $backurl); |
my ($diffrev, $upwhere, $filename, $backurl); |
| |
|
| readLog($fullname); |
readLog($fullname); |
| |
|
| html_header("CVS log for $where"); |
html_header("CVS log for $where"); |
| ($upwhere = $where) =~ s|(Attic/)?[^/]+$||; |
($upwhere = $where) =~ s|(Attic/)?[^/]+$||; |
| ($filename = $where) =~ s|^.*/||; |
($filename = $where) =~ s|^.*/||; |
| $backurl = $scriptname . "/" . urlencode($upwhere) . $query; |
$backurl = $scriptname . "/" . urlencode($upwhere) . $query; |
| print &link($backicon, "$backurl#$filename"), |
print &link($backicon, "$backurl#$filename"), " <b>Up to ", |
| " <b>Up to ", &clickablePath($upwhere, 1), "</b><p>\n"; |
&clickablePath($upwhere, 1), "</b><p>\n"; |
| print &link('Request diff between arbitrary revisions', '#diff'); |
print &link('Request diff between arbitrary revisions', '#diff'); |
| print '<HR NOSHADE>'; |
print '<HR NOSHADE>'; |
| |
|
| if ($curbranch) { |
if ($curbranch) { |
| print "Default branch: ", ($revsym{$curbranch} || $curbranch); |
print "Default branch: ", ($revsym{$curbranch} || $curbranch); |
| |
} else { |
| |
print "No default branch"; |
| } |
} |
| else { |
|
| print "No default branch"; |
|
| } |
|
| print "<BR>\n"; |
print "<BR>\n"; |
| |
|
| if ($input{only_with_tag}) { |
if ($input{only_with_tag}) { |
| print "Current tag: $input{only_with_tag}<BR>\n"; |
print "Current tag: $input{only_with_tag}<BR>\n"; |
| } |
} |
| |
|
| undef %nameprinted; |
undef %nameprinted; |
| |
|
| for (my $i = 0; $i <= $#revdisplayorder; $i++) { |
for (my $i = 0 ; $i <= $#revdisplayorder ; $i++) { |
| print "<HR size=1 NOSHADE>"; |
print "<HR size=1 NOSHADE>"; |
| printLog($revdisplayorder[$i]); |
printLog($revdisplayorder[$i]); |
| } |
} |
| |
|
| print "<HR NOSHADE>"; |
print "<HR NOSHADE>"; |
| print "<A NAME=diff>\n"; |
print "<A NAME=diff>\n"; |
| print "This form allows you to request diff's between any two\n"; |
print "This form allows you to request diff's between any two\n"; |
| print "revisions of a file. You may select a symbolic revision\n"; |
print "revisions of a file. You may select a symbolic revision\n"; |
| print "name using the selection box or you may type in a numeric\n"; |
print "name using the selection box or you may type in a numeric\n"; |
| print "name using the type-in text box.\n"; |
print "name using the type-in text box.\n"; |
| print "</A><P>\n"; |
print "</A><P>\n"; |
| print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\" NAME=\"diff_select\">\n"; |
print |
| foreach (@stickyvars) { |
"<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}.diff\" NAME=\"diff_select\">\n"; |
| printf('<INPUT TYPE=HIDDEN NAME="%s" VALUE="%s">', $_, $input{$_}) |
|
| if (defined($input{$_}) |
foreach (@stickyvars) { |
| |
printf('<INPUT TYPE=HIDDEN NAME="%s" VALUE="%s">', $_, |
| |
$input{$_}) |
| |
if (defined($input{$_}) |
| && ((!defined($DEFAULTVALUE{$_}) |
&& ((!defined($DEFAULTVALUE{$_}) |
| || $input{$_} ne $DEFAULTVALUE{$_}) |
|| $input{$_} ne $DEFAULTVALUE{$_}) && $input{$_} ne "")); |
| && $input{$_} ne "")); |
|
| } |
} |
| print "<TABLE><TR>\n"; |
print "<TABLE><TR>\n"; |
| print "<TD align=right>Diffs between \n"; |
print "<TD align=right>Diffs between \n"; |
|
|
| print "</SELECT>\n"; |
print "</SELECT>\n"; |
| $diffrev = $revdisplayorder[$#revdisplayorder]; |
$diffrev = $revdisplayorder[$#revdisplayorder]; |
| $diffrev = $input{"r1"} if (defined($input{"r1"})); |
$diffrev = $input{"r1"} if (defined($input{"r1"})); |
| print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'></TD>"; |
print |
| |
"<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'></TD>"; |
| print "<TD><BR></TD></TR>\n"; |
print "<TD><BR></TD></TR>\n"; |
| print "<TR><TD align=right>and \n"; |
print "<TR><TD align=right>and \n"; |
| print "<SELECT NAME=\"r2\">\n"; |
print "<SELECT NAME=\"r2\">\n"; |
|
|
| print "</SELECT>\n"; |
print "</SELECT>\n"; |
| $diffrev = $revdisplayorder[0]; |
$diffrev = $revdisplayorder[0]; |
| $diffrev = $input{"r2"} if (defined($input{"r2"})); |
$diffrev = $input{"r2"} if (defined($input{"r2"})); |
| print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='document.diff_select.r2.selectedIndex=0'></TD>"; |
print |
| |
"<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='document.diff_select.r2.selectedIndex=0'></TD>"; |
| print "<TD><INPUT TYPE=SUBMIT VALUE=\" Get Diffs \"></TD>\n"; |
print "<TD><INPUT TYPE=SUBMIT VALUE=\" Get Diffs \"></TD>\n"; |
| print "</FORM>\n"; |
print "</FORM>\n"; |
| print "</TR></TABLE>\n"; |
print "</TR></TABLE>\n"; |
|
|
| print "<TD>"; |
print "<TD>"; |
| printDiffSelect($use_java_script); |
printDiffSelect($use_java_script); |
| print "</TD><TD></TD></TR>\n"; |
print "</TD><TD></TD></TR>\n"; |
| if (@branchnames) { |
|
| print "<TR><TD align=right>View only Branch:</TD>"; |
if (@branchnames) { |
| print "<TD>"; |
print "<TR><TD align=right>View only Branch:</TD>"; |
| print "<A name=branch></A>\n"; |
print "<TD>"; |
| print "<SELECT NAME=\"only_with_tag\""; |
print "<A name=branch></A>\n"; |
| print " onchange=\"submit()\"" if ($use_java_script); |
print "<SELECT NAME=\"only_with_tag\""; |
| print ">\n"; |
print " onchange=\"submit()\"" if ($use_java_script); |
| print "<OPTION VALUE=\"\""; |
print ">\n"; |
| print " SELECTED" if (defined($input{"only_with_tag"}) && |
print "<OPTION VALUE=\"\""; |
| $input{"only_with_tag"} eq ""); |
print " SELECTED" |
| print ">Show all branches\n"; |
if (defined($input{"only_with_tag"}) |
| foreach (reverse sort @branchnames) { |
&& $input{"only_with_tag"} eq ""); |
| print "<OPTION"; |
print ">Show all branches\n"; |
| print " SELECTED" if (defined($input{"only_with_tag"}) |
|
| && $input{"only_with_tag"} eq $_); |
foreach (reverse sort @branchnames) { |
| print ">${_}\n"; |
print "<OPTION"; |
| } |
print " SELECTED" |
| print "</SELECT></TD><TD></TD></TR>\n"; |
if (defined($input{"only_with_tag"}) |
| |
&& $input{"only_with_tag"} eq $_); |
| |
print ">${_}\n"; |
| |
} |
| |
print "</SELECT></TD><TD></TD></TR>\n"; |
| } |
} |
| |
|
| foreach (@stickyvars) { |
foreach (@stickyvars) { |
| next if ($_ eq "f"); |
next if ($_ eq "f"); |
| next if ($_ eq "only_with_tag"); |
next if ($_ eq "only_with_tag"); |
| next if ($_ eq "logsort"); |
next if ($_ eq "logsort"); |
| print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n" |
print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n" |
| if (defined($input{$_}) |
if (defined($input{$_}) |
| && (!defined($DEFAULTVALUE{$_}) |
&& (!defined($DEFAULTVALUE{$_}) |
| || $input{$_} ne $DEFAULTVALUE{$_}) |
|| $input{$_} ne $DEFAULTVALUE{$_}) && $input{$_} ne ""); |
| && $input{$_} ne ""); |
|
| } |
} |
| print "<TR><TD align=right>"; |
print "<TR><TD align=right>"; |
| print "<A name=logsort></A>\n"; |
print "<A name=logsort></A>\n"; |
|
|
| print "<TD><INPUT TYPE=SUBMIT VALUE=\" Set \"></TD>"; |
print "<TD><INPUT TYPE=SUBMIT VALUE=\" Set \"></TD>"; |
| print "</FORM>\n"; |
print "</FORM>\n"; |
| print "</TR></TABLE>"; |
print "</TR></TABLE>"; |
| print &html_footer; |
print &html_footer; |
| print "</BODY></HTML>\n"; |
print "</BODY></HTML>\n"; |
| } |
} |
| |
|
| sub flush_diff_rows($$$$) { |
sub flush_diff_rows($$$$) { |
| my $j; |
my $j; |
| my ($leftColRef,$rightColRef,$leftRow,$rightRow) = @_; |
my ($leftColRef, $rightColRef, $leftRow, $rightRow) = @_; |
| if ($state eq "PreChangeRemove") { # we just got remove-lines before |
|
| for ($j = 0 ; $j < $leftRow; $j++) { |
if (!defined($state)) { |
| print "<tr><td bgcolor=\"$diffcolorRemove\">@$leftColRef[$j]</td>"; |
return; |
| print "<td bgcolor=\"$diffcolorEmpty\"> </td></tr>\n"; |
} |
| } |
|
| } |
if ($state eq "PreChangeRemove") { # we just got remove-lines before |
| elsif ($state eq "PreChange") { # state eq "PreChange" |
for ($j = 0 ; $j < $leftRow ; $j++) { |
| # we got removes with subsequent adds |
print |
| for ($j = 0; $j < $leftRow || $j < $rightRow ; $j++) { # dump out both cols |
"<tr><td bgcolor=\"$diffcolorRemove\">@$leftColRef[$j]</td>"; |
| print "<tr>"; |
print |
| if ($j < $leftRow) { |
"<td bgcolor=\"$diffcolorEmpty\"> </td></tr>\n"; |
| print "<td bgcolor=\"$diffcolorChange\">@$leftColRef[$j]</td>"; |
} |
| } |
} elsif ($state eq "PreChange") { # state eq "PreChange" |
| else { |
# we got removes with subsequent adds |
| print "<td bgcolor=\"$diffcolorDarkChange\"> </td>"; |
|
| } |
for ($j = 0 ; $j < $leftRow || $j < $rightRow ; $j++) |
| if ($j < $rightRow) { |
{ # dump out both cols |
| print "<td bgcolor=\"$diffcolorChange\">@$rightColRef[$j]</td>"; |
print "<tr>"; |
| } |
if ($j < $leftRow) { |
| else { |
print |
| print "<td bgcolor=\"$diffcolorDarkChange\"> </td>"; |
"<td bgcolor=\"$diffcolorChange\">@$leftColRef[$j]</td>"; |
| } |
} else { |
| print "</tr>\n"; |
print |
| } |
"<td bgcolor=\"$diffcolorDarkChange\"> </td>"; |
| } |
} |
| |
|
| |
if ($j < $rightRow) { |
| |
print |
| |
"<td bgcolor=\"$diffcolorChange\">@$rightColRef[$j]</td>"; |
| |
} else { |
| |
print |
| |
"<td bgcolor=\"$diffcolorDarkChange\"> </td>"; |
| |
} |
| |
print "</tr>\n"; |
| |
} |
| |
} |
| } |
} |
| |
|
| ## |
## |
| # Function to generate Human readable diff-files |
# Function to generate Human readable diff-files |
| # human_readable_diff(String revision_to_return_to); |
# human_readable_diff(String revision_to_return_to); |
| ## |
## |
| sub human_readable_diff($){ |
sub human_readable_diff($) { |
| my ($difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd); |
my ($difftxt, $where_nd, $filename, $pathname, $scriptwhere_nd); |
| my ($fh, $rev) = @_; |
my ($fh, $rev) = @_; |
| my ($date1, $date2, $r1d, $r2d, $r1r, $r2r, $rev1, $rev2, $sym1, $sym2); |
my ($date1, $date2, $r1d, $r2d, $r1r, $r2r, $rev1, $rev2, $sym1, $sym2); |
| my (@rightCol, @leftCol); |
my (@rightCol, @leftCol); |
| |
|
| ($where_nd = $where) =~ s/.diff$//; |
($where_nd = $where) =~ s/.diff$//; |
| ($filename = $where_nd) =~ s/^.*\///; |
($filename = $where_nd) =~ s/^.*\///; |
| ($pathname = $where_nd) =~ s/(Attic\/)?[^\/]*$//; |
($pathname = $where_nd) =~ s/(Attic\/)?[^\/]*$//; |
| ($scriptwhere_nd = $scriptwhere) =~ s/.diff$//; |
($scriptwhere_nd = $scriptwhere) =~ s/.diff$//; |
| |
|
| navigateHeader($scriptwhere_nd, $pathname, $filename, $rev, "diff"); |
navigateHeader($scriptwhere_nd, $pathname, $filename, $rev, "diff"); |
| |
|
| # Read header to pick up read revision and date, if possible |
# Read header to pick up read revision and date, if possible |
| while (<$fh>) { |
while (<$fh>) { |
| ($r1d,$r1r) = /\t(.*)\t(.*)$/ if (/^--- /); |
($r1d, $r1r) = /\t(.*)\t(.*)$/ if (/^--- /); |
| ($r2d,$r2r) = /\t(.*)\t(.*)$/ if (/^\+\+\+ /); |
($r2d, $r2r) = /\t(.*)\t(.*)$/ if (/^\+\+\+ /); |
| last if (/^\+\+\+ /); |
last if (/^\+\+\+ /); |
| } |
} |
| if (defined($r1r) && $r1r =~ /^(\d+\.)+\d+$/) { |
|
| $rev1 = $r1r; |
|
| $date1 = $r1d; |
|
| } |
|
| if (defined($r2r) && $r2r =~ /^(\d+\.)+\d+$/) { |
|
| $rev2 = $r2r; |
|
| $date2 = $r2d; |
|
| } |
|
| |
|
| print "<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n", |
if (defined($r1r) && $r1r =~ /^(\d+\.)+\d+$/) { |
| "<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n", |
$rev1 = $r1r; |
| "<tr bgcolor=\"#ffffff\">\n", |
$date1 = $r1d; |
| "<th width=\"50%\" valign=TOP>", |
} |
| "version $rev1"; |
if (defined($r2r) && $r2r =~ /^(\d+\.)+\d+$/) { |
| print ", $date1" if (defined($date1)); |
$rev2 = $r2r; |
| print "<br>Tag: $sym1\n" if ($sym1); |
$date2 = $r2d; |
| print "</th>\n", |
} |
| "<th width=\"50%\" valign=TOP>", |
|
| "version $rev2"; |
|
| print ", $date2" if (defined($date2)); |
|
| print "<br>Tag: $sym2\n" if ($sym1); |
|
| print "</th>\n"; |
|
| |
|
| my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\"><tt>"; |
print |
| my $fe = "</tt></font>"; |
"<h3 align=center>Diff for /$where_nd between version $rev1 and $rev2</h3>\n", |
| |
"<table border=0 cellspacing=0 cellpadding=0 width=\"100%\">\n", |
| |
"<tr bgcolor=\"#ffffff\">\n", "<th width=\"50%\" valign=TOP>", |
| |
"version $rev1"; |
| |
print ", $date1" if (defined($date1)); |
| |
print "<br>Tag: $sym1\n" if ($sym1); |
| |
print "</th>\n", "<th width=\"50%\" valign=TOP>", "version $rev2"; |
| |
print ", $date2" if (defined($date2)); |
| |
print "<br>Tag: $sym2\n" if ($sym1); |
| |
print "</th>\n"; |
| |
|
| my $leftRow = 0; |
my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\"><tt>"; |
| my $rightRow = 0; |
my $fe = "</tt></font>"; |
| my ($oldline, $newline, $funname, $diffcode, $rest); |
|
| |
|
| # Process diff text |
my $leftRow = 0; |
| # The diffrows are could make excellent use of |
my $rightRow = 0; |
| # cascading style sheets because we've to set the |
my ($oldline, $newline, $funname, $diffcode, $rest); |
| # font and color for each row. anyone ...? |
|
| #### |
|
| |
|
| # prefetch several lines |
# Process diff text |
| my @buf = head($fh); |
# The diffrows are could make excellent use of |
| |
# cascading style sheets because we've to set the |
| |
# font and color for each row. anyone ...? |
| |
#### |
| |
|
| my %d = scan_directives(@buf); |
# prefetch several lines |
| |
my @buf = head($fh); |
| |
|
| while (@buf || !eof($fh)) { |
my %d = scan_directives(@buf); |
| $difftxt = @buf ? shift @buf : <$fh>; |
|
| |
|
| if ($difftxt =~ /^@@/) { |
while (@buf || !eof($fh)) { |
| ($oldline,$newline,$funname) = $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/; |
$difftxt = @buf ? shift @buf : <$fh>; |
| $funname = htmlquote($funname); |
|
| print "<tr bgcolor=\"$diffcolorHeading\"><td width=\"50%\">"; |
|
| print "<table width=\"100%\" border=1 cellpadding=5><tr><td><b>Line $oldline</b>"; |
|
| print " <font size=-1>$funname</font></td></tr></table>"; |
|
| print "</td><td width=\"50%\">"; |
|
| print "<table width=\"100%\" border=1 cellpadding=5><tr><td><b>Line $newline</b>"; |
|
| print " <font size=-1>$funname</font></td></tr></table>"; |
|
| print "</td>\n"; |
|
| $state = "dump"; |
|
| $leftRow = 0; |
|
| $rightRow = 0; |
|
| } |
|
| else { |
|
| ($diffcode,$rest) = $difftxt =~ /^([-+ ])(.*)/; |
|
| $_ = spacedHtmlText($rest, $d{'tabstop'}); |
|
| |
|
| # Add fontface, size |
if ($difftxt =~ /^@@/) { |
| $_ = "$fs $_$fe"; |
($oldline, $newline, $funname) = |
| |
$difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/; |
| |
$funname = htmlquote($funname); |
| |
print |
| |
"<tr bgcolor=\"$diffcolorHeading\"><td width=\"50%\">"; |
| |
print |
| |
"<table width=\"100%\" border=1 cellpadding=5><tr><td><b>Line $oldline</b>"; |
| |
print |
| |
" <font size=-1>$funname</font></td></tr></table>"; |
| |
print "</td><td width=\"50%\">"; |
| |
print |
| |
"<table width=\"100%\" border=1 cellpadding=5><tr><td><b>Line $newline</b>"; |
| |
print |
| |
" <font size=-1>$funname</font></td></tr></table>"; |
| |
print "</td>\n"; |
| |
$state = "dump"; |
| |
$leftRow = 0; |
| |
$rightRow = 0; |
| |
} else { |
| |
($diffcode, $rest) = $difftxt =~ /^([-+ ])(.*)/; |
| |
$_ = spacedHtmlText($rest, $d{'tabstop'}); |
| |
|
| ######### |
# Add fontface, size |
| # little state machine to parse unified-diff output (Hen, zeller@think.de) |
$_ = "$fs $_$fe"; |
| # in order to get some nice 'ediff'-mode output |
|
| # states: |
|
| # "dump" - just dump the value |
|
| # "PreChangeRemove" - we began with '-' .. so this could be the start of a 'change' area or just remove |
|
| # "PreChange" - okey, we got several '-' lines and moved to '+' lines -> this is a change block |
|
| ########## |
|
| |
|
| if ($diffcode eq '+') { |
######### |
| if ($state eq "dump") { # 'change' never begins with '+': just dump out value |
# little state machine to parse unified-diff output (Hen, zeller@think.de) |
| print "<tr><td bgcolor=\"$diffcolorEmpty\"> </td><td bgcolor=\"$diffcolorAdd\">$_</td></tr>\n"; |
# in order to get some nice 'ediff'-mode output |
| } |
# states: |
| else { # we got minus before |
# "dump" - just dump the value |
| $state = "PreChange"; |
# "PreChangeRemove" - we began with '-' .. so this could be the start of a 'change' area or just remove |
| $rightCol[$rightRow++] = $_; |
# "PreChange" - okey, we got several '-' lines and moved to '+' lines -> this is a change block |
| } |
########## |
| } |
|
| elsif ($diffcode eq '-') { |
|
| $state = "PreChangeRemove"; |
|
| $leftCol[$leftRow++] = $_; |
|
| } |
|
| else { # empty diffcode |
|
| flush_diff_rows \@leftCol, \@rightCol, $leftRow, $rightRow; |
|
| print "<tr><td>$_</td><td>$_</td></tr>\n"; |
|
| $state = "dump"; |
|
| $leftRow = 0; |
|
| $rightRow = 0; |
|
| } |
|
| } |
|
| } |
|
| flush_diff_rows \@leftCol, \@rightCol, $leftRow, $rightRow; |
|
| |
|
| # state is empty if we didn't have any change |
if ($diffcode eq '+') { |
| if (!$state) { |
if ($state eq "dump") |
| print "<tr><td colspan=2> </td></tr>"; |
{ # 'change' never begins with '+': just dump out value |
| print "<tr bgcolor=\"$diffcolorEmpty\" >"; |
print |
| print "<td colspan=2 align=center><b>- No viewable Change -</b></td></tr>"; |
"<tr><td bgcolor=\"$diffcolorEmpty\"> </td><td bgcolor=\"$diffcolorAdd\">$_</td></tr>\n"; |
| } |
} else { # we got minus before |
| print "</table>"; |
$state = "PreChange"; |
| close($fh); |
$rightCol[$rightRow++] = $_; |
| |
} |
| |
} elsif ($diffcode eq '-') { |
| |
$state = "PreChangeRemove"; |
| |
$leftCol[$leftRow++] = $_; |
| |
} else { # empty diffcode |
| |
flush_diff_rows \@leftCol, \@rightCol, $leftRow, |
| |
$rightRow; |
| |
print "<tr><td>$_</td><td>$_</td></tr>\n"; |
| |
$state = "dump"; |
| |
$leftRow = 0; |
| |
$rightRow = 0; |
| |
} |
| |
} |
| |
} |
| |
flush_diff_rows \@leftCol, \@rightCol, $leftRow, $rightRow; |
| |
|
| print "<br><hr noshade width=\"100%\">\n"; |
# state is empty if we didn't have any change |
| |
if (!$state) { |
| |
print "<tr><td colspan=2> </td></tr>"; |
| |
print "<tr bgcolor=\"$diffcolorEmpty\" >"; |
| |
print |
| |
"<td colspan=2 align=center><b>- No viewable Change -</b></td></tr>"; |
| |
} |
| |
print "</table>"; |
| |
close($fh); |
| |
|
| print "<table border=0>"; |
print "<br><hr noshade width=\"100%\">\n"; |
| |
|
| print "<tr><td>"; |
print "<table border=0>"; |
| # print legend |
|
| print "<table border=1><tr><td>"; |
|
| print "Legend:<br><table border=0 cellspacing=0 cellpadding=1>\n"; |
|
| print "<tr><td align=center bgcolor=\"$diffcolorRemove\">Removed from v.$rev1</td><td bgcolor=\"$diffcolorEmpty\"> </td></tr>"; |
|
| print "<tr bgcolor=\"$diffcolorChange\"><td align=center colspan=2>changed lines</td></tr>"; |
|
| print "<tr><td bgcolor=\"$diffcolorEmpty\"> </td><td align=center bgcolor=\"$diffcolorAdd\">Added in v.$rev2</td></tr>"; |
|
| print "</table></td></tr></table>\n"; |
|
| |
|
| print "<td>"; |
print "<tr><td>"; |
| # Print format selector |
|
| print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}\">\n"; |
|
| foreach my $var (keys %input) { |
|
| next if ($var eq "f"); |
|
| next if (defined($DEFAULTVALUE{$var}) |
|
| && $DEFAULTVALUE{$var} eq $input{$var}); |
|
| print "<INPUT TYPE=HIDDEN NAME=\"",urlencode($var),"\" VALUE=\"", |
|
| urlencode($input{$var}),"\">\n"; |
|
| } |
|
| printDiffSelect($use_java_script); |
|
| print "<INPUT TYPE=SUBMIT VALUE=\"Show\">\n"; |
|
| print "</FORM>\n"; |
|
| print "</td>"; |
|
| |
|
| print "</tr></table>"; |
# print legend |
| |
print "<table border=1><tr><td>"; |
| |
print "Legend:<br><table border=0 cellspacing=0 cellpadding=1>\n"; |
| |
print |
| |
"<tr><td align=center bgcolor=\"$diffcolorRemove\">Removed from v.$rev1</td><td bgcolor=\"$diffcolorEmpty\"> </td></tr>"; |
| |
print |
| |
"<tr bgcolor=\"$diffcolorChange\"><td align=center colspan=2>changed lines</td></tr>"; |
| |
print |
| |
"<tr><td bgcolor=\"$diffcolorEmpty\"> </td><td align=center bgcolor=\"$diffcolorAdd\">Added in v.$rev2</td></tr>"; |
| |
print "</table></td></tr></table>\n"; |
| |
|
| |
print "<td>"; |
| |
|
| |
# Print format selector |
| |
print "<FORM METHOD=\"GET\" ACTION=\"${scriptwhere}\">\n"; |
| |
foreach my $var (keys %input) { |
| |
next if ($var eq "f"); |
| |
next |
| |
if (defined($DEFAULTVALUE{$var}) |
| |
&& $DEFAULTVALUE{$var} eq $input{$var}); |
| |
print "<INPUT TYPE=HIDDEN NAME=\"", urlencode($var), |
| |
"\" VALUE=\"", urlencode($input{$var}), "\">\n"; |
| |
} |
| |
printDiffSelect($use_java_script); |
| |
print "<INPUT TYPE=SUBMIT VALUE=\"Show\">\n"; |
| |
print "</FORM>\n"; |
| |
print "</td>"; |
| |
|
| |
print "</tr></table>"; |
| } |
} |
| |
|
| sub navigateHeader($$$$$) { |
sub navigateHeader($$$$$) { |
| my ($swhere,$path,$filename,$rev,$title) = @_; |
my ($swhere, $path, $filename, $rev, $title) = @_; |
| $swhere = "" if ($swhere eq $scriptwhere); |
$swhere = "" if ($swhere eq $scriptwhere); |
| $swhere = './' . urlencode($filename) if ($swhere eq ""); |
$swhere = './' . urlencode($filename) if ($swhere eq ""); |
| |
|
| print <<EOF; |
print <<EOF; |
| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> |
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> |
| <HTML> |
<HTML> |
| <HEAD> |
<HEAD> |
| Line 2789 $body_tag_for_src |
|
| Line 3057 $body_tag_for_src |
|
| <tr valign=bottom><td> |
<tr valign=bottom><td> |
| EOF |
EOF |
| |
|
| print &link($backicon, "$swhere$query#rev$rev"); |
print &link($backicon, "$swhere$query#rev$rev"); |
| print "<b>Return to ", &link($filename,"$swhere$query#rev$rev")," CVS log"; |
print "<b>Return to ", &link($filename, "$swhere$query#rev$rev"), |
| print "</b> $fileicon</td>"; |
" CVS log"; |
| |
print "</b> $fileicon</td>"; |
| |
|
| print "<td align=right>$diricon <b>Up to ", &clickablePath($path, 1), "</b></td>"; |
print "<td align=right>$diricon <b>Up to ", &clickablePath($path, 1), |
| print "</tr></table>"; |
"</b></td>"; |
| |
print "</tr></table>"; |
| } |
} |
| |
|
| sub plural_write($$) { |
sub plural_write($$) { |
| my ($num,$text) = @_; |
my ($num, $text) = @_; |
| if ($num != 1) { |
if ($num != 1) { |
| $text .= "s"; |
$text .= "s"; |
| } |
} |
| if ($num > 0) { |
|
| return join(' ', $num, $text); |
if ($num > 0) { |
| } |
return join (' ', $num, $text); |
| else { |
} else { |
| return ""; |
return ""; |
| } |
} |
| } |
} |
| |
|
| ## |
## |
| Line 2816 sub plural_write($$) { |
|
| Line 3086 sub plural_write($$) { |
|
| # H. Zeller <zeller@think.de> |
# H. Zeller <zeller@think.de> |
| ## |
## |
| sub readableTime($$) { |
sub readableTime($$) { |
| my ($i, $break, $retval); |
my ($i, $break, $retval); |
| my ($secs,$long) = @_; |
my ($secs, $long) = @_; |
| |
|
| # this function works correct for time >= 2 seconds |
# this function works correct for time >= 2 seconds |
| if ($secs < 2) { |
if ($secs < 2) { |
| return "very little time"; |
return "very little time"; |
| } |
} |
| |
|
| my %desc = (1 , 'second', |
my %desc = ( |
| 60, 'minute', |
1, 'second', 60, 'minute', 3600, 'hour', |
| 3600, 'hour', |
86400, 'day', 604800, 'week', 2628000, 'month', |
| 86400, 'day', |
31536000, 'year' |
| 604800, 'week', |
); |
| 2628000, 'month', |
my @breaks = sort { $a <=> $b } keys %desc; |
| 31536000, 'year'); |
$i = 0; |
| my @breaks = sort {$a <=> $b} keys %desc; |
|
| $i = 0; |
|
| while ($i <= $#breaks && $secs >= 2 * $breaks[$i]) { |
|
| $i++; |
|
| } |
|
| $i--; |
|
| $break = $breaks[$i]; |
|
| $retval = plural_write(int ($secs / $break), $desc{$break}); |
|
| |
|
| if ($long == 1 && $i > 0) { |
while ($i <= $#breaks && $secs >= 2 * $breaks[$i]) { |
| my $rest = $secs % $break; |
$i++; |
| |
} |
| $i--; |
$i--; |
| $break = $breaks[$i]; |
$break = $breaks[$i]; |
| my $resttime = plural_write(int ($rest / $break), |
$retval = plural_write(int($secs / $break), $desc{$break}); |
| $desc{$break}); |
|
| if ($resttime) { |
if ($long == 1 && $i > 0) { |
| $retval .= ", $resttime"; |
my $rest = $secs % $break; |
| |
$i--; |
| |
$break = $breaks[$i]; |
| |
my $resttime = plural_write(int($rest / $break), $desc{$break}); |
| |
if ($resttime) { |
| |
$retval .= ", $resttime"; |
| |
} |
| } |
} |
| } |
|
| |
|
| return $retval; |
return $retval; |
| } |
} |
| |
|
| ## |
## |
| Line 2862 sub readableTime($$) { |
|
| Line 3130 sub readableTime($$) { |
|
| # basename (last directory/file) is a link as well |
# basename (last directory/file) is a link as well |
| ## |
## |
| sub clickablePath($$) { |
sub clickablePath($$) { |
| my ($pathname,$clickLast) = @_; |
my ($pathname, $clickLast) = @_; |
| my $retval = ''; |
my $retval = ''; |
| |
|
| if ($pathname eq '/') { |
if ($pathname eq '/') { |
| # this should never happen - chooseCVSRoot() is |
|
| # intended to do this |
# this should never happen - chooseCVSRoot() is |
| $retval = "[$cvstree]"; |
# intended to do this |
| } |
$retval = "[$cvstree]"; |
| else { |
} else { |
| $retval .= ' ' . &link("[$cvstree]", sprintf('%s/%s#dirlist', |
$retval .= ' ' . &link("[$cvstree]", |
| $scriptname, |
sprintf('%s/%s#dirlist', $scriptname, $query)); |
| $query)); |
my $wherepath = ''; |
| my $wherepath = ''; |
my ($lastslash) = $pathname =~ m|/$|; |
| my ($lastslash) = $pathname =~ m|/$|; |
|
| foreach (split(/\//, $pathname)) { |
foreach (split (/\//, $pathname)) { |
| $retval .= " / "; |
$retval .= " / "; |
| $wherepath .= "/$_"; |
$wherepath .= "/$_"; |
| my ($last) = "$wherepath/" eq "/$pathname" |
my ($last) = "$wherepath/" eq "/$pathname" |
| || $wherepath eq "/$pathname"; |
|| $wherepath eq "/$pathname"; |
| if ($clickLast || !$last) { |
|
| $retval .= &link($_, join('', |
if ($clickLast || !$last) { |
| $scriptname, |
$retval .= &link($_, |
| urlencode($wherepath), |
join ('', $scriptname, |
| (!$last || $lastslash ? '/' : ''), |
urlencode($wherepath), |
| $query, |
(!$last || $lastslash ? '/' : ''), |
| (!$last || $lastslash ? "#dirlist" : ""))); |
$query, |
| } |
(!$last || $lastslash ? "#dirlist" : "") |
| else { # do not make a link to the current dir |
)); |
| $retval .= $_; |
} else { # do not make a link to the current dir |
| } |
$retval .= $_; |
| |
} |
| |
} |
| } |
} |
| } |
return $retval; |
| return $retval; |
|
| } |
} |
| |
|
| sub chooseCVSRoot() { |
sub chooseCVSRoot() { |
| if (2 <= @CVSROOT) { |
if (2 <= @CVSROOT) { |
| my ($k); |
my ($k); |
| print "<form method=\"GET\" action=\"${scriptwhere}\">\n"; |
print "<form method=\"GET\" action=\"${scriptwhere}\">\n"; |
| foreach $k (keys %input) { |
foreach $k (keys %input) { |
| print "<input type=hidden NAME=$k VALUE=$input{$k}>\n" |
print "<input type=hidden NAME=$k VALUE=$input{$k}>\n" |
| if ($input{$k}) && ($k ne "cvsroot"); |
if ($input{$k}) && ($k ne "cvsroot"); |
| |
} |
| |
|
| |
# Form-Elements look wierd in Netscape if the background |
| |
# isn't gray and the form elements are not placed |
| |
# within a table ... |
| |
print "<table><tr>"; |
| |
print "<td>CVS Root:</td>"; |
| |
print "<td>\n<select name=\"cvsroot\""; |
| |
print " onchange=\"submit()\"" if ($use_java_script); |
| |
print ">\n"; |
| |
|
| |
foreach $k (@CVSROOT) { |
| |
print "<option value=\"$k\""; |
| |
print " selected" if ($k eq $cvstree); |
| |
print ">", ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : $k), |
| |
"</option>\n"; |
| |
} |
| |
print "</select>\n</td>"; |
| |
print "<td>"; |
| |
} else { |
| |
|
| |
# no choice -- but we need the form to select module/path, at least for Netscape |
| |
print "<form method=\"GET\" action=\"${scriptwhere}\">\n"; |
| |
print "CVS Root: <b>[$cvstree]</b>"; |
| } |
} |
| # Form-Elements look wierd in Netscape if the background |
|
| # isn't gray and the form elements are not placed |
|
| # within a table ... |
|
| print "<table><tr>"; |
|
| print "<td>CVS Root:</td>"; |
|
| print "<td>\n<select name=\"cvsroot\""; |
|
| print " onchange=\"submit()\"" if ($use_java_script); |
|
| print ">\n"; |
|
| foreach $k (@CVSROOT) { |
|
| print "<option value=\"$k\""; |
|
| print " selected" if ($k eq $cvstree); |
|
| print ">", ($CVSROOTdescr{$k} ? $CVSROOTdescr{$k} : $k), "</option>\n"; |
|
| } |
|
| print "</select>\n</td>"; |
|
| print "<td>"; |
|
| } |
|
| else { |
|
| # no choice .. |
|
| print "CVS Root: <b>[$cvstree]</b>"; |
|
| } |
|
| |
|
| print " Module path or alias:\n"; |
print " Module path or alias:\n"; |
| print "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"\" SIZE=15>\n"; |
print "<INPUT TYPE=TEXT NAME=\"path\" VALUE=\"\" SIZE=15>\n"; |
| print "<input type=submit value=\"Go\">"; |
print "<input type=submit value=\"Go\">"; |
| |
|
| if (2 <= @CVSROOT) { |
if (2 <= @CVSROOT) { |
| print "</td></tr></table></form>"; |
print "</td></tr></table>"; |
| } |
} |
| |
print "</form>"; |
| } |
} |
| |
|
| sub chooseMirror() { |
sub chooseMirror() { |
| my ($mirror,$moremirrors); |
my ($mirror, $moremirrors); |
| $moremirrors = 0; |
$moremirrors = 0; |
| # This code comes from the original BSD-cvsweb |
|
| # and may not be useful for your site; If you don't |
# This code comes from the original BSD-cvsweb |
| # set %MIRRORS this won't show up, anyway |
# and may not be useful for your site; If you don't |
| # |
# set %MIRRORS this won't show up, anyway |
| # Should perhaps exlude the current site somehow.. |
# |
| if (keys %MIRRORS) { |
# Should perhaps exlude the current site somehow.. |
| print "\nThis cvsweb is mirrored in:\n"; |
if (keys %MIRRORS) { |
| foreach $mirror (keys %MIRRORS) { |
print "\nThis cvsweb is mirrored in:\n"; |
| print ", " if ($moremirrors); |
|
| print &link(htmlquote($mirror),$MIRRORS{$mirror}); |
foreach $mirror (keys %MIRRORS) { |
| $moremirrors = 1; |
print ", " if ($moremirrors); |
| |
print &link(htmlquote($mirror), $MIRRORS{$mirror}); |
| |
$moremirrors = 1; |
| |
} |
| |
print "<p>\n"; |
| } |
} |
| print "<p>\n"; |
|
| } |
|
| } |
} |
| |
|
| sub fileSortCmp() { |
sub fileSortCmp() { |
| my ($comp) = 0; |
my ($comp) = 0; |
| my ($c,$d,$af,$bf); |
my ($c, $d, $af, $bf); |
| |
|
| ($af = $a) =~ s/,v$//; |
($af = $a) =~ s/,v$//; |
| ($bf = $b) =~ s/,v$//; |
($bf = $b) =~ s/,v$//; |
| my ($rev1,$date1,$log1,$author1,$filename1) = @{$fileinfo{$af}} |
my ($rev1, $date1, $log1, $author1, $filename1) = @{$fileinfo{$af}} |
| if (defined($fileinfo{$af})); |
if (defined($fileinfo{$af})); |
| my ($rev2,$date2,$log2,$author2,$filename2) = @{$fileinfo{$bf}} |
my ($rev2, $date2, $log2, $author2, $filename2) = @{$fileinfo{$bf}} |
| if (defined($fileinfo{$bf})); |
if (defined($fileinfo{$bf})); |
| |
|
| if (defined($filename1) && defined($filename2) && $af eq $filename1 && $bf eq $filename2) { |
if (defined($filename1) && defined($filename2) && $af eq $filename1 |
| # Two files |
&& $bf eq $filename2) |
| $comp = -revcmp($rev1, $rev2) if ($byrev && $rev1 && $rev2); |
{ |
| $comp = ($date2 <=> $date1) if ($bydate && $date1 && $date2); |
|
| $comp = ($log1 cmp $log2) if ($bylog && $log1 && $log2); |
# Two files |
| $comp = ($author1 cmp $author2) if ($byauthor && $author1 && $author2); |
$comp = -revcmp($rev1, $rev2) if ($byrev && $rev1 && $rev2); |
| } |
$comp = ($date2 <=> $date1) if ($bydate && $date1 && $date2); |
| if ($comp == 0) { |
$comp = ($log1 cmp $log2) if ($bylog && $log1 && $log2); |
| # Directories first, then sorted on name if no other sort critera |
$comp = ($author1 cmp $author2) |
| # available. |
if ($byauthor && $author1 && $author2); |
| my $ad = ((-d "$fullname/$a")?"D":"F"); |
} |
| my $bd = ((-d "$fullname/$b")?"D":"F"); |
|
| ($c=$a) =~ s|.*/||; |
if ($comp == 0) { |
| ($d=$b) =~ s|.*/||; |
|
| $comp = ("$ad$c" cmp "$bd$d"); |
# Directories first, then sorted on name if no other sort critera |
| } |
# available. |
| return $comp; |
my $ad = ((-d "$fullname/$a") ? "D" : "F"); |
| |
my $bd = ((-d "$fullname/$b") ? "D" : "F"); |
| |
($c = $a) =~ s|.*/||; |
| |
($d = $b) =~ s|.*/||; |
| |
$comp = ("$ad$c" cmp "$bd$d"); |
| |
} |
| |
return $comp; |
| } |
} |
| |
|
| # make A url for downloading |
# make A url for downloading |
| sub download_url($$;$) { |
sub download_url($$;$) { |
| my ($url,$revision,$mimetype) = @_; |
my ($url, $revision, $mimetype) = @_; |
| |
|
| $revision =~ s/\b0\.//; |
$revision =~ s/\b0\.//; |
| |
|
| if (defined($checkoutMagic) |
if (defined($checkoutMagic) |
| && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) |
| my $path = $where; |
{ |
| $path =~ s|/[^/]*$|/|; |
my $path = $where; |
| $url = "$scriptname/$checkoutMagic/${path}$url"; |
$path =~ s|/[^/]*$|/|; |
| } |
$url = "$scriptname/$checkoutMagic/${path}$url"; |
| $url .= "?rev=$revision"; |
} |
| $url .= '&content-type=' . urlencode($mimetype) if (defined($mimetype)); |
$url .= "?rev=$revision"; |
| |
$url .= '&content-type=' . urlencode($mimetype) if (defined($mimetype)); |
| |
|
| $url; |
$url; |
| } |
} |
| |
|
| # Presents a link to download the |
# Presents a link to download the |
| # selected revision |
# selected revision |
| sub download_link($$$;$) { |
sub download_link($$$;$) { |
| my ($url, $revision, $textlink, $mimetype) = @_; |
my ($url, $revision, $textlink, $mimetype) = @_; |
| my ($fullurl) = download_url($url, $revision, $mimetype); |
my ($fullurl) = download_url($url, $revision, $mimetype); |
| |
|
| $fullurl =~ s/:/sprintf("%%%02x", ord($&))/eg; |
$fullurl =~ s/:/sprintf("%%%02x", ord($&))/eg; |
| |
|
| printf '<A HREF="%s"', hrefquote("$fullurl$barequery"); |
printf '<A HREF="%s"', hrefquote("$fullurl$barequery"); |
| |
|
| if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { |
if ($open_extern_window |
| print ' target="cvs_checkout"'; |
&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) |
| # we should have |
{ |
| # 'if (document.cvswin==null) document.cvswin=window.open(...' |
print ' target="cvs_checkout"'; |
| # in order to allow the user to resize the window; otherwise |
|
| # the user may resize the window, but on next checkout - zap - |
|
| # its original (configured s. cvsweb.conf) size is back again |
|
| # .. annoying (if $extern_window_(width|height) is defined) |
|
| # but this if (..) solution is far from perfect |
|
| # what we need to do as well is |
|
| # 1) save cvswin in an invisible frame that always exists |
|
| # (document.cvswin will be void on next load) |
|
| # 2) on close of the cvs_checkout - window set the cvswin |
|
| # variable to 'null' again - so that it will be |
|
| # reopenend with the configured size |
|
| # anyone a JavaScript programmer ? |
|
| # .. so here without if (..): |
|
| # currently, the best way is to comment out the size parameters |
|
| # ($extern_window...) in cvsweb.conf. |
|
| if ($use_java_script) { |
|
| my @attr = qw(resizeable scrollbars); |
|
| |
|
| push @attr, qw(status toolbar) |
# we should have |
| if (defined($mimetype) && $mimetype eq "text/html"); |
# 'if (document.cvswin==null) document.cvswin=window.open(...' |
| |
# in order to allow the user to resize the window; otherwise |
| |
# the user may resize the window, but on next checkout - zap - |
| |
# its original (configured s. cvsweb.conf) size is back again |
| |
# .. annoying (if $extern_window_(width|height) is defined) |
| |
# but this if (..) solution is far from perfect |
| |
# what we need to do as well is |
| |
# 1) save cvswin in an invisible frame that always exists |
| |
# (document.cvswin will be void on next load) |
| |
# 2) on close of the cvs_checkout - window set the cvswin |
| |
# variable to 'null' again - so that it will be |
| |
# reopenend with the configured size |
| |
# anyone a JavaScript programmer ? |
| |
# .. so here without if (..): |
| |
# currently, the best way is to comment out the size parameters |
| |
# ($extern_window...) in cvsweb.conf. |
| |
if ($use_java_script) { |
| |
my @attr = qw(resizeable scrollbars); |
| |
|
| push @attr, "width=$extern_window_width" |
push @attr, qw(status toolbar) |
| if (defined($extern_window_width)); |
if (defined($mimetype) && $mimetype eq "text/html"); |
| |
|
| push @attr, "height=$extern_window_height" |
push @attr, "width=$extern_window_width" |
| if (defined($extern_window_height)); |
if (defined($extern_window_width)); |
| |
|
| printf q` onClick="window.open('%s','cvs_checkout','%s');"`, |
push @attr, "height=$extern_window_height" |
| hrefquote($fullurl), join(',', @attr); |
if (defined($extern_window_height)); |
| |
|
| |
printf |
| |
q` onClick="window.open('%s','cvs_checkout','%s');"`, |
| |
hrefquote($fullurl), join (',', @attr); |
| |
} |
| } |
} |
| } |
print "><b>$textlink</b></A>"; |
| print "><b>$textlink</b></A>"; |
|
| } |
} |
| |
|
| # Returns a Query string with the |
# Returns a Query string with the |
| # specified parameter toggled |
# specified parameter toggled |
| sub toggleQuery($$) { |
sub toggleQuery($$) { |
| my ($toggle,$value) = @_; |
my ($toggle, $value) = @_; |
| my ($newquery,$var); |
my ($newquery, $var); |
| my (%vars); |
my (%vars); |
| %vars = %input; |
%vars = %input; |
| if (defined($value)) { |
|
| $vars{$toggle} = $value; |
if (defined($value)) { |
| } |
$vars{$toggle} = $value; |
| else { |
} else { |
| $vars{$toggle} = $vars{$toggle} ? 0 : 1; |
$vars{$toggle} = $vars{$toggle} ? 0 : 1; |
| } |
|
| # Build a new query of non-default paramenters |
|
| $newquery = ""; |
|
| foreach $var (@stickyvars) { |
|
| my ($value) = defined($vars{$var}) ? $vars{$var} : ""; |
|
| my ($default) = defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : ""; |
|
| if ($value ne $default) { |
|
| $newquery .= "&" if ($newquery ne ""); |
|
| $newquery .= urlencode($var) . "=" . urlencode($value); |
|
| } |
} |
| } |
|
| if ($newquery) { |
# Build a new query of non-default paramenters |
| return '?' . $newquery; |
$newquery = ""; |
| } |
foreach $var (@stickyvars) { |
| return ""; |
my ($value) = defined($vars{$var}) ? $vars{$var} : ""; |
| |
my ($default) = |
| |
defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : ""; |
| |
|
| |
if ($value ne $default) { |
| |
$newquery .= "&" if ($newquery ne ""); |
| |
$newquery .= urlencode($var) . "=" . urlencode($value); |
| |
} |
| |
} |
| |
|
| |
if ($newquery) { |
| |
return '?' . $newquery; |
| |
} |
| |
return ""; |
| } |
} |
| |
|
| sub urlencode($) { |
sub urlencode($) { |
| local($_) = @_; |
local ($_) = @_; |
| |
|
| s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge; |
s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge; |
| |
|
| $_; |
$_; |
| } |
} |
| |
|
| sub htmlquote($) { |
sub htmlquote($) { |
| local($_) = @_; |
local ($_) = @_; |
| |
|
| # Special Characters; RFC 1866 |
# Special Characters; RFC 1866 |
| s/&/&/g; |
s/&/&/g; |
| s/\"/"/g; |
s/\"/"/g; |
| s/</</g; |
s/</</g; |
| s/>/>/g; |
s/>/>/g; |
| |
|
| $_; |
$_; |
| } |
} |
| |
|
| sub htmlunquote($) { |
sub htmlunquote($) { |
| local($_) = @_; |
local ($_) = @_; |
| |
|
| # Special Characters; RFC 1866 |
# Special Characters; RFC 1866 |
| s/"/\"/g; |
s/"/\"/g; |
| s/</</g; |
s/</</g; |
| s/>/>/g; |
s/>/>/g; |
| s/&/&/g; |
s/&/&/g; |
| |
|
| $_; |
$_; |
| } |
} |
| |
|
| sub hrefquote($) { |
sub hrefquote($) { |
| local($_) = @_; |
local ($_) = @_; |
| |
|
| y/ /+/; |
y/ /+/; |
| |
|
| htmlquote($_) |
htmlquote($_) |
| } |
} |
| |
|
| sub http_header(;$) { |
sub http_header(;$) { |
| my $content_type = shift || "text/html"; |
my $content_type = shift || "text/html"; |
| |
|
| $content_type .= "; charset=$charset" |
$content_type .= "; charset=$charset" |
| if $content_type =~ m,^text/, && defined($charset) && $charset; |
if $content_type =~ m,^text/, && defined($charset) && $charset; |
| |
|
| if (defined($moddate)) { |
if (defined($moddate)) { |
| |
if ($is_mod_perl) { |
| |
Apache->request->header_out( |
| |
"Last-Modified" => scalar gmtime($moddate) |
| |
. " GMT"); |
| |
} else { |
| |
print "Last-Modified: ", scalar gmtime($moddate), |
| |
" GMT\r\n"; |
| |
} |
| |
} |
| |
|
| if ($is_mod_perl) { |
if ($is_mod_perl) { |
| Apache->request->header_out("Last-Modified" => scalar gmtime($moddate) . " GMT"); |
Apache->request->content_type($content_type); |
| |
} else { |
| |
print "Content-type: $content_type\r\n"; |
| } |
} |
| else { |
|
| print "Last-Modified: ", scalar gmtime($moddate), " GMT\r\n"; |
if ($allow_compress && $maycompress) { |
| |
if ($has_zlib |
| |
|| (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c")) |
| |
) |
| |
{ |
| |
|
| |
if ($is_mod_perl) { |
| |
Apache->request->content_encoding("x-gzip"); |
| |
Apache->request->header_out( |
| |
Vary => "Accept-Encoding"); |
| |
Apache->request->send_http_header; |
| |
} else { |
| |
print "Content-encoding: x-gzip\r\n"; |
| |
print "Vary: Accept-Encoding\r\n" |
| |
; #RFC 2068, 14.43 |
| |
print "\r\n"; # Close headers |
| |
} |
| |
$| = 1; |
| |
$| = 0; # Flush header output |
| |
|
| |
if ($has_zlib) { |
| |
tie *GZIP, __PACKAGE__, \*STDOUT; |
| |
} |
| |
select(GZIP); |
| |
$gzip_open = 1; |
| |
|
| |
# print "<!-- gzipped -->" if ($content_type =~ m|^text/html\b|); |
| |
} else { |
| |
if ($is_mod_perl) { |
| |
Apache->request->send_http_header; |
| |
} else { |
| |
print "\r\n"; # Close headers |
| |
} |
| |
print |
| |
"<font size=-1>Unable to find gzip binary in the <b>\$command_path</b> ($command_path) to compress output</font><br>"; |
| |
} |
| |
} else { |
| |
|
| |
if ($is_mod_perl) { |
| |
Apache->request->send_http_header; |
| |
} else { |
| |
print "\r\n"; # Close headers |
| |
} |
| } |
} |
| } |
|
| if ($is_mod_perl) { |
|
| Apache->request->content_type($content_type); |
|
| } |
|
| else { |
|
| print "Content-type: $content_type\r\n"; |
|
| } |
|
| if ($allow_compress && $maycompress) { |
|
| if ($has_zlib || (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c"))) { |
|
| if ($is_mod_perl) { |
|
| Apache->request->content_encoding("x-gzip"); |
|
| Apache->request->header_out(Vary => "Accept-Encoding"); |
|
| Apache->request->send_http_header; |
|
| } |
|
| else { |
|
| print "Content-encoding: x-gzip\r\n"; |
|
| print "Vary: Accept-Encoding\r\n"; #RFC 2068, 14.43 |
|
| print "\r\n"; # Close headers |
|
| } |
|
| $| = 1; $| = 0; # Flush header output |
|
| if ($has_zlib) { |
|
| tie *GZIP, __PACKAGE__, \*STDOUT; |
|
| } |
|
| select(GZIP); |
|
| $gzip_open = 1; |
|
| # print "<!-- gzipped -->" if ($content_type =~ m|^text/html\b|); |
|
| } |
|
| else { |
|
| if ($is_mod_perl) { |
|
| Apache->request->send_http_header; |
|
| } |
|
| else { |
|
| print "\r\n"; # Close headers |
|
| } |
|
| print "<font size=-1>Unable to find gzip binary in the <b>\$command_path</b> ($command_path) to compress output</font><br>"; |
|
| } |
|
| } |
|
| else { |
|
| if ($is_mod_perl) { |
|
| Apache->request->send_http_header; |
|
| } |
|
| else { |
|
| print "\r\n"; # Close headers |
|
| } |
|
| } |
|
| } |
} |
| |
|
| sub html_header($) { |
sub html_header($) { |
| my ($title) = @_; |
my ($title) = @_; |
| http_header("text/html"); |
http_header("text/html"); |
| print <<EOH; |
print <<EOH; |
| <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" |
<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" |
| "http://www.w3.org/TR/REC-html40/loose.dtd"> |
"http://www.w3.org/TR/REC-html40/loose.dtd"> |
| <html> |
<html> |
|
|
| } |
} |
| |
|
| sub html_footer() { |
sub html_footer() { |
| return "<hr noshade><address>$address</address>\n"; |
return "<hr noshade><address>$address</address></body></html>\n"; |
| } |
} |
| |
|
| sub link_tags($) { |
sub link_tags($) { |
| my ($tags) = @_; |
my ($tags) = @_; |
| my ($ret) = ""; |
my ($ret) = ""; |
| my ($fileurl,$filename); |
my ($fileurl, $filename); |
| |
|
| ($filename = $where) =~ s/^.*\///; |
($filename = $where) =~ s/^.*\///; |
| $fileurl = './' . urlencode($filename); |
$fileurl = './' . urlencode($filename); |
| |
|
| foreach my $sym (split(", ", $tags)) { |
foreach my $sym (split (", ", $tags)) { |
| $ret .= ",\n" if ($ret ne ""); |
$ret .= ",\n" if ($ret ne ""); |
| $ret .= &link($sym, $fileurl . toggleQuery('only_with_tag',$sym)); |
$ret .= |
| } |
&link($sym, $fileurl . toggleQuery('only_with_tag', $sym)); |
| return "$ret\n"; |
} |
| |
return "$ret\n"; |
| } |
} |
| |
|
| # |
# |
| # See if a module is listed in the config file's @HideModule list. |
# See if a module is listed in the config file's @HideModules list. |
| # |
# |
| sub forbidden_module($) { |
sub forbidden_module($) { |
| my($module) = @_; |
my ($module) = @_; |
| |
local $_; |
| |
|
| for (my $i=0; $i < @HideModules; $i++) { |
for (@HideModules) { |
| return 1 if $module eq $HideModules[$i]; |
return 1 if $module =~ $_; |
| } |
} |
| |
return 0; |
| |
} |
| |
|
| return 0; |
sub forbidden_file($) { |
| |
my ($path) = @_; |
| |
$path = substr($path, length($cvsroot) + 1); |
| |
local $_; |
| |
for (@ForbiddenFiles) { |
| |
return 1 if $path =~ $_; |
| |
} |
| |
return 0; |
| } |
} |
| |
|
| # Close the GZIP handle remove the tie. |
# Close the GZIP handle remove the tie. |
| |
|
| sub gzipclose { |
sub gzipclose { |
| if ($gzip_open) { |
if ($gzip_open) { |
| select(STDOUT); |
select(STDOUT); |
| close(GZIP); |
close(GZIP); |
| untie *GZIP; |
untie *GZIP; |
| $gzip_open = 0; |
$gzip_open = 0; |
| } |
} |
| } |
} |
| |
|
| Line 3244 sub gzipclose { |
|
| Line 3555 sub gzipclose { |
|
| |
|
| sub MAGIC1() { 0x1f } |
sub MAGIC1() { 0x1f } |
| sub MAGIC2() { 0x8b } |
sub MAGIC2() { 0x8b } |
| sub OSCODE() { 3 } |
sub OSCODE() { 3 } |
| |
|
| sub TIEHANDLE { |
sub TIEHANDLE { |
| my ($class, $out) = @_; |
my ($class, $out) = @_; |
| my ($d) = Compress::Zlib::deflateInit(-Level => Compress::Zlib::Z_BEST_COMPRESSION(), |
my ($d) = Compress::Zlib::deflateInit( |
| -WindowBits => -Compress::Zlib::MAX_WBITS()) or return undef; |
-Level => Compress::Zlib::Z_BEST_COMPRESSION(), |
| |
-WindowBits => -Compress::Zlib::MAX_WBITS() |
| |
) or return undef; |
| my ($o) = { |
my ($o) = { |
| handle => $out, |
handle => $out, |
| dh => $d, |
dh => $d, |
| crc => 0, |
crc => 0, |
| len => 0, |
len => 0, |
| }; |
}; |
| my ($header) = pack("c10", MAGIC1, MAGIC2, Compress::Zlib::Z_DEFLATED(), 0,0,0,0,0,0, OSCODE); |
my ($header) = |
| |
pack("c10", MAGIC1, MAGIC2, Compress::Zlib::Z_DEFLATED(), 0, 0, 0, |
| |
0, 0, 0, OSCODE); |
| print {$o->{handle}} $header; |
print {$o->{handle}} $header; |
| return bless($o, $class); |
return bless($o, $class); |
| } |
} |
| |
|
| sub PRINT { |
sub PRINT { |
| my ($o) = shift; |
my ($o) = shift; |
| my ($buf) = join(defined $, ? $, : "",@_); |
my ($buf) = join (defined $, ? $, : "", @_); |
| my ($len) = length($buf); |
my ($len) = length($buf); |
| my ($compressed, $status) = $o->{dh}->deflate($buf); |
my ($compressed, $status) = $o->{dh}->deflate($buf); |
| print {$o->{handle}} $compressed if defined($compressed); |
print {$o->{handle}} $compressed if defined($compressed); |
|
|
| } |
} |
| |
|
| sub PRINTF { |
sub PRINTF { |
| my ($o) = shift; |
my ($o) = shift; |
| my ($fmt) = shift; |
my ($fmt) = shift; |
| my ($buf) = sprintf($fmt, @_); |
my ($buf) = sprintf($fmt, @_); |
| my ($len) = length($buf); |
my ($len) = length($buf); |
|
|
| |
|
| sub CLOSE { |
sub CLOSE { |
| my ($o) = @_; |
my ($o) = @_; |
| return if !defined( $o->{dh}); |
return if !defined($o->{dh}); |
| my ($buf) = $o->{dh}->flush(); |
my ($buf) = $o->{dh}->flush(); |
| $buf .= pack("V V", $o->{crc}, $o->{len}); |
$buf .= pack("V V", $o->{crc}, $o->{len}); |
| print {$o->{handle}} $buf; |
print {$o->{handle}} $buf; |
![[BACK]](/cvsweb/icons/back.gif){kind=icon}
Return to cvsweb.cgi CVS log ![[TXT]](/cvsweb/icons/text.gif){kind=icon}
![[DIR]](/cvsweb/icons/dir.gif){kind=icon}
Up to [cvsweb.bsd.lv] / cvsweb