";
my $generateBackoutCVSCommands = 0;
if (defined $::FORM{'generateBackoutCVSCommands'}) {
@@ -47,23 +71,20 @@ if (!$generateBackoutCVSCommands) {
";
- $script_str='';
- &setup_script;
-
- print "$script_str";
+ print setup_script();
}
#print "";
-$CVS_REPOS_SUFIX = $CVS_ROOT;
+my $CVS_REPOS_SUFIX = $::CVS_ROOT;
$CVS_REPOS_SUFIX =~ s/\//_/g;
-$CHECKIN_DATA_FILE = "data/checkinlog${CVS_REPOS_SUFIX}";
-$CHECKIN_INDEX_FILE = "data/index${CVS_REPOS_SUFIX}";
+my $CHECKIN_DATA_FILE = "data/checkinlog${CVS_REPOS_SUFIX}";
+my $CHECKIN_INDEX_FILE = "data/index${CVS_REPOS_SUFIX}";
-$SORT_HEAD="bgcolor=\"#DDDDDD\"";
+my $SORT_HEAD="bgcolor=\"#DDDDDD\"";
#
# Log the query
@@ -72,106 +93,112 @@ Log("Query [$ENV{'REMOTE_ADDR'}]: $ENV{'QUERY_STRING'}");
#
# build a module map
#
-$query_module = $::FORM{'module'};
+$::query_module = $::FORM{'module'};
#
# allow ?file=/a/b/c/foo.c to be synonymous with ?dir=/a/b/c&file=foo.c
#
-if ( $::FORM{'dir'} eq '' ) {
+$::FORM{'file'} = "" unless defined $::FORM{'file'};
+unless ($::FORM{'dir'}) {
$::FORM{'file'} = Fix_BonsaiLink($::FORM{'file'});
if ($::FORM{'file'} =~ m@(.*?/)([^/]*)$@) {
$::FORM{'dir'} = $1;
$::FORM{'file'} = $2;
+ } else {
+ $::FORM{'dir'} = "";
}
}
#
# build a directory map
#
-@query_dirs = split(/[;, \t]+/, $::FORM{'dir'});
+@::query_dirs = split(/[;, \t]+/, $::FORM{'dir'});
-$query_file = $::FORM{'file'};
-$query_filetype = $::FORM{'filetype'};
-$query_logexpr = $::FORM{'logexpr'};
+$::query_file = $::FORM{'file'};
+$::query_filetype = $::FORM{'filetype'};
+$::query_logexpr = $::FORM{'logexpr'};
#
# date
#
-$query_date_type = $::FORM{'date'};
-if( $query_date_type eq 'hours' ){
- $query_date_min = time - $::FORM{'hours'}*60*60;
+$::query_date_type = $::FORM{'date'};
+if( $::query_date_type eq 'hours' ){
+ $::query_date_min = time - $::FORM{'hours'}*60*60;
}
-elsif( $query_date_type eq 'day' ){
- $query_date_min = time - 24*60*60;
+elsif( $::query_date_type eq 'day' ){
+ $::query_date_min = time - 24*60*60;
}
-elsif( $query_date_type eq 'week' ){
- $query_date_min = time - 7*24*60*60;
+elsif( $::query_date_type eq 'week' ){
+ $::query_date_min = time - 7*24*60*60;
}
-elsif( $query_date_type eq 'month' ){
- $query_date_min = time - 30*24*60*60;
+elsif( $::query_date_type eq 'month' ){
+ $::query_date_min = time - 30*24*60*60;
}
-elsif( $query_date_type eq 'all' ){
- $query_date_min = 0;
+elsif( $::query_date_type eq 'all' ){
+ $::query_date_min = 0;
}
-elsif( $query_date_type eq 'explicit' ){
+elsif( $::query_date_type eq 'explicit' ){
if ($::FORM{'mindate'} ne "") {
- $query_date_min = parse_date($::FORM{'mindate'});
+ $::query_date_min = parse_date($::FORM{'mindate'});
}
if ($::FORM{'maxdate'} ne "") {
- $query_date_max = parse_date($::FORM{'maxdate'});
+ $::query_date_max = parse_date($::FORM{'maxdate'});
}
}
else {
- $query_date_min = time-60*60*2;
+ $::query_date_min = time-60*60*2;
}
#
# who
#
-$query_who = $::FORM{'who'};
-$query_whotype = $::FORM{'whotype'};
+$::query_who = $::FORM{'who'};
+$::query_whotype = $::FORM{'whotype'};
-$show_raw = 0;
+my $show_raw = 0;
$show_raw = $::FORM{'raw'} ne ''
if $::FORM{'raw'};
#
# branch
#
-$query_branch = $::FORM{'branch'};
-if (!defined $query_branch) {
- $query_branch = 'HEAD';
+$::query_branch = $::FORM{'branch'};
+if (!defined $::query_branch) {
+ $::query_branch = 'HEAD';
}
-$query_branchtype = $::FORM{'branchtype'};
+$::query_branchtype = $::FORM{'branchtype'};
#
# tags
#
-$query_begin_tag = $::FORM{'begin_tag'};
-$query_end_tag = $::FORM{'end_tag'};
+$::query_begin_tag = $::FORM{'begin_tag'};
+$::query_end_tag = $::FORM{'end_tag'};
#
# Get the query in english and print it.
#
+my ($t, $e);
$t = $e = &query_to_english;
$t =~ s/<[^>]*>//g;
-$query_debug = $::FORM{'debug'};
+$::query_debug = $::FORM{'debug'};
my %mod_map = ();
-$result= &query_checkins( %mod_map );
+my $result= &query_checkins( %mod_map );
-for $i (@{$result}) {
- $w{"$i->[$CI_WHO]\@$userdomain"} = 1;
+my %w;
+
+for my $i (@{$result}) {
+ $w{"$i->[$::CI_WHO]\@$userdomain"} = 1;
}
-@p = sort keys %w;
-$pCount = @p;
-$s = join(",%20", @p);
+my @p = sort keys %w;
+my $pCount = @p;
+my $s = join(",%20", @p);
$e =~ s/Checkins in/In/;
@@ -193,12 +220,12 @@ if (defined $::FORM{'generateBackoutCVSCommands'}) {
";
foreach my $ci (@{$result}) {
- if ($ci->[$CI_REV] eq "") {
- print "echo 'Changes made to $ci->[$CI_DIR]/$ci->[$CI_FILE] need to be backed out by hand'\n";
+ if ($ci->[$::CI_REV] eq "") {
+ print "echo 'Changes made to $ci->[$::CI_DIR]/$ci->[$::CI_FILE] need to be backed out by hand'\n";
next;
}
- my $prev_revision = PrevRev($ci->[$CI_REV]);
- print "cvs update -j$ci->[$CI_REV] -j$prev_revision $ci->[$CI_DIR]/$ci->[$CI_FILE]\n";
+ my $prev_revision = PrevRev($ci->[$::CI_REV]);
+ print "cvs update -j$ci->[$::CI_REV] -j$prev_revision $ci->[$::CI_DIR]/$ci->[$::CI_FILE]\n";
}
exit;
}
@@ -212,48 +239,48 @@ PutsHeader($t, "CVS Checkins", "$menu");
$|=1;
-$head_who = '';
-$head_file = '';
-$head_directory = '';
-$head_delta = '';
-$head_date = '';
+my $head_who = '';
+my $head_file = '';
+my $head_directory = '';
+my $head_delta = '';
+my $head_date = '';
if( !$show_raw ) {
if( $::FORM{"sortby"} eq "Who" ){
$result = [sort {
- $a->[$CI_WHO] cmp $b->[$CI_WHO]
- || $b->[$CI_DATE] <=> $a->[$CI_DATE]
+ $a->[$::CI_WHO] cmp $b->[$::CI_WHO]
+ || $b->[$::CI_DATE] <=> $a->[$::CI_DATE]
} @{$result}] ;
$head_who = $SORT_HEAD;
}
elsif( $::FORM{"sortby"} eq "File" ){
$result = [sort {
- $a->[$CI_FILE] cmp $b->[$CI_FILE]
- || $b->[$CI_DATE] <=> $a->[$CI_DATE]
- || $a->[$CI_DIRECTORY] cmp $b->[$CI_DIRECTORY]
+ $a->[$::CI_FILE] cmp $b->[$::CI_FILE]
+ || $b->[$::CI_DATE] <=> $a->[$::CI_DATE]
+ || $a->[$::CI_DIRECTORY] cmp $b->[$::CI_DIRECTORY]
} @{$result}] ;
$head_file = $SORT_HEAD;
}
elsif( $::FORM{"sortby"} eq "Directory" ){
$result = [sort {
- $a->[$CI_DIRECTORY] cmp $b->[$CI_DIRECTORY]
- || $a->[$CI_FILE] cmp $b->[$CI_FILE]
- || $b->[$CI_DATE] <=> $a->[$CI_DATE]
+ $a->[$::CI_DIRECTORY] cmp $b->[$::CI_DIRECTORY]
+ || $a->[$::CI_FILE] cmp $b->[$::CI_FILE]
+ || $b->[$::CI_DATE] <=> $a->[$::CI_DATE]
} @{$result}] ;
$head_directory = $SORT_HEAD;
}
elsif( $::FORM{"sortby"} eq "Change Size" ){
$result = [sort {
- ($b->[$CI_LINES_ADDED]- $b->[$CI_LINES_REMOVED])
- <=> ($a->[$CI_LINES_ADDED]- $a->[$CI_LINES_REMOVED])
- #|| $b->[$CI_DATE] <=> $a->[$CI_DATE]
+ ($b->[$::CI_LINES_ADDED]- $b->[$::CI_LINES_REMOVED])
+ <=> ($a->[$::CI_LINES_ADDED]- $a->[$::CI_LINES_REMOVED])
+ #|| $b->[$::CI_DATE] <=> $a->[$::CI_DATE]
} @{$result}] ;
$head_delta = $SORT_HEAD;
}
else{
- $result = [sort {$b->[$CI_DATE] <=> $a->[$CI_DATE]} @{$result}] ;
+ $result = [sort {$b->[$::CI_DATE] <=> $a->[$::CI_DATE]} @{$result}] ;
$head_date = $SORT_HEAD;
}
@@ -261,8 +288,8 @@ if( !$show_raw ) {
}
else {
print "";
- for $ci (@$result) {
- $ci->[$CI_LOG] = '';
+ for my $ci (@$result) {
+ $ci->[$::CI_LOG] = '';
$s = join("|",@$ci);
print "$s\n";
}
@@ -272,8 +299,8 @@ else {
#
#
sub print_result {
- local($result) = @_;
- local($ci,$i,$k,$j,$max, $l, $span);
+ my ($result) = @_;
+ my ($ci,$i,$k,$j,$max, $l, $span);
&print_head;
@@ -284,14 +311,14 @@ sub print_result {
while( $k < $max ){
$ci = $result->[$k];
$span = 1;
- if( ($l = $ci->[$CI_LOG]) ne '' ){
+ if( ($l = $ci->[$::CI_LOG]) ne '' ){
#
# Calculate the number of consequitive logs that are
# the same and nuke them
#
$j = $k+1;
- while( $j < $max && $result->[$j]->[$CI_LOG] eq $l ){
- $result->[$j]->[$CI_LOG] = '';
+ while( $j < $max && $result->[$j]->[$::CI_LOG] eq $l ){
+ $result->[$j]->[$::CI_LOG] = '';
$j++;
}
@@ -320,58 +347,60 @@ sub print_result {
&print_foot;
}
+my $descwidth;
+
sub print_ci {
- local($ci, $span) = @_;
- local($sec,$minute,$hour,$mday,$mon,$year,$t);
- local($log);
+ my ($ci, $span) = @_;
- ($sec,$minute,$hour,$mday,$mon,$year) = localtime( $ci->[$CI_DATE] );
- $t = sprintf("%02d/%02d/%04d %02d:%02d",$mon+1,$mday,$year+1900,$hour,$minute);
+ my ($sec,$minute,$hour,$mday,$mon,$year) = localtime( $ci->[$::CI_DATE] );
+ my $t = sprintf("%02d/%02d/%04d %02d:%02d",$mon+1,$mday,$year+1900,$hour,$minute);
- $log = &html_log($ci->[$CI_LOG]);
- $rev = $ci->[$CI_REV];
+ my $log = &html_log($ci->[$::CI_LOG]);
+ my $rev = $ci->[$::CI_REV];
print "\n";
print "${sm_font_tag}$t";
- print " [$CI_WHO]','',event);\" >"
- . "$ci->[$CI_WHO] \n";
- print "[$CI_DIR]','$ci->[$CI_FILE]','$ci->[$CI_REV]','$query_branch',event)\">\n";
-# if( (length $ci->[$CI_FILE]) + (length $ci->[$CI_DIR]) > 30 ){
-# $d = $ci->[$CI_DIR];
-# if( (length $ci->[$CI_DIR]) > 30 ){
+ print " [$::CI_WHO]','',event);\" >"
+ . "$ci->[$::CI_WHO] \n";
+ print "[$::CI_DIR]','$ci->[$::CI_FILE]','$ci->[$::CI_REV]','$::query_branch',event)\">\n";
+# if( (length $ci->[$::CI_FILE]) + (length $ci->[$::CI_DIR]) > 30 ){
+# $d = $ci->[$::CI_DIR];
+# if( (length $ci->[$::CI_DIR]) > 30 ){
# $d =~ s/([^\n]*\/)(classes\/)/$1classes\/ \n";
+# print " $d/ \n";
# }
# else{
-# print " $ci->[$CI_DIR]/$ci->[$CI_FILE] \n";
+# print " $ci->[$::CI_DIR]/$ci->[$::CI_FILE] \n";
# }
- $d = "$ci->[$CI_DIR]/$ci->[$CI_FILE]";
- if( $query_module eq 'allrepositories' ){ $d = "$ci->[$CI_REPOSITORY]/$d"; }
+ my $d = "$ci->[$::CI_DIR]/$ci->[$::CI_FILE]";
+ if ($::query_module eq 'allrepositories') {
+ $d = "$ci->[$::CI_REPOSITORY]/$d";
+ }
$d =~ s:/:/ :g; # Insert a whitespace after any slash, so that
# we'll break long names at a reasonable place.
print "$d\n";
if( $rev ne '' ){
- $prevrev = &PrevRev( $rev );
+ my $prevrev = &PrevRev( $rev );
print " ${sm_font_tag}$rev \n";
+ $ci->[$::CI_DIR] . "\&command=DIFF_FRAMESET\&file=" .
+ $ci->[$::CI_FILE] . "\&rev1=$prevrev&rev2=$rev&root=$::CVS_ROOT'>$rev\n";
}
else {
print " \ \n";
}
- if( !$query_branch_head ){
- print " $ci->[$CI_BRANCH] $ci->[$::CI_BRANCH] ${sm_font_tag}$ci->[$CI_LINES_ADDED]/$ci->[$CI_LINES_REMOVED] \n";
+ print " ${sm_font_tag}$ci->[$::CI_LINES_ADDED]/$ci->[$::CI_LINES_REMOVED] \n";
if( $log ne '' ){
$log = MarkUpText($log);
# Makes numbers into links to bugsplat.
@@ -391,16 +420,16 @@ sub print_ci {
sub print_head {
-if ($versioninfo ne "") {
+if ($::versioninfo ne "") {
print "";
- print "(+$lines_added/$lines_removed) Lines changed.";
+ print "(+$::lines_added/$::lines_removed) Lines changed.";
}
-$anchor = $ENV{QUERY_STRING};
+my $anchor = $ENV{QUERY_STRING};
$anchor =~ s/\&sortby\=[A-Za-z\ \+]*//g;
$anchor = "${anchor}&sortby=File>File \n";
print " Rev\n";
$descwidth = 47;
-if( !$query_branch_head ){
+if( !$::query_branch_head ){
print " Branch\n";
$descwidth -= 2;
}
@@ -429,15 +458,15 @@ sub print_foot {
}
sub html_log {
- local( $log ) = @_;
+ my ( $log ) = @_;
$log =~ s/&/&/g;
$log =~ s/
var event = 0; // Nav3.0 compatibility
@@ -528,6 +557,7 @@ function js_file_menu(repos,dir,file,rev,branch,d) {
ENDJS
+ return $script_str;
}
#
@@ -536,57 +566,58 @@ ENDJS
sub query_to_english {
my $english = 'Checkins ';
- if( $query_module eq 'allrepositories' ){
+ if( $::query_module eq 'allrepositories' ){
$english .= "to All Repositories ";
}
- elsif( $query_module ne 'all' && @query_dirs == 0 ){
- $english .= "to module $query_module ";
+ elsif( $::query_module ne 'all' && @::query_dirs == 0 ){
+ $english .= "to module $::query_module ";
}
elsif( $::FORM{dir} ne "" ) {
my $word = "directory";
- if (@query_dirs > 1) {
+ if (@::query_dirs > 1) {
$word = "directories";
}
$english .= "to $word $::FORM{dir} ";
}
- if ($query_file ne "") {
+ if ($::query_file ne "") {
if ($english ne 'Checkins ') {
$english .= "and ";
}
- $english .= "to file $query_file ";
+ $english .= "to file $::query_file ";
}
- if( ! ($query_branch =~ /^[ ]*HEAD[ ]*$/i) ){
- if($query_branch eq '' ){
+ if( ! ($::query_branch =~ /^[ ]*HEAD[ ]*$/i) ){
+ if($::query_branch eq '' ){
$english .= "on all branches ";
}
else {
- $english .= "on branch $query_branch ";
+ $english .= "on branch $::query_branch ";
}
}
- if( $query_who ne '' ){
- $english .= "by $query_who ";
+ if( $::query_who ne '' ){
+ $english .= "by $::query_who ";
}
- $query_date_type = $::FORM{'date'};
- if( $query_date_type eq 'hours' ){
+ $::query_date_type = $::FORM{'date'};
+ if( $::query_date_type eq 'hours' ){
$english .="in the last $::FORM{hours} hours";
}
- elsif( $query_date_type eq 'day' ){
+ elsif( $::query_date_type eq 'day' ){
$english .="in the last day";
}
- elsif( $query_date_type eq 'week' ){
+ elsif( $::query_date_type eq 'week' ){
$english .="in the last week";
}
- elsif( $query_date_type eq 'month' ){
+ elsif( $::query_date_type eq 'month' ){
$english .="in the last month";
}
- elsif( $query_date_type eq 'all' ){
+ elsif( $::query_date_type eq 'all' ){
$english .="since the beginning of time";
}
- elsif( $query_date_type eq 'explicit' ){
+ elsif( $::query_date_type eq 'explicit' ){
+ my ($w1, $w2);
if ( $::FORM{mindate} ne "" && $::FORM{maxdate} ne "" ) {
$w1 = "between";
$w2 = "and" ;
@@ -597,16 +628,16 @@ sub query_to_english {
}
if( $::FORM{'mindate'} ne "" ){
- $dd = &parse_date($::FORM{'mindate'});
- ($sec,$minute,$hour,$mday,$mon,$year) = localtime( $dd );
- $t = sprintf("%02d/%02d/%04d %02d:%02d",$mon+1,$mday,$year+1900,$hour,$minute);
+ my $dd = &parse_date($::FORM{'mindate'});
+ my ($sec,$minute,$hour,$mday,$mon,$year) = localtime( $dd );
+ my $t = sprintf("%02d/%02d/%04d %02d:%02d",$mon+1,$mday,$year+1900,$hour,$minute);
$english .= "$w1 $t ";
}
if( $::FORM{'maxdate'} ne "" ){
- $dd = &parse_date($::FORM{'maxdate'});
- ($sec,$minute,$hour,$mday,$mon,$year) = localtime( $dd );
- $t = sprintf("%02d/%02d/%04d %02d:%02d",$mon+1,$mday,$year+1900,$hour,$minute);
+ my $dd = &parse_date($::FORM{'maxdate'});
+ my ($sec,$minute,$hour,$mday,$mon,$year) = localtime( $dd );
+ my $t = sprintf("%02d/%02d/%04d %02d:%02d",$mon+1,$mday,$year+1900,$hour,$minute);
$english .= "$w2 $t ";
}
}
diff --git a/mozilla/webtools/bonsai/cvsquery.pl b/mozilla/webtools/bonsai/cvsquery.pl
index 15b897f551d..5f848bbe2ee 100755
--- a/mozilla/webtools/bonsai/cvsquery.pl
+++ b/mozilla/webtools/bonsai/cvsquery.pl
@@ -19,38 +19,56 @@
require 'globals.pl';
require 'get_line.pl';
+use diagnostics;
+use strict;
+
+# Shut up misguided -w warnings about "used only once". "use vars" just
+# doesn't work for me.
+
+sub cvsquery_pl_sillyness {
+ my $zz;
+ $zz = $::CI_BRANCH;
+ $zz = $::CI_CHANGE;
+ $zz = $::CI_DATE;
+ $zz = $::CI_STICKY;
+ $zz = $::TreeID;
+ $zz = $::query_debug;
+ $zz = $::query_filetype;
+ $zz = $::versioninfo;
+};
+
#
# Constants
#
-$CI_CHANGE=0;
-$CI_DATE=1;
-$CI_WHO=2;
-$CI_REPOSITORY=3;
-$CI_DIR=4;
-$CI_FILE=5;
-$CI_REV=6;
-$CI_STICKY=7;
-$CI_BRANCH=8;
-$CI_LINES_ADDED=9;
-$CI_LINES_REMOVED=10;
-$CI_LOG=11;
+$::CI_CHANGE=0;
+$::CI_DATE=1;
+$::CI_WHO=2;
+$::CI_REPOSITORY=3;
+$::CI_DIR=4;
+$::CI_FILE=5;
+$::CI_REV=6;
+$::CI_STICKY=7;
+$::CI_BRANCH=8;
+$::CI_LINES_ADDED=9;
+$::CI_LINES_REMOVED=10;
+$::CI_LOG=11;
-$NOT_LOCAL = 1;
-$IS_LOCAL = 2;
+my $NOT_LOCAL = 1;
+my $IS_LOCAL = 2;
-chomp($CVS_ROOT) if defined($CVS_ROOT);
-if (!defined($CVS_ROOT) || $CVS_ROOT eq "" ){
- $CVS_ROOT = pickDefaultRepository();
+chomp($::CVS_ROOT) if defined($::CVS_ROOT);
+if (!defined($::CVS_ROOT) || $::CVS_ROOT eq "" ){
+ $::CVS_ROOT = pickDefaultRepository();
}
#global variables
-$lines_added = 0;
-$lines_removed = 0;
+$::lines_added = 0;
+$::lines_removed = 0;
-$modules = {};
+$::modules = {};
-$CVS_MODULES="${CVS_ROOT}/CVSROOT/modules";
+my $CVS_MODULES="$::CVS_ROOT/CVSROOT/modules";
open( MOD, "<$CVS_MODULES") || die "can't open ${CVS_MODULES}";
&parse_modules;
@@ -64,17 +82,18 @@ close( MOD );
sub query_checkins {
my (%mod_map) = @_;
my ($ci,$result,$lastlog,$rev,$begin_tag,$end_tag);
+ my $have_mod_map;
- if( $query_module ne 'all' && $query_module ne 'allrepositories' && @query_dirs == 0 ){
+ if( $::query_module ne 'all' && $::query_module ne 'allrepositories' && @::query_dirs == 0 ){
$have_mod_map = 1;
- %mod_map = &get_module_map( $query_module );
+ %mod_map = &get_module_map( $::query_module );
}
else {
$have_mod_map = 0;
%mod_map = ();
}
- for $i (@query_dirs ){
+ for my $i (@::query_dirs ){
$i =~ s:^/::; # Strip leading slash.
$i =~ s:/$::; # Strip trailing slash.
@@ -85,19 +104,19 @@ sub query_checkins {
$mod_map{$i} = $NOT_LOCAL;
}
- if( $query_branch =~ /^[ ]*HEAD[ ]*$/i ){
- $query_branch_head = 1;
+ if( $::query_branch =~ /^[ ]*HEAD[ ]*$/i ){
+ $::query_branch_head = 1;
}
$begin_tag = "";
$end_tag = "";
- if (defined($query_begin_tag) && $query_begin_tag ne '') {
- $begin_tag = load_tag($query_begin_tag);
+ if (defined($::query_begin_tag) && $::query_begin_tag ne '') {
+ $begin_tag = load_tag($::query_begin_tag);
}
- if (defined($query_end_tag) && $query_end_tag ne '') {
- $end_tag = load_tag($query_end_tag);
+ if (defined($::query_end_tag) && $::query_end_tag ne '') {
+ $end_tag = load_tag($::query_end_tag);
}
@@ -107,49 +126,49 @@ sub query_checkins {
my $qstring = "select type, UNIX_TIMESTAMP(ci_when), people.who, repositories.repository, dirs.dir, files.file, revision, stickytag, branches.branch, addedlines, removedlines, descs.description from checkins,people,repositories,dirs,files,branches,descs where people.id=whoid and repositories.id=repositoryid and dirs.id=dirid and files.id=fileid and branches.id=branchid and descs.id=descid";
- if( $query_module ne 'allrepositories' ){
- $qstring .= " and repositories.repository = '$CVS_ROOT'";
+ if( $::query_module ne 'allrepositories' ){
+ $qstring .= " and repositories.repository = '$::CVS_ROOT'";
}
- if ($query_date_min) {
- my $t = formatSqlTime($query_date_min);
+ if ($::query_date_min) {
+ my $t = formatSqlTime($::query_date_min);
$qstring .= " and ci_when >= '$t'";
}
- if ($query_date_max) {
- my $t = formatSqlTime($query_date_max);
+ if ($::query_date_max) {
+ my $t = formatSqlTime($::query_date_max);
$qstring .= " and ci_when <= '$t'";
}
- if ($query_branch_head) {
+ if ($::query_branch_head) {
$qstring .= " and branches.branch = ''";
- } elsif ($query_branch ne '') {
- my $q = SqlQuote($query_branch);
- if ($query_branchtype eq 'regexp') {
+ } elsif ($::query_branch ne '') {
+ my $q = SqlQuote($::query_branch);
+ if ($::query_branchtype eq 'regexp') {
$qstring .=
" and branches.branch regexp $q";
- } elsif ($query_branchtype eq 'notregexp') {
+ } elsif ($::query_branchtype eq 'notregexp') {
$qstring .=
" and not (branches.branch regexp $q) ";
} else {
$qstring .=
" and (branches.branch = $q or branches.branch = ";
- $qstring .= SqlQuote("T$query_branch") . ")";
+ $qstring .= SqlQuote("T$::query_branch") . ")";
}
}
- if (defined $query_file && $query_file ne '') {
- my $q = SqlQuote($query_file);
- if ($query_filetype eq 'regexp') {
+ if (defined $::query_file && $::query_file ne '') {
+ my $q = SqlQuote($::query_file);
+ if ($::query_filetype eq 'regexp') {
$qstring .= " and files.file regexp $q";
} else {
$qstring .= " and files.file = $q";
}
}
- if (defined $query_who && $query_who ne '') {
- my $q = SqlQuote($query_who);
- if ($query_whotype eq 'regexp') {
+ if (defined $::query_who && $::query_who ne '') {
+ my $q = SqlQuote($::query_who);
+ if ($::query_whotype eq 'regexp') {
$qstring .= " and people.who regexp $q";
}
- elsif ($query_whotype eq 'notregexp') {
+ elsif ($::query_whotype eq 'notregexp') {
$qstring .= " and not (people.who regexp $q)";
} else {
@@ -157,12 +176,12 @@ sub query_checkins {
}
}
- if (defined($query_logexpr) && $query_logexpr ne '') {
- my $q = SqlQuote($query_logexpr);
+ if (defined($::query_logexpr) && $::query_logexpr ne '') {
+ my $q = SqlQuote($::query_logexpr);
$qstring .= " and descs.description regexp $q";
}
- if ($query_debug) {
+ if ($::query_debug) {
print " Query: $qstring\nTreeID is $::TreeID\n";
if ($have_mod_map) {
print "Dump of module map:\n";
@@ -176,30 +195,31 @@ sub query_checkins {
SendSQL($qstring);
$lastlog = 0;
+ my @row;
while (@row = FetchSQLData()) {
#print "";
$ci = [];
- for ($i=0 ; $i<=$CI_LOG ; $i++) {
+ for (my $i=0 ; $i<=$::CI_LOG ; $i++) {
$ci->[$i] = $row[$i];
#print "$row[$i] ";
}
#print " ";
- $key = "$ci->[$CI_DIR]/$ci->[$CI_FILE]";
- if (IsHidden("$ci->[$CI_REPOSITORY]/$key")) {
+ my $key = "$ci->[$::CI_DIR]/$ci->[$::CI_FILE]";
+ if (IsHidden("$ci->[$::CI_REPOSITORY]/$key")) {
next;
}
if( $have_mod_map &&
- !&in_module(\%mod_map, $ci->[$CI_DIR], $ci->[$CI_FILE] ) ){
+ !&in_module(\%mod_map, $ci->[$::CI_DIR], $ci->[$::CI_FILE] ) ){
next;
}
if( $begin_tag) {
$rev = $begin_tag->{$key};
print "Please wait -- rebuilding index file... \n";
- system "./cvsindex.pl $CVS_ROOT";
- print "...OK, done. \n";
- }
- Lock();
- if(! open(IDX , "<$CHECKIN_INDEX_FILE") ){
- print "can't open index ";
- Unlock();
- return 0;
- }
- $i = 0;
- while() {
- last if $done;
- $line = $_;
- chop($line);
-
- ($o,$d) = split(/\|/,$line);
- if( $d && $query_date_min > $d ){
- $done = 1;
- }
- $i++;
- }
- if( $F_DEBUG ){
- print "seekdate($d) seekoffset($o) readcount($i)\n";
- }
- close IDX;
- Unlock();
- return $o;
-}
-
-
sub in_module {
- local($mod_map, $dirname, $filename ) = @_;
- local( @path );
- local( $i, $fp, $local );
+ my ($mod_map, $dirname, $filename ) = @_;
+ my ( @path );
+ my ( $i, $fp, $local );
#
#quick check if it is already in there.
@@ -401,32 +384,34 @@ sub get_module_map {
sub parse_modules {
+ my $l;
while( $l = &get_line ){
- ($mod_name, $flag, @params) = split(/[ \t]+/,$l);
+ my ($mod_name, $flag, @params) = split(/[ \t]+/,$l);
if ( $#params eq -1 ) {
@params = $flag;
$flag = "";
}
elsif( $flag eq '-d' ){
+ my $dummy;
($mod_name, $dummy, $dummy, @params) = split(/[ \t]+/,$l);
}
elsif( $flag ne '-a' ){
next;
}
- $modules->{$mod_name} = [@params];
+ $::modules->{$mod_name} = [@params];
}
}
sub build_map {
- local($name,$mod_map) = @_;
- local($bFound, $local);
+ my ($name,$mod_map) = @_;
+ my ($bFound, $local);
$local = $NOT_LOCAL;
$bFound = 0;
- for $i ( @{$modules->{$name}} ){
+ for my $i ( @{$::modules->{$name}} ){
$bFound = 1;
if( $i eq '-l' ){
$local = $IS_LOCAL;
diff --git a/mozilla/webtools/bonsai/cvsqueryform.cgi b/mozilla/webtools/bonsai/cvsqueryform.cgi
index b1bb150aff3..b306f5e6356 100755
--- a/mozilla/webtools/bonsai/cvsqueryform.cgi
+++ b/mozilla/webtools/bonsai/cvsqueryform.cgi
@@ -20,6 +20,9 @@
# Query the CVS database.
#
+use diagnostics;
+use strict;
+
require 'CGI.pl';
$|=1;
@@ -27,19 +30,19 @@ $|=1;
print "Content-type: text/html\n\n";
LoadTreeConfig();
-$CVS_ROOT = $::FORM{'cvsroot'};
-$CVS_ROOT = pickDefaultRepository() unless $CVS_ROOT;
+$::CVS_ROOT = $::FORM{'cvsroot'};
+$::CVS_ROOT = pickDefaultRepository() unless $::CVS_ROOT;
if (exists $::FORM{'module'}) {
if (exists($::TreeInfo{$::FORM{'module'}}{'repository'})) {
$::TreeID = $::FORM{'module'}
}
}
-$modules = {};
+$::modules = {};
require 'modules.pl';
PutsHeader("Bonsai - CVS Query Form", "CVS Query Form",
- "$CVS_ROOT - $::TreeInfo{$::TreeID}{shortdesc}");
+ "$::CVS_ROOT - $::TreeInfo{$::TreeID}{shortdesc}");
print "
@@ -63,13 +66,13 @@ print "
#
# check to see if there are multple repositories
#
-@reposList = &getRepositoryList();
-$bMultiRepos = (@reposList > 1);
+my @reposList = &getRepositoryList();
+my $bMultiRepos = (@reposList > 1);
#
# This code sucks, I should rewrite it to be shorter
#
-$Module = 'default';
+my $Module = 'default';
if (!exists $::FORM{module} || $::FORM{module} eq 'all' ||
$::FORM{module} eq '') {
@@ -96,7 +99,7 @@ else {
#
# Print out all the Different Modules
#
-for $k (sort( keys( %$modules ) ) ){
+for my $k (sort( keys( %$::modules ) ) ){
print "$k\n";
}
@@ -197,10 +200,7 @@ print "
# Print the date selector
#
-$CVS_REPOS_SUFFIX = $CVS_ROOT;
-$CVS_REPOS_SUFFIX =~ s:/:_:g;
-
-$startdate = fetchCachedStartDate($CVS_ROOT);
+my $startdate = fetchCachedStartDate($::CVS_ROOT);
if (!defined($::FORM{date}) || $::FORM{date} eq "") {
$::FORM{date} = "hours";
@@ -255,7 +255,7 @@ print "
-
@@ -273,7 +273,7 @@ sub sortTest {
return " SELECTED";
}
-refigureStartDateIfNecessary($CVS_ROOT);
+refigureStartDateIfNecessary($::CVS_ROOT);
sub dateTest {
if( $_[0] eq $::FORM{date} ){
@@ -310,6 +310,8 @@ sub regexpradio {
}
+my $rememberedcachedate;
+
sub fetchCachedStartDate {
my ($repository) = @_;
open(CACHE, "{'repository'};
- foreach $j (@SRCROOTS) {
+my @SRCROOTS;
+NEXTTREE: foreach my $i (@::TreeList) {
+ my $r = $::TreeInfo{$i}->{'repository'};
+ foreach my $j (@SRCROOTS) {
if ($r eq $j) {
next NEXTTREE;
}
@@ -62,16 +81,16 @@ NEXTTREE: foreach $i (@::TreeList) {
push @SRCROOTS, $r;
}
-$opt_rev1 = '';
-$opt_rev2 = '';
-$opt_root = '';
-$opt_files = '';
-$opt_branch = '';
-$opt_skip = 0;
-$debug = 0;
+my $opt_rev1 = '';
+my $opt_rev2 = '';
+my $opt_root = '';
+my $opt_files = '';
+my $opt_branch = '';
+my $opt_skip = 0;
+my $debug = 0;
-$MAX_REVS = 8;
+my $MAX_REVS = 8;
#
@@ -79,11 +98,14 @@ $MAX_REVS = 8;
# XXX dup stdout onto stderr and flush stdout after the following prints
#
# Until then, replace standard die built-in with our own.
-sub die {
- print 'fatal error: ';
- print @_;
- exit;
-}
+# sub die {
+# print 'fatal error: ';
+# print @_;
+# exit;
+# }
+
+
+my $line_buffer;
# Consume one token from the already opened RCSFILE filehandle.
# Unescape string tokens, if necessary.
@@ -103,7 +125,7 @@ sub get_token {
# ...or an RCS-encoded string that starts with an @ character.
$line_buffer =~ s/^@([^@]*)//o;
- $token = $1;
+ my $token = $1;
# Detect single @ character used to close RCS-encoded string.
while ($line_buffer !~ /^@[^@]*$/o) {
@@ -124,9 +146,9 @@ sub get_token {
# Consume a token from RCS filehandle and ensure that it matches
# the given string constant.
sub match_token {
- local ($match) = @_;
+ my ($match) = @_;
- local ($token) = &get_token;
+ my ($token) = &get_token;
&die ("Unexpected parsing error in RCS file.\n",
"Expected token: $match, but saw: $token\n")
if ($token ne $match);
@@ -134,29 +156,29 @@ sub match_token {
# Push RCS token back into the input buffer.
sub unget_token {
- local ($token) = @_;
+ my ($token) = @_;
$line_buffer = "$token $line_buffer";
}
# Parses "administrative" header of RCS files, setting these globals:
#
-# $head_revision -- Revision for which cleartext is stored
-# $principal_branch
-# $file_description
-# %revision_symbolic_name -- mapping from numerical revision # to symbolic tag
-# %tag_revision -- mapping from symbolic tag to numerical revision #
+# $::head_revision -- Revision for which cleartext is stored
+# $::principal_branch
+# $::file_description
+# %::revision_symbolic_name -- maps from numerical revision # to symbolic tag
+# %::tag_revision -- maps from symbolic tag to numerical revision #
#
sub parse_rcs_admin {
- local ($token, $tag, $tag_name, $tag_revision);
- local (@tags);
+ my ($token, $tag, $tag_name, $tag_revision);
+ my (@tags);
# Undefine variables, because we may have already read another RCS file
- undef %tag_revision;
- undef %revision_symbolic_name;
+ undef %::tag_revision;
+ undef %::revision_symbolic_name;
while (1) {
# Read initial token at beginning of line
- $token = &get_token(RCSFILE);
+ $token = &get_token();
# We're done once we reach the description of the RCS tree
if ($token =~ /^\d/o) {
@@ -167,10 +189,10 @@ sub parse_rcs_admin {
# print "token: $token\n";
if ($token eq 'head') {
- $head_revision = &get_token;
+ $::head_revision = &get_token;
&get_token; # Eat semicolon
} elsif ($token eq 'branch') {
- $principal_branch = &get_token;
+ $::principal_branch = &get_token;
&get_token; # Eat semicolon
} elsif ($token eq 'symbols') {
@@ -179,11 +201,11 @@ sub parse_rcs_admin {
while (($tag = &get_token) ne ';') {
($tag_name, $tag_revision) = split(':', $tag);
- $tag_revision{$tag_name} = $tag_revision;
- $revision_symbolic_name{$tag_revision} = $tag_name;
+ $::tag_revision{$tag_name} = $tag_revision;
+ $::revision_symbolic_name{$tag_revision} = $tag_name;
}
} elsif ($token eq 'comment') {
- $file_description = &get_token;
+ $::file_description = &get_token;
&get_token; # Eat semicolon
# Ignore all these other fields - We don't care about them.
@@ -204,38 +226,38 @@ sub parse_rcs_admin {
# and other arrays that contain info about individual revisions.
#
# The following associative arrays are created, keyed by revision number:
-# %revision_date -- e.g. "96.02.23.00.21.52"
-# %timestamp -- seconds since 12:00 AM, Jan 1, 1970 GMT
-# %revision_author -- e.g. "tom"
-# %revision_branches -- descendant branch revisions, separated by spaces,
+# %::revision_date -- e.g. "96.02.23.00.21.52"
+# %::timestamp -- seconds since 12:00 AM, Jan 1, 1970 GMT
+# %::revision_author -- e.g. "tom"
+# %::revision_branches -- descendant branch revisions, separated by spaces,
# e.g. "1.21.4.1 1.21.2.6.1"
-# %prev_revision -- revision number of previous *ancestor* in RCS tree.
+# %::prev_revision -- revision number of previous *ancestor* in RCS tree.
# Traversal of this array occurs in the direction
# of the primordial (1.1) revision.
-# %prev_delta -- revision number of previous revision which forms the
+# %::prev_delta -- revision number of previous revision which forms the
# basis for the edit commands in this revision.
# This causes the tree to be traversed towards the
# trunk when on a branch, and towards the latest trunk
# revision when on the trunk.
-# %next_delta -- revision number of next "delta". Inverts %prev_delta.
+# %::next_delta -- revision number of next "delta". Inverts %::prev_delta.
#
-# Also creates %last_revision, keyed by a branch revision number, which
+# Also creates %::last_revision, keyed by a branch revision number, which
# indicates the latest revision on a given branch,
-# e.g. $last_revision{"1.2.8"} == 1.2.8.5
+# e.g. $::last_revision{"1.2.8"} == 1.2.8.5
#
sub parse_rcs_tree {
- local($revision, $date, $author, $branches, $next);
- local($branch, $is_trunk_revision);
+ my($revision, $date, $author, $branches, $next);
+ my($branch, $is_trunk_revision);
# Undefine variables, because we may have already read another RCS file
- undef %revision_date;
- undef %timestamp;
- undef %revision_author;
- undef %revision_branches;
- undef %prev_revision;
- undef %prev_delta;
- undef %next_delta;
- undef %last_revision;
+ undef %::revision_date;
+ undef %::timestamp;
+ undef %::revision_author;
+ undef %::revision_branches;
+ undef %::prev_revision;
+ undef %::prev_delta;
+ undef %::next_delta;
+ undef %::last_revision;
while (1) {
$revision = &get_token;
@@ -248,25 +270,25 @@ sub parse_rcs_tree {
$is_trunk_revision = ($revision =~ /^[0-9]+\.[0-9]+$/);
- $tag_revision{$revision} = $revision;
+ $::tag_revision{$revision} = $revision;
($branch) = $revision =~ /(.*)\.[0-9]+/o;
- $last_revision{$branch} = $revision;
+ $::last_revision{$branch} = $revision;
# Parse date
&match_token('date');
$date = &get_token;
- $revision_date{$revision} = $date;
+ $::revision_date{$revision} = $date;
&match_token(';');
# Convert date into timestamp
# @date_fields = reverse(split(/\./, $date));
# $date_fields[4]--; # Month ranges from 0-11, not 1-12
-# $timestamp{$revision} = &timegm(@date_fields);
+# $::timestamp{$revision} = &timegm(@date_fields);
# Parse author
&match_token('author');
$author = &get_token;
- $revision_author{$revision} = $author;
+ $::revision_author{$revision} = $author;
&match_token(';');
# Parse state;
@@ -276,12 +298,13 @@ sub parse_rcs_tree {
# Parse branches
&match_token('branches');
$branches = '';
+ my $token;
while (($token = &get_token) ne ';') {
- $prev_revision{$token} = $revision;
- $prev_delta{$token} = $revision;
+ $::prev_revision{$token} = $revision;
+ $::prev_delta{$token} = $revision;
$branches .= "$token ";
}
- $revision_branches{$revision} = $branches;
+ $::revision_branches{$revision} = $branches;
# Parse revision of next delta in chain
&match_token('next');
@@ -289,12 +312,12 @@ sub parse_rcs_tree {
if (($token = &get_token) ne ';') {
$next = $token;
&get_token; # Eat semicolon
- $next_delta{$revision} = $next;
- $prev_delta{$next} = $revision;
+ $::next_delta{$revision} = $next;
+ $::prev_delta{$next} = $revision;
if ($is_trunk_revision) {
- $prev_revision{$revision} = $next;
+ $::prev_revision{$revision} = $next;
} else {
- $prev_revision{$next} = $revision;
+ $::prev_revision{$next} = $revision;
}
}
@@ -310,7 +333,7 @@ sub parse_rcs_tree {
# Reads and parses complete RCS file from already-opened RCSFILE descriptor.
sub parse_rcs_file {
- local ($file) = @_;
+ my ($file) = @_;
&die("Couldn't open $file\n") if !open(RCSFILE, "< $file");
$line_buffer = '';
print "Reading RCS admin...\n" if ($debug);
@@ -325,15 +348,15 @@ sub parse_rcs_file {
# branch tag, a symbolic revision tag, or an ordinary numerical
# revision number.
sub map_tag_to_revision {
- local($tag_or_revision) = @_;
+ my($tag_or_revision) = @_;
- local ($revision) = $tag_revision{$tag_or_revision};
+ my ($revision) = $::tag_revision{$tag_or_revision};
# Is this a branch tag, e.g. xxx.yyy.0.zzz
if ($revision =~ /(.*)\.0\.([0-9]+)/o) {
- $branch = $1 . '.' . $2;
+ my $branch = $1 . '.' . $2;
# Return latest revision on the branch, if any.
- return $last_revision{$branch} if (defined($last_revision{$branch}));
+ return $::last_revision{$branch} if (defined($::last_revision{$branch}));
return $1; # No revisions on branch - return branch point
} else {
return $revision;
@@ -345,11 +368,11 @@ sub map_tag_to_revision {
#
print "Content-type: text/html\n\n";
-$request_method = $ENV{'REQUEST_METHOD'}; # e.g., "GET", "POST", etc.
-$script_name = $ENV{'SCRIPT_NAME'};
-$prefix = $script_name . '?'; # prefix for HREF= entries
+my $request_method = $ENV{'REQUEST_METHOD'}; # e.g., "GET", "POST", etc.
+my $script_name = $ENV{'SCRIPT_NAME'};
+my $prefix = $script_name . '?'; # prefix for HREF= entries
$prefix = $script_name . $ENV{PATH_INFO} . '?' if (exists($ENV{PATH_INFO}));
-$query_string = $ENV{QUERY_STRING};
+my $query_string = $ENV{QUERY_STRING};
# Undo % URL-encoding
while ($query_string =~ /(.*)\%([0-9a-fA-F][0-9a-fA-F])(.*)/) {
@@ -361,13 +384,17 @@ while ($query_string =~ /(.*)\%([0-9a-fA-F][0-9a-fA-F])(.*)/) {
if ($request_method ne 'GET');
# Default option values
-$opt_diff_mode = 'context';
-$opt_whitespace_mode = 'show';
+my $opt_diff_mode = 'context';
+my $opt_whitespace_mode = 'show';
+
+my $opt_file;
+my $opt_rev;
+my $opt_subdir;
# Parse options in URL. For example,
# http://w3/cgi/cvsview.pl?subdir=foo&file=bar would assign
# $opt_subdir = foo and $opt_file = bar.
-foreach $option (split(/&/, $query_string)) {
+foreach my $option (split(/&/, $query_string)) {
&die("command $opt_command: garbled option $option\n")
if ($option !~ /^([^=]+)=(.*)/);
eval('$opt_' . $1 . '="' . $2 . '";');
@@ -377,13 +404,13 @@ if (defined($opt_branch) && $opt_branch eq 'HEAD' ) { $opt_branch = ''; }
# Configuration colors for diff output.
-$stable_bg_color = 'White';
-$skipping_bg_color = '#c0c0c0';
-$header_bg_color = 'Orange';
-$change_bg_color = 'LightBlue';
-$addition_bg_color = 'LightGreen';
-$deletion_bg_color = 'LightGreen';
-$diff_bg_color = 'White';
+my $stable_bg_color = 'White';
+my $skipping_bg_color = '#c0c0c0';
+my $header_bg_color = 'Orange';
+my $change_bg_color = 'LightBlue';
+my $addition_bg_color = 'LightGreen';
+my $deletion_bg_color = 'LightGreen';
+my $diff_bg_color = 'White';
# Ensure that necessary arguments are present
&die("command not defined in URL\n") if $opt_command eq '';
@@ -403,15 +430,16 @@ $prefix .= "&whitespace_mode=$opt_whitespace_mode";
$prefix .= "&root=$opt_root";
# Create a shorthand for the longest common initial substring of our URL.
-$magic_url = "$prefix&subdir=$opt_subdir";
+my $magic_url = "$prefix&subdir=$opt_subdir";
# Now that we've munged QUERY_STRING into perl variables, set rcsdiff options.
-$rcsdiff = "$rcsdiffcommand -f";
+my $rcsdiff = "$rcsdiffcommand -f";
$rcsdiff .= ' -w' if ($opt_whitespace_mode eq 'ignore');
# Handle the "root" argument
#
-if (defined($root = $opt_root) && $root ne '') {
+my $root = $opt_root;
+if (defined $root && $root ne '') {
$root =~ s|/$||;
if (-d $root) {
unshift(@SRCROOTS, $root);
@@ -421,6 +449,9 @@ if (defined($root = $opt_root) && $root ne '') {
exit;
}
}
+
+my $found = 0;
+my $dir;
foreach $root (@SRCROOTS) {
$dir = "$root/$opt_subdir";
if (-d $dir) {
@@ -487,7 +518,8 @@ sub do_diff_links {
my $lxr_path = "$opt_subdir/$opt_file";
my $lxr_link = Fix_LxrLink($lxr_path);
- my $blame_link = "$blame_base?root=$CVS_ROOT\&file=$opt_subdir/$opt_file";
+ my $blame_link = "$blame_base?file=$opt_subdir/$opt_file";
+ $blame_link .= "&root=$opt_root" if defined($opt_root);
my $diff_link = "$magic_url&command=DIRECTORY&file=$opt_file&rev1=$opt_rev1&rev2=$opt_rev2";
$diff_link .= "&root=$opt_root" if defined($opt_root);
@@ -515,6 +547,7 @@ sub do_diff_links {
$anchor_num = 0;
while () {
# Get one command from the diff file
+ my $line = "";
if (/^(c|a)(\d+)/) {
$line = $2;
while () {
@@ -544,10 +577,10 @@ sub do_diff_links {
# Default tab width, although it's frequently 4.
-$tab_width = 8;
+my $tab_width = 8;
sub next_tab_stop {
- local ($pos) = @_;
+ my ($pos) = @_;
return int(($pos + $tab_width) / $tab_width) * $tab_width;
}
@@ -558,9 +591,9 @@ sub next_tab_stop {
# In the latter case, set $tab_width to 4.
#
sub guess_tab_width {
- local ($opt_file) = @_;
- local ($found_tab_width) = 0;
- local ($many_tabs, $any_tabs) = (0, 0);
+ my ($opt_file) = @_;
+ my ($found_tab_width) = 0;
+ my ($many_tabs, $any_tabs) = (0, 0);
open(RCSFILE, "$opt_file");
while () {
@@ -593,7 +626,7 @@ sub do_diff {
chdir($dir);
- local ($rcsfile) = "$opt_file,v";
+ my ($rcsfile) = "$opt_file,v";
$rcsfile = "Attic/$opt_file,v" if (! -r $rcsfile);
&guess_tab_width($rcsfile);
@@ -634,9 +667,10 @@ sub do_log {
#
sub do_directory {
- $output = "";
+ my $output = "
";
+ my $link_path = "";
- foreach $path (split('/',$opt_subdir)) {
+ foreach my $path (split('/',$opt_subdir)) {
$link_path .= $path;
$output .= "
0;
if (!$revs_remaining--) {
#print ' ';
@@ -707,7 +743,7 @@ sub do_directory {
$href_close = "";
}
print " $href_open$rev$href_close ";
+ print "$::revision_author{$rev}";
}
print "
\n";
@@ -716,12 +752,12 @@ sub do_directory {
print "\n";
$skip = $opt_skip;
$revs_remaining = $MAX_REVS;
- for ($rev = $first_rev; $rev; $rev = $prev_revision{$rev}) {
+ for (my $rev = $first_rev; $rev; $rev = $::prev_revision{$rev}) {
next if $skip-- > 0;
last if !$revs_remaining--;
print "$revision_author{$rev} ",
+ print "&file=$file&rev=$rev>$::revision_author{$rev}",
" \n";}
@@ -783,8 +819,10 @@ sub do_directory {
# a later version of OLDREV's file.
#
sub html_diff {
- local ($file, $rev1, $rev2) = @_;
- local ($old_line_num) = 1;
+ my ($file, $rev1, $rev2) = @_;
+ my ($old_line_num) = 1;
+ my ($old_line);
+ my ($point, $mark);
open(DIFF, "$rcsdiff -f -r$rev1 -r$rev2 $file 2>/dev/null |");
open(OLDREV, "$cocommand -p$rev1 $file 2>/dev/null |");
@@ -804,7 +842,7 @@ sub html_diff {
$mark = 0;
if (/^a(\d+)/) {
$point = $1;
- &skip_to_line($point + 1, *OLDREV, *old_line_num);
+ $old_line_num = skip_to_line($point + 1, *OLDREV, $old_line_num);
while () {
last if (/^\.$/);
&print_row('', $stable_bg_color, $_, $addition_bg_color);
@@ -812,7 +850,7 @@ sub html_diff {
} elsif ((($point, $mark) = /^c(\d+) (\d+)$/) ||
(($point) = /^c(\d+)$/)) {
$mark = $point if (!$mark);
- &skip_to_line($point, *OLDREV, *old_line_num);
+ $old_line_num = skip_to_line($point, *OLDREV, $old_line_num);
while () {
last if (/^\.$/);
if ($old_line_num <= $mark) {
@@ -831,7 +869,7 @@ sub html_diff {
} elsif ((($point, $mark) = /^d(\d+) (\d+)$/) ||
(($point) = /^d(\d+)$/)) {
$mark = $point if (!$mark);
- &skip_to_line($point, *OLDREV, *old_line_num);
+ $old_line_num = skip_to_line($point, *OLDREV, $old_line_num);
while ($old_line = ) {
$old_line_num++;
&print_row($old_line, $deletion_bg_color, '', $stable_bg_color);
@@ -849,7 +887,7 @@ sub html_diff {
# Print the remaining lines in the original file. These are lines that
# were not modified in the later revision
#
- local ($base_old_line_num) = $old_line_num;
+ my ($base_old_line_num) = $old_line_num;
while ($old_line = ) {
$old_line_num++;
&print_row($old_line, $stable_bg_color, $old_line, $stable_bg_color)
@@ -867,10 +905,12 @@ sub html_diff {
}
sub skip_to_line {
- local ($line_num, *OLDREV, *old_line_num) = @_;
- local ($anchor_printed) = 0;
- local ($skip_line_printed) = ($line_num - $old_line_num <= 10);
- local ($base_old_line_num) = $old_line_num;
+ my ($line_num, $old_line_num);
+ local (*OLDREV);
+ ($line_num, *OLDREV, $old_line_num) = @_;
+ my ($anchor_printed) = 0;
+ my ($skip_line_printed) = ($line_num - $old_line_num <= 10);
+ my ($base_old_line_num) = $old_line_num;
while ($old_line_num < $line_num) {
@@ -889,7 +929,7 @@ sub skip_to_line {
$skip_line_printed = 1;
}
- $old_line = ;
+ my $old_line = ;
$old_line_num++;
&print_row($old_line, $stable_bg_color, $old_line, $stable_bg_color)
@@ -901,12 +941,13 @@ sub skip_to_line {
print "" if (!$anchor_printed);
print ' ';
$anchor_num++;
+ return $old_line_num;
}
sub print_cell {
- local ($line, $color) = @_;
- local ($i, $j, $k, $n);
- local ($c, $newline);
+ my ($line, $color) = @_;
+ my ($i, $j, $k, $n);
+ my ($c, $newline);
if ($color eq $stable_bg_color) {
print "$font_tag";
@@ -941,8 +982,10 @@ sub print_cell {
}
sub print_row {
- local ($line1, $color1, $line2, $color2) = @_;
+ my ($line1, $color1, $line2, $color2) = @_;
print " ";
+ $line1 = "" unless defined $line1;
+ $line2 = "" unless defined $line2;
&print_cell($line1, $color1);
&print_cell($line2, $color2);
}
diff --git a/mozilla/webtools/bonsai/doadmin.cgi b/mozilla/webtools/bonsai/doadmin.cgi
index c61d2d16497..34edcf113de 100755
--- a/mozilla/webtools/bonsai/doadmin.cgi
+++ b/mozilla/webtools/bonsai/doadmin.cgi
@@ -1,4 +1,4 @@
-#!/usr/bonsaitools/bin/perl
+#!/usr/bonsaitools/bin/perl -w
# -*- Mode: perl; indent-tabs-mode: nil -*-
#
# The contents of this file are subject to the Netscape Public License
@@ -18,6 +18,9 @@
# Netscape Communications Corporation. All Rights Reserved.
+use strict;
+use diagnostics;
+
require 'CGI.pl';
require 'adminfuncs.pl';
@@ -28,7 +31,7 @@ CheckPassword(FormData('password'));
Lock();
LoadCheckins();
-$cmd = FormData('command');
+my $cmd = FormData('command');
if ($cmd eq 'close') {
close_tree();
diff --git a/mozilla/webtools/bonsai/doeditcheckin.cgi b/mozilla/webtools/bonsai/doeditcheckin.cgi
index d19b40e98a8..ddcf82423fb 100755
--- a/mozilla/webtools/bonsai/doeditcheckin.cgi
+++ b/mozilla/webtools/bonsai/doeditcheckin.cgi
@@ -17,6 +17,9 @@
# Corporation. Portions created by Netscape are Copyright (C) 1998
# Netscape Communications Corporation. All Rights Reserved.
+use diagnostics;
+use strict;
+
require 'CGI.pl';
print "Content-type: text/html
@@ -37,11 +40,11 @@ if (!exists $::FORM{'id'}) {
} else {
$info = eval("\\%" . $::FORM{'id'});
- if (!exists $info{'notes'}) {
- $info{'notes'} = "";
+ if (!exists $info->{'notes'}) {
+ $info->{'notes'} = "";
}
- foreach $i (sort(keys(%$info))) {
+ foreach my $i (sort(keys(%$info))) {
if (FormData("orig$i") ne $info->{$i}) {
$busted = 1;
last;
diff --git a/mozilla/webtools/bonsai/doeditmessage.cgi b/mozilla/webtools/bonsai/doeditmessage.cgi
index 7f5901a6d31..15bf36fbf6a 100755
--- a/mozilla/webtools/bonsai/doeditmessage.cgi
+++ b/mozilla/webtools/bonsai/doeditmessage.cgi
@@ -17,6 +17,18 @@
# Corporation. Portions created by Netscape are Copyright (C) 1998
# Netscape Communications Corporation. All Rights Reserved.
+use diagnostics;
+use strict;
+
+# Shut up misguided -w warnings about "used only once". "use vars" just
+# doesn't work for me.
+
+sub sillyness {
+ my $zz;
+ $zz = $::TreeID;
+ $zz = $::TreeInfo;
+}
+
require 'CGI.pl';
print "Content-type: text/html\n\n";
@@ -48,11 +60,11 @@ open(FILE, "> $RealFilename")
print FILE $Text;
chmod(0666, $RealFilename);
close(FILE);
-Log("$RealFilename set to $text");
+Log("$RealFilename set to $Text");
Unlock();
LoadTreeConfig();
PutsHeader("New $Filename", "New $Filename",
"$Filename - $::TreeInfo{$::TreeID}{shortdesc}");
-print "The file $filename has been changed.";
+print "The file $Filename has been changed.";
PutsTrailer();
diff --git a/mozilla/webtools/bonsai/doeditwhiteboard.cgi b/mozilla/webtools/bonsai/doeditwhiteboard.cgi
index 0a03e010966..bf120797b5e 100755
--- a/mozilla/webtools/bonsai/doeditwhiteboard.cgi
+++ b/mozilla/webtools/bonsai/doeditwhiteboard.cgi
@@ -17,6 +17,9 @@
# Corporation. Portions created by Netscape are Copyright (C) 1998
# Netscape Communications Corporation. All Rights Reserved.
+use diagnostics;
+use strict;
+
require 'CGI.pl';
print "Content-type: text/html\n\n";
@@ -58,7 +61,7 @@ Change the free-for-all whiteboard:Pick a different tree \n";
print "You attempted to move checkins into the tree that\n";
print "they're already in. Hit Back and try again.\n";
diff --git a/mozilla/webtools/bonsai/editcheckin.cgi b/mozilla/webtools/bonsai/editcheckin.cgi
index be06e68d6cb..8a214f12c60 100755
--- a/mozilla/webtools/bonsai/editcheckin.cgi
+++ b/mozilla/webtools/bonsai/editcheckin.cgi
@@ -17,6 +17,17 @@
# Corporation. Portions created by Netscape are Copyright (C) 1998
# Netscape Communications Corporation. All Rights Reserved.
+use diagnostics;
+use strict;
+
+# Shut up misguided -w warnings about "used only once". "use vars" just
+# doesn't work for me.
+
+sub sillyness {
+ my $zz;
+ $zz = $::TreeID;
+}
+
require 'CGI.pl';
LoadCheckins();
@@ -89,7 +100,7 @@ foreach my $i (sort(keys(%$info))) {
print "
";
-$Module = 'default';
+my $Module = 'default';
if( $::FORM{module} eq 'all' || $::FORM{module} eq '' ){
print "All Files in the Repository\n";
}
@@ -70,7 +82,7 @@ else {
#
$::TreeID = $Module if (exists($::TreeInfo{$Module}{'repository'}));
LoadDirList();
-for $k (sort( grep(!/\*$/, @::LegalDirs) ) ){
+for my $k (sort( grep(!/\*$/, @::LegalDirs) ) ){
print " $k\n" if ($k ne $Module);
}
@@ -86,10 +98,10 @@ print "
if( $::FORM{module} ne '' ){
- $mod = $::FORM{module};
+ my $mod = $::FORM{module};
print "Examining Module '$mod' \n\n";
- for $i (sort( grep(!/\*$/, @::LegalDirs) ) ){
+ for my $i (sort( grep(!/\*$/, @::LegalDirs) ) ){
if( -d "$CVS_ROOT/$i"){
print "Dir: ";
print "$i ";
@@ -103,9 +115,9 @@ if( $::FORM{module} ne '' ){
print "$i : Not a file or a directory.";
}
- if( $mod_map->{$i} == $IS_LOCAL ){
- print " LOCAL LOCAL
";
-@revs = ();
+my @revs = ();
#if( $ENV{"QUERY_STRING"} eq "" ){
# $ENV{"QUERY_STRING"}="brendan%2Cns%2Fjs%2Fsrc%2Cjsapi.c%2C-1=on&brendan%2Cns%2Fjs%2Fsrc%2Cjsapi.h%2C-1=on&brendan%2Cns%2Fjs%2Fsrc%2Cjsarray.c%2C-106=on&brendan%2Cns%2Fjs%2Fsrc%2Cjsarray.h%2C-0=on&brendan%2Cns%2Fjs%2Fsrc%2Cjsatom.c%2C-9=on";
@@ -45,32 +48,35 @@ print "Content-type: text/html
# print "$k='$v'\n";
#}
-if( $form{"cvsroot"} ne "" ){
+my $cvsroot;
+if( $form{"cvsroot"} ){
$cvsroot = $form{"cvsroot"};
}
else {
$cvsroot = pickDefaultRepository();
}
-if( $form{"allchanges"} ne "" ){
+if( $form{"allchanges"} ){
@revs = split(/,/, $form{"allchanges"} );
}
else {
- while( ($k, $v) = each( %form ) ){
+ while( my ($k, $v) = each( %form ) ){
push( @revs, $k );
}
}
-$didone = 0;
-for $k (@revs) {
- ($who,$dir,$file,$rev) = split(/\|/, $k );
+my $didone = 0;
+
+my $rcsdiffcommand = Param('rcsdiffcommand');
+for my $k (@revs) {
+ my ($who,$dir,$file,$rev) = split(/\|/, $k );
if ($rev eq "") {
next;
}
- $prevrev = &PrevRev($rev);
+ my $prevrev = &PrevRev($rev);
# this doesn't handle files in the attic
- $fullname = "$cvsroot/$dir/$file,v";
+ my $fullname = "$cvsroot/$dir/$file,v";
if (IsHidden($fullname)) {
next;
}
@@ -91,7 +97,7 @@ if ($didone == 0) {
sub split_cgi_args {
- local($i,$var,$value, $s);
+ my ($i,$var,$value, $s);
if( $ENV{"REQUEST_METHOD"} eq 'POST'){
while(<> ){
@@ -102,10 +108,10 @@ sub split_cgi_args {
$s = $ENV{"QUERY_STRING"};
}
- @args= split(/\&/, $s );
+ my @args= split(/\&/, $s );
- for $i (@args) {
- ($var, $value) = split(/=/, $i);
+ for my $i (@args) {
+ my ($var, $value) = split(/=/, $i);
$var =~ tr/+/ /;
$var =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
$value =~ tr/+/ /;
@@ -115,8 +121,8 @@ sub split_cgi_args {
}
sub PrevRev {
- local( $rev ) = @_;
- local( $i, $j, $ret, @r );
+ my( $rev ) = @_;
+ my( $i, $j, $ret, @r );
@r = split( /\./, $rev );
diff --git a/mozilla/webtools/bonsai/rebuildcvshistory.cgi b/mozilla/webtools/bonsai/rebuildcvshistory.cgi
index bba31dee53c..bd55d0f2317 100755
--- a/mozilla/webtools/bonsai/rebuildcvshistory.cgi
+++ b/mozilla/webtools/bonsai/rebuildcvshistory.cgi
@@ -1,4 +1,4 @@
-#!/usr/bonsaitools/bin/perl
+#!/usr/bonsaitools/bin/perl -w
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "License"); you may not use this file except in
@@ -16,6 +16,18 @@
# Corporation. Portions created by Netscape are Copyright (C) 1998
# Netscape Communications Corporation. All Rights Reserved.
+use diagnostics;
+use strict;
+
+# Shut up misguided -w warnings about "used only once". "use vars" just
+# doesn't work for me.
+
+sub sillyness {
+ my $zz;
+ $zz = $::RepositoryID;
+ $zz = $::StartingDir;
+}
+
use File::Basename;
require "CGI.pl";
@@ -97,7 +109,7 @@ sub ProcessOneFile {
$datestr =~ s!^(\d+)/(\d+/\d+)!$2/$1!;
$date = str2time($datestr, "GMT");
if ($date >= $::StartFrom) {
- AddToDatabase("C|$date|$author|$Repository|$filehead|$filetail|$revision||$branch|+$pluscount|-$minuscount", $desc);
+ AddToDatabase("C|$date|$author|$::Repository|$filehead|$filetail|$revision||$branch|+$pluscount|-$minuscount", $desc);
}
}
$indesc = 0;
@@ -144,8 +156,10 @@ sub ProcessOneFile {
}
}
- last
- unless ($line = );
+ $line = ;
+ if (!defined $line) {
+ last;
+ }
chop($line);
}
}
@@ -175,11 +189,11 @@ sub ProcessDirectory {
} else {
next unless ($file =~ /,v$/);
- if ($FirstFile && ($FirstFile ne $file)) {
+ if ($::FirstFile && ($::FirstFile ne $file)) {
print "Skipping $file...\n";
next;
}
- $FirstFile = 0;
+ $::FirstFile = 0;
ProcessOneFile($file);
}
}
@@ -232,13 +246,14 @@ Rebuilding entire checkin history in $::Description, (`$::TreeID' tree) ...
Log("Rebuilding cvs history in $::Description, (`$::TreeID' tree)...");
LoadDirList();
-@Dirs = grep(!/\*$/, @::LegalDirs);
+my @Dirs = grep(!/\*$/, @::LegalDirs);
@Dirs = split(/,\s*/, $::Modules) if $::Modules;
+my $StartingDir;
($StartingDir = "$::Repository/$::SubDir") =~ s!/.?$!! if $::SubDir;
print "Doing directories: @Dirs ...\n";
-foreach $Dir (@Dirs) {
+foreach my $Dir (@Dirs) {
my $dir = "$::Repository/$Dir";
unless (grep $Dir, @::LegalDirs) {
diff --git a/mozilla/webtools/bonsai/reposfiles.pl b/mozilla/webtools/bonsai/reposfiles.pl
index cdc47ca5fd2..310407bdcaa 100755
--- a/mozilla/webtools/bonsai/reposfiles.pl
+++ b/mozilla/webtools/bonsai/reposfiles.pl
@@ -18,14 +18,17 @@
# Netscape Communications Corporation. All Rights Reserved.
+use diagnostics;
+use strict;
+
if( $ARGV[0] eq '' ){
- $CVS_ROOT = '/m/src';
+ $::CVS_ROOT = '/m/src';
}
else {
- $CVS_ROOT = $ARGV[0];
+ $::CVS_ROOT = $ARGV[0];
}
-$CVS_REPOS_SUFIX = $CVS_ROOT;
+$CVS_REPOS_SUFIX = $::CVS_ROOT;
$CVS_REPOS_SUFIX =~ s/\//_/g;
@@ -33,7 +36,7 @@ $FILE_LIST = "/d/webdocs/projects/bonsai/data/reposfiles${CVS_REPOS_SUFIX}";
open FL, ">$FILE_LIST";
-GoDir($CVS_ROOT);
+GoDir($::CVS_ROOT);
sub GoDir {
local($dir) = @_;
diff --git a/mozilla/webtools/bonsai/rview.cgi b/mozilla/webtools/bonsai/rview.cgi
index 1690c46f44d..ea8d8cea499 100755
--- a/mozilla/webtools/bonsai/rview.cgi
+++ b/mozilla/webtools/bonsai/rview.cgi
@@ -1,4 +1,4 @@
-#!/usr/bonsaitools/bin/perl --
+#!/usr/bonsaitools/bin/perl -w
# -*- Mode: perl; indent-tabs-mode: nil -*-
#
# The contents of this file are subject to the Netscape Public License
@@ -21,11 +21,23 @@
#
# Query the CVS database.
#
+
+use diagnostics;
+use strict;
+
+# Shut up misguided -w warnings about "used only once". "use vars" just
+# doesn't work for me.
+
+sub sillyness {
+ my $zz;
+ $zz = $::Setup_String;
+}
+
require 'CGI.pl';
$|=1;
-$CVS_ROOT = $::FORM{"cvsroot"};
+my $CVS_ROOT = $::FORM{"cvsroot"};
$CVS_ROOT = pickDefaultRepository() unless $CVS_ROOT;
LoadTreeConfig();
@@ -40,11 +52,11 @@ $::TreeID = 'default'
# get dir, remove leading and trailing slashes
-$dir = $::FORM{"dir"};
+my $dir = $::FORM{"dir"};
$dir =~ s/^\/([^:]*)/$1/;
$dir =~ s/([^:]*)\/$/$1/;
-$rev = $::FORM{"rev"};
+my $rev = $::FORM{"rev"};
if(!defined($rev)) {
$rev='';
@@ -53,8 +65,10 @@ if(!defined($rev)) {
print "Content-type: text/html\n\n";
+my $script_str;
+
&setup_script;
-$Setup_String = $script_str;
+$::Setup_String = $script_str;
if( $CVS_ROOT eq "" ){
@@ -63,26 +77,30 @@ if( $CVS_ROOT eq "" ){
validateRepository($CVS_ROOT);
+my $s = "";
+
if( $rev ne "" ){
$s = "for branch $rev ";
}
CheckHidden("$CVS_ROOT/$dir");
-$revstr = '';
+my $revstr = '';
$revstr = "&rev=$rev" unless $rev eq '';
-$rootstr = '';
+my $rootstr = '';
$rootstr .= "&cvsroot=$::FORM{'cvsroot'}" if defined $::FORM{'cvsroot'};
$rootstr .= "&module=$::TreeID";
-$module = $::TreeInfo{$::TreeID}{'module'};
+my $module = $::TreeInfo{$::TreeID}{'module'};
-$toplevel = Param('toplevel');
+my $toplevel = Param('toplevel');
-$output = "";
+my $output = "
";
$output .= "
$toplevel / ";
-($dir_head, $dir_tail) = $dir =~ m@(.*/)?(.+)@;
-foreach $path (split('/',$dir_head)) {
+my ($dir_head, $dir_tail) = $dir =~ m@(.*/)?(.+)@;
+$dir_head = "" unless defined $dir_head;
+my $link_path = "";
+foreach my $path (split('/',$dir_head)) {
$link_path .= $path;
$output .= "
$path / ";
$link_path .= '/';
@@ -95,8 +113,10 @@ PutsHeader("Repository Directory $toplevel/$dir $s", $output);
cvsmenu("align=right width=30%");
+my $other_dir;
+
($other_dir = $dir) =~ s!^$module/?!!;
-$other_dir_used = 1;
+my $other_dir_used = 1;
LoadDirList();
if (-d "$CVS_ROOT/$dir") {
@@ -130,7 +150,7 @@ Branch:
";
-@dirs = ();
+my @dirs = ();
DIR:
@@ -142,15 +162,18 @@ while( <*> ){
+my $j;
+my $split;
+
if( @dirs != 0 ){
$j = 1;
$split = int(@dirs/4)+1;
print "
Directories:
";
- for $i (@dirs){
+ for my $i (@dirs){
$::FORM{"dir"} = ($dir ne "" ? "$dir/$i" : $i);
- $anchor = &make_cgi_args;
+ my $anchor = &make_cgi_args;
print "$i \n";
if( $j % $split == 0 ){
print "\n\n";
@@ -164,7 +187,7 @@ if( @dirs != 0 ){
print "Files:
";
-@files = <*,v>;
+my @files = <*,v>;
$j = 1;
$split = int(@files/4)+1;
diff --git a/mozilla/webtools/bonsai/showcheckins.cgi b/mozilla/webtools/bonsai/showcheckins.cgi
index e634e1bf1b0..59654a0b2fe 100755
--- a/mozilla/webtools/bonsai/showcheckins.cgi
+++ b/mozilla/webtools/bonsai/showcheckins.cgi
@@ -17,6 +17,9 @@
# Corporation. Portions created by Netscape are Copyright (C) 1998
# Netscape Communications Corporation. All Rights Reserved.
+use diagnostics;
+use strict;
+
require 'CGI.pl';
use vars qw(@TreeList);
@@ -118,7 +121,8 @@ my $total_removed = 0;
# Calculate delta information
#
CHECKIN:
-foreach $info (@list) {
+foreach my $infoname (@list) {
+ $info = eval("\\\%$infoname");
$$info{added} = 0;
$$info{removed} = 0;
diff --git a/mozilla/webtools/bonsai/switchtree.cgi b/mozilla/webtools/bonsai/switchtree.cgi
index f44b521f8d8..3669c80b6c5 100755
--- a/mozilla/webtools/bonsai/switchtree.cgi
+++ b/mozilla/webtools/bonsai/switchtree.cgi
@@ -17,6 +17,18 @@
# Corporation. Portions created by Netscape are Copyright (C) 1998
# Netscape Communications Corporation. All Rights Reserved.
+use diagnostics;
+use strict;
+
+# Shut up misguided -w warnings about "used only once". "use vars" just
+# doesn't work for me.
+
+sub sillyness {
+ my $zz;
+ $zz = $::TreeID;
+ $zz = $::TreeList;
+}
+
require 'CGI.pl';
print "Content-type: text/html\n\n";
LoadTreeConfig();
diff --git a/mozilla/webtools/bonsai/whohastouchedwhat.cgi b/mozilla/webtools/bonsai/whohastouchedwhat.cgi
index f4789ee1525..166d230e570 100755
--- a/mozilla/webtools/bonsai/whohastouchedwhat.cgi
+++ b/mozilla/webtools/bonsai/whohastouchedwhat.cgi
@@ -1,4 +1,4 @@
-#!/usr/bonsaitools/bin/perl --
+#!/usr/bonsaitools/bin/perl -w
# -*- Mode: perl; indent-tabs-mode: nil -*-
#
# The contents of this file are subject to the Netscape Public License