=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.22 retrieving revision 1.1.1.26 diff -u -p -r1.1.1.22 -r1.1.1.26 --- cvsweb/cvsweb.cgi 2001/01/14 08:49:27 1.1.1.22 +++ cvsweb/cvsweb.cgi 2001/06/05 10:56:15 1.1.1.26 @@ -42,8 +42,8 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $zId: cvsweb.cgi,v 1.105 2000/11/26 01:51:04 jumager Exp $ -# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $ +# $zId: cvsweb.cgi,v 1.106 2001/03/10 01:16:27 hnordstrom Exp $ +# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.74 2001/06/05 04:46:21 knu Exp $ # ### @@ -139,9 +139,9 @@ sub forbidden_module($); ##### Start of Configuration Area ######## delete $ENV{PATH}; -$cvsweb_revision = join('.', '1.105', (split(/ /, - q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.64 2001/01/13 07:48:09 knu Exp $ -))[2]); +$cvsweb_revision = '1.106' . '.' . (split(/ /, + q$Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.74 2001/06/05 04:46:21 knu Exp $ +))[2]; use File::Basename; @@ -309,9 +309,7 @@ if (-f $config) { } else { &fatal("500 Internal Error", 'Configuration not found. Set the variable $config ' - . 'in cvsweb.cgi, or the environment variable ' - . 'CVSWEB_CONFIG, to your cvsweb.conf ' - . 'configuration file first.'); + . 'in cvsweb.cgi to your cvsweb.conf configuration file first.'); } undef %input; @@ -750,10 +748,10 @@ if (-d $fullname) { else { print &link($backicon, $url); } - print " ", &link("Previous Directory", $url); + print " ", &link("Parent Directory", $url); } else { - $url = urlencode($_) . "/$query"; + $url = './' . urlencode($_) . "/$query"; print ""; if ($nofilelinks) { print $diricon; @@ -816,7 +814,7 @@ if (-d $fullname) { } elsif (s/,v$//) { $fileurl = ($attic ? "Attic/" : "") . urlencode($_); - $url = $fileurl . $query; + $url = './' . $fileurl . $query; my $rev = ''; my $date = ''; my $log = ''; @@ -914,7 +912,7 @@ if (-d $fullname) { &link("Download this directory in tarball", # Mangle the filename so browsers show a reasonable # filename to download. - "$basefile.tar.gz$query". + "./$basefile.tar.gz$query". ($query ? "&" : "?")."tarball=1"), ""; } @@ -1108,11 +1106,11 @@ sub findLastModifiedSubdirs(@) { sub htmlify_sub(&$) { (my $proc, local $_) = @_; - local @_ = split(m`(]+>[^<]*)`i); + my @a = split(m`(]+>[^<]*)`i); my $linked; my $result = ''; - while (($_, $linked) = splice(@_, 0, 2)) { + while (($_, $linked) = splice(@a, 0, 2)) { &$proc(); $result .= $_ if defined($_); $result .= $linked if defined($linked); @@ -1228,6 +1226,8 @@ sub spacedHtmlText($;$) { sub link($$) { my($name, $url) = @_; + $url =~ s/:/sprintf("%%%02x", ord($&))/eg if $url =~ /^[^a-z]/; # relative + sprintf '%s', hrefquote($url), $name; } @@ -1305,6 +1305,7 @@ sub safeglob($) { push(@results, "$dirname/" .$_); } } + closedir($dh); } @results; @@ -1413,7 +1414,7 @@ sub doAnnotate($$) { # the public domain. # we could abandon the use of rlog, rcsdiff and co using # the cvsserver in a similiar way one day (..after rewrite) - $pid = open2($reader, $writer, "cvs", @cvs_options, "server") + $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: @@ -1704,7 +1705,11 @@ sub cvswebMarkup($$$) { print ""; } else { - print "\n", <$filehandle>; + print "<PRE>"; + while (<$filehandle>) { + print htmlquote($_); + } + print "</PRE>"; } } @@ -1771,7 +1776,7 @@ sub doDiff($$$$$$) { while (($re1, $re2) = each %funcline_regexp) { if ($fullname =~ /$re1/) { - push @difftype, '-F', '$re2'; + push @difftype, '-F', $re2; last; } } @@ -2640,8 +2645,8 @@ sub human_readable_diff($){ print "<br>Tag: $sym2\n" if ($sym1); print "</th>\n"; - my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\">"; - my $fe = "</font>"; + my $fs = "<font face=\"$difffontface\" size=\"$difffontsize\"><tt>"; + my $fe = "</tt></font>"; my $leftRow = 0; my $rightRow = 0; @@ -2663,6 +2668,7 @@ sub human_readable_diff($){ if ($difftxt =~ /^@@/) { ($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 "&nbsp;<font size=-1>$funname</font></td></tr></table>"; @@ -2757,7 +2763,7 @@ sub human_readable_diff($){ sub navigateHeader($$$$$) { my ($swhere,$path,$filename,$rev,$title) = @_; $swhere = "" if ($swhere eq $scriptwhere); - $swhere = urlencode($filename) if ($swhere eq ""); + $swhere = './' . urlencode($filename) if ($swhere eq ""); print <<EOF; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> @@ -2772,7 +2778,7 @@ $body_tag_for_src EOF print &link($backicon, "$swhere$query#rev$rev"); - print "</a> <b>Return to ", &link("$filename","$swhere$query#rev$rev")," CVS log"; + print "<b>Return to ", &link($filename,"$swhere$query#rev$rev")," CVS log"; print "</b> $fileicon</td>"; print "<td align=right>$diricon <b>Up to ", &clickablePath($path, 1), "</b></td>"; @@ -2990,6 +2996,8 @@ sub download_link($$$;$) { my ($url, $revision, $textlink, $mimetype) = @_; my ($fullurl) = download_url($url, $revision, $mimetype); + $fullurl =~ s/:/sprintf("%%%02x", ord($&))/eg; + printf '<A HREF="%s"', hrefquote("$fullurl$barequery"); if ($open_extern_window && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) { @@ -3186,7 +3194,7 @@ sub link_tags($) { my ($fileurl,$filename); ($filename = $where) =~ s/^.*\///; - $fileurl = urlencode($filename); + $fileurl = './' . urlencode($filename); foreach my $sym (split(", ", $tags)) { $ret .= ",\n" if ($ret ne "");