=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 3.12 retrieving revision 3.15 diff -u -p -r3.12 -r3.15 --- cvsweb/cvsweb.cgi 2000/08/15 06:54:01 3.12 +++ cvsweb/cvsweb.cgi 2000/08/25 09:01:58 3.15 @@ -41,8 +41,8 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $zId: cvsweb.cgi,v 1.93 2000/07/27 17:42:28 hzeller Exp $ -# $Id: cvsweb.cgi,v 3.12 2000/08/15 06:54:01 knu Exp $ +# $zId: cvsweb.cgi,v 1.94 2000/08/24 06:41:22 hnordstrom Exp $ +# $Id: cvsweb.cgi,v 3.15 2000/08/25 09:01:58 knu Exp $ # ### @@ -124,7 +124,10 @@ use Cwd; # User configuration is stored in $config = undef; -for ($ENV{CVSWEB_CONFIG}, '/usr/local/etc/cvsweb.conf', getcwd . '/cvsweb.conf') { +for ($ENV{CVSWEB_CONFIG}, +# '/home/knu/etc/cvsweb.conf', + '/usr/local/etc/cvsweb.conf', + getcwd . '/cvsweb.conf') { $config = $_ if defined($_) && -r $_; } @@ -717,7 +720,7 @@ elsif (-d $fullname) { print "All tags / default branch\n"; foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) { print "$tag\n"; } print "\n"; @@ -753,7 +756,7 @@ elsif (-d $fullname) { printDiffSelect(0); print ""; print "Show Attic files: "; - print "\n"; print ""; print "\n"; @@ -909,7 +912,7 @@ sub spacedHtmlText($) { local $_ = $_[0]; # Cut trailing spaces - s/\s+$//; + s/\s+\n$//; # Expand tabs s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e @@ -946,6 +949,10 @@ sub link($$) { sub revcmp($$) { my($rev1, $rev2) = @_; + + # make no comparison for a tag or a branch + return 0 if $rev1 =~ /[^\d.]/ || $rev2 =~ /[^\d.]/; + my(@r1) = split(/\./, $rev1); my(@r2) = split(/\./, $rev2); my($a,$b); @@ -1060,7 +1067,7 @@ sub doAnnotate($$) { # make sure the revisions a wellformed, for security # reasons .. - if (!($rev =~ /^[\d\.]+$/)) { + if ($rev =~ /[^\w.]/) { &fatal("404 Not Found", "Malformed query \"$ENV{QUERY_STRING}\""); } @@ -1211,9 +1218,13 @@ sub doCheckout($$) { my ($mimetype,$revopt); my $fh = do {local(*FH);}; + if ($rev eq 'HEAD' || $rev eq '.') { + $rev = undef; + } + # make sure the revisions a wellformed, for security # reasons .. - if (defined($rev) && !($rev =~ /^[\d\.]+$/)) { + if (defined($rev) && $rev =~ /[^\w.]/) { &fatal("404 Not Found", "Malformed query \"$ENV{QUERY_STRING}\""); } @@ -1249,7 +1260,7 @@ sub doCheckout($$) { # Safely for a child process to read from. if (! open($fh, "-|")) { # child open(STDERR, ">&STDOUT"); # Redirect stderr to stdout - exec("cvs", "-d", $cvsroot, "co", "-p", $revopt, $where); + exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where); } #=================================================================== #Checking out squid/src/ftp.c @@ -1366,9 +1377,10 @@ sub doDiff($$$$$$) { $rev2 = $tr2; $sym2 = ""; } + # make sure the revisions a wellformed, for security # reasons .. - if (!($rev1 =~ /^[\d\.]+$/) || !($rev2 =~ /^[\d\.]+$/)) { + if ($rev1 =~ /[^\w.]/ || $rev2 =~ /[^\w.]/) { &fatal("404 Not Found", "Malformed query \"$ENV{QUERY_STRING}\""); } @@ -1410,7 +1422,7 @@ sub doDiff($$$$$$) { # apply special options if ($showfunc) { - push @difftype, '-p'; + push @difftype, '-p' if $f =~ /^[cHhu]$/; my($re1, $re2); @@ -2122,7 +2134,7 @@ EOF print "\n"; $diffrev = $revdisplayorder[0]; $diffrev = $input{"r2"} if (defined($input{"r2"})); - print "\n"; + print "\n"; print "Type of Diff should be a "; printDiffSelect(0); print "\n"; @@ -2370,7 +2382,7 @@ sub navigateHeader($$$$$) { $swhere = urlencode($filename) if ($swhere eq ""); print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"; print "\n\n"; - print ''; + print ''; print "\n$path$filename - $title - $rev\n"; print "\n"; print ""; @@ -2722,7 +2734,7 @@ sub http_header(;$) { sub html_header($) { my ($title) = @_; - my $version = '$zRevision: 1.93 $ $Revision: 3.12 $'; #' + my $version = '$zRevision: 1.94 $ $Revision: 3.15 $'; #' http_header(); print <