Annotation of cvsweb/cvsweb.cgi, Revision 3.251
3.204 scop 1: #!/usr/bin/perl -T
1.1 jfieber 2: #
3.1 knu 3: # cvsweb - a CGI interface to CVS trees.
1.1 jfieber 4: #
3.12 knu 5: # Written in their spare time by
3.113 scop 6: # Bill Fenner <fenner@FreeBSD.org> (original work)
7: # extended by Henner Zeller <zeller@think.de>,
8: # Henrik Nordstrom <hno@hem.passagen.se>
9: # Ken Coar <coar@Apache.Org>
10: # Dick Balaska <dick@buckosoft.com>
11: # Akinori MUSHA <knu@FreeBSD.org>
12: # Jens-Uwe Mager <jum@helios.de>
13: # Ville Skyttä <scop@FreeBSD.org>
14: # Vassilii Khachaturov <vassilii@tarunz.org>
3.1 knu 15: #
16: # Based on:
17: # * Bill Fenners cvsweb.cgi revision 1.28 available from:
3.5 knu 18: # http://www.FreeBSD.org/cgi/cvsweb.cgi/www/en/cgi/cvsweb.cgi
1.1 jfieber 19: #
1.21 wosch 20: # Copyright (c) 1996-1998 Bill Fenner
3.1 knu 21: # (c) 1998-1999 Henner Zeller
3.109 scop 22: # (c) 1999 Henrik Nordstrom
23: # (c) 2000-2002 Akinori MUSHA
3.216 scop 24: # (c) 2002-2004 Ville Skyttä
1.21 wosch 25: # All rights reserved.
26: #
27: # Redistribution and use in source and binary forms, with or without
28: # modification, are permitted provided that the following conditions
29: # are met:
30: # 1. Redistributions of source code must retain the above copyright
31: # notice, this list of conditions and the following disclaimer.
32: # 2. Redistributions in binary form must reproduce the above copyright
33: # notice, this list of conditions and the following disclaimer in the
34: # documentation and/or other materials provided with the distribution.
35: #
36: # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
37: # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
38: # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
39: # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
40: # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
41: # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
42: # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
43: # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
44: # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
45: # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
46: # SUCH DAMAGE.
47: #
3.87 knu 48: # $FreeBSD$
3.82 knu 49: # $Id: cvsweb.cgi,v 1.112 2001/07/24 13:03:16 hzeller Exp $
3.85 knu 50: # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 3.84 2001/10/07 20:50:10 knu Exp $
1.21 wosch 51: #
3.1 knu 52: ###
53:
3.204 scop 54: require 5.006;
3.55 knu 55:
3.1 knu 56: use strict;
1.21 wosch 57:
3.204 scop 58: use warnings;
59: use filetest qw(access);
60:
3.1 knu 61: use vars qw (
3.222 scop 62: $VERSION $CheckoutMagic $MimeTypes
3.144 scop 63: $config $allow_version_select
3.120 scop 64: @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr
65: %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
3.225 scop 66: %DIFF_COMMANDS @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
3.129 scop 67: %alltags %fileinfo %tags @branchnames %nameprinted
3.120 scop 68: %symrev %revsym @allrevisions %date %author @revdisplayorder
3.152 scop 69: @revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution
3.120 scop 70: $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi
3.222 scop 71: $doCheckout $scriptname $scriptwhere
3.120 scop 72: $where $pathinfo $Browser $nofilelinks $maycompress
3.194 scop 73: @stickyvars %funcline_regexp
3.120 scop 74: $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
75: %input $query $barequery $sortby $bydate $byrev $byauthor
76: $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
3.230 scop 77: $charset $output_filter
78: @command_path %CMD $allow_compress $backicon $diricon $fileicon $graphicon
3.152 scop 79: $fullname $newname $cvstreedefault $logo $defaulttitle $address $binfileicon
3.131 scop 80: $long_intro $short_instruction $shortLogLen $show_author
3.129 scop 81: $tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst
82: $inputTextSize $mime_types $allow_annotate $allow_markup
3.120 scop 83: $allow_log_extra $allow_dir_extra $allow_source_extra
3.218 scop 84: $allow_cvsgraph $cvsgraph_config $use_java_script $edit_option_form
3.144 scop 85: $show_subdir_lastmod $show_log_in_markup $preformat_in_markup
3.233 scop 86: $tabstop $state $annTable $sel @ForbiddenFiles
87: $use_descriptions %descriptions @mytz $dwhere
3.222 scop 88: $use_moddate $gzip_open $file_list_len
3.120 scop 89: $allow_tar @tar_options @gzip_options @zip_options @cvs_options
3.222 scop 90: @annotate_options @rcsdiff_options
3.165 scop 91: $HTML_DOCTYPE $HTML_META $cssurl $CSS
3.222 scop 92: $allow_enscript @enscript_options %enscript_types
3.1 knu 93: );
94:
3.183 scop 95: use Cwd qw(abs_path cwd);
3.172 scop 96: use File::Basename qw(dirname);
3.171 scop 97: use File::Path qw(rmtree);
3.232 scop 98: use File::Spec::Functions qw(canonpath catdir catfile curdir devnull rootdir
99: tmpdir updir);
3.225 scop 100: use File::Temp qw(tempdir tempfile);
3.229 scop 101: use IPC::Run qw();
3.172 scop 102: use Time::Local qw(timegm);
3.206 scop 103: use URI::Escape qw(uri_escape uri_unescape);
3.122 scop 104:
3.222 scop 105: use constant VALID_PATH => qr/^([[:^cntrl:]]+)$/o;
106: use constant VALID_TAG1 => qr/^([a-zA-Z][[:graph:]]*)$/o;
107: use constant VALID_TAG2 => qr/^([^\$,.:;@]+)$/o;
108: use constant CVSWEBMARKUP => qr/^text\/(x-cvsweb|vnd\.viewcvs)-markup$/io;
109: use constant LOG_FILESEPR => qr/^={77}$/o;
110: use constant LOG_REVSEPR => qr/^-{28}$/o;
111:
112: use constant HAS_ZLIB => eval { require Compress::Zlib; };
113: use constant HAS_EDIFF => eval { require String::Ediff; };
3.194 scop 114:
3.122 scop 115: # -----------------------------------------------------------------------------
116:
117: # All global initialization that can be done in compile time should go to
118: # the BEGIN block. Persistent environments, such as mod_perl, will benefit
119: # from this.
120:
121: BEGIN
122: {
3.248 scop 123: $VERSION = '3.0.0';
3.122 scop 124:
125: $HTML_DOCTYPE =
3.208 scop 126: '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ' .
127: '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
3.122 scop 128:
129: $HTML_META = <<EOM;
3.208 scop 130: <meta name="robots" content="nofollow" />
131: <meta name="generator" content="FreeBSD-CVSweb $VERSION" />
132: <meta http-equiv="Content-Script-Type" content="text/javascript" />
133: <meta http-equiv="Content-Style-Type" content="text/css" />
3.122 scop 134: EOM
135:
3.156 scop 136: # Use MIME::Types for MIME type lookups if it's available.
137: eval {
138: require MIME::Types;
3.223 scop 139: $MimeTypes = MIME::Types->new(only_complete => 1);
3.156 scop 140: };
141: $MimeTypes = undef if $@;
142:
3.222 scop 143: $CheckoutMagic = '~checkout~';
3.122 scop 144: }
145:
146: # -----------------------------------------------------------------------------
147:
3.12 knu 148: sub printDiffSelect($);
3.168 scop 149: sub printDiffSelectStickyVars();
3.225 scop 150: sub getDiffLinks($$$);
3.37 knu 151: sub printLogSortSelect($);
3.12 knu 152: sub findLastModifiedSubdirs(@);
3.36 knu 153: sub htmlify_sub(&$);
3.12 knu 154: sub htmlify($;$);
3.20 knu 155: sub spacedHtmlText($;$);
3.12 knu 156: sub link($$);
157: sub revcmp($$);
3.103 knu 158: sub fatal($$@);
3.12 knu 159: sub redirect($);
160: sub safeglob($);
3.58 knu 161: sub search_path($);
3.219 scop 162: sub getEnscriptHL($);
3.156 scop 163: sub getMimeType($;$);
3.24 knu 164: sub head($;$);
165: sub scan_directives(@);
3.86 knu 166: sub openOutputFilter();
3.133 scop 167: sub doAnnotate($);
3.12 knu 168: sub doCheckout($$);
3.240 scop 169: sub doEnscript($$$;$);
3.170 scop 170: sub doGraph();
171: sub doGraphView();
3.219 scop 172: sub cvswebMarkup($$$$$$;$);
3.12 knu 173: sub viewable($);
174: sub doDiff($$$$$$);
175: sub getDirLogs($$@);
176: sub readLog($;$);
3.219 scop 177: sub printLog($$$;$$);
3.12 knu 178: sub doLog($);
179: sub flush_diff_rows($$$$);
3.144 scop 180: sub human_readable_diff($$);
3.163 scop 181: sub navigateHeader($$$$$;$);
3.12 knu 182: sub plural_write($$);
183: sub readableTime($$);
184: sub clickablePath($$);
185: sub chooseCVSRoot();
186: sub chooseMirror();
187: sub fileSortCmp();
188: sub download_url($$;$);
189: sub download_link($$$;$);
3.219 scop 190: sub display_url($$;$);
191: sub display_link($$;$$);
3.170 scop 192: sub graph_link($;$);
3.140 scop 193: sub toggleQuery($;$);
3.12 knu 194: sub urlencode($);
3.35 knu 195: sub htmlquote($);
3.36 knu 196: sub htmlunquote($);
3.48 knu 197: sub hrefquote($);
3.163 scop 198: sub http_header(;$$);
199: sub html_header($;$);
3.12 knu 200: sub html_footer();
201: sub link_tags($);
3.233 scop 202: sub forbidden($);
3.191 scop 203: sub startproc(@);
3.215 scop 204: sub runproc(@);
3.225 scop 205: sub checkout_to_temp($$$);
3.12 knu 206:
3.1 knu 207: ##### Start of Configuration Area ########
3.122 scop 208:
3.142 scop 209: # Get rid of unsafe environment vars. Don't do this in BEGIN...
210: delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)});
3.59 knu 211:
3.172 scop 212: my ($mydir) = (dirname($0) =~ /(.*)/); # untaint
3.58 knu 213:
3.12 knu 214: # == EDIT this ==
3.28 knu 215: # Locations to search for user configuration, in order:
3.165 scop 216: for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
217: if (-r $_) {
3.120 scop 218: $config = $_;
219: last;
220: }
3.11 knu 221: }
3.122 scop 222: undef $mydir;
3.1 knu 223:
224: # == Configuration defaults ==
225: # Defaults for configuration variables that shouldn't need
226: # to be configured..
227: $allow_version_select = 1;
3.120 scop 228: $allow_log_extra = 1;
3.1 knu 229:
230: ##### End of Configuration Area ########
231:
232: ######## Configuration variables #########
233: # These are defined to allow checking with perl -cw
3.120 scop 234:
3.80 knu 235: @CVSrepositories = @CVSROOT = %CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS =
3.225 scop 236: %MTYPES = %tags = %alltags = %fileinfo = %DIFF_COMMANDS = ();
3.120 scop 237:
3.129 scop 238: $cvstreedefault = $logo = $defaulttitle =
3.120 scop 239: $address = $long_intro = $short_instruction = $shortLogLen = $show_author =
3.131 scop 240: $tablepadding = $hr_breakable = $showfunc = $hr_ignwhite =
3.129 scop 241: $hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate =
3.218 scop 242: $allow_markup = $use_java_script = $edit_option_form =
3.144 scop 243: $show_subdir_lastmod = $show_log_in_markup =
3.163 scop 244: $tabstop = $use_moddate = $gzip_open = undef;
3.32 knu 245:
3.37 knu 246: @DIFFTYPES = qw(h H u c s);
247: @DIFFTYPES{@DIFFTYPES} = (
3.120 scop 248: {
249: 'descr' => 'colored',
250: 'opts' => ['-u'],
251: 'colored' => 1,
252: },
253: {
254: 'descr' => 'long colored',
255: 'opts' => ['--unified=15'],
256: 'colored' => 1,
257: },
258: {
259: 'descr' => 'unified',
260: 'opts' => ['-u'],
261: 'colored' => 0,
262: },
263: {
264: 'descr' => 'context',
265: 'opts' => ['-c'],
266: 'colored' => 0,
267: },
268: {
269: 'descr' => 'side by side',
3.236 scop 270: # width=168 should be enough to support 80 character line lengths
271: 'opts' => ['--side-by-side', '--width=168'],
3.120 scop 272: 'colored' => 0,
273: },
3.80 knu 274: );
3.37 knu 275:
276: @LOGSORTKEYS = qw(cvs date rev);
277: @LOGSORTKEYS{@LOGSORTKEYS} = (
3.120 scop 278: {'descr' => 'Not sorted',},
279: {'descr' => 'Commit date',},
280: {'descr' => 'Revision',},
3.80 knu 281: );
3.37 knu 282:
3.1 knu 283: ##### End of configuration variables #####
284:
3.194 scop 285: if ($ENV{PATH_INFO}) {
286: ($pathinfo) = ($ENV{PATH_INFO} =~ VALID_PATH)
287: or fatal('500 Internal Error',
288: 'Illegal PATH_INFO in environment: <code>%s</code>',
289: $ENV{PATH_INFO});
290: }
291: if ($ENV{SCRIPT_NAME}) {
292: ($scriptname) = ($ENV{SCRIPT_NAME} =~ VALID_PATH)
293: or fatal('500 Internal Error',
294: 'Illegal SCRIPT_NAME in environment: <code>%s</code>',
295: $ENV{SCRIPT_NAME});
296: }
297:
298: $pathinfo = '' unless defined($pathinfo);
299: $scriptname = '' unless defined($scriptname);
300:
3.120 scop 301: $where = $pathinfo;
3.222 scop 302: $doCheckout = ($where =~ m|^/$CheckoutMagic/|o);
303: $where =~ s|^/$CheckoutMagic/|/|o;
3.120 scop 304: $where =~ s|^/||;
305: $scriptname =~ s|^/*|/|;
3.63 knu 306:
3.64 knu 307: # Let's workaround thttpd's stupidity..
3.63 knu 308: if ($scriptname =~ m|/$|) {
3.120 scop 309: $pathinfo .= '/';
310: my $re = quotemeta $pathinfo;
311: $scriptname =~ s/$re$//;
3.63 knu 312: }
313:
3.120 scop 314: $scriptwhere = $scriptname;
3.63 knu 315: $scriptwhere .= '/' . urlencode($where);
316: $where = '/' if ($where eq '');
3.3 knu 317:
3.188 scop 318: # In text-based browsers, it's very annoying to have two links per file;
319: # skip linking the image for them.
320:
3.120 scop 321: $Browser = $ENV{HTTP_USER_AGENT} || '';
3.187 scop 322: $is_links = ($Browser =~ m`^E?Links `);
3.80 knu 323: $is_lynx = ($Browser =~ m`^Lynx/`i);
324: $is_w3m = ($Browser =~ m`^w3m/`i);
325: $is_msie = ($Browser =~ m`MSIE`);
3.5 knu 326: $is_mozilla3 = ($Browser =~ m`^Mozilla/[3-9]`);
3.3 knu 327:
3.34 knu 328: $is_textbased = ($is_links || $is_lynx || $is_w3m);
3.5 knu 329:
330: $nofilelinks = $is_textbased;
3.1 knu 331:
332: # newer browsers accept gzip content encoding
333: # and state this in a header
334: # (netscape did always but didn't state it)
335: # It has been reported that these
336: # braindamaged MS-Internet Exploders claim that they
337: # accept gzip .. but don't in fact and
338: # display garbage then :-/
3.23 knu 339: # Turn off gzip if running under mod_perl and no zlib is available,
340: # piping does not work as expected inside the server.
3.120 scop 341: $maycompress = (
342: ((defined($ENV{HTTP_ACCEPT_ENCODING})
343: && $ENV{HTTP_ACCEPT_ENCODING} =~ /gzip/)
344: || $is_mozilla3)
345: && !$is_msie
3.222 scop 346: && !(defined($ENV{MOD_PERL}) && !HAS_ZLIB)
3.120 scop 347: );
3.1 knu 348:
3.194 scop 349: # Variables that will be sticky in all constructed links/query strings.
350: @stickyvars =
351: qw(cvsroot hideattic ignorecase sortby logsort f only_with_tag ln);
1.1 jfieber 352:
3.227 scop 353: #
354: # Load configuration.
355: #
3.1 knu 356: if (-f $config) {
3.120 scop 357: do "$config"
358: or fatal("500 Internal Error",
3.208 scop 359: 'Error in loading configuration file: %s<br /><br />%s<br />',
3.120 scop 360: $config, $@);
3.27 knu 361: } else {
3.120 scop 362: fatal("500 Internal Error",
363: 'Configuration not found. Set the variable <code>$config</code> in cvsweb.cgi to your <b>cvsweb.conf</b> configuration file first.');
3.1 knu 364: }
365:
3.183 scop 366: # Try to find a readable dir where we can cd into. Some abs_path()
367: # implementations as well as various cvs operations require such a dir to
368: # work properly.
369: {
370: local $^W = 0;
3.190 scop 371: if (!-r cwd()) {
372: for my $dir (tmpdir(), rootdir()) {
373: last if (-r $dir && chdir($dir));
374: }
3.183 scop 375: }
376: }
377:
3.144 scop 378: $CSS = $cssurl ?
3.208 scop 379: sprintf("<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\" />\n",
3.144 scop 380: htmlquote($cssurl)) : '';
381:
3.194 scop 382: # --- input parameters
383:
3.202 scop 384: my %query = ();
385: if (defined($ENV{QUERY_STRING})) {
386: for my $p (split(/[;&]+/, $ENV{QUERY_STRING})) {
387: next unless $p;
388: $p =~ y/+/ /;
389: my ($key, $val) = split(/=/, $p, 2);
390: next unless defined($key);
391: $val = 1 unless defined($val);
3.222 scop 392: ($key = uri_unescape($key)) =~ /[[:graph:]]/ or next;
393: ($val = uri_unescape($val)) =~ /[[:graph:]]/ or next;
3.202 scop 394: $query{$key} = $val;
395: }
396: }
397:
3.1 knu 398: undef %input;
1.10 wosch 399:
3.194 scop 400: my $t;
401: for my $p (qw(graph hideattic hidecvsroot hidenonreadable ignorecase ln copt
402: makeimage options tarball)) {
3.202 scop 403: $t = $query{$p};
404: if (defined($t)) {
3.222 scop 405: ($input{$p}) = ($t =~ /^([01]|on)$/)
3.194 scop 406: or fatal('500 Internal Error',
407: 'Invalid boolean value: <code>%s=%s</code>', $p, $t);
408: }
409: }
410: for my $p (qw(annotate r1 r2 rev tr1 tr2)) {
3.202 scop 411: $t = $query{$p};
412: if (defined($t)) {
3.207 scop 413: if (($p eq 'r1' || $p eq 'r2') && $t eq 'text') {
414: # Special case for the "Use text field" option in the log view diff form.
415: $input{$p} = $t;
416: next;
417: }
3.194 scop 418: my ($rev, $tag) = split(/:/, $t, 2);
3.251 ! scop 419: ($input{$p}) = ($rev =~ /^(\d+(?:\.\d+)*)$/)
3.194 scop 420: or fatal('500 Internal Error',
421: 'Invalid revision: <code>%s=%s</code>', $p, $t);
422: if (defined($tag)) {
423: ($tag) = ($tag =~ VALID_TAG1)
424: or fatal('500 Internal Error',
425: 'Invalid revision: <code>%s=%s</code>', $p, $t);
426: ($tag) = ($tag =~ VALID_TAG2)
427: or fatal('500 Internal Error',
428: 'Invalid revision: <code>%s=%s</code>', $p, $t);
3.207 scop 429: $input{$p} .= ':' . $tag;
3.194 scop 430: }
431: }
432: }
3.202 scop 433: $t = defined($query{only_with_tag}) ?
434: $query{only_with_tag} : $query{only_on_branch}; # Backwards compatibility.
435: if (defined($t)) {
3.211 scop 436: ($input{only_with_tag}) = ($t =~ VALID_TAG1)
3.194 scop 437: or fatal('500 Internal Error',
438: 'Invalid tag/branch name: <code>%s</code>', $t);
3.211 scop 439: ($input{only_with_tag}) = ($t =~ VALID_TAG2)
3.194 scop 440: or fatal('500 Internal Error',
441: 'Invalid tag/branch name: <code>%s</code>', $t);
442: }
3.202 scop 443: $t = $query{logsort};
444: if (defined($t)) {
3.222 scop 445: ($input{logsort}) = ($t =~ /^(cvs|date|rev)$/)
3.194 scop 446: or fatal('500 Internal Error',
447: 'Unsupported log sort key: <code>%s</code>', $t);
448: }
3.202 scop 449: $t = $query{f};
450: if (defined($t)) {
3.225 scop 451: ($input{f}) = ($t =~ /^(([hH]|[ucs]c?)|ext\d*)$/)
3.194 scop 452: or fatal('500 Internal Error',
453: 'Unsupported diff format: <code>%s</code>', $t);
454: }
3.202 scop 455: $t = $query{sortby};
456: if (defined($t)) {
3.222 scop 457: ($input{sortby}) = ($t =~ /^(file|date|rev|author|log)$/)
3.194 scop 458: or fatal('500 Internal Error',
459: 'Unsupported dir sort key: <code>%s</code>', $t);
460: }
3.202 scop 461: $t = $query{'content-type'};
462: if (defined($t)) {
3.222 scop 463: ($input{'content-type'}) = ($t =~ /^([-0-9A-Za-z]+\/[-0-9A-Za-z\.]+)$/)
3.194 scop 464: or fatal('500 Internal Error',
465: 'Unsupported content type: <code>%s</code>', $t);
466: }
3.202 scop 467: $t = $query{cvsroot};
468: if (defined($t)) {
3.222 scop 469: ($input{cvsroot}) = ($t =~ /^([[:print:]]+)$/)
3.194 scop 470: or fatal('500 Internal Error',
471: 'Invalid symbolic CVS root name: <code>%s</code>', $t);
472: }
3.202 scop 473: $t = $query{path};
474: if (defined($t)) {
3.194 scop 475: ($input{path}) = ($t =~ VALID_PATH)
476: or fatal('500 Internal Error',
477: 'Invalid path: <code>%s</code>', $t);
3.97 knu 478: }
3.194 scop 479: undef($t);
3.205 scop 480: undef(%query);
3.97 knu 481:
3.194 scop 482: # --- end input parameters
1.10 wosch 483:
3.158 scop 484: #
485: # CVS roots
486: #
487: my $rootfound = 0;
488: for (my $i = 0; $i < scalar(@CVSrepositories); $i += 2) {
489: my $key = $CVSrepositories[$i];
3.232 scop 490: my ($descr, $root) = @{$CVSrepositories[$i+1]};
491: $root = canonpath($root);
492: unless (-d $root) {
493: warn("Root '$root' defined in \@CVSrepositories is not a directory, " .
3.158 scop 494: 'entry ignored');
495: next;
496: }
497: $rootfound ||= 1;
498: $cvstreedefault = $key unless defined($cvstreedefault);
499: $CVSROOTdescr{$key} = $descr;
3.232 scop 500: $CVSROOT{$key} = $root;
3.158 scop 501: push(@CVSROOT, $key);
502: }
503: unless ($rootfound) {
504: fatal('500 Internal Error',
505: 'No valid CVS roots found! See <code>@CVSrepositories</code> in ' .
3.221 scop 506: 'the configuration file (<code>%s</code>).',
3.158 scop 507: $config);
508: }
509: undef $rootfound;
510:
511: #
512: # Default CVS root
513: #
514: if (!defined($CVSROOT{$cvstreedefault})) {
515: fatal("500 Internal Error",
516: '<code>$cvstreedefault</code> points to a repository (%s) not ' .
517: 'defined in <code>@CVSrepositories</code> in your configuration ' .
518: 'file (<code>%s</code>).',
519: $cvstreedefault,
520: $config);
521: }
522:
3.1 knu 523: $DEFAULTVALUE{'cvsroot'} = $cvstreedefault;
1.10 wosch 524:
3.120 scop 525: while (my ($key, $defval) = each %DEFAULTVALUE) {
3.80 knu 526:
3.120 scop 527: # Replace not given parameters with defaults.
3.194 scop 528: next unless (defined($defval) && $defval =~ /\S/ && !defined($input{$key}));
3.120 scop 529:
530: # Empty checkboxes in forms return nothing, so we define a helper variable
531: # in these forms (copt) which indicates that we just set parameters with a
532: # checkbox.
3.194 scop 533: if ($input{copt}) {
3.120 scop 534:
3.194 scop 535: # 'copt' is set -> the result of empty input checkbox
3.120 scop 536: # -> set to zero (disable) if default is a boolean (0|1).
537: $input{$key} = 0 if ($defval eq '0' || $defval eq '1');
538:
539: } else {
540:
3.194 scop 541: # 'copt' isn't set --> empty input is not the result
3.120 scop 542: # of empty input checkbox --> set default.
543: $input{$key} = $defval;
544: }
1.10 wosch 545: }
3.12 knu 546:
3.1 knu 547: $barequery = "";
3.31 knu 548: my @barequery;
3.1 knu 549: foreach (@stickyvars) {
3.80 knu 550:
3.120 scop 551: # construct a query string with the sticky non default parameters set
552: if (defined($input{$_})
553: && !(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_}))
554: {
3.206 scop 555: push(@barequery, join('=', uri_escape($_), uri_escape($input{$_})));
3.120 scop 556: }
3.1 knu 557: }
3.80 knu 558:
3.168 scop 559: if ($allow_enscript) {
560: push(@DIFFTYPES, qw(uc cc sc));
561: @DIFFTYPES{qw(uc cc sc)} = (
562: {
563: 'descr' => 'unified, colored',
564: 'opts' => ['-u'],
565: 'colored' => 0,
566: },
567: {
568: 'descr' => 'context, colored',
569: 'opts' => ['-c'],
570: 'colored' => 0,
571: },
572: {
573: 'descr' => 'side by side, colored',
3.238 scop 574: # width=168 should be enough to support 80 character line lengths
575: 'opts' => ['--side-by-side', '--width=168'],
3.168 scop 576: 'colored' => 0,
577: },
578: );
579: } else {
580: # No Enscript -> respect difftype, but don't offer colorization.
581: if ($input{f} && $input{f} =~ /^([ucs])c$/) {
582: $input{f} = $1;
583: }
584: }
585:
3.1 knu 586: # is there any query ?
3.31 knu 587: if (@barequery) {
3.203 scop 588: $barequery = join (';', @barequery);
3.120 scop 589: $query = "?$barequery";
3.203 scop 590: $barequery = ";$barequery";
3.80 knu 591: } else {
3.120 scop 592: $query = "";
3.1 knu 593: }
3.31 knu 594: undef @barequery;
3.1 knu 595:
3.120 scop 596: if (defined($input{'path'})) {
597: redirect("$scriptname/$input{path}$query");
3.57 knu 598: }
599:
3.1 knu 600: # get actual parameters
3.144 scop 601: {
602: my $sortby = $input{sortby} || 'file';
603: $bydate = 0;
604: $byrev = 0;
605: $byauthor = 0;
606: $bylog = 0;
607: $byfile = 0;
608: if ($sortby eq 'date') {
609: $bydate = 1;
610: } elsif ($sortby eq 'rev') {
611: $byrev = 1;
612: } elsif ($sortby eq 'author') {
613: $byauthor = 1;
614: } elsif ($sortby eq 'log') {
615: $bylog = 1;
616: } else {
617: $byfile = 1;
618: }
3.1 knu 619: }
620:
3.37 knu 621: $defaultDiffType = $input{'f'};
3.1 knu 622:
3.3 knu 623: $logsort = $input{'logsort'};
3.1 knu 624:
625: # alternate CVS-Tree, configured in cvsweb.conf
626: if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}}) {
3.120 scop 627: $cvstree = $input{'cvsroot'};
3.1 knu 628: } else {
3.120 scop 629: $cvstree = $cvstreedefault;
1.10 wosch 630: }
631:
3.1 knu 632: $cvsroot = $CVSROOT{$cvstree};
1.10 wosch 633:
3.1 knu 634: # create icons out of description
3.120 scop 635: foreach my $k (keys %ICONS) {
636: my ($itxt, $ipath, $iwidth, $iheight) = @{$ICONS{$k}};
637: no strict 'refs';
638: if ($ipath) {
639: ${"${k}icon"} =
3.208 scop 640: sprintf('<img src="%s" alt="%s" border="0" width="%d" height="%d" />',
3.132 scop 641: hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight);
3.120 scop 642: } else {
643: ${"${k}icon"} = $itxt;
644: }
1.24 wosch 645: }
646:
3.27 knu 647: my $config_cvstree = "$config-$cvstree";
648:
3.1 knu 649: # Do some special configuration for cvstrees
3.27 knu 650: if (-f $config_cvstree) {
3.120 scop 651: do "$config_cvstree"
652: or fatal("500 Internal Error",
3.208 scop 653: 'Error in loading configuration file: %s<br /><br />%s<br />',
3.120 scop 654: $config_cvstree, $@);
3.27 knu 655: }
3.31 knu 656: undef $config_cvstree;
3.1 knu 657:
3.120 scop 658: $re_prcategories = '(?:' . join ('|', @prcategories) . ')' if @prcategories;
659: $re_prkeyword = quotemeta($prkeyword) if defined($prkeyword);
660: $prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
1.24 wosch 661:
3.233 scop 662: $fullname = catfile($cvsroot, $where);
3.1 knu 663:
3.63 knu 664: my $rewrite = 0;
665:
666: if ($pathinfo =~ m|//|) {
3.120 scop 667: $pathinfo =~ y|/|/|s;
668: $rewrite = 1;
3.63 knu 669: }
670:
3.120 scop 671: if (-d $fullname) {
672: if ($pathinfo !~ m|/$|) {
673: $pathinfo .= '/';
674: $rewrite = 1;
675: }
676: } else {
677: if ($pathinfo =~ m|/$|) {
678: chop $pathinfo;
679: $rewrite = 1;
680: }
3.63 knu 681: }
682:
683: if ($rewrite) {
3.120 scop 684: redirect($scriptname . urlencode($pathinfo) . $query);
3.1 knu 685: }
686:
3.63 knu 687: undef $rewrite;
688:
3.1 knu 689: if (!-d $cvsroot) {
3.120 scop 690: fatal("500 Internal Error",
691: '$CVSROOT not found!<p>The server on which the CVS tree lives is probably down. Please try again in a few minutes.');
3.1 knu 692: }
693:
694: #
3.233 scop 695: # Short-circuit forbidden things. Note that $fullname should not change
696: # after this, because the rest of the code assumes this check has already
697: # been done.
3.1 knu 698: #
3.233 scop 699: fatal('403 Forbidden', 'Access to %s forbidden.', $where)
700: if forbidden($fullname);
3.46 knu 701:
702: #
703: # Handle tarball downloads before any headers are output.
704: #
705: if ($input{tarball}) {
3.120 scop 706: fatal('403 Forbidden', 'Downloading tarballs is prohibited.')
707: unless $allow_tar;
3.191 scop 708:
3.120 scop 709: my ($module) = ($where =~ m,^/?(.*),); # untaint
710: $module =~ s,/([^/]*)$,,;
3.191 scop 711: my ($ext) = ($1 =~ /(\.t(?:ar\.)?gz|\.zip)$/);
3.120 scop 712: my ($basedir) = ($module =~ m,([^/]+)$,);
713:
714: if ($basedir eq '' || $module eq '') {
715: fatal('500 Internal Error',
716: 'You cannot download the top level directory.');
717: }
718:
3.191 scop 719: my $istar = ($ext eq '.tar.gz' || $ext eq '.tgz');
720: if ($istar) {
721: fatal('500 Internal Error', 'tar command not found.') unless $CMD{tar};
722: fatal('500 Internal Error', 'gzip command not found.') unless $CMD{gzip};
723: }
724: my $iszip = ($ext eq '.zip');
725: if ($iszip && !$CMD{zip}) {
726: fatal('500 Internal Error', 'zip command not found.');
727: }
3.215 scop 728: if (!$istar && !$iszip) {
729: fatal('500 Internal Error', 'Unsupported archive type.');
730: }
3.191 scop 731:
3.138 scop 732: my $tmpexportdir;
733: eval {
734: local $SIG{__DIE__};
3.171 scop 735: # Don't use the CLEANUP argument to tempdir() here, since we might be under
736: # mod_perl (the process runs for a long time), unlink explicitly later.
737: $tmpexportdir = tempdir('.cvsweb.XXXXXXXX', TMPDIR => 1);
3.138 scop 738: };
739: if ($@) {
740: fatal('500 Internal Error', 'Unable to make temporary directory: %s', $@);
741: }
3.191 scop 742: if (!chdir($tmpexportdir)) {
743: fatal('500 Internal Error',
744: "Can't cd to temporary directory %s: %s", $tmpexportdir, $!);
745: }
3.120 scop 746:
747: my @fatal;
3.194 scop 748: my $tag = $input{only_with_tag} || 'HEAD';
749: $tag = 'HEAD' if ($tag eq 'MAIN');
3.120 scop 750:
3.215 scop 751: my @cmd =
3.241 scop 752: ($CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', $tag,
753: '-d', $basedir, $module);
3.215 scop 754: my $export_err;
755: my ($errcode, $err) = runproc(\@cmd, '2>', \$export_err);
756: if ($errcode) {
757: @fatal =
758: ('500 Internal Error',
759: 'Export failure (exit status %s), output: <pre>%s</pre>',
760: $errcode, $err || $export_err);
3.191 scop 761:
3.215 scop 762: } else {
3.191 scop 763:
3.120 scop 764: $| = 1; # Essential to get the buffering right.
3.191 scop 765: local (*TAR_OUT);
3.120 scop 766:
3.191 scop 767: my (@cmd, $ctype);
768: if ($istar) {
769: my @tar = ($CMD{tar}, @tar_options, '-cf', '-', $basedir);
770: my @gzip = ($CMD{gzip}, @gzip_options, '-c');
771: push(@cmd, \@tar, '|', \@gzip);
772: $ctype = 'application/x-gzip';
773: } elsif ($iszip) {
774: my @zip = ($CMD{zip}, @zip_options, '-r', '-', $basedir);
775: push(@cmd, \@zip, \'');
776: $ctype = 'application/zip';
777: }
3.229 scop 778: push(@cmd, '>pipe', \*TAR_OUT);
3.191 scop 779:
780: my ($h, $err) = startproc(@cmd);
781: if ($h) {
782: print "Content-Type: $ctype\r\n\r\n";
783: local $/ = undef;
784: print <TAR_OUT>;
3.229 scop 785: $h->finish();
3.120 scop 786: } else {
3.215 scop 787: @fatal = ('500 Internal Error',
788: '%s failure (exit status %s), output: <pre>%s</pre>',
789: $istar ? 'Tar' : 'Zip', $? >> 8 || -1, $err);
3.120 scop 790: }
791: }
3.46 knu 792:
3.171 scop 793: # Clean up.
794: rmtree($tmpexportdir);
3.46 knu 795:
3.120 scop 796: &fatal(@fatal) if @fatal;
3.46 knu 797:
3.120 scop 798: exit;
3.46 knu 799: }
800:
3.1 knu 801: ##############################
802: # View a directory
803: ###############################
3.46 knu 804: if (-d $fullname) {
3.233 scop 805:
3.120 scop 806: my $dh = do { local (*DH); };
807: opendir($dh, $fullname) or fatal("404 Not Found", '%s: %s', $where, $!);
3.233 scop 808: my @dir = grep(!forbidden(catfile($fullname, $_)), readdir($dh));
3.120 scop 809: closedir($dh);
810: my @subLevelFiles = findLastModifiedSubdirs(@dir)
811: if ($show_subdir_lastmod);
3.150 scop 812: my @unreadable = getDirLogs($cvsroot, $where, @subLevelFiles);
3.120 scop 813:
814: if ($where eq '/') {
815: html_header($defaulttitle);
816: $long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g;
817: print $long_intro;
818: } else {
819: html_header($where);
3.212 scop 820: my $html = (-f catfile($fullname, 'README.cvs.html,v') ||
821: -f catfile($fullname, 'Attic', 'README.cvs.html,v'));
822: my $text = (!$html &&
823: (-f catfile($fullname, 'README.cvs,v') ||
824: -f catfile($fullname, 'Attic', 'README.cvs,v')));
825: if ($html || $text) {
826: my $rev = $input{only_with_tag} || 'HEAD';
827: my $cr = abs_path($cvsroot) || $cvsroot;
828: my $co = "$where/README.cvs.html" if $html;
829: $co ||= "$where/README.cvs" if $text;
830: # abs_path() taints when run as a CGI...
831: if ($cr =~ VALID_PATH) {
832: $cr = $1;
833: } else {
834: fatal('500 Internal Error', 'Illegal CVS root: <code>%s</code>', $cr);
835: }
836: my @cmd = ($CMD{cvs}, @cvs_options, '-d', $cr, 'co', '-p', "-r$rev",$co);
837: local (*CVS_OUT, *CVS_ERR);
838: my ($h, $err) = startproc(\@cmd, \"", '>pipe', \*CVS_OUT,
3.229 scop 839: '2>pipe', \*CVS_ERR);
3.212 scop 840: fatal('500 Internal Error', $err) unless $h;
841: if ($html) {
842: local $/ = undef;
843: print <CVS_OUT>;
844: } else {
845: print "<p>\n";
846: while (<CVS_OUT>) {
847: chomp;
848: print htmlquote($_), '<br />';
849: }
850: print "</p>";
851: }
3.229 scop 852: $h->finish();
3.212 scop 853: }
3.120 scop 854: print $short_instruction;
855: }
856:
3.165 scop 857: if ($use_descriptions &&
858: open(DESC, '<', catfile($cvsroot, 'CVSROOT', 'descriptions'))) {
3.120 scop 859: while (<DESC>) {
860: chomp;
861: my ($dir, $description) = /(\S+)\s+(.*)/;
862: $descriptions{$dir} = $description;
863: }
864: close(DESC);
865: }
866:
867: print "<p><a name=\"dirlist\"></a></p>\n";
868:
869: # give direct access to dirs
870: if ($where eq '/') {
871: chooseMirror();
872: chooseCVSRoot();
873: } else {
874: print "<p>Current directory: <b>", &clickablePath($where, 0), "</b></p>\n";
875:
3.153 scop 876: print "<p>Current tag: <b>", htmlquote($input{only_with_tag}), "</b></p>\n"
3.120 scop 877: if $input{only_with_tag};
878:
879: }
880:
3.208 scop 881: print "<hr />\n";
3.120 scop 882:
3.179 scop 883: my $infocols = 1;
3.131 scop 884:
3.199 scop 885: printf(<<EOF, htmlquote("Index of $where"));
3.182 scop 886: <table class="dir" width="100%%" cellspacing="0" cellpadding="$tablepadding" summary="%s">
3.179 scop 887: <tr>
888: EOF
3.199 scop 889: printf('<th colspan="2"%s>', ($byfile ? ' class="sorted"' : ''));
3.131 scop 890:
891: if ($byfile) {
892: print 'File';
893: } else {
894: print &link('File',
895: sprintf('./%s#dirlist', toggleQuery('sortby', 'file')));
896: }
897: print "</th>\n";
3.120 scop 898:
3.131 scop 899: # Do not display the other column headers if we do not have any files
900: # with revision information.
901: if (scalar(%fileinfo)) {
3.120 scop 902: $infocols++;
3.199 scop 903: printf('<th%s>', ($byrev ? ' class="sorted"' : ''));
3.120 scop 904:
3.131 scop 905: if ($byrev) {
906: print 'Rev.';
3.120 scop 907: } else {
3.131 scop 908: print &link('Rev.',
909: sprintf('./%s#dirlist', toggleQuery('sortby', 'rev')));
3.120 scop 910: }
911: print "</th>\n";
3.131 scop 912: $infocols++;
3.199 scop 913: printf('<th%s>', ($bydate ? ' class="sorted"' : ''));
3.120 scop 914:
3.131 scop 915: if ($bydate) {
916: print 'Age';
917: } else {
918: print &link('Age',
919: sprintf('./%s#dirlist', toggleQuery('sortby', 'date')));
920: }
921: print "</th>\n";
3.120 scop 922:
3.131 scop 923: if ($show_author) {
3.120 scop 924: $infocols++;
3.199 scop 925: printf('<th%s>', ($byauthor ? ' class="sorted"' : ''));
3.120 scop 926:
3.131 scop 927: if ($byauthor) {
928: print 'Author';
3.120 scop 929: } else {
3.131 scop 930: print
931: &link('Author',
932: sprintf('./%s#dirlist', toggleQuery('sortby', 'author')));
3.120 scop 933: }
934: print "</th>\n";
3.131 scop 935: }
936: $infocols++;
3.199 scop 937: printf('<th%s>', ($bylog ? ' class="sorted"' : ''));
3.120 scop 938:
3.131 scop 939: if ($bylog) {
940: print 'Last log entry';
941: } else {
942: print &link('Last log entry',
943: sprintf('./%s#dirlist', toggleQuery('sortby', 'log')));
3.120 scop 944: }
3.131 scop 945: print "</th>\n";
946: } elsif ($use_descriptions) {
3.199 scop 947: print "<th>Description</th>\n";
3.131 scop 948: $infocols++;
3.120 scop 949: }
3.131 scop 950: print "</tr>\n";
951:
3.120 scop 952: my $dirrow = 0;
953:
954: my $i;
955: lookingforattic:
956: for ($i = 0; $i <= $#dir; $i++) {
957: if ($dir[$i] eq "Attic") {
958: last lookingforattic;
959: }
960: }
961:
962: if (!$input{'hideattic'}
963: && ($i <= $#dir)
964: && opendir($dh, $fullname . '/Attic'))
965: {
966: splice(@dir, $i, 1, grep((s|^|Attic/|, !m|/\.|), readdir($dh)));
967: closedir($dh);
968: }
969:
970: my $hideAtticToggleLink =
971: $input{'hideattic'}
972: ? ''
3.239 scop 973: : &link('[hide]', sprintf('./%s#dirlist', &toggleQuery('hideattic')));
3.120 scop 974:
975: # Sort without the Attic/ pathname.
976: # place directories first
977:
978: my $attic;
979: my $url;
980: my $fileurl;
981: my $filesexists;
982: my $filesfound;
983:
984: foreach my $file (sort { &fileSortCmp } @dir) {
985:
3.196 scop 986: next if ($file eq curdir());
3.120 scop 987:
988: # ignore CVS lock and stale NFS files
989: next if ($file =~ /^\#cvs\.|^,|^\.nfs/); # \# for XEmacs cperl-mode...
990:
991: # Check whether to show the CVSROOT path
3.234 scop 992: next if ($input{'hidecvsroot'} && $where eq '/' && $file eq 'CVSROOT');
3.120 scop 993:
3.150 scop 994: # Is it a directory?
3.232 scop 995: my $isdir = -d catdir($fullname, $file);
3.150 scop 996:
997: # Ignore non-readable files and directories?
998: next if ($input{'hidenonreadable'} && (! -r _ || ($isdir && ! -x _)));
3.120 scop 999:
1000: if ($file =~ s|^Attic/||) {
3.239 scop 1001: $attic = ' <span class="attic">(in the Attic) ' .
1002: $hideAtticToggleLink . '</span>';
3.120 scop 1003: } else {
1004: $attic = '';
1005: }
1006:
3.196 scop 1007: if ($file eq updir() || $isdir) {
1008: next if ($file eq updir() && $where eq '/');
3.152 scop 1009: my ($rev, $date, $log, $author, $filename, $keywordsubst) =
1010: @{$fileinfo{$file}} if (defined($fileinfo{$file}));
3.239 scop 1011: printf "<tr class=\"%s\">\n<td class=\"dir\" colspan=\"2\">",
3.132 scop 1012: ($dirrow % 2) ? 'even' : 'odd';
3.120 scop 1013:
3.196 scop 1014: if ($file eq updir()) {
3.120 scop 1015: $url = "../$query";
1016: if ($nofilelinks) {
1017: print $backicon;
1018: } else {
1019: print &link($backicon, $url);
1020: }
1021: print ' ', &link("Parent Directory", $url);
1022: } else {
1023: $url = './' . urlencode($file) . "/$query";
3.136 scop 1024: print '<a name="', hrefquote($file), '"></a>';
3.120 scop 1025:
1026: if ($nofilelinks) {
1027: print $diricon;
1028: } else {
1029: print &link($diricon, $url);
1030: }
3.136 scop 1031: print ' ', &link(htmlquote("$file/"), $url), $attic;
3.120 scop 1032:
1033: if ($file eq "Attic") {
3.239 scop 1034: print ' <span class="attic">',
1035: &link('[show]',
1036: sprintf('./%s#dirlist', &toggleQuery('hideattic'))),
1037: '</span>';
3.120 scop 1038: }
1039: }
1040:
1041: # Show last change in dir
1042: if ($filename) {
3.199 scop 1043: print "</td>\n<td> </td>\n<td class=\"age\">";
1044: print readableTime(time() - $date, 0) if $date;
1045: print "</td>\n<td class=\"author\">", htmlquote($author)
1046: if $show_author;
1047: print "</td>\n<td class=\"log\">";
3.120 scop 1048: $filename =~ s%^[^/]+/%%;
3.199 scop 1049: print &link(htmlquote("$filename/$rev"),
1050: sprintf('%s/%s%s#rev%s',
3.206 scop 1051: uri_escape($file), uri_escape($filename),
3.208 scop 1052: $query, $rev)), '<br />';
3.120 scop 1053: if ($log) {
3.199 scop 1054: print htmlify(substr($log, 0, $shortLogLen), $allow_dir_extra);
3.120 scop 1055: print '...' if (length($log) > 80);
1056: }
3.199 scop 1057:
3.120 scop 1058: } else {
1059: my $dwhere = ($where ne '/' ? $where : '') . $file;
1060:
1061: if ($use_descriptions && defined $descriptions{$dwhere}) {
3.199 scop 1062: print '<td colspan="', ($infocols - 1), '">';
3.120 scop 1063: print $descriptions{$dwhere};
1064:
3.131 scop 1065: } elsif ($infocols > 1) {
3.120 scop 1066:
1067: # close the row with the appropriate number of
1068: # columns, so that the vertical seperators are visible
1069: my ($cols) = $infocols;
1070: while ($cols > 1) {
1071: print "</td>\n<td> ";
1072: $cols--;
1073: }
1074: }
1075: }
1076:
3.131 scop 1077: print "</td>\n</tr>\n";
3.120 scop 1078: $dirrow++;
3.131 scop 1079:
3.120 scop 1080: } elsif ($file =~ s/,v$//) {
1081:
1082: $fileurl = ($attic ? 'Attic/' : '') . urlencode($file);
1083: $url = './' . $fileurl . $query;
1084: $filesexists++;
1085: next if (!defined($fileinfo{$file}));
3.152 scop 1086: my ($rev, $date, $log, $author, $filename, $keywordsubst) =
1087: @{$fileinfo{$file}};
3.156 scop 1088: my $isbinary = $keywordsubst eq 'b' ? 1 : 0;
3.120 scop 1089: $filesfound++;
3.156 scop 1090:
3.199 scop 1091: printf "<tr class=\"%s\">\n", ($dirrow % 2) ? 'even' : 'odd';
3.239 scop 1092: printf '<td class="file"%s>', $allow_cvsgraph ? '' : ' colspan="2"';
3.120 scop 1093:
3.156 scop 1094: my $icon = $isbinary ? $binfileicon : $fileicon;
3.120 scop 1095: if ($nofilelinks) {
3.152 scop 1096: print $icon;
3.120 scop 1097: } else {
3.152 scop 1098: print &link($icon, $url);
3.120 scop 1099: }
1100: print ' ', &link(htmlquote($file), $url), $attic;
3.199 scop 1101: print '</td><td class="graph">', graph_link($fileurl) if $allow_cvsgraph;
3.219 scop 1102: print "</td>\n<td width=\"30\">", display_link($fileurl, $rev);
3.199 scop 1103: print "</td>\n<td class=\"age\">";
1104: print readableTime(time() - $date, 0) if $date;
1105: print "</td>\n<td class=\"author\">", htmlquote($author) if $show_author;
1106: print "</td>\n<td class=\"log\">";
3.120 scop 1107:
1108: if ($log) {
3.199 scop 1109: print htmlify(substr($log, 0, $shortLogLen), $allow_dir_extra);
3.120 scop 1110: print '...' if (length $log > 80);
1111: }
3.131 scop 1112: print "</td>\n</tr>";
3.120 scop 1113: $dirrow++;
1114: }
1115: print "\n";
1116: }
1117:
3.131 scop 1118: print "</table>\n";
3.120 scop 1119:
3.150 scop 1120: if ((my $num = scalar(@unreadable)) && ! $input{hidenonreadable}) {
1121: printf(<<EOF, $num, htmlquote(join(', ', @unreadable)));
1122: <p>
3.208 scop 1123: <b>NOTE:</b> The following %d unreadable files were ignored:<br />
3.150 scop 1124: <em>%s</em>
1125: </p>
1126: EOF
1127: }
1128:
3.120 scop 1129: if ($filesexists && !$filesfound) {
3.150 scop 1130: my $currtag = defined($input{only_with_tag}) ?
1131: sprintf(' (%s)', htmlquote($input{only_with_tag})) : '';
1132: printf(<<EOF, $filesexists, $currtag);
1133: <p>
1134: <b>NOTE:</b> There are %d files, but none matches the current tag%s.
1135: </p>
1136: EOF
3.120 scop 1137: }
1138:
1139: if ($input{only_with_tag} && (!%tags || !$tags{$input{only_with_tag}})) {
1140: %tags = %alltags;
1141: }
1142:
1143: if (scalar %tags
1144: || $input{only_with_tag}
1145: || $edit_option_form
1146: || defined($input{"options"}))
1147: {
3.208 scop 1148: print "<hr />\n";
3.120 scop 1149: }
1150:
1151: if (scalar %tags || $input{only_with_tag}) {
3.208 scop 1152: print "<form method=\"get\" action=\"./\">\n<p>\n";
3.120 scop 1153: foreach my $var (@stickyvars) {
3.208 scop 1154: printf("<input type=\"hidden\" name=\"$var\" value=\"%s\" />\n",
3.154 scop 1155: htmlquote($input{$var}))
3.120 scop 1156: if (defined($input{$var})
1157: && (!defined($DEFAULTVALUE{$var})
1158: || $input{$var} ne $DEFAULTVALUE{$var})
1159: && $var ne 'only_with_tag');
1160: }
3.208 scop 1161: printf(<<EOF, ($use_java_script ? ' onchange="this.form.submit()"' : ''));
3.239 scop 1162: <span class="nowrap">
3.208 scop 1163: <label for="only_with_tag" accesskey="T">Show only files with tag:
1164: <select id="only_with_tag" name="only_with_tag"%s>
1165: <option value="">All tags / default branch</option>
1166: EOF
3.120 scop 1167: foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) {
3.136 scop 1168: my $selected =
1169: defined($input{only_with_tag}) && $input{only_with_tag} eq $tag;
1170: printf("<option%s>%s</option>\n",
3.208 scop 1171: $selected ? ' selected="selected"' : '',
3.136 scop 1172: htmlquote($tag));
3.120 scop 1173: }
3.208 scop 1174: printf(<<EOF, htmlquote($where));
1175: </select>
3.239 scop 1176: </label></span> <span class="nowrap">
1177: <label for="path" accesskey="P">Module path or alias:
3.208 scop 1178: <input type="text" id="path" name="path" value="%s" size="15" /></label>
3.239 scop 1179: </span>
3.208 scop 1180: <input type="submit" value="Go" accesskey="G" />
1181: </p>
1182: </form>
1183: EOF
3.120 scop 1184: }
1185:
3.188 scop 1186: if ($allow_tar && $filesfound) {
3.120 scop 1187: my ($basefile) = ($where =~ m,(?:.*/)?([^/]+),);
3.192 scop 1188: my $havetar = $CMD{tar} && $CMD{gzip};
1189: my $havezip = $CMD{zip};
1190: if (defined($basefile) && $basefile ne '' && ($havetar || $havezip)) {
3.203 scop 1191: my $q = ($query ? "$query;" : '?') . 'tarball=1';
3.208 scop 1192: print "<hr />\n",
3.189 scop 1193: '<div style="text-align: center">Download this directory in ';
3.192 scop 1194: # Mangle the filename so browsers show a reasonable filename to download.
1195: my @types = ();
1196: push(@types, &link('tarball', "$basefile.tar.gz$q")) if $havetar;
1197: push(@types, &link('zip archive', "$basefile.zip$q")) if $havezip;
1198: print join(' or ', @types), "</div>\n";
3.120 scop 1199: }
1200: }
1201:
1202: if ($edit_option_form || defined($input{"options"})) {
1203:
1204: my $formwhere = $scriptwhere;
1205: $formwhere =~ s|Attic/?$|| if ($input{'hideattic'});
1206:
3.149 scop 1207: print <<EOF;
1208: <form method="get" action="${formwhere}">
3.189 scop 1209: <fieldset>
1210: <legend>General options</legend>
3.208 scop 1211: <input type="hidden" name="copt" value="1" />
3.149 scop 1212: EOF
3.120 scop 1213: if ($cvstree ne $cvstreedefault) {
3.208 scop 1214: print "<input type=\"hidden\" name=\"cvsroot\" value=\"$cvstree\" />\n";
3.120 scop 1215: }
3.149 scop 1216: print <<EOF;
3.189 scop 1217: <table>
3.149 scop 1218: <tr>
3.189 scop 1219: <td class="opt-label">
1220: <label for="sortby" accesskey="F">Sort files by:</label>
1221: </td>
1222: <td class="opt-value">
3.149 scop 1223: <select id="sortby" name="sortby">
1224: <option value="">File</option>
1225: EOF
3.208 scop 1226: print "<option", $bydate ? ' selected="selected"' : '',
3.120 scop 1227: " value=\"date\">Age</option>\n";
3.208 scop 1228: print "<option", $byauthor ? ' selected="selected"' : '',
3.120 scop 1229: " value=\"author\">Author</option>\n"
3.140 scop 1230: if $show_author;
3.208 scop 1231: print "<option", $byrev ? ' selected="selected"' : '',
3.120 scop 1232: " value=\"rev\">Revision</option>\n";
3.208 scop 1233: print "<option", $bylog ? ' selected="selected"' : '',
3.120 scop 1234: " value=\"log\">Log message</option>\n";
3.189 scop 1235: print <<EOF;
1236: </select>,
1237: <label for="ignorecase" accesskey="I">case-insensitive:
1238: EOF
1239: print '<input id="ignorecase" name="ignorecase" type="checkbox"',
3.208 scop 1240: $input{ignorecase} ? ' checked="checked"' : '',
1241: " value=\"1\" /></label>\n";
3.189 scop 1242: print <<EOF;
1243: </td>
1244: <td class="opt-label">
1245: <label for="hideattic" accesskey="A">Hide files in Attic:</label>
1246: </td>
1247: <td class="opt-value">
1248: EOF
1249: print '<input id="hideattic" name="hideattic" type="checkbox"',
3.208 scop 1250: $input{hideattic} ? ' checked="checked"' : '', ' value="1" />';
3.189 scop 1251: print <<EOF;
1252: </td>
1253: </tr>
1254: <tr>
1255: <td class="opt-label">
1256: <label for="logsort" accesskey="L">Sort log by:</label>
1257: </td>
1258: <td class="opt-value">
1259: EOF
3.120 scop 1260: printLogSortSelect(0);
3.189 scop 1261: print <<EOF;
1262: </td>
1263: <td class="opt-label">
1264: <label for="ln" accesskey="N">Show line numbers:</label>
1265: </td>
1266: <td class="opt-value">
1267: EOF
1268: print '<input id="ln" name="ln" type="checkbox"',
3.208 scop 1269: $input{ln} ? ' checked="checked"' : '', " value=\"1\" />\n";
3.189 scop 1270: print <<EOF;
1271: </td>
1272: </tr>
1273: <tr>
1274: <td class="opt-label">
1275: <label for="f" accesskey="D">Diff format:</label>
1276: </td>
1277: <td>
1278: EOF
3.120 scop 1279: printDiffSelect(0);
3.149 scop 1280: print <<EOF;
3.189 scop 1281: </td>
1282: <td colspan="2" class="opt-label">
3.208 scop 1283: <input type="submit" value="Change Options" accesskey="C" />
3.189 scop 1284: </td>
3.149 scop 1285: </tr>
1286: </table>
3.189 scop 1287: </fieldset>
3.149 scop 1288: </form>
1289: EOF
3.120 scop 1290: }
1291: html_footer();
3.80 knu 1292: }
3.1 knu 1293:
1294: ###############################
1295: # View Files
1296: ###############################
3.80 knu 1297: elsif (-f $fullname . ',v') {
3.114 scop 1298:
3.120 scop 1299: if (defined($input{'rev'}) || $doCheckout) {
3.228 scop 1300: my $rev = defined($input{rev}) ? $input{rev} : '.';
1301: &doCheckout($fullname, $rev);
3.120 scop 1302: gzipclose();
1303: exit;
1304: }
1305:
1306: if (defined($input{'annotate'}) && $allow_annotate) {
1307: &doAnnotate($input{'annotate'});
1308: gzipclose();
1309: exit;
1310: }
1311:
1312: if (defined($input{'r1'}) && defined($input{'r2'})) {
1313: &doDiff($fullname, $input{'r1'}, $input{'tr1'},
1314: $input{'r2'}, $input{'tr2'}, $input{'f'});
1315: gzipclose();
1316: exit;
1317: }
3.132 scop 1318:
3.170 scop 1319: if ($allow_cvsgraph && $input{graph}) {
1320: if ($input{makeimage}) {
1321: doGraph();
3.132 scop 1322: } else {
3.170 scop 1323: doGraphView();
3.132 scop 1324: }
1325: gzipclose();
1326: exit;
1327: }
1328:
3.120 scop 1329: &doLog($fullname);
1330:
1331: ##############################
1332: # View Diff
1333: ##############################
1334: } elsif ($fullname =~ s/\.diff$//
1335: && -f $fullname . ",v"
1336: && $input{'r1'}
1337: && $input{'r2'})
1338: {
1339:
1340: # $where-diff-removal if 'cvs rdiff' is used
1341: # .. but 'cvs rdiff'doesn't support some options
1342: # rcsdiff does (-w and -p), so it is disabled
1343: # $where =~ s/\.diff$//;
1344:
3.189 scop 1345: # Allow diffs using the ".diff" extension so that browsers that default
1346: # to the filename in the URL when saving don't save diffs as eg. foo.c.
3.120 scop 1347: &doDiff($fullname, $input{'r1'}, $input{'tr1'},
1348: $input{'r2'}, $input{'tr2'}, $input{'f'});
1349: gzipclose();
1350: exit;
1351: } elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1|
1352: && -f $newname . ",v")
1353: {
1354:
1355: # The file has been removed and is in the Attic.
1356: # Send a redirect pointing to the file in the Attic.
1357: (my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|;
1358: if ($ENV{QUERY_STRING} ne "") {
1359: redirect("${newplace}?$ENV{QUERY_STRING}");
1360: } else {
1361: redirect($newplace);
1362: }
1363: exit;
3.80 knu 1364: } elsif (0 && (my @files = &safeglob($fullname . ",v"))) {
3.120 scop 1365: http_header("text/plain");
1366: print "You matched the following files:\n";
1367: print join ("\n", @files);
3.80 knu 1368:
3.120 scop 1369: # Find the tags from each file
1370: # Display a form offering diffs between said tags
3.80 knu 1371: } else {
3.120 scop 1372: my $fh = do { local (*FH); };
3.233 scop 1373: my $module;
3.80 knu 1374:
3.120 scop 1375: # Assume it's a module name with a potential path following it.
3.233 scop 1376: my $xtra = (($module = $where) =~ s|/.*||) ? $& : '';
3.80 knu 1377:
3.120 scop 1378: # Is there an indexed version of modules?
1379: if (open($fh, "< $cvsroot/CVSROOT/modules")) {
1380: while (<$fh>) {
1381: if (/^(\S+)\s+(\S+)/o
1382: && $module eq $1
1383: && -d "$cvsroot/$2"
1384: && $module ne $2)
1385: {
1386: redirect("$scriptname/$2$xtra$query");
1387: }
1388: }
1389: }
1390: fatal("404 Not Found", '%s: no such file or directory', $where);
3.80 knu 1391: }
3.23 knu 1392:
3.25 knu 1393: gzipclose();
3.80 knu 1394:
3.1 knu 1395: ## End MAIN
1396:
3.175 scop 1397:
3.120 scop 1398: sub printDiffSelect($)
1399: {
1400: my ($use_java_script) = @_;
1401:
1402: print '<select id="f" name="f"';
1403: print ' onchange="this.form.submit()"' if $use_java_script;
1404: print ">\n";
1405:
3.175 scop 1406: for my $difftype (@DIFFTYPES) {
3.120 scop 1407: printf("<option value=\"%s\"%s>%s</option>\n",
3.208 scop 1408: $difftype, $input{f} eq $difftype ? ' selected="selected"' : '',
3.175 scop 1409: "\u$DIFFTYPES{$difftype}{descr}");
3.120 scop 1410: }
1411:
1412: print "</select>";
1413: }
1414:
3.175 scop 1415:
3.168 scop 1416: sub printDiffSelectStickyVars()
1417: {
1418: while (my ($key, $val) = each %input) {
1419: next if ($key eq 'f');
1420: next if (defined($DEFAULTVALUE{$key}) && $DEFAULTVALUE{$key} eq $val);
3.206 scop 1421: print "<input type=\"hidden\" name=\"", htmlquote($key), "\" value=\"",
3.208 scop 1422: htmlquote($val), "\" />\n";
3.168 scop 1423: }
1424: }
1425:
3.175 scop 1426:
3.120 scop 1427: sub printLogSortSelect($)
1428: {
1429: my ($use_java_script) = @_;
1430:
1431: print '<select id="logsort" name="logsort"';
1432: print ' onchange="this.form.submit()"' if $use_java_script;
1433: print ">\n";
1434:
3.175 scop 1435: for my $sortkey (@LOGSORTKEYS) {
3.120 scop 1436: printf("<option value=\"%s\"%s>%s</option>\n",
3.208 scop 1437: $sortkey, $logsort eq $sortkey ? ' selected="selected"' : '',
3.175 scop 1438: "\u$LOGSORTKEYS{$sortkey}{descr}");
3.120 scop 1439: }
1440:
1441: print "</select>";
1442: }
1443:
3.175 scop 1444:
3.197 scop 1445: #
1446: # Find the last modified, version controlled files in the given directories.
1447: # Compares solely based on modification timestamps. Files in the returned list
1448: # are without the ,v suffix, and unreadable files have been filtered out.
1449: #
3.120 scop 1450: sub findLastModifiedSubdirs(@)
1451: {
1452: my (@dirs) = @_;
1453:
3.175 scop 1454: my @files;
1455: foreach my $dirname (@dirs) {
3.196 scop 1456: next if ($dirname eq curdir() || $dirname eq updir());
1457: my $dir = catdir($fullname, $dirname);
3.120 scop 1458: next if (!-d $dir);
1459:
1460: my $dh = do { local (*DH); };
1461: opendir($dh, $dir) or next;
3.233 scop 1462: my (@filenames) = grep(!forbidden(catfile($dir, $_)), readdir($dh));
3.120 scop 1463: closedir($dh);
1464:
3.175 scop 1465: my $lastmod = undef;
1466: my $lastmodtime = undef;
3.120 scop 1467: foreach my $filename (@filenames) {
3.197 scop 1468: ($filename) =
1469: (catfile($dirname, $filename) =~ VALID_PATH) or next; # untaint
3.196 scop 1470: my ($file) = catfile($fullname, $filename);
3.197 scop 1471: next if ($filename !~ /,v$/o || !-f $file || !-r _);
1472: my $modtime = -M _;
3.120 scop 1473: if (!defined($lastmod) || $modtime < $lastmodtime) {
3.233 scop 1474: ($lastmod = $filename) =~ s/,v$//;
3.120 scop 1475: $lastmodtime = $modtime;
1476: }
1477: }
3.175 scop 1478: push(@files, $lastmod) if (defined($lastmod));
3.120 scop 1479: }
1480: return @files;
1481: }
1482:
3.175 scop 1483:
3.120 scop 1484: sub htmlify_sub(&$)
1485: {
1486: (my $proc, local $_) = @_;
1487: my @a = split (m`(<a [^>]+>[^<]*</a>)`i);
1488: my $linked;
1489: my $result = '';
1490:
1491: while (($_, $linked) = splice(@a, 0, 2)) {
1492: &$proc();
1493: $result .= $_ if defined($_);
1494: $result .= $linked if defined($linked);
1495: }
1496:
3.175 scop 1497: return $result;
3.120 scop 1498: }
1499:
3.175 scop 1500:
3.120 scop 1501: sub htmlify($;$)
1502: {
1503: (local $_, my $extra) = @_;
1504:
1505: $_ = htmlquote($_);
1506:
1507: # get URL's as link
1508: s{
3.130 scop 1509: ((https?|ftp)://.+?)([\s\']|&(quot|[lg]t);)
3.120 scop 1510: }{
3.130 scop 1511: &link($1, htmlunquote($1)) . $3
3.120 scop 1512: }egx;
1513:
1514: # get e-mails as link
1515: $_ = htmlify_sub {
1516: s<
1517: [\w+=\-.!]+@[\w\-]+(\.[\w\-]+)+
1518: ><
1519: &link($&, "mailto:$&")
1520: >egix;
1521: } $_;
1522:
1523: if ($extra) {
1524:
1525: # get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"
1526: if (defined($prcgi) && defined($re_prkeyword)) {
1527: my $prev;
1528:
1529: do {
1530: $prev = $_;
1531:
1532: $_ = htmlify_sub {
1533: s{
1534: (\b$re_prkeyword[:\#]?\s*
1535: (?:
1536: \#?
1537: \d+[,\s]\s*
1538: )*
1539: \#?)
1540: (\d+)\b
1541: }{
1542: $1 . &link($2, sprintf($prcgi, $2))
1543: }egix;
1544: } $_;
1545: } while ($_ ne $prev);
1546:
1547: if (defined($re_prcategories)) {
1548: $_ = htmlify_sub {
1549: s{
1550: (\b$re_prcategories/(\d+)\b)
1551: }{
1552: &link($1, sprintf($prcgi, $2))
1553: }egox;
1554: } $_;
1555: }
1556: }
1557:
1558: # get manpage specs as link: "foo.1" "foo(1)"
1559: if (defined($mancgi)) {
1560: $_ = htmlify_sub {
1561: s{
3.143 knu 1562: (
1563: \b ( \w[\w+\-.]* (?: ::\w[\w+\-.]*)* )
3.120 scop 1564: (?:
3.143 knu 1565: \( ([0-9n]) \) \B
3.120 scop 1566: |
3.143 knu 1567: \. ([0-9n]) \b
3.120 scop 1568: )
1569: )
1570: }{
3.149 scop 1571: my($text, $name, $section) = ($1, $2, defined($3) ? $3 : $4);
1572: ($name =~ /[A-Za-z]/ && $name !~ /\.(:|$)/)
1573: ? &link($text, sprintf($mancgi, $section, $name))
1574: : $text;
3.120 scop 1575: }egx;
1576: } $_;
1577: }
1578: }
1579:
3.175 scop 1580: return $_;
3.120 scop 1581: }
1582:
3.175 scop 1583:
3.120 scop 1584: sub spacedHtmlText($;$)
1585: {
3.175 scop 1586: (local $_, my $ts) = @_;
3.224 scop 1587: return '' unless defined($_);
3.175 scop 1588: $ts ||= $tabstop;
3.120 scop 1589:
1590: # Cut trailing spaces and tabs
1591: s/[ \t]+$//;
1592:
1593: if (defined($ts)) {
1594:
1595: # Expand tabs
1596: 1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e;
1597: }
1598:
1599: # replace <tab> and <space> (\001 is to protect us from htmlify)
1600: # gzip can make excellent use of this repeating pattern :-)
1601: if ($hr_breakable) {
1602:
1603: # make every other space 'breakable'
1604: s/ / \001nbsp;/g; # 2 * <space>
1605: # leave single space as it is
1606: } else {
1607: s/ /\001nbsp;/g;
1608: }
1609:
1610: $_ = htmlify($_, $allow_source_extra);
1611:
1612: # unescape
1613: y/\001/&/;
1614:
1615: return $_;
1616: }
1617:
3.175 scop 1618:
3.120 scop 1619: # Note that this doesn't htmlquote the first argument...
1620: sub link($$)
1621: {
1622: my ($name, $url) = @_;
1623:
1624: $url =~ s/:/sprintf("%%%02x", ord($&))/eg
1625: if $url =~ /^[^a-z]/; # relative
1626:
1627: sprintf '<a href="%s">%s</a>', hrefquote($url), $name;
1628: }
1629:
3.175 scop 1630:
3.120 scop 1631: sub revcmp($$)
1632: {
1633: my ($rev1, $rev2) = @_;
1634:
1635: # make no comparison for a tag or a branch
1636: return 0 if $rev1 =~ /[^\d.]/ || $rev2 =~ /[^\d.]/;
1637:
1638: my (@r1) = split (/\./, $rev1);
1639: my (@r2) = split (/\./, $rev2);
1640: my ($a, $b);
1641:
1642: while (($a = shift (@r1)) && ($b = shift (@r2))) {
1643: if ($a != $b) {
1644: return $a <=> $b;
1645: }
1646: }
1647: if (@r1) { return 1; }
1648: if (@r2) { return -1; }
1649: return 0;
1650: }
1651:
3.175 scop 1652:
3.120 scop 1653: sub fatal($$@)
1654: {
1655: my ($errcode, $format, @args) = @_;
3.185 scop 1656: print "Status: $errcode\r\n";
3.131 scop 1657: html_header('Error');
3.215 scop 1658: print '<div id="error">Error: ',
1659: sprintf($format, map(htmlquote($_), @args)), "</div>\n";
3.120 scop 1660: html_footer();
1661: exit(1);
1662: }
1663:
3.175 scop 1664:
3.120 scop 1665: sub redirect($)
1666: {
1667: my ($url) = @_;
3.185 scop 1668: print "Status: 301 Moved\r\n", "Location: $url\r\n";
3.131 scop 1669: html_header('Moved');
3.120 scop 1670: print "<p>This document is located ", &link('here', $url), "</p>\n";
1671: html_footer();
1672: exit(1);
1673: }
1674:
3.175 scop 1675:
3.120 scop 1676: sub safeglob($)
1677: {
1678: my ($filename) = @_;
1679:
3.175 scop 1680: (my $dirname = $filename) =~ s|/[^/]+$||;
3.120 scop 1681: $filename =~ s|.*/||;
1682:
3.175 scop 1683: my @results;
1684: my $dh = do { local (*DH); };
3.120 scop 1685: if (opendir($dh, $dirname)) {
1686: my $glob = $filename;
1687: my $t;
1688:
3.149 scop 1689: # transform filename from glob to regex. Deal with:
1690: # [, {, ?, * as glob chars
1691: # make sure to escape all other regex chars
3.120 scop 1692: $glob =~ s/([\.\(\)\|\+])/\\$1/g;
1693: $glob =~ s/\*/.*/g;
1694: $glob =~ s/\?/./g;
1695: $glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg;
3.222 scop 1696: $glob = qr/^$glob$/;
1697:
3.120 scop 1698: foreach (readdir($dh)) {
3.222 scop 1699: if ($_ =~ $glob && $_ =~ VALID_PATH) {
3.194 scop 1700: push(@results, catfile($dirname, $1)); # untaint
3.120 scop 1701: }
1702: }
1703: closedir($dh);
1704: }
1705:
3.175 scop 1706: return @results;
3.120 scop 1707: }
1708:
3.160 scop 1709:
3.227 scop 1710: #
3.230 scop 1711: # Searches @command_path for the given executable file.
3.227 scop 1712: #
3.120 scop 1713: sub search_path($)
1714: {
1715: my ($command) = @_;
3.230 scop 1716: for my $d (@command_path) {
3.227 scop 1717: my $cmd = catfile($d, $command);
1718: return $cmd if (-x $cmd && !-d _);
3.120 scop 1719: }
1720: return '';
1721: }
1722:
3.156 scop 1723:
3.219 scop 1724: #
1725: # Gets the enscript(1) highlight mode corresponding to the given filename,
1726: # or undef if unsupported.
1727: #
1728: sub getEnscriptHL($)
1729: {
1730: return undef unless $allow_enscript;
1731: my ($filename) = @_;
1732: while (my ($hl, $regex) = each %enscript_types) {
1733: return $hl if ($filename =~ $regex);
1734: }
1735: return undef;
1736: }
1737:
1738:
1739: #
1740: # Gets the MIME type for the given file name.
1741: #
3.156 scop 1742: sub getMimeType($;$)
3.120 scop 1743: {
3.156 scop 1744: my ($fullname, $binary) = @_;
1745: $binary = ($keywordsubstitution && $keywordsubstitution =~ /b/)
1746: unless defined($binary);
1747:
1748: (my $suffix = $fullname) =~ s/^.*\.([^.]*)$/$1/;
1749:
1750: my $mimetype = $MTYPES{$suffix};
1751: $mimetype ||= $MimeTypes->mimeTypeOf($fullname) if defined($MimeTypes);
1752:
1753: if (!$mimetype && $suffix ne '*' && -f $mime_types && -r _) {
1754: my $fh = do { local (*FH); };
1755: if (open($fh, $mime_types)) {
1756: my $re = sprintf('^\s*(\S+\/\S+)\s.+\b%s\b', quotemeta($suffix));
3.222 scop 1757: $re = qr/$re/;
3.156 scop 1758: while (my $line = <$fh>) {
1759: if ($line =~ $re) {
1760: $mimetype = $1;
1761: $MTYPES{$suffix} = $mimetype;
1762: last;
1763: }
3.120 scop 1764: }
3.156 scop 1765: close($fh);
1766: } else {
1767: warn("Can't open MIME types file $mime_types for reading: $!");
3.120 scop 1768: }
1769: }
1770:
3.156 scop 1771: $mimetype ||= $MTYPES{'*'};
1772: $mimetype ||= $binary ? 'application/octet-stream' : 'text/plain';
3.120 scop 1773: return $mimetype;
3.1 knu 1774: }
1775:
3.156 scop 1776:
3.1 knu 1777: ###############################
3.24 knu 1778: # read first lines like head(1)
1779: ###############################
3.120 scop 1780: sub head($;$)
1781: {
3.175 scop 1782: my ($fh, $linecount) = @_;
1783: $linecount ||= 10;
3.24 knu 1784:
3.120 scop 1785: my @buf;
1786: if ($linecount > 0) {
3.184 scop 1787: for (my $i = 0; !eof($fh) && $i < $linecount; $i++) {
3.120 scop 1788: push @buf, scalar <$fh>;
1789: }
1790: } else {
1791: @buf = <$fh>;
1792: }
3.175 scop 1793: return @buf;
1794: }
3.120 scop 1795:
3.24 knu 1796:
1797: ###############################
1798: # scan vim and Emacs directives
1799: ###############################
3.120 scop 1800: sub scan_directives(@)
1801: {
1802: my $ts = undef;
3.24 knu 1803:
3.120 scop 1804: for (@_) {
1805: $ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/;
1806: }
3.24 knu 1807:
3.120 scop 1808: ('tabstop' => $ts);
3.24 knu 1809: }
1810:
3.175 scop 1811:
3.120 scop 1812: sub openOutputFilter()
1813: {
3.175 scop 1814: return unless $output_filter;
3.86 knu 1815:
3.120 scop 1816: open(STDOUT, "|-") and return;
3.86 knu 1817:
3.120 scop 1818: # child of child
3.165 scop 1819: open(STDERR, '>', devnull());
3.120 scop 1820: exec($output_filter) or exit -1;
3.86 knu 1821: }
1822:
3.175 scop 1823:
3.24 knu 1824: ###############################
3.1 knu 1825: # show Annotation
1826: ###############################
3.133 scop 1827: sub doAnnotate($)
3.120 scop 1828: {
1829: my ($rev) = @_;
3.174 scop 1830: (my $pathname = $where) =~ s/(Attic\/)?[^\/]*$//;
1831: (my $filename = $where) =~ s/^.*\///;
3.126 scop 1832:
3.174 scop 1833: # This annotate version is based on the cvs annotate-demo Perl script by
1834: # Cyclic Software. It was written by Cyclic Software,
1835: # http://www.cyclic.com/, and is in the public domain.
1836: # We could abandon the use of rlog, rcsdiff and co using
1837: # the cvs server in a similiar way one day (..after rewrite).
1838:
1839: local (*CVS_IN, *CVS_OUT);
3.215 scop 1840: my $annotate_err;
3.174 scop 1841: my ($h, $err) =
1842: startproc([ $CMD{cvs}, @annotate_options, 'server' ],
3.215 scop 1843: '<pipe', \*CVS_IN, '>pipe', \*CVS_OUT,
3.229 scop 1844: '2>', \$annotate_err);
3.215 scop 1845: fatal('500 Internal Error',
1846: 'Annotate failure (exit status %s), output: <pre>%s</pre>',
1847: $? >> 8 || -1, $err)
1848: unless $h;
3.120 scop 1849:
1850: # OK, first send the request to the server. A simplified example is:
1851: # Root /home/kingdon/zwork/cvsroot
1852: # Argument foo/xx
1853: # Directory foo
1854: # /home/kingdon/zwork/cvsroot/foo
1855: # Directory .
1856: # /home/kingdon/zwork/cvsroot
1857: # annotate
1858: # although as you can see there are a few more details.
1859:
3.174 scop 1860: print CVS_IN "Root $cvsroot\n";
1861: print CVS_IN
3.120 scop 1862: "Valid-responses ok error Valid-requests Checked-in Updated Merged Removed M E\n";
1863:
1864: # Don't worry about sending valid-requests, the server just needs to
1865: # support "annotate" and if it doesn't, there isn't anything to be done.
3.174 scop 1866: print CVS_IN "UseUnchanged\n";
1867: print CVS_IN "Argument -r\n";
1868: print CVS_IN "Argument $rev\n";
1869: print CVS_IN "Argument $where\n";
3.120 scop 1870:
1871: # The protocol requires us to fully fake a working directory (at
1872: # least to the point of including the directories down to the one
1873: # containing the file in question).
3.123 scop 1874: # So if $where is "dir/sdir/file", then dirs will be ("dir","sdir","file")
1875: my $path = '';
1876: foreach my $dir (split('/', $where)) {
3.120 scop 1877:
1878: if ($path eq "") {
3.123 scop 1879: # In our example, $dir is "dir".
1880: $path = $dir;
3.120 scop 1881: } else {
3.174 scop 1882: print CVS_IN "Directory $path\n";
1883: print CVS_IN "$cvsroot/$path\n";
3.120 scop 1884:
1885: # In our example, $_ is "sdir" and $path becomes "dir/sdir"
1886: # And the next time, "file" and "dir/sdir/file" (which then gets
1887: # ignored, because we don't need to send Directory for the file).
3.123 scop 1888: $path .= "/$dir";
3.120 scop 1889: }
1890: }
3.123 scop 1891: undef $path;
3.120 scop 1892:
1893: # And the last "Directory" before "annotate" is the top level.
3.174 scop 1894: print CVS_IN "Directory .\n";
1895: print CVS_IN "$cvsroot\n";
3.120 scop 1896:
3.174 scop 1897: print CVS_IN "annotate\n";
3.120 scop 1898:
1899: # OK, we've sent our command to the server. Thing to do is to
3.215 scop 1900: # close the writer side and get all the responses.
1901: if (!close(CVS_IN)) {
3.229 scop 1902: $h->finish();
3.215 scop 1903: fatal('500 Internal Error',
1904: 'Annotate failure (exit status %s): <code>%s</code>, output: ' .
1905: '<pre>%s</pre>', $? >> 8, $!, $annotate_err);
1906: }
3.120 scop 1907:
3.133 scop 1908: navigateHeader($scriptwhere, $pathname, $filename, $rev, 'annotate');
3.120 scop 1909:
3.136 scop 1910: print '<h3 style="text-align: center">Annotation of ',
1911: htmlquote("$pathname$filename"), ", revision $rev</h3>\n";
3.120 scop 1912:
1913: # Ready to get the responses from the server.
1914: # For example:
1915: # E Annotations for foo/xx
1916: # E ***************
1917: # M 1.3 (kingdon 06-Sep-97): hello
1918: # ok
1919: my ($lineNr) = 0;
1920: my ($oldLrev, $oldLusr) = ("", "");
1921: my ($revprint, $usrprint);
1922:
1923: if ($annTable) {
3.179 scop 1924: print <<EOF;
1925: <table style="border: none" cellspacing="0" cellpadding="0" summary="Annotation">
1926: EOF
3.120 scop 1927: } else {
1928: print "<pre>";
1929: }
1930:
1931: # prefetch several lines
3.174 scop 1932: my @buf = head(*CVS_OUT);
3.120 scop 1933:
1934: my %d = scan_directives(@buf);
1935:
3.174 scop 1936: while (@buf || !eof(*CVS_OUT)) {
3.197 scop 1937:
3.174 scop 1938: $_ = @buf ? shift @buf : <CVS_OUT>;
3.120 scop 1939: my @words = split;
1940:
1941: # Adding one is for the (single) space which follows $words[0].
1942: my $rest = substr($_, length($words[0]) + 1);
1943: if ($words[0] eq "E") {
1944: next;
1945: } elsif ($words[0] eq "M") {
1946: $lineNr++;
1947: (my $lrev = substr($_, 2, 13)) =~ y/ //d;
1948: (my $lusr = substr($_, 16, 9)) =~ y/ //d;
1949: my $line = substr($_, 36);
1950: my $isCurrentRev = ($rev eq $lrev);
1951:
1952: # we should parse the date here ..
1953: if ($lrev eq $oldLrev) {
1954: $revprint = sprintf('%-8s', '');
1955: } else {
1956: $revprint = sprintf('%-8s', $lrev);
1957: $revprint =~ s`\S+`&link($&, "$scriptwhere$query#rev$&")`e; # `
1958: $oldLusr = '';
1959: }
1960:
1961: if ($lusr eq $oldLusr) {
1962: $usrprint = '';
1963: } else {
1964: $usrprint = $lusr;
1965: }
1966: $oldLrev = $lrev;
1967: $oldLusr = $lusr;
1968:
3.250 scop 1969: print $is_textbased ? '<b>' : '<span class="current-rev">'
1970: if $isCurrentRev;
3.120 scop 1971:
3.136 scop 1972: $usrprint = sprintf('%-8s', $usrprint);
1973: printf '%s%s %s %4d:', $revprint, $isCurrentRev ? '!' : ' ',
1974: htmlquote($usrprint), $lineNr;
3.120 scop 1975: print spacedHtmlText($line, $d{'tabstop'});
1976:
3.250 scop 1977: print $is_textbased ? '</b>' : '</span>' if $isCurrentRev;
1978:
3.120 scop 1979: } elsif ($words[0] eq "ok") {
1980:
1981: # We could complain about any text received after this, like the
1982: # CVS command line client. But for simplicity, we don't.
1983: } elsif ($words[0] eq "error") {
1984: fatal("500 Internal Error",
1985: 'Error occured during annotate: <b>%s</b>', $_);
1986: }
1987: }
3.229 scop 1988: $h->finish();
3.120 scop 1989:
1990: if ($annTable) {
1991: print "</table>";
1992: } else {
1993: print "</pre>";
1994: }
3.124 scop 1995: html_footer();
3.1 knu 1996: }
1997:
1998: ###############################
1999: # make Checkout
2000: ###############################
3.120 scop 2001: sub doCheckout($$)
2002: {
2003: my ($fullname, $rev) = @_;
3.194 scop 2004: $rev = undef if ($rev eq 'HEAD' || $rev eq '.');
3.120 scop 2005:
3.219 scop 2006: # Start resolving whether we will do a markup view or not.
2007: my $do_markup = undef;
3.226 scop 2008: my $want_type = $input{'content-type'};
2009:
3.219 scop 2010: # No markup if markup disallowed.
2011: $do_markup = 0 unless $allow_markup;
3.226 scop 2012:
3.219 scop 2013: # No markup if checkout magic cookie in URL.
2014: $do_markup = 0 if (!defined($do_markup) && $doCheckout);
3.226 scop 2015:
3.219 scop 2016: # Do markup if explicitly asked using cvsweb-markup content type. If the
2017: # asked content type is anything else, no markup.
3.226 scop 2018: if (!defined($do_markup) && $want_type) {
2019: if ($want_type =~ CVSWEBMARKUP) {
2020: $want_type = undef;
2021: $do_markup = 1;
2022: } else {
2023: $do_markup = 0;
2024: }
3.219 scop 2025: }
2026:
2027: # Ok, if $do_markup is still undefined, we know that a download has not been
2028: # explicitly asked. For the last check further down below we'll need to
2029: # know if the file is binary, and possibly run a log on it.
2030: my $needlog = $do_markup || $use_moddate;
3.120 scop 2031:
3.163 scop 2032: my $moddate = undef;
3.175 scop 2033: my $revopt;
3.120 scop 2034: if (defined($rev)) {
2035: $revopt = "-r$rev";
3.219 scop 2036: if ($needlog) {
3.120 scop 2037: readLog($fullname, $rev);
2038: $moddate = $date{$rev};
2039: }
2040: } else {
2041: $revopt = "-rHEAD";
3.219 scop 2042: if ($needlog) {
3.120 scop 2043: readLog($fullname);
2044: $moddate = $date{$symrev{HEAD}};
2045: }
2046: }
2047:
3.194 scop 2048: my $cr = abs_path($cvsroot) || $cvsroot;
2049: # abs_path() taints when run as a CGI...
2050: if ($cr =~ VALID_PATH) {
2051: $cr = $1;
2052: } else {
2053: fatal('500 Internal Error', 'Illegal CVS root: <code>%s</code>', $cr);
2054: }
3.183 scop 2055: # Use abs_path() to work around a bug of cvs -p; expand symlinks if we can.
3.194 scop 2056: my @cmd = ($CMD{cvs}, @cvs_options, '-d', $cr, 'co', '-p', $revopt, $where);
3.183 scop 2057:
3.174 scop 2058: local (*CVS_OUT, *CVS_ERR);
2059: my ($h, $err) =
3.229 scop 2060: startproc(\@cmd, \"", '>pipe', \*CVS_OUT, '2>pipe', \*CVS_ERR);
3.215 scop 2061: fatal('500 Internal Error',
2062: 'Checkout failure (exit status %s), output: <pre>%s</pre>',
2063: $? >> 8 || -1, $err)
2064: unless $h;
3.120 scop 2065:
3.174 scop 2066: if (eof(CVS_ERR)) {
3.229 scop 2067: $h->finish();
3.120 scop 2068: fatal("404 Not Found", '%s is not (any longer) pertinent', $where);
2069: }
2070:
2071: #===================================================================
2072: #Checking out squid/src/ftp.c
2073: #RCS: /usr/src/CVS/squid/src/ftp.c,v
2074: #VERS: 1.1.1.28.6.2
2075: #***************
2076:
2077: # Parse CVS header
2078: my ($revision, $filename, $cvsheader);
2079: $filename = "";
3.174 scop 2080: while (<CVS_ERR>) {
3.120 scop 2081: last if (/^\*\*\*\*/);
2082: $revision = $1 if (/^VERS: (.*)$/);
2083:
2084: if (/^Checking out (.*)$/) {
3.214 scop 2085: ($filename = $1) =~ s|^\./+||;
3.120 scop 2086: }
2087: $cvsheader .= $_;
2088: }
3.219 scop 2089: close(CVS_ERR);
3.120 scop 2090:
2091: if ($filename ne $where) {
3.229 scop 2092: $h->finish();
3.120 scop 2093: fatal("500 Internal Error",
3.214 scop 2094: 'Unexpected output from cvs co: <pre>%s</pre> ' .
2095: '(expected "<code>%s</code>" but got "<code>%s</code>")',
2096: $cvsheader, $where, $filename);
3.120 scop 2097: }
2098:
3.219 scop 2099: # Last checks whether we'll do markup or not.
2100: my $isbin = $keywordsubstitution && $keywordsubstitution =~ /b/;
2101: my $mimetype = getMimeType($fullname, $isbin);
2102:
2103: # If we still are not sure whether to do markup or not:
2104: # if the MIME type is "viewable" or this is not a binary file, do.
2105: $do_markup = !$isbin || viewable($mimetype) unless defined($do_markup);
2106:
2107: if ($do_markup) {
2108:
2109: # If this is something we'll be linking to in the markup view, we are
2110: # done with this particular output from "cvs co" and must discard it.
2111: my $linked = $mimetype =~ m{^image/|application/pdf$}i;
2112: if ($linked) {
2113: close(CVS_OUT);
3.229 scop 2114: $h->finish();
3.219 scop 2115: }
2116:
3.163 scop 2117: # Here we know the last modified date, but don't know if tags have been
3.219 scop 2118: # added afterwards (those are shown in the markup view): no last-modified.
2119: cvswebMarkup(\*CVS_OUT, $fullname, $revision, $isbin, $mimetype, $needlog);
2120:
3.229 scop 2121: $h->finish() unless $linked;
3.219 scop 2122:
3.120 scop 2123: } else {
3.226 scop 2124: http_header($want_type || $mimetype, $moddate);
3.174 scop 2125: local $/ = undef;
2126: print <CVS_OUT>;
3.229 scop 2127: $h->finish();
3.120 scop 2128: }
1.12 fenner 2129: }
2130:
3.174 scop 2131:
3.219 scop 2132: sub cvswebMarkup($$$$$$;$)
3.120 scop 2133: {
3.219 scop 2134: my ($filehandle, $fullname, $rev, $isbin, $mimetype, $logged, $mod) = @_;
3.1 knu 2135:
3.175 scop 2136: (my $pathname = $where) =~ s/(Attic\/)?[^\/]*$//;
2137: (my $filename = $where) =~ s/^.*\///;
2138: my $fileurl = urlencode($filename);
3.120 scop 2139:
3.219 scop 2140: navigateHeader($scriptwhere, $pathname, $filename, $rev, 'view', $mod);
3.120 scop 2141:
3.144 scop 2142: print <<EOF;
3.208 scop 2143: <hr />
3.182 scop 2144: <div class="log-markup">
2145: File:
3.144 scop 2146: EOF
3.219 scop 2147: print &clickablePath($where, 1), "<br />\n";
3.120 scop 2148:
2149: if ($show_log_in_markup) {
3.219 scop 2150: readLog($fullname) unless $logged; #,$rev);
2151: printLog($rev, $mimetype, $isbin);
3.120 scop 2152: } else {
3.244 scop 2153: print "Revision: <b>$rev</b><br />\n";
2154: print 'Tag: ', htmlquote($input{only_with_tag}), "<br />\n"
3.120 scop 2155: if $input{only_with_tag};
2156: }
3.208 scop 2157: print "</div>\n<hr />";
3.219 scop 2158: my $url = download_url($fileurl, $rev, $mimetype);
3.120 scop 2159:
3.219 scop 2160: if ($mimetype =~ m|^image/|i) {
3.208 scop 2161: printf '<img src="%s" alt="%s" /><br />',
3.160 scop 2162: hrefquote("$url$barequery"), htmlquote($filename);
3.219 scop 2163: } elsif (lc($mimetype) eq 'application/pdf') {
3.208 scop 2164: printf '<embed src="%s" width="100%%" height="100%%" /><br />',
3.157 scop 2165: hrefquote("$url$barequery");
3.120 scop 2166: } else {
2167:
3.208 scop 2168: print "<pre>\n";
3.167 scop 2169: my $linenumbers = $input{ln} || 0;
3.149 scop 2170:
3.219 scop 2171: if (my $enscript_hl = getEnscriptHL($filename)) {
3.167 scop 2172: doEnscript($filehandle, $enscript_hl, $linenumbers);
3.148 scop 2173:
2174: } else {
3.200 scop 2175: my $ln = 0;
2176: my @buf = ();
2177: my $ts = undef;
2178:
2179: if ($preformat_in_markup) {
2180: # prefetch several lines
2181: @buf = head($filehandle);
2182: my %d = scan_directives(@buf);
2183: $ts = $d{tabstop};
2184: }
2185:
2186: while (@buf || !eof($filehandle)) {
2187: $_ = @buf ? shift @buf : <$filehandle>;
3.167 scop 2188: if ($linenumbers) {
2189: $ln++;
2190: printf '<a id="l%d" class="src">%5d: </a>', ($ln) x 2;
3.149 scop 2191: }
3.200 scop 2192: print $preformat_in_markup ? spacedHtmlText($_, $ts) : htmlquote($_);
3.148 scop 2193: }
3.120 scop 2194: }
3.149 scop 2195:
2196: print "</pre>\n";
3.120 scop 2197: }
3.131 scop 2198: html_footer();
3.120 scop 2199: }
2200:
3.156 scop 2201:
3.120 scop 2202: sub viewable($)
2203: {
3.219 scop 2204: return shift =~ m{^((text|image)/|application/pdf)}i;
3.156 scop 2205: }
3.120 scop 2206:
3.1 knu 2207:
2208: ###############################
2209: # Show Colored Diff
2210: ###############################
3.120 scop 2211: sub doDiff($$$$$$)
2212: {
2213: my ($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
2214:
3.233 scop 2215: if (forbidden($fullname)) {
2216: fatal('403 Forbidden', 'Access to %s forbidden.', $where);
3.120 scop 2217: }
2218:
3.175 scop 2219: my ($rev1, $sym1);
3.120 scop 2220: if ($r1 =~ /([^:]+)(:(.+))?/) {
2221: $rev1 = $1;
2222: $sym1 = $3;
2223: }
2224: if ($r1 eq 'text') {
2225: $rev1 = $tr1;
2226: $sym1 = "";
2227: }
2228:
3.175 scop 2229: my ($rev2, $sym2);
3.120 scop 2230: if ($r2 =~ /([^:]+)(:(.+))?/) {
2231: $rev2 = $1;
2232: $sym2 = $3;
2233: }
2234: if ($r2 eq 'text') {
2235: $rev2 = $tr2;
2236: $sym2 = "";
2237: }
2238:
2239: #
2240: # rev1 and rev2 are now both numeric revisions.
2241: # Thus we do a DWIM here and swap them if rev1 is after rev2.
2242: # XXX should we warn about the fact that we do this?
2243: if (&revcmp($rev1, $rev2) > 0) {
2244: my ($tmp1, $tmp2) = ($rev1, $sym1);
2245: ($rev1, $sym1) = ($rev2, $sym2);
2246: ($rev2, $sym2) = ($tmp1, $tmp2);
2247: }
3.225 scop 2248:
2249: my $mimetype = getMimeType($fullname);
2250:
2251: #
2252: # Check for per-MIME type diff commands.
2253: #
2254: my $diffcmd = undef;
2255: if (my $diffcmds = $DIFF_COMMANDS{lc($mimetype)}) {
2256: if ($f =~ /^ext(\d*)$/) {
2257: my $n = $1 || 0;
2258: $diffcmd = $diffcmds->[$n];
2259: }
2260: }
2261: if ($diffcmd && $diffcmd->{cmd} && $diffcmd->{name}) {
2262:
2263: if ($diffcmd->{args} && ref($diffcmd->{args}) ne 'ARRAY') {
2264: fatal('500 Internal Error',
2265: 'Configuration error: arguments to external diff tools must ' .
2266: 'be given as array refs. See "<code>%s</code>" in ' .
2267: '<code>%%DIFF_COMMANDS</code>.',
2268: $diffcmd->{name});
2269: }
2270:
2271: (my $cvsname = $where) =~ s/\.diff$//;
2272:
2273: # Create two temporary files with the two revisions
2274: my $temp_fn1 = checkout_to_temp($cvsroot, $cvsname, $rev1);
2275: my $temp_fn2 = checkout_to_temp($cvsroot, $cvsname, $rev2);
2276:
2277: # Execute chosen diff binary.
2278: local (*DIFF_OUT);
2279: my @cmd = ($diffcmd->{cmd});
2280: push(@cmd, @{$diffcmd->{args}}) if $diffcmd->{args};
2281: push(@cmd, $temp_fn1, $temp_fn2);
2282: my ($h, $err) = startproc(\@cmd, \"", '>pipe', \*DIFF_OUT);
2283: if (!$h) {
2284: unlink($temp_fn1);
2285: unlink($temp_fn2);
2286: fatal('500 Internal Error',
2287: 'Diff failure (exit status %s), output: <pre>%s</pre>',
2288: $? >> 8 || -1, $err);
2289: }
2290:
2291: http_header($diffcmd->{type} || 'text/plain');
2292: local $/ = undef;
2293: print <DIFF_OUT>;
3.229 scop 2294: $h->finish();
3.225 scop 2295: unlink($temp_fn1);
2296: unlink($temp_fn2);
2297:
2298: exit;
2299: }
2300:
2301: #
2302: # Normal CVS diff.
2303: #
2304:
2305: $f = $DEFAULTVALUE{f} || 'u' if ($f =~ /^ext\d*$/);
3.120 scop 2306: my $difftype = $DIFFTYPES{$f};
2307: if (!$difftype) {
2308: fatal("400 Bad arguments", 'Diff format %s not understood', $f);
2309: }
2310:
2311: my @difftype = @{$difftype->{'opts'}};
2312: my $human_readable = $difftype->{'colored'};
2313:
3.247 scop 2314: # Apply special diff options. -p and -F are not available with side by side
2315: # diffs and may cause problems with older (< 2.8) versions of diffutils if
2316: # used with --side-by-side.
2317: if ($showfunc && $f !~ /^s/) {
2318: push(@difftype, '-p');
2319: while (my ($re1, $re2) = each %funcline_regexp) {
3.222 scop 2320: if ($fullname =~ $re1) {
3.247 scop 2321: push(@difftype, '-F', $re2);
3.120 scop 2322: last;
2323: }
2324: }
2325: }
2326:
2327: if ($human_readable) {
3.247 scop 2328: push(@difftype, '-w') if $hr_ignwhite;
2329: push(@difftype, '-kk') if $hr_ignkeysubst;
3.120 scop 2330: }
2331:
3.175 scop 2332: my $fh = do { local (*FH); };
3.120 scop 2333: if (!open($fh, "-|")) { # child
2334: open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
2335: openOutputFilter();
3.166 scop 2336: exec($CMD{rcsdiff}, @rcsdiff_options, @difftype, "-r$rev1", "-r$rev2",
2337: $fullname) or exit -1;
3.120 scop 2338: }
3.166 scop 2339:
3.120 scop 2340: if ($human_readable) {
3.168 scop 2341: #
2342: # Human readable diff.
2343: #
2344: human_readable_diff($fh, $rev2);
2345: html_footer();
2346: gzipclose();
2347: exit;
2348:
2349: } elsif ($f =~ /^([ucs])c$/) {
2350: #
2351: # Enscript colored diff.
2352: #
2353: my $hl = 'diff';
2354: $hl .= $1 if ($1 eq 'u' || $1 eq 's');
2355: (my $where_nd = $where) =~ s/\.diff$//;
2356: (my $pathname = $where_nd) =~ s|(Attic\/)?[^/]*$||;
2357: (my $filename = $where_nd) =~ s|^.*/||;
2358: (my $swhere = $scriptwhere) =~ s|\.diff$||;
2359: navigateHeader($swhere, $pathname, $filename, $rev2, 'diff');
2360: printf(<<EOF, $where_nd, $rev1, $rev2);
2361: <h3 style="text-align: center">Diff for /%s between versions %s and %s</h3>
2362: <pre>
2363: EOF
3.240 scop 2364: doEnscript(\$fh, $hl, 0, 'cvsweb_diff');
3.168 scop 2365: print <<EOF;
2366: </pre>
3.208 scop 2367: <hr style="width: 100%" />
3.168 scop 2368: <form method="get" action="$scriptwhere">
2369: EOF
2370: printDiffSelectStickyVars();
2371: print 'Diff format: ';
2372: printDiffSelect($use_java_script);
3.208 scop 2373: print "<input type=\"submit\" value=\"Show\" />\n</form>\n";
3.120 scop 2374: html_footer();
2375: gzipclose();
2376: exit;
3.168 scop 2377:
3.120 scop 2378: } else {
3.168 scop 2379: #
2380: # Plain diff.
2381: #
3.120 scop 2382: http_header("text/plain");
2383: }
2384:
2385: #
2386: #===================================================================
2387: #RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
2388: #retrieving revision 1.16
2389: #retrieving revision 1.17
2390: #diff -c -r1.16 -r1.17
2391: #*** /home/ncvs/src/sys/netinet/tcp_output.c 1995/11/03 22:08:08 1.16
2392: #--- /home/ncvs/src/sys/netinet/tcp_output.c 1995/12/05 17:46:35 1.17
2393: #
2394: # Ideas:
2395: # - nuke the stderr output if it's what we expect it to be
2396: # - Add "no differences found" if the diff command supplied no output.
2397: #
2398: #*** src/sys/netinet/tcp_output.c 1995/11/03 22:08:08 1.16
2399: #--- src/sys/netinet/tcp_output.c 1995/12/05 17:46:35 1.17 RELENG_2_1_0
2400: # (bogus example, but...)
2401: #
3.175 scop 2402: my ($f1, $f2);
3.120 scop 2403: if (grep { $_ eq '-u' } @difftype) {
2404: $f1 = '---';
2405: $f2 = '\+\+\+';
2406: } else {
2407: $f1 = '\*\*\*';
2408: $f2 = '---';
2409: }
2410:
2411: while (<$fh>) {
2412: if (m|^$f1 $cvsroot|o) {
2413: s|$cvsroot/||o;
2414: if ($sym1) {
2415: chop;
2416: $_ .= " $sym1\n";
2417: }
2418: } elsif (m|^$f2 $cvsroot|o) {
2419: s|$cvsroot/||o;
2420:
2421: if ($sym2) {
2422: chop;
2423: $_ .= " $sym2\n";
2424: }
2425: }
2426: print $_;
2427: }
2428: close($fh);
1.12 fenner 2429: }
2430:
3.175 scop 2431:
3.1 knu 2432: ###############################
2433: # Show Logs ..
2434: ###############################
3.120 scop 2435: sub getDirLogs($$@)
2436: {
2437: my ($cvsroot, $dirname, @otherFiles) = @_;
3.139 scop 2438: my $tag = $input{only_with_tag};
3.196 scop 2439: my $DirName = catdir($cvsroot, $where);
3.120 scop 2440:
3.139 scop 2441: my @files = &safeglob("$DirName/*,v");
2442: push (@files, &safeglob("$DirName/Attic/*,v")) if (!$input{'hideattic'});
3.120 scop 2443: foreach my $file (@otherFiles) {
3.196 scop 2444: push(@files, catfile($DirName, $file));
3.120 scop 2445: }
2446:
3.150 scop 2447: # Weed out unreadable files.
2448: my $i = 0;
2449: my @unreadable = ();
2450: while ($i < scalar(@files)) {
3.197 scop 2451: # Note: last modified files from subdirs returned by
2452: # findLastModifiedSubdirs() come without the ,v suffix so they're not
2453: # found here, but have already been checked for readability. *cough*
2454: if (-r $files[$i] || !-e _) {
3.150 scop 2455: $i++;
2456: } else {
2457: push(@unreadable, splice(@files, $i, 1));
2458: }
2459: }
2460:
3.139 scop 2461: # If there are no files, we're done.
3.150 scop 2462: return @unreadable unless @files;
3.120 scop 2463:
3.139 scop 2464: my @cmd = ($CMD{rlog});
2465: # Can't use -r<tag> as '-' is allowed in tagnames,
2466: # but misinterpreted by rlog.
2467: push(@cmd, '-r') unless defined($tag);
3.120 scop 2468:
3.139 scop 2469: my $fh = do { local (*FH); };
2470: if (!open($fh, '-|')) { # Child
3.165 scop 2471: open(STDERR, '>', devnull()); # Ignore rlog's complaints.
3.139 scop 2472: openOutputFilter();
2473: if ($file_list_len && $file_list_len > 1) {
2474: while (scalar(@files) > $file_list_len) { # Process files in chunks.
2475: system(@cmd, splice(@files, 0, $file_list_len)) == 0 or exit -1;
2476: }
3.120 scop 2477: }
3.139 scop 2478: exec(@cmd, @files) or exit -1;
2479: }
2480: undef @cmd;
3.120 scop 2481:
3.139 scop 2482: my $state = 'start';
2483: my ($date, $branchpoint, $branch, $log, @filetags);
3.152 scop 2484: my ($rev, $revision, $revwanted, $filename, $head, $author, $keywordsubst);
3.120 scop 2485:
2486: while (<$fh>) {
2487: if ($state eq "start") {
2488:
2489: #Next file. Initialize file variables
2490: $rev = '';
2491: $revwanted = '';
2492: $branch = '';
2493: $branchpoint = '';
2494: $filename = '';
2495: $log = '';
2496: $revision = '';
2497: %symrev = ();
2498: @filetags = ();
3.152 scop 2499: $keywordsubst= '';
3.120 scop 2500:
2501: #jump to head state
2502: $state = "head";
2503: }
3.144 scop 2504:
3.120 scop 2505: again:
2506:
2507: if ($state eq "head") {
2508:
2509: #$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet)
2510:
2511: if (/^Working file: (.+)$/) {
2512: $filename = $1;
2513: } elsif (/^head: (.+)$/) {
2514: $head = $1;
2515: } elsif (/^branch: (.+)$/) {
2516: $branch = $1;
3.152 scop 2517: } elsif (/^keyword substitution: (.+)$/) {
2518: $keywordsubst = $1;
3.120 scop 2519: } elsif (/^symbolic names:/) {
2520: $state = "tags";
2521: ($branch = $head) =~ s/\.\d+$//
2522: if $branch eq '';
2523: $branch =~ s/(\d+)$/0.$1/;
2524: $symrev{MAIN} = $branch;
2525: $symrev{HEAD} = $branch;
2526: $alltags{MAIN} = 1;
2527: $alltags{HEAD} = 1;
2528: push (@filetags, "MAIN", "HEAD");
3.222 scop 2529: } elsif ($_ =~ LOG_REVSEPR) {
3.120 scop 2530: $state = "log";
2531: $rev = '';
2532: $date = '';
2533: $log = '';
2534:
2535: # Try to reconstruct the relative filename if RCS spits out a full path
2536: $filename =~ s%^\Q$DirName\E/%%;
2537: }
2538: next;
2539: }
2540:
2541: if ($state eq "tags") {
2542: if (/^\s+([^:]+):\s+([\d\.]+)\s*$/) {
2543: push (@filetags, $1);
2544: $symrev{$1} = $2;
2545: $alltags{$1} = 1;
2546: next;
2547: } elsif (/^\S/) {
2548:
2549: if (defined($tag)) {
2550: if (defined($symrev{$tag}) || $tag eq "HEAD") {
2551: $revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};
2552: ($branch = $revwanted) =~ s/\b0\.//;
2553: ($branchpoint = $branch) =~ s/\.?\d+$//;
2554: $revwanted = '' if ($revwanted ne $branch);
2555: } elsif ($tag ne "HEAD") {
2556: $state = "skip";
2557: next;
2558: }
2559: }
2560:
2561: foreach my $tagfound (@filetags) {
2562: $tags{$tagfound} = 1;
2563: }
2564: $state = "head";
2565: goto again;
2566: }
2567: }
2568:
2569: if ($state eq "log") {
3.222 scop 2570: if ($_ =~ LOG_REVSEPR || $_ =~ LOG_FILESEPR) {
3.120 scop 2571:
2572: # End of a log entry.
2573: my $revbranch = $rev;
2574: $revbranch =~ s/\.\d+$//;
2575:
2576: if ($revwanted eq '' && $branch ne '' && $branch eq $revbranch
2577: || !defined($tag))
2578: {
2579: $revwanted = $rev;
2580: }
2581:
2582: if ($revwanted ne ''
2583: ? $rev eq $revwanted
2584: : $branchpoint ne ''
2585: ? $rev eq $branchpoint
2586: : 0
2587: && ($rev eq $head))
2588: { # Don't think head is needed here..
3.152 scop 2589: my @finfo = ($rev, $date, $log, $author, $filename, $keywordsubst);
2590: (my $name = $filename) =~ s%/.*%%;
3.120 scop 2591: $fileinfo{$name} = [@finfo];
2592: $state = "done" if ($rev eq $revwanted);
2593: }
2594: $rev = '';
2595: $date = '';
2596: $log = '';
2597: } elsif ($date eq ''
2598: && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|)
2599: {
3.172 scop 2600: my $yr = $1;
2601: $yr -= 1900 if ($yr > 100); # Damn 2-digit year routines :-)
2602: $date = timegm($6, $5, $4, $3, $2 - 1, $yr);
3.120 scop 2603: ($author) = /author: ([^;]+)/;
3.172 scop 2604: $state = 'log';
2605: $log = '';
3.120 scop 2606: next;
2607: } elsif ($rev eq '' && /^revision (\d+(?:\.\d+)+).*$/) {
2608: $rev = $1; # .*$ eats up the locker(lockers?) info, if any
2609: next;
2610: } else {
2611: $log .= $_;
2612: }
2613: }
2614:
3.222 scop 2615: if ($_ =~ LOG_FILESEPR) {
3.120 scop 2616: $state = "start";
2617: next;
2618: }
2619: }
2620:
3.139 scop 2621: my $linesread = $. || 0;
2622: close($fh);
2623:
2624: if ($linesread == 0) {
3.137 scop 2625: fatal('500 Internal Error',
3.230 scop 2626: 'Failed to spawn GNU rlog on <em>"%s"</em>.<br /><br />Did you set the <b><code>@command_path</code></b> in your configuration file correctly? (Currently: "<code>%s</code>")',
2627: htmlquote(join(', ', @files)), join(':', @command_path));
3.120 scop 2628: }
3.150 scop 2629:
2630: return @unreadable;
3.120 scop 2631: }
2632:
3.175 scop 2633:
3.120 scop 2634: sub readLog($;$)
2635: {
2636: my ($fullname, $revision) = @_;
2637: my ($symnames, $head, $rev, $br, $brp, $branch, $branchrev);
2638:
3.144 scop 2639: $revision = defined($revision) ? "-r$revision" : '';
3.120 scop 2640:
2641: undef %symrev;
2642: undef %revsym;
2643: undef @allrevisions;
2644: undef %date;
2645: undef %author;
2646: undef %state;
2647: undef %difflines;
2648: undef %log;
3.152 scop 2649: $keywordsubstitution = '';
3.120 scop 2650:
3.175 scop 2651: my $fh = do { local (*FH); };
3.120 scop 2652: if (!open($fh, "-|")) { # child
2653: if ($revision ne '') {
2654: openOutputFilter();
2655: exec($CMD{rlog}, $revision, $fullname) or exit -1;
2656: } else {
2657: openOutputFilter();
2658: exec($CMD{rlog}, $fullname) or exit -1;
2659: }
2660: }
2661:
3.217 scop 2662: my $curbranch = undef;
3.120 scop 2663: while (<$fh>) {
2664: if ($symnames) {
2665: if (/^\s+([^:]+):\s+([\d\.]+)/) {
2666: $symrev{$1} = $2;
3.152 scop 2667: next;
3.120 scop 2668: } else {
2669: $symnames = 0;
2670: }
3.152 scop 2671: }
2672: if (/^head:\s+([\d\.]+)/) {
3.120 scop 2673: $head = $1;
2674: } elsif (/^branch:\s+([\d\.]+)/) {
2675: $curbranch = $1;
2676: } elsif (/^symbolic names/) {
2677: $symnames = 1;
3.152 scop 2678: } elsif (/^keyword substitution: (.+)$/) {
2679: $keywordsubstitution = $1;
3.120 scop 2680: } elsif (/^-----/) {
2681: last;
2682: }
2683: }
2684: ($curbranch = $head) =~ s/\.\d+$// if (!defined($curbranch));
2685:
2686: # each log entry is of the form:
2687: # ----------------------------
2688: # revision 3.7.1.1
2689: # date: 1995/11/29 22:15:52; author: fenner; state: Exp; lines: +5 -3
2690: # log info
2691: # ----------------------------
2692:
2693: # For a locked revision, the first line after the separator
2694: # becomes smth like
3.149 scop 2695: # revision 9.19 locked by: vassilii;
3.120 scop 2696:
2697: logentry:
2698:
3.222 scop 2699: while ($_ !~ LOG_FILESEPR) {
3.120 scop 2700: $_ = <$fh>;
2701: last logentry if (!defined($_)); # EOF
2702: if (/^revision (\d+(?:\.\d+)+)/) {
2703: $rev = $1;
2704: unshift (@allrevisions, $rev);
3.222 scop 2705: } elsif ($_ =~ LOG_FILESEPR || $_ =~ LOG_REVSEPR) {
3.120 scop 2706: next logentry;
2707: } else {
2708:
2709: # The rlog output is syntactically ambiguous. We must
2710: # have guessed wrong about where the end of the last log
2711: # message was.
2712: # Since this is likely to happen when people put rlog output
2713: # in their commit messages, don't even bother keeping
2714: # these lines since we don't know what revision they go with
2715: # any more.
2716: next logentry;
2717: }
2718: $_ = <$fh>;
2719: if (
2720: m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);\s+state:\s+(\S+);\s+(lines:\s+([0-9\s+-]+))?|
2721: )
2722: {
3.172 scop 2723: my $yr = $1;
2724: $yr -= 1900 if ($yr > 100); # Damn 2-digit year routines :-)
2725: $date{$rev} = timegm($6, $5, $4, $3, $2 - 1, $yr);
3.120 scop 2726: $author{$rev} = $7;
2727: $state{$rev} = $8;
2728: $difflines{$rev} = $10;
2729: } else {
2730: fatal("500 Internal Error", 'Error parsing RCS output: %s', $_);
2731: }
2732:
2733: line:
2734: while (<$fh>) {
2735: next line if (/^branches:\s/);
3.222 scop 2736: last line if ($_ =~ LOG_FILESEPR || $_ =~ LOG_REVSEPR);
3.120 scop 2737: $log{$rev} .= $_;
2738: }
2739: }
2740: close($fh);
2741:
2742: @revorder = reverse sort { revcmp($a, $b) } @allrevisions;
2743:
2744: #
2745: # HEAD is an artificial tag which is simply the highest tag number on the main
2746: # branch, unless there is a branch tag in the RCS file in which case it's the
2747: # highest revision on that branch. Find it by looking through @revorder; it
2748: # is the first commit listed on the appropriate branch.
2749: # This is not neccesary the same revision as marked as head in the RCS file.
2750: my $headrev = $curbranch || "1";
2751: ($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/;
2752:
2753: foreach $rev (@revorder) {
2754: if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
2755: $symrev{"HEAD"} = $rev;
2756: last;
2757: }
2758: }
2759: ($symrev{"HEAD"} = $headrev) =~ s/\.\d+$//
2760: if (!defined($symrev{"HEAD"}));
2761:
2762: #
2763: # Now that we know all of the revision numbers, we can associate
2764: # absolute revision numbers with all of the symbolic names, and
2765: # pass them to the form so that the same association doesn't have
2766: # to be built then.
2767: #
2768: undef @branchnames;
2769: undef %branchpoint;
2770: undef $sel;
2771:
2772: foreach (reverse sort keys %symrev) {
2773: $rev = $symrev{$_};
2774: if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
2775: push (@branchnames, $_);
2776:
2777: #
2778: # A revision number of A.B.0.D really translates into
2779: # "the highest current revision on branch A.B.D".
2780: #
2781: # If there is no branch A.B.D, then it translates into
2782: # the head A.B .
2783: #
2784: # This reasoning also applies to the main branch A.B,
2785: # with the branch number 0.A, with the exception that
2786: # it has no head to translate to if there is nothing on
2787: # the branch, but I guess this can never happen?
2788: #
2789: # (the code below gracefully forgets about the branch
2790: # if it should happen)
2791: #
2792: $head = defined($2) ? $2 : "";
2793: $branch = $3;
2794: $branchrev = $head . ($head ne "" ? "." : "") . $branch;
3.222 scop 2795: $rev = $head;
2796:
2797: my $regex = '^' . quotemeta($branchrev) . '\b';
2798: $regex = qr/$regex/;
3.120 scop 2799:
2800: foreach my $r (@revorder) {
3.222 scop 2801: if ($r =~ $regex) {
3.120 scop 2802: $rev = $branchrev;
2803: last;
2804: }
2805: }
2806: next if ($rev eq "");
2807:
2808: if ($rev ne $head && $head ne "") {
3.131 scop 2809: $branchpoint{$head} .= ', ' if ($branchpoint{$head});
3.120 scop 2810: $branchpoint{$head} .= $_;
2811: }
2812: }
2813: $revsym{$rev} .= ", " if ($revsym{$rev});
2814: $revsym{$rev} .= $_;
3.136 scop 2815: $sel .= sprintf("<option value=\"%s:%s\">%s</option>\n",
2816: htmlquote($rev), (htmlquote($_)) x 2);
3.120 scop 2817: }
2818:
2819: my ($onlyonbranch, $onlybranchpoint);
2820: if ($onlyonbranch = $input{'only_with_tag'}) {
2821: $onlyonbranch = $symrev{$onlyonbranch};
2822: if ($onlyonbranch =~ s/\b0\.//) {
2823: ($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
2824: } else {
2825: $onlybranchpoint = $onlyonbranch;
2826: }
2827:
2828: if (!defined($onlyonbranch) || $onlybranchpoint eq "") {
2829: fatal("404 Tag not found", 'Tag %s not defined',
3.131 scop 2830: $input{'only_with_tag'});
3.120 scop 2831: }
2832: }
2833:
2834: undef @revisions;
2835:
2836: foreach (@allrevisions) {
2837: ($br = $_) =~ s/\.\d+$//;
2838: ($brp = $br) =~ s/\.\d+$//;
2839: next if ($onlyonbranch
2840: && $br ne $onlyonbranch
2841: && $_ ne $onlybranchpoint);
2842: unshift (@revisions, $_);
2843: }
2844:
2845: if ($logsort eq "date") {
2846:
2847: # Sort the revisions in commit order an secondary sort on revision
2848: # (secondary sort needed for imported sources, or the first main
2849: # revision gets before the same revision on the 1.1.1 branch)
2850: @revdisplayorder =
2851: sort { $date{$b} <=> $date{$a} || -revcmp($a, $b) } @revisions;
2852: } elsif ($logsort eq "rev") {
2853:
2854: # Sort the revisions in revision order, highest first
2855: @revdisplayorder = reverse sort { revcmp($a, $b) } @revisions;
2856: } else {
2857:
2858: # No sorting. Present in the same order as rlog / cvs log
2859: @revdisplayorder = @revisions;
2860: }
2861:
3.217 scop 2862: return $curbranch;
3.120 scop 2863: }
2864:
3.175 scop 2865:
3.225 scop 2866: sub getDiffLinks($$$)
3.120 scop 2867: {
3.225 scop 2868: my ($url, $mimetype, $isbin) = @_;
2869:
2870: my @links = ();
2871: if (!$isbin) { # Offer ordinary diff only for non-binary files.
2872: push(@links, &link('preferred', $url));
2873: for my $difftype ($DIFFTYPES{$defaultDiffType}{colored} ? qw(u) : qw(h)) {
2874: my $f = $difftype eq $defaultDiffType ? '' : $difftype;
2875: push(@links,
2876: &link(htmlquote(lc($DIFFTYPES{$difftype}{descr})), "$url;f=$f"));
2877: }
2878: }
2879: if (my $extdiffs = $DIFF_COMMANDS{lc($mimetype)}) {
2880: for my $i (0 .. scalar(@$extdiffs)-1) {
2881: my $extdiff = $extdiffs->[$i];
2882: push(@links, &link(htmlquote($extdiff->{name}), "$url;f=ext$i"))
2883: if ($extdiff->{cmd} && $extdiff->{name});
2884: }
3.120 scop 2885: }
3.225 scop 2886: return @links;
3.120 scop 2887: }
2888:
3.175 scop 2889:
3.219 scop 2890: sub printLog($$$;$$)
3.120 scop 2891: {
3.219 scop 2892: # inlogview: 1 if in log view, otherwise in markup view.
2893: ($_, my $mimetype, my $isbin, my $inlogview, my $isSelected) = @_;
3.175 scop 2894: (my $br = $_) =~ s/\.\d+$//;
2895: (my $brp = $br) =~ s/\.?\d+$//;
3.120 scop 2896:
3.131 scop 2897: my $isDead = ($state{$_} eq 'dead');
2898:
3.219 scop 2899: (my $filename = $where) =~ s/^.*\///;
2900: my $fileurl = urlencode($filename);
3.120 scop 2901:
3.219 scop 2902: print "<a name=\"rev$_\"></a>";
2903: if (defined($revsym{$_})) {
2904: foreach my $sym (split (", ", $revsym{$_})) {
2905: print '<a name="', hrefquote($sym), '"></a>';
3.120 scop 2906: }
3.219 scop 2907: }
2908: if ($revsym{$br} && !defined($nameprinted{$br})) {
2909: foreach my $sym (split (", ", $revsym{$br})) {
2910: print '<a name="', hrefquote($sym), '"></a>';
3.120 scop 2911: }
3.219 scop 2912: $nameprinted{$br} = 1;
2913: }
3.120 scop 2914:
3.219 scop 2915: printf "\n Revision <b>%s</b>", htmlquote($_);
2916: if (/^1\.1\.1\.\d+$/) {
2917: print " <i>(vendor branch)</i>";
2918: }
2919: if (!$isDead) {
3.220 scop 2920: print ': ', download_link($fileurl, $_, 'download', $mimetype);
3.219 scop 2921:
2922: my @vlinks = ();
2923: push(@vlinks, display_link($fileurl, $_, 'text', 'text/plain'))
2924: unless $isbin;
2925: push(@vlinks, display_link($fileurl, $_, 'markup', 'text/x-cvsweb-markup'))
2926: if ($allow_markup && $inlogview && (!$isbin || viewable($mimetype)));
2927: if (!$isbin) {
2928: push(@vlinks,
2929: &link('annotated',
2930: sprintf('%s/%s?annotate=%s%s',
2931: $scriptname, urlencode($where), $_, $barequery)))
2932: if $allow_annotate;
2933: }
2934: print ' - view: ', join(', ', @vlinks) if @vlinks;
2935: undef @vlinks;
2936:
3.243 scop 2937: if (!$isbin && $allow_version_select) {
2938: print ' - ';
2939: if ($isSelected) {
2940: print '<b>[selected for diffs]</b>';
2941: } else {
2942: print &link('select for diffs',
2943: sprintf('%s?r1=%s%s#rev%s',
2944: $scriptwhere, $_, $barequery, $_));
3.120 scop 2945: }
2946: }
3.243 scop 2947: print ' - ', graph_link('', 'revision graph')
2948: if (!$inlogview && $allow_cvsgraph);
3.120 scop 2949: }
3.219 scop 2950: print "<br />\n";
3.120 scop 2951:
3.219 scop 2952: print '<i>';
3.120 scop 2953: if (defined @mytz) {
2954: my ($est) = $mytz[(localtime($date{$_}))[8]];
3.219 scop 2955: print scalar localtime($date{$_}), " $est</i> (";
3.120 scop 2956: } else {
3.219 scop 2957: print scalar gmtime($date{$_}), " UTC</i> (";
3.120 scop 2958: }
3.136 scop 2959: print readableTime(time() - $date{$_}, 1), ' ago)';
3.208 scop 2960: print ' by <i>', htmlquote($author{$_}), "</i><br />\n";
3.136 scop 2961:
3.243 scop 2962: printf("Branches: %s<br />\n", link_tags($revsym{$br})) if $revsym{$br};
2963: printf("CVS tags: %s<br />\n", link_tags($revsym{$_})) if $revsym{$_};
2964: printf("Branch point for: %s<br />\n", link_tags($branchpoint{$_}))
2965: if $branchpoint{$_};
3.120 scop 2966:
2967: # Find the previous revision
3.175 scop 2968: my $prev;
3.120 scop 2969: my @prevrev = split (/\./, $_);
2970: do {
2971: if (--$prevrev[$#prevrev] <= 0) {
2972:
2973: # If it was X.Y.Z.1, just make it X.Y
2974: pop (@prevrev);
2975: pop (@prevrev);
2976: }
2977: $prev = join (".", @prevrev);
2978: } until (defined($date{$prev}) || $prev eq "");
2979:
2980: if ($isDead) {
3.219 scop 2981: print "<b><i>FILE REMOVED</i></b><br />\n";
3.243 scop 2982: } else {
3.120 scop 2983: my %diffrev = ();
2984: $diffrev{$_} = 1;
2985: $diffrev{""} = 1;
2986: my $diff = 'Diff';
3.219 scop 2987: my $printed = 0;
3.120 scop 2988:
2989: #
2990: # Offer diff to previous revision
2991: if ($prev) {
2992: $diffrev{$prev} = 1;
2993: my $url =
3.203 scop 2994: sprintf('%s.diff?r1=%s;r2=%s%s', $scriptwhere, $prev, $_, $barequery);
3.225 scop 2995: if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
2996: print $diff, ' to previous ', $prev, ': ', join(', ', @dlinks);
2997: $diff = ''; $printed = 1;
2998: }
3.120 scop 2999: }
3000:
3001: #
3002: # Plus, if it's on a branch, and it's not a vendor branch,
3003: # offer a diff with the branch point.
3004: if ($revsym{$brp}
3005: && !/^1\.1\.1\.\d+$/
3006: && !defined($diffrev{$brp}))
3007: {
3008: my $url =
3.203 scop 3009: sprintf('%s.diff?r1=%s;r2=%s%s', $scriptwhere, $brp, $_, $barequery);
3.225 scop 3010: if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
3011: print $diff, ' to branchpoint ', $brp, ': ', join(', ', @dlinks);
3012: $diff = ''; $printed = 1;
3013: }
3.120 scop 3014: }
3015:
3016: #
3017: # Plus, if it's on a branch, and it's not a vendor branch,
3018: # offer to diff with the next revision of the higher branch.
3019: # (e.g. change gets committed and then brought
3020: # over to -stable)
3021: if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) {
3022: my ($i, $nextmain);
3023:
3024: for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++) {
3025: }
3026: my @tmp2 = split (/\./, $_);
3027: for ($nextmain = ""; $i > 0; $i--) {
3028: my $next = $revorder[$i - 1];
3029: my @tmp1 = split (/\./, $next);
3030:
3031: if (@tmp1 < @tmp2) {
3032: $nextmain = $next;
3033: last;
3034: }
3035:
3036: # Only the highest version on a branch should have
3037: # a diff for the "next main".
3038: last
3039: if (@tmp1 - 1 <= @tmp2
3040: && join (".", @tmp1[0 .. $#tmp1 - 1]) eq
3041: join (".", @tmp2[0 .. $#tmp1 - 1]));
3042: }
3043:
3044: if (!defined($diffrev{$nextmain})) {
3045: $diffrev{$nextmain} = 1;
3.203 scop 3046: my $url = sprintf('%s.diff?r1=%s;r2=%s%s',
3.120 scop 3047: $scriptwhere, $nextmain, $_, $barequery);
3.225 scop 3048: if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
3049: print $diff, ' next main ', $nextmain, ': ', join(', ', @dlinks);
3050: $diff = ''; $printed = 1;
3051: }
3.120 scop 3052: }
3053: }
3054:
3055: # Plus if user has selected only r1, then present a link
3056: # to make a diff to that revision
3057: if (defined($input{"r1"}) && !defined($diffrev{$input{"r1"}})) {
3058: $diffrev{$input{"r1"}} = 1;
3.203 scop 3059: my $url = sprintf('%s.diff?r1=%s;r2=%s%s',
3.120 scop 3060: $scriptwhere, $input{'r1'}, $_, $barequery);
3.225 scop 3061: if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
3062: print $diff, ' to selected ', $input{r1}, ': ', join(', ', @dlinks);
3063: $diff = ''; $printed = 1;
3064: }
3.120 scop 3065: }
3066:
3.219 scop 3067: print "<br />\n" if $printed;
3068: }
3069:
3070: if ($prev ne "" && $difflines{$_}) {
3071: printf "Changes since revision %s: %s lines<br />\n",
3072: htmlquote($prev), htmlquote($difflines{$_});
3.120 scop 3073: }
3.189 scop 3074:
3.219 scop 3075: print "<pre class=\"log\">\n";
3.120 scop 3076: print &htmlify($log{$_}, $allow_log_extra);
3077: print "</pre>\n";
3078: }
3079:
3.175 scop 3080:
3.132 scop 3081: #
3082: # Generates the HTML view for CvsGraph.
3083: #
3.170 scop 3084: sub doGraphView()
3.132 scop 3085: {
3086: (my $pathname = $where) =~ s|[^/]*$||;
3087: (my $filename = $where) =~ s|^.*/||;
3088:
3.170 scop 3089: navigateHeader($scriptwhere, $pathname, $filename, undef, 'graph');
3.132 scop 3090:
3.146 scop 3091: my $title = 'Revision graph of ' . htmlquote($pathname . $filename);
3.132 scop 3092: my $mapname = 'CvsGraphMap';
3093:
3.170 scop 3094: printf(<<EOF, $title, $mapname, $cvstree, $title);
3.146 scop 3095: <h3 style="text-align: center">%s</h3>
3.219 scop 3096: <div style="text-align: center"><img border="0" usemap="#%s" src="?cvsroot=%s;graph=1;makeimage=1" alt="%s" />
3.146 scop 3097: EOF
3.132 scop 3098:
3.181 scop 3099: my $qquery = hrefquote($barequery);
3.135 scop 3100: my @graph_cmd =
3101: ($CMD{cvsgraph},
3102: '-r', $cvsroot,
3.249 scop 3103: '-m', $pathname,
3.135 scop 3104: '-i',
3105: '-M', $mapname,
3.208 scop 3106: '-x', 'x',
3.181 scop 3107: "-Omap_branch_href=\"href=\\\"./?only_with_tag=%(%t%)$qquery\\\"\"",
3.219 scop 3108: "-Omap_rev_href=\"href=\\\"?rev=%(%R%)$qquery\\\"\"",
3.146 scop 3109: "-Omap_diff_href=\"href=\\\"%(%F%).diff" .
3.203 scop 3110: "?r1=%(%P%);r2=%(%R%)$qquery\\\"\"",
3.135 scop 3111: );
3.132 scop 3112: push(@graph_cmd, '-c', $cvsgraph_config) if $cvsgraph_config;
3.249 scop 3113: push(@graph_cmd, $filename . ',v');
3.132 scop 3114:
3.174 scop 3115: local *CVSGRAPH_OUT;
3116: my ($h, $err) =
3.229 scop 3117: startproc(\@graph_cmd, \"", '>pipe', \*CVSGRAPH_OUT);
3.174 scop 3118: fatal('500 Internal Error', $err) unless $h;
3.242 scop 3119:
3120: # Browser compatibility kludge: many browsers do not support client side
3121: # image maps where the <map> element contains only the id attribute. Let's
3122: # add the corresponding name attribute to it on the fly.
3123: while (<CVSGRAPH_OUT>) {
3124: s/(<map\s+id="([^"]+)")\s*>/$1 name="$2">/;
3125: print;
3.132 scop 3126: }
3.242 scop 3127:
3.229 scop 3128: $h->finish();
3.219 scop 3129: print "</div>\n";
3.132 scop 3130:
3131: html_footer();
3132: }
3133:
3.175 scop 3134:
3.132 scop 3135: #
3136: # Generates a graph using CvsGraph.
3137: #
3.170 scop 3138: sub doGraph()
3.132 scop 3139: {
3140: (my $pathname = $where) =~ s|[^/]*$||;
3141: (my $filename = $where) =~ s|^.*/||;
3142:
3143: http_header('image/png');
3144:
3.249 scop 3145: my @graph_cmd = ($CMD{cvsgraph}, '-r', $cvsroot, '-m', $pathname);
3.132 scop 3146: push(@graph_cmd, '-c', $cvsgraph_config) if $cvsgraph_config;
3.249 scop 3147: push(@graph_cmd, $filename . ',v');
3.132 scop 3148:
3.174 scop 3149: local *CVSGRAPH_OUT;
3150: my ($h, $err) =
3.229 scop 3151: startproc(\@graph_cmd, \"", '>pipe', \*CVSGRAPH_OUT);
3.174 scop 3152: fatal('500 Internal Error', $err) unless $h;
3.132 scop 3153: {
3154: local $/ = undef;
3155: binmode(\*STDOUT);
3.174 scop 3156: print <CVSGRAPH_OUT>;
3.132 scop 3157: }
3.229 scop 3158: $h->finish();
3.132 scop 3159: }
3160:
3161:
3.120 scop 3162: sub doLog($)
3163: {
3164: my ($fullname) = @_;
3165:
3.217 scop 3166: my $curbranch = readLog($fullname);
3.120 scop 3167:
3168: html_header("CVS log for $where");
3.144 scop 3169:
3170: (my $upwhere = $where) =~ s|(Attic/)?[^/]+$||;
3171: (my $filename = $where) =~ s|^.*/||;
3172: my $backurl = $scriptname . "/" . urlencode($upwhere) . $query;
3173:
3.219 scop 3174: my $isbin = $keywordsubstitution =~ /b/;
3175: my $mimetype = getMimeType($filename, $isbin);
3176:
3.120 scop 3177: print "<p>\n ";
3178: print &link($backicon, "$backurl#$filename"), " <b>Up to ",
3179: &clickablePath($upwhere, 1), "</b>\n</p>\n";
3180: print "<p>\n ";
3181: print &link('Request diff between arbitrary revisions', '#diff');
3.132 scop 3182: if ($allow_cvsgraph) {
3.219 scop 3183: print ' - ', &graph_link('', 'Display revisions graphically');
3.132 scop 3184: }
3.208 scop 3185: print "\n</p>\n<hr />\n";
3.120 scop 3186:
3187: print "<p>\n";
3.152 scop 3188:
3.219 scop 3189: my $explain = $isbin ? ' (i.e.: CVS considers this a binary file)' : '';
3.208 scop 3190: print "Keyword substitution: $keywordsubstitution$explain<br />\n";
3.217 scop 3191: if ($curbranch) {
3192: print "Default branch: ", ($revsym{$curbranch} || $curbranch);
3193: } else {
3194: print "No default branch";
3195: }
3.208 scop 3196: print "<br />\n";
3.120 scop 3197:
3.208 scop 3198: print 'Current tag: ', htmlquote($input{only_with_tag}), "<br />\n"
3.153 scop 3199: if $input{only_with_tag};
3.120 scop 3200: print "</p>\n";
3201:
3202: undef %nameprinted;
3203:
3.182 scop 3204: for my $r (@revdisplayorder) {
3.208 scop 3205: print "<hr />\n";
3.182 scop 3206: my $sel = (defined($input{r1}) && $input{r1} eq $r);
3207: print "<div class=\"diff-selected\">\n" if $sel;
3.219 scop 3208: printLog($r, $mimetype, $isbin, 1, $sel);
3.182 scop 3209: print "</div>\n" if $sel;
3.120 scop 3210: }
3211:
3.144 scop 3212: printf(<<EOF, $scriptwhere);
3.208 scop 3213: <hr />
3214: <form method="get" action="%s.diff" id="diff_select">
3.189 scop 3215: <fieldset>
3216: <legend>Diff request</legend>
3.144 scop 3217: <p>
3218: <a name="diff">
3.189 scop 3219: This form allows you to request diffs between any two revisions of a file.
3.144 scop 3220: You may select a symbolic revision name using the selection box or you may
3221: type in a numeric name using the type-in text box.
3222: </a>
3223: </p>
3224: EOF
3.120 scop 3225:
3226: foreach (@stickyvars) {
3.208 scop 3227: printf("<input type=\"hidden\" name=\"%s\" value=\"%s\" />\n",
3.154 scop 3228: $_, htmlquote($input{$_}))
3.194 scop 3229: if (defined($input{$_}) &&
3230: (!defined($DEFAULTVALUE{$_}) || $input{$_} ne $DEFAULTVALUE{$_}));
3.120 scop 3231: }
3.144 scop 3232:
3233: print <<EOF;
3.189 scop 3234: <table summary="Diff between arbitrary revisions">
3.144 scop 3235: <tr>
3.189 scop 3236: <td class="opt-label">
3237: <label for="r1" accesskey="1">Diffs between</label>
3238: </td>
3239: <td class="opt-value">
3.144 scop 3240: <select id="r1" name="r1">
3.208 scop 3241: <option value="text" selected="selected">Use Text Field</option>
3.144 scop 3242: EOF
3243: print $sel, "</select>\n";
3244:
3245: my $diffrev = defined($input{r1}) ?
3246: $input{r1} : $revdisplayorder[$#revdisplayorder];
3247:
3248: printf(<<EOF, $inputTextSize, $diffrev);
3.208 scop 3249: <input type="text" size="%s" name="tr1" value="%s" onchange="this.form.r1.selectedIndex=0" />
3.144 scop 3250: </td>
3.189 scop 3251: <td></td>
3252: </tr>
3253: <tr>
3254: <td class="opt-label">
3255: <label for="r2" accesskey="2">and</label>
3256: </td>
3257: <td class="opt-value">
3.144 scop 3258: <select id="r2" name="r2">
3.208 scop 3259: <option value="text" selected="selected">Use Text Field</option>
3.144 scop 3260: EOF
3261: print $sel, "</select>\n";
3262:
3263: $diffrev = defined($input{r2}) ? $input{r2} : $revdisplayorder[0];
3264:
3265: printf(<<EOF, $inputTextSize, $diffrev, $scriptwhere);
3.208 scop 3266: <input type="text" size="%s" name="tr2" value="%s" onchange="this.form.r2.selectedIndex=0" />
3.144 scop 3267: </td>
3.208 scop 3268: <td><input type="submit" value="Get Diffs" accesskey="G" /></td>
3.144 scop 3269: </tr>
3270: </table>
3.189 scop 3271: </fieldset>
3.144 scop 3272: </form>
3273: <form method="get" action="%s">
3.189 scop 3274: <fieldset>
3275: <legend>Log view options</legend>
3276: <table summary="Log view options">
3.144 scop 3277: <tr>
3.189 scop 3278: <td class="opt-label">
3279: <label for="f" accesskey="D">Preferred diff type:</label>
3280: </td>
3281: <td class="opt-value">
3.144 scop 3282: EOF
3.120 scop 3283: printDiffSelect($use_java_script);
3.144 scop 3284: print <<EOF;
3.189 scop 3285: </td>
3286: <td></td>
3.144 scop 3287: </tr>
3288: EOF
3.120 scop 3289:
3290: if (@branchnames) {
3.144 scop 3291:
3292: printf(<<EOF, $use_java_script ? ' onchange="this.form.submit()"' : '');
3293: <tr>
3.189 scop 3294: <td class="opt-label">
3.188 scop 3295: <label for="only_with_tag" accesskey="B">View only branch:</label>
3.189 scop 3296: </td>
3297: <td class="opt-value">
3298: <a name="branch">
3.144 scop 3299: <select id="only_with_tag" name="only_with_tag"%s>
3300: EOF
3.120 scop 3301:
3.193 scop 3302: my @tmp = ();
3303: my $selfound = 0;
3.120 scop 3304: foreach (reverse sort @branchnames) {
3.136 scop 3305: my $selected =
3306: (defined($input{"only_with_tag"}) && $input{"only_with_tag"} eq $_);
3.193 scop 3307: $selfound ||= $selected;
3308: push(@tmp, sprintf('<option%s>%s</option>',
3.208 scop 3309: $selected ? ' selected="selected"' : '',
3.193 scop 3310: htmlquote($_)));
3.120 scop 3311: }
3.193 scop 3312: printf("<option value=\"\"%s>Show all branches</option>\n",
3.208 scop 3313: $selfound ? '' : ' selected="selected"');
3.193 scop 3314: print join("\n", @tmp);
3315:
3.144 scop 3316: print <<EOF
3317: </select>
3.189 scop 3318: </a>
3.144 scop 3319: </td>
3320: <td></td>
3321: </tr>
3322: EOF
3.120 scop 3323: }
3324:
3.144 scop 3325: print <<EOF;
3.189 scop 3326: <tr>
3327: <td class="opt-label">
3328: <label for="logsort" accesskey="L">Sort log by:</label>
3329: </td>
3330: <td>
3.144 scop 3331: EOF
3.120 scop 3332: printLogSortSelect($use_java_script);
3.144 scop 3333: print <<EOF;
3.189 scop 3334: </td>
3.208 scop 3335: <td><input type="submit" value="Set" accesskey="S" /></td>
3.189 scop 3336: </tr>
3.144 scop 3337: </table>
3338: EOF
3.154 scop 3339: foreach (@stickyvars) {
3340: next if ($_ eq "f");
3341: next if ($_ eq "only_with_tag");
3342: next if ($_ eq "logsort");
3.208 scop 3343: printf("<input type=\"hidden\" name=\"$_\" value=\"%s\" />\n",
3.154 scop 3344: htmlquote($input{$_}))
3345: if (defined($input{$_})
3.194 scop 3346: && (!defined($DEFAULTVALUE{$_}) || $input{$_} ne $DEFAULTVALUE{$_}));
3.154 scop 3347: }
3.189 scop 3348: print "</fieldset>\n</form>\n";
3.120 scop 3349: html_footer();
3350: }
3351:
3.175 scop 3352:
3.120 scop 3353: sub flush_diff_rows($$$$)
3354: {
3355: my ($leftColRef, $rightColRef, $leftRow, $rightRow) = @_;
3356:
3.175 scop 3357: return unless defined($state);
3.120 scop 3358:
3359: if ($state eq "PreChangeRemove") { # we just got remove-lines before
3.133 scop 3360: for (my $j = 0; $j < $leftRow; $j++) {
3.144 scop 3361: printf(<<EOF, scalar(@$leftColRef[$j]));
3362: <tr>
3363: <td class="diff-removed"> %s</td>
3364: <td class="diff-empty"> </td>
3365: </tr>
3366: EOF
3.120 scop 3367: }
3368: } elsif ($state eq "PreChange") { # state eq "PreChange"
3369: # we got removes with subsequent adds
3.222 scop 3370: if (HAS_EDIFF) {
3.176 scop 3371: # construct the suffix tree
3372: my $left_diff = join("\n", @$leftColRef[0..$leftRow-1]);
3373: my $right_diff = join("\n", @$rightColRef[0..$rightRow-1]);
3374: my $diff_str = String::Ediff::ediff($left_diff, $right_diff);
3375:
3376: my @diff_str = split(/ /, $diff_str);
3377: my $INFINITY = 10000000;
3378: push(@diff_str, ($INFINITY) x 8);
3379: my ($idx, $b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3380: (0, @diff_str[0..7]);
3381: my ($l_cul, $r_cul) = (0, 0);
3382: my ($ldx, $rdx) = (0, 0);
3383: my (@left_html, @right_html);
3384: for (my $j = 0; $j < $leftRow; $j++) {
3385: my $line_len = length(@$leftColRef[$j]);
3386: my $line = @$leftColRef[$j];
3387: $l_cul += length($line) + 1; # includes "\n"
3388: my $l_culx = $l_cul - 1; # not includes "\n"
3389: if ($j < $lb1) {
3390: $line = spacedHtmlText($line);
3391: push(@left_html, "<td class=\"diff-changed\">$line</td>");
3392: } elsif ($lb1 == $j) {
3393: my $html_line;
3394: while ($lb1 == $j) {
3395: my $begin_char = $l_culx - $b1;
3396:
3397: $line =~ /^(.*)(.{$begin_char})$/;
3398: $html_line .= spacedHtmlText($1) .
3399: '</span><span class="diff-unchanged">';
3400: $line = $2;
3401: last if ($j != $le1);
3402:
3403: my $end_char = $l_culx - $e1;
3404: $line =~ /^(.*)(.{$end_char})$/;
3405: $html_line .= spacedHtmlText($1) .
3406: '</span><span class="diff-changed">';
3407: $line = $2;
3408:
3409: $idx++;
3410: my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
3411: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
3412: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3413: @diff_str[$idx*8..($idx+1)*8-1];
3414: $lb1 = $INFINITY if ($lb1 < 0);
3415: $lb2 = $INFINITY if ($lb2 < 0);
3416: $le1 = $INFINITY if ($le1 < 0);
3417: $le2 = $INFINITY if ($le2 < 0);
3418: if ($te1 > $b1) {
3419: ($b1, $lb1) = ($te1, $tle1);
3420: }
3421: if ($te2 > $b2) {
3422: ($b2, $lb2) = ($te2, $tle2);
3423: }
3424: }
3425: push(@left_html,
3426: sprintf('<td><span class="%s">%s%s</span></td>',
3427: 'diff-changed', $html_line, spacedHtmlText($line)));
3428: } elsif ($le1 == $j) {
3429: my $html_line;
3430: while ($le1 == $j) {
3431: my $end_char = $l_culx - $e1;
3432: $line =~ /^(.*)(.{$end_char})$/;
3433: $html_line .= spacedHtmlText($1) .
3434: '</span><span class="diff-changed">';
3435: $line = $2;
3436:
3437: $idx++;
3438: my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
3439: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
3440: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3441: @diff_str[$idx*8..($idx+1)*8-1];
3442: $lb1 = $INFINITY if ($lb1 < 0);
3443: $lb2 = $INFINITY if ($lb2 < 0);
3444: $le1 = $INFINITY if ($le1 < 0);
3445: $le2 = $INFINITY if ($le2 < 0);
3446: if ($te1 > $b1) {
3447: ($b1, $lb1) = ($te1, $tle1);
3448: }
3449: if ($te2 > $b2) {
3450: ($b2, $lb2) = ($te2, $tle2);
3451: }
3452:
3453: last if ($lb1 != $j);
3454:
3455: my $begin_char = $l_culx - $b1;
3456:
3457: $line =~ /^(.*)(.{$begin_char})$/;
3458: $html_line .= spacedHtmlText($1) .
3459: '</span><span class="diff-unchanged">';
3460: $line = $2;
3461: }
3462: push(@left_html,
3463: sprintf('<td><span class="%s">%s%s</span></td>',
3464: 'diff-unchanged', $html_line, spacedHtmlText($line)));
3465: } else {
3466: $line = spacedHtmlText($line);
3467: push(@left_html, "<td class=\"diff-unchanged\">$line</td>");
3468: }
3469: }
3470: ($idx, $b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3471: (0, @diff_str[0..7]);
3472: $lb1 = $INFINITY if ($lb1 < 0);
3473: $lb2 = $INFINITY if ($lb2 < 0);
3474: $le1 = $INFINITY if ($le1 < 0);
3475: $le2 = $INFINITY if ($le2 < 0);
3476: for (my $j = 0; $j < $rightRow; $j++) {
3477: my $line_len = length(@$rightColRef[$j]);
3478: my $line = @$rightColRef[$j];
3479: $r_cul += length($line) + 1; # includes "\n"
3480: my $r_culx = $r_cul - 1; # not includes "\n"
3481: if ($j < $lb2) {
3482: $line = spacedHtmlText($line);
3483: push(@right_html, "<td class=\"diff-changed\">$line</td>");
3484: } elsif ($lb2 == $j) {
3485: my $html_line;
3486: while ($lb2 == $j) {
3487: my $begin_char = $r_culx - $b2;
3488:
3489: $line =~ /^(.*)(.{$begin_char})$/;
3490: $html_line .= spacedHtmlText($1) .
3491: '</span><span class="diff-unchanged">';
3492: $line = $2;
3493:
3494: last if ($j != $le2);
3495:
3496: my $end_char = $r_culx - $e2;
3497: $line =~ /^(.*)(.{$end_char})$/;
3498: $html_line .= spacedHtmlText($1) .
3499: '</span><span class="diff-changed">';
3500: $line = $2;
3501:
3502: $idx++;
3503: my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
3504: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
3505: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3506: @diff_str[$idx*8..($idx+1)*8-1];
3507: $lb1 = $INFINITY if ($lb1 < 0);
3508: $lb2 = $INFINITY if ($lb2 < 0);
3509: $le1 = $INFINITY if ($le1 < 0);
3510: $le2 = $INFINITY if ($le2 < 0);
3511: if ($te1 > $b1) {
3512: ($b1, $lb1) = ($te1, $tle1);
3513: }
3514: if ($te2 > $b2) {
3515: ($b2, $lb2) = ($te2, $tle2);
3516: }
3517: }
3518: push(@right_html,
3519: sprintf('<td><span class="%s">%s%s</span></td>',
3520: 'diff-changed', $html_line, spacedHtmlText($line)));
3521: } elsif ($le2 == $j) {
3522: my $html_line;
3523: while ($le2 == $j) {
3524: my $end_char = $r_culx - $e2;
3525: $line =~ /^(.*)(.{$end_char})$/;
3526: $html_line .= spacedHtmlText($1) .
3527: '</span><span class="diff-changed">';
3528: $line = $2;
3529:
3530: $idx++;
3531: my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
3532: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
3533: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3534: @diff_str[$idx*8..($idx+1)*8-1];
3535: $lb1 = $INFINITY if ($lb1 < 0);
3536: $lb2 = $INFINITY if ($lb2 < 0);
3537: $le1 = $INFINITY if ($le1 < 0);
3538: $le2 = $INFINITY if ($le2 < 0);
3539: if ($te1 > $b1) {
3540: ($b1, $lb1) = ($te1, $tle1);
3541: }
3542: if ($te2 > $b2) {
3543: ($b2, $lb2) = ($te2, $tle2);
3544: }
3545:
3546: last if ($lb2 != $j);
3547:
3548: my $begin_char = $r_culx - $b2;
3549: $line =~ /^(.*)(.{$begin_char})$/;
3550: $html_line .= spacedHtmlText($1) .
3551: '</span><span class="diff-unchanged">';
3552: $line = $2;
3553: }
3554: push(@right_html,
3.208 scop 3555: sprintf('<td nowrap="nowrap"><span class="%s">%s%s</span></td>',
3.176 scop 3556: 'diff-unchanged', $html_line, spacedHtmlText($line)));
3557: } else {
3558: $line = spacedHtmlText ($line);
3559: push @right_html, "<td class=\"diff-unchanged\">$line</td>";
3560: }
3561: }
3562: for (my $j = 0; $j < $leftRow || $j < $rightRow ; $j++) { # dump out both cols
3563: print '<tr>';
3564: if ($j < $leftRow) {
3565: print $left_html[$j];
3566: } else {
3567: print '<td class="diff-changed-missing"> </td>';
3568: }
3569: if ($j < $rightRow) {
3570: print $right_html[$j];
3571: } else {
3572: print '<td class="diff-changed-missing"> </td>';
3573: }
3574: print "</tr>\n";
3.120 scop 3575: }
3.176 scop 3576: } else {
3577: for (my $j = 0; $j < $leftRow || $j < $rightRow; $j++) { # dump both cols
3578: print "<tr>\n";
3579: if ($j < $leftRow) {
3580: print '<td class="diff-changed"> ' .
3581: spacedHtmlText(@$leftColRef[$j]) . '</td>';
3582: } else {
3583: print '<td class="diff-changed-missing"> </td>';
3584: }
3585: print "\n";
3.120 scop 3586:
3.176 scop 3587: if ($j < $rightRow) {
3588: print '<td class="diff-changed"> ' .
3589: spacedHtmlText(@$rightColRef[$j]) . '</td>';
3590: } else {
3591: print '<td class="diff-changed-missing"> </td>';
3592: }
3593: print "\n</tr>\n";
3.120 scop 3594: }
3595: }
3596: }
3.1 knu 3597: }
3598:
3.175 scop 3599:
3.1 knu 3600: ##
3601: # Function to generate Human readable diff-files
3602: # human_readable_diff(String revision_to_return_to);
3603: ##
3.144 scop 3604: sub human_readable_diff($$)
3.120 scop 3605: {
3606: my ($fh, $rev) = @_;
3.144 scop 3607:
3.169 scop 3608: (my $where_nd = $where) =~ s|\.diff$||;
3609: (my $filename = $where_nd) =~ s|^.*/||;
3610: (my $pathname = $where_nd) =~ s|(Attic/)?[^/]*$||;
3611: (my $scriptwhere_nd = $scriptwhere) =~ s|\.diff$||;
3.120 scop 3612:
3.133 scop 3613: navigateHeader($scriptwhere_nd, $pathname, $filename, $rev, 'diff');
3.120 scop 3614:
3.178 scop 3615: # Read header to pick up read revision and date, if possible.
3616:
3617: my ($r1d, $r1r, $r2d, $r2r);
3.120 scop 3618: while (<$fh>) {
3619: ($r1d, $r1r) = /\t(.*)\t(.*)$/ if (/^--- /);
3620: ($r2d, $r2r) = /\t(.*)\t(.*)$/ if (/^\+\+\+ /);
3621: last if (/^\+\+\+ /);
3622: }
3623:
3.178 scop 3624: my ($rev1, $date1);
3.120 scop 3625: if (defined($r1r) && $r1r =~ /^(\d+\.)+\d+$/) {
3626: $rev1 = $r1r;
3627: $date1 = $r1d;
3628: }
3.178 scop 3629: my ($rev2, $date2);
3.120 scop 3630: if (defined($r2r) && $r2r =~ /^(\d+\.)+\d+$/) {
3631: $rev2 = $r2r;
3632: $date2 = $r2d;
3633: }
3.178 scop 3634: $rev1 = 'unknown-left' unless defined($rev1);
3635: $rev2 = 'unknown-right' unless defined($rev2);
3636: $date1 = defined($date1) ? ', ' . htmlquote($date1) : '';
3637: $date2 = defined($date2) ? ', ' . htmlquote($date2) : '';
3.120 scop 3638:
3.219 scop 3639: my $link = uri_escape($filename) . $query;
3.210 scop 3640:
3.144 scop 3641: # Using <table style=\"border: none\" here breaks NS 4.x badly...
3.210 scop 3642: print <<EOF;
3643: <h3 style="text-align: center">Diff for /$where_nd between versions $rev1 and $rev2</h3>
3644: <table border="0" cellspacing="0" cellpadding="0" width="100%" summary="Diff output">
3.144 scop 3645: <tr style="background-color: #ffffff">
3.210 scop 3646: <th style="text-align: center; vertical-align: top" width="50%">
3647: <a href="$link;rev=$rev1">version $rev1</a>$date1
3.178 scop 3648: </th>
3.210 scop 3649: <th style="text-align: center; vertical-align: top" width="50%">
3650: <a href="$link;rev=$rev2">version $rev2</a>$date2
3.144 scop 3651: </th>
3.178 scop 3652: </tr>
3.144 scop 3653: EOF
3.120 scop 3654:
3655: # Process diff text
3656: # prefetch several lines
3657: my @buf = head($fh);
3.144 scop 3658: my %d = scan_directives(@buf);
3.120 scop 3659:
3.144 scop 3660: my $leftRow = 0;
3661: my $rightRow = 0;
3662: my ($difftxt, @rightCol, @leftCol, $oldline, $newline, $funname);
3.120 scop 3663:
3.219 scop 3664: $link .= ';content-type=text%2Fx-cvsweb-markup';
3.210 scop 3665: $link .= ';ln=1' unless ($link =~ /\?.*\bln=1\b/);
3666:
3.120 scop 3667: while (@buf || !eof($fh)) {
3668: $difftxt = @buf ? shift @buf : <$fh>;
3669:
3670: if ($difftxt =~ /^@@/) {
3671: ($oldline, $newline, $funname) =
3672: $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/;
3673: $funname = htmlquote($funname);
3674: $funname =~ s/\s/ /go;
3.182 scop 3675: $funname &&= " <span style=\"font-size: smaller\">$funname</span>";
3.210 scop 3676: my $ol = $oldline || 1;
3677: my $nl = $newline || 1;
3.144 scop 3678:
3.210 scop 3679: print <<EOF;
3.182 scop 3680: <tr>
3.210 scop 3681: <td width="50%" class="diff-heading">
3682: <b><a href="$link;rev=$rev1#l$ol">Line $oldline</a></b>$funname
3.182 scop 3683: </td>
3.210 scop 3684: <td width="50%" class="diff-heading">
3685: <b><a href="$link;rev=$rev2#l$nl">Line $newline</a></b>$funname
3.144 scop 3686: </td>
3.208 scop 3687: </tr>
3.144 scop 3688: EOF
3689:
3.120 scop 3690: $state = "dump";
3691: $leftRow = 0;
3692: $rightRow = 0;
3693: } else {
3.224 scop 3694: my ($diffcode, $rest) = $difftxt =~ /^([-+ ])(.*)/;
3695: $diffcode = '' unless defined($diffcode);
3.176 scop 3696: $_ = $rest;
3.120 scop 3697:
3698: #########
3699: # little state machine to parse unified-diff output (Hen, zeller@think.de)
3700: # in order to get some nice 'ediff'-mode output
3701: # states:
3702: # "dump" - just dump the value
3703: # "PreChangeRemove" - we began with '-' .. so this could be the start of a 'change' area or just remove
3704: # "PreChange" - okey, we got several '-' lines and moved to '+' lines -> this is a change block
3705: ##########
3706:
3707: if ($diffcode eq '+') {
3708: if ($state eq "dump")
3709: { # 'change' never begins with '+': just dump out value
3.176 scop 3710: $_ = spacedHtmlText($rest, $d{'tabstop'});
3.144 scop 3711: printf(<<EOF, $_);
3712: <tr>
3713: <td class="diff-empty"> </td>
3714: <td class="diff-added"> %s</td>
3715: </tr>
3716: EOF
3.120 scop 3717: } else { # we got minus before
3718: $state = "PreChange";
3719: $rightCol[$rightRow++] = $_;
3720: }
3721: } elsif ($diffcode eq '-') {
3722: $state = "PreChangeRemove";
3723: $leftCol[$leftRow++] = $_;
3724: } else { # empty diffcode
3725: flush_diff_rows \@leftCol, \@rightCol, $leftRow, $rightRow;
3.176 scop 3726: $_ = spacedHtmlText($rest, $d{'tabstop'});
3.147 scop 3727: printf(<<EOF, $_, $_);
3.144 scop 3728: <tr>
3729: <td class="diff-same"> %s</td>
3730: <td class="diff-same"> %s</td>
3731: </tr>
3732: EOF
3.120 scop 3733: $state = "dump";
3734: $leftRow = 0;
3735: $rightRow = 0;
3736: }
3737: }
3738: }
3739: close($fh);
3740:
3741: flush_diff_rows \@leftCol, \@rightCol, $leftRow, $rightRow;
3742:
3743: # state is empty if we didn't have any change
3744: if (!$state) {
3.144 scop 3745: print <<EOF;
3746: <tr>
3747: <td colspan="2"> </td>
3748: </tr>
3749: <tr class="diff-empty">
3750: <td colspan="2" align="center"><b>- No viewable change -</b></td>
3751: </tr>
3752: EOF
3.120 scop 3753: }
3754:
3.182 scop 3755: printf(<<EOF, $scriptwhere);
3.144 scop 3756: </table>
3.208 scop 3757: <hr style="width: 100%%" />
3.144 scop 3758: <form method="get" action="%s">
3.182 scop 3759: <div style="float: left">
3.208 scop 3760: <label for="f">Diff format:<br />
3.144 scop 3761: EOF
3.168 scop 3762: printDiffSelectStickyVars();
3.120 scop 3763: printDiffSelect($use_java_script);
3.182 scop 3764: printf(<<EOF, $rev1, $rev2);
3.179 scop 3765: </label>
3.208 scop 3766: <input type="submit" value="Show" />
3.182 scop 3767: </div>
3768: <table style="float: right; border: thin outset" cellspacing="0" cellpadding="1" title="Legend" summary="Legend">
3769: <tr>
3770: <td align="center" class="diff-removed">Removed from v.%s</td>
3771: <td class="diff-empty"> </td>
3772: </tr><tr class="diff-changed">
3773: <td align="center" colspan="2">changed lines</td>
3774: </tr><tr>
3775: <td class="diff-empty"> </td>
3776: <td align="center" class="diff-added">Added in v.%s</td>
3777: </tr>
3.144 scop 3778: </table>
3779: </form>
3.208 scop 3780: <br clear="all" />
3.144 scop 3781: EOF
3.120 scop 3782: }
3.167 scop 3783:
3784:
3.245 scop 3785: sub doEnscript($$$;$)
3.167 scop 3786: {
3.240 scop 3787: my ($filehandle, $highlight, $linenumbers, $lang) = @_;
3788: $lang ||= 'cvsweb';
3.167 scop 3789:
3.174 scop 3790: my @cmd = ($CMD{enscript},
3791: @enscript_options,
3.240 scop 3792: '-q', "--language=$lang", '-o', '-', "--highlight=$highlight");
3.174 scop 3793:
3794: local *ENSCRIPT_OUT;
3795: my ($h, $err) =
3.229 scop 3796: startproc(\@cmd, $filehandle, '>pipe', \*ENSCRIPT_OUT);
3.174 scop 3797: fatal('500 Internal Error', $err) unless $h;
3798:
3799: # We could short-circuit and have enscript output directly to STDOUT above,
3800: # but that doesn't work with mod_perl (at least some 1.99 versions).
3801: if ($linenumbers) {
3802: my $ln = 0;
3803: while (<ENSCRIPT_OUT>) {
3804: printf '<a id="l%d" class="src">%5d: </a>', (++$ln) x 2;
3805: print $_;
3.167 scop 3806: }
3.174 scop 3807: } else {
3808: local $/ = undef;
3809: print <ENSCRIPT_OUT>;
3.167 scop 3810: }
3.229 scop 3811: $h->finish();
3.167 scop 3812: }
3813:
3.120 scop 3814:
3.163 scop 3815: sub navigateHeader($$$$$;$)
3.120 scop 3816: {
3.163 scop 3817: my ($swhere, $path, $filename, $rev, $title, $moddate) = @_;
3.120 scop 3818: $swhere = "" if ($swhere eq $scriptwhere);
3819: $swhere = './' . urlencode($filename) if ($swhere eq "");
3820:
3.136 scop 3821: my $qfile = htmlquote($filename);
3822: my $qpath = htmlquote($path);
3.170 scop 3823: my $trev = $rev ? " - $rev" : '';
3.100 knu 3824:
3.163 scop 3825: http_header('', $moddate);
3.133 scop 3826:
3.120 scop 3827: print <<EOF;
3.100 knu 3828: $HTML_DOCTYPE
3.89 knu 3829: <html>
3830: <head>
3.170 scop 3831: <title>$qpath$qfile - $title$trev</title>
3.144 scop 3832: $HTML_META$CSS</head>
3.129 scop 3833: <body class="src">
3.182 scop 3834: <table class="navigate-header" width="100%">
3.184 scop 3835: <tr>
3836: <td>
3.64 knu 3837: EOF
3838:
3.170 scop 3839: print &link($backicon, "$swhere$query" . ($rev ? "#rev$rev" : ''));
3.136 scop 3840: printf '<b>Return to %s CVS log',
3.205 scop 3841: &link($qfile, "$swhere$query" . ($rev ? "#rev$rev" : ''));
3.120 scop 3842: print "</b> $fileicon</td>";
3843:
3.144 scop 3844: printf(<<EOF, $diricon, &clickablePath($path, 1));
3.182 scop 3845: <td style="text-align: right">%s <b>Up to %s</b></td>
3.144 scop 3846: </tr>
3847: </table>
3848: EOF
3.120 scop 3849: }
3850:
3.175 scop 3851:
3.120 scop 3852: sub plural_write($$)
3853: {
3854: my ($num, $text) = @_;
3855: if ($num != 1) {
3856: $text .= "s";
3857: }
3858:
3859: if ($num > 0) {
3860: return join (' ', $num, $text);
3861: } else {
3862: return "";
3863: }
3.1 knu 3864: }
3865:
3.175 scop 3866:
3.1 knu 3867: ##
3868: # print readable timestamp in terms of
3869: # '..time ago'
3870: # H. Zeller <zeller@think.de>
3871: ##
3.120 scop 3872: sub readableTime($$)
3873: {
3874: my ($secs, $long) = @_;
3875:
3.175 scop 3876: # This function works correctly for time >= 2 seconds.
3877: return 'very little time' if ($secs < 2);
3.120 scop 3878:
3879: my %desc = (
3.133 scop 3880: 1 => 'second',
3881: 60 => 'minute',
3882: 3600 => 'hour',
3883: 86400 => 'day',
3884: 604800 => 'week',
3885: 2628000 => 'month',
3886: 31536000 => 'year'
3887: );
3888:
3.120 scop 3889: my @breaks = sort { $a <=> $b } keys %desc;
3.133 scop 3890: my $i = 0;
3.120 scop 3891:
3892: while ($i <= $#breaks && $secs >= 2 * $breaks[$i]) {
3893: $i++;
3894: }
3895: $i--;
3.133 scop 3896: my $break = $breaks[$i];
3897: my $retval = plural_write(int($secs / $break), $desc{$break});
3.120 scop 3898:
3899: if ($long == 1 && $i > 0) {
3900: my $rest = $secs % $break;
3901: $i--;
3902: $break = $breaks[$i];
3903: my $resttime = plural_write(int($rest / $break), $desc{$break});
3904: if ($resttime) {
3905: $retval .= ", $resttime";
3906: }
3907: }
3.1 knu 3908:
3.120 scop 3909: return $retval;
3.1 knu 3910: }
3911:
3.175 scop 3912:
3.1 knu 3913: ##
3914: # clickablePath(String pathname, boolean last_item_clickable)
3915: #
3916: # returns a html-ified path whereas each directory is a link for
3917: # faster navigation. last_item_clickable controls whether the
3918: # basename (last directory/file) is a link as well
3919: ##
3.120 scop 3920: sub clickablePath($$)
3921: {
3922: my ($pathname, $clickLast) = @_;
3923:
3.154 scop 3924: my $root = '[' . htmlquote($CVSROOTdescr{$cvstree} || $cvstree) . ']';
3925:
3.144 scop 3926: # This should never happen (see chooseCVSRoot()), but let's be sure...
3.154 scop 3927: return $root if ($pathname eq '/');
3.120 scop 3928:
3.144 scop 3929: my $retval =
3.154 scop 3930: ' ' . &link($root, sprintf('%s/%s#dirlist', $scriptname, $query));
3.144 scop 3931: my $wherepath = '';
3932: my ($lastslash) = $pathname =~ m|/$|;
3933:
3934: foreach (split (/\//, $pathname)) {
3935: $retval .= ' / ';
3936: $wherepath .= "/$_";
3937: my $last = "$wherepath/" eq "/$pathname" || $wherepath eq "/$pathname";
3938:
3939: if ($clickLast || !$last) {
3940: $retval .= &link(htmlquote($_),
3941: join ('',
3942: $scriptname, urlencode($wherepath),
3943: (!$last || $lastslash ? '/' : ''), $query,
3944: (!$last || $lastslash ? "#dirlist" : "")));
3945: } else { # do not make a link to the current dir
3946: $retval .= htmlquote($_);
3.120 scop 3947: }
3948: }
3949: return $retval;
3950: }
3951:
3.144 scop 3952:
3.120 scop 3953: sub chooseCVSRoot()
3954: {
3.208 scop 3955: print "<form method=\"get\" action=\"${scriptwhere}\">\n<p>\n";
3.120 scop 3956: if (2 <= @CVSROOT) {
3.133 scop 3957: foreach my $k (keys %input) {
3.208 scop 3958: printf("<input type=\"hidden\" name=\"%s\" value=\"%s\" />\n",
3.154 scop 3959: htmlquote($k), htmlquote($input{$k}))
3960: if ($input{$k} && $k ne 'cvsroot');
3.120 scop 3961: }
3962:
3.144 scop 3963: printf(<<EOF, $use_java_script ? ' onchange="this.form.submit()"' : '');
3.208 scop 3964: <label for="cvsroot" accesskey="C">CVS Root:
3.144 scop 3965: <select id="cvsroot" name="cvsroot"%s>
3966: EOF
3.120 scop 3967:
3.133 scop 3968: foreach my $k (@CVSROOT) {
3.136 scop 3969: printf("<option value=\"%s\"%s>%s</option>\n",
3970: htmlquote($k),
3.208 scop 3971: ($k eq $cvstree) ? ' selected="selected"' : '',
3.136 scop 3972: htmlquote($CVSROOTdescr{$k} || $k));
3.120 scop 3973: }
3.208 scop 3974: print '</select></label>';
3.120 scop 3975: } else {
3976:
3977: # no choice -- but we need the form to select module/path,
3978: # at least for Netscape
3.208 scop 3979: printf "CVS Root: <b>[%s]</b>",
3.154 scop 3980: htmlquote($CVSROOTdescr{$cvstree} || $cvstree);
3.120 scop 3981: }
3982:
3.144 scop 3983: print <<EOF;
3984: <label for="mpath" accesskey="M">
3985: Module path or alias:
3.208 scop 3986: <input type="text" id="mpath" name="path" value="" size="15" />
3.144 scop 3987: </label>
3.208 scop 3988: <input type="submit" value="Go" accesskey="O" />
3989: </p>
3990: </form>
3.144 scop 3991: EOF
3.120 scop 3992: }
3993:
3.175 scop 3994:
3.120 scop 3995: sub chooseMirror()
3996: {
3997: # This code comes from the original BSD-cvsweb
3998: # and may not be useful for your site; If you don't
3999: # set %MIRRORS this won't show up, anyway.
4000: scalar(%MIRRORS) or return;
4001:
4002: # Should perhaps exclude the current site somehow...
4003: print "\n<p>\nThis CVSweb is mirrored in\n";
4004:
4005: my @tmp = map(&link(htmlquote($_), $MIRRORS{$_}), sort keys %MIRRORS);
4006: my $tmp = pop (@tmp);
4007:
4008: if (scalar(@tmp)) {
4009: print join (', ', @tmp), ' and ';
4010: }
4011:
4012: print "$tmp.\n</p>\n";
4013: }
4014:
3.175 scop 4015:
3.120 scop 4016: sub fileSortCmp()
4017: {
3.175 scop 4018: (my $af = $a) =~ s/,v$//;
4019: (my $bf = $b) =~ s/,v$//;
3.120 scop 4020: my ($rev1, $date1, $log1, $author1, $filename1) = @{$fileinfo{$af}}
4021: if (defined($fileinfo{$af}));
4022: my ($rev2, $date2, $log2, $author2, $filename2) = @{$fileinfo{$bf}}
4023: if (defined($fileinfo{$bf}));
4024:
3.175 scop 4025: my $comp = 0;
3.140 scop 4026: if (defined($filename1) && defined($filename2) &&
4027: $af eq $filename1 && $bf eq $filename2)
3.120 scop 4028: {
4029:
4030: # Two files
3.140 scop 4031: $comp = -revcmp($rev1, $rev2) if ($byrev && $rev1 && $rev2);
4032: $comp = ($date2 <=> $date1) if ($bydate && $date1 && $date2);
4033: if ($input{ignorecase}) {
4034: $comp = (uc($log1) cmp uc($log2)) if ($bylog && $log1 && $log2);
4035: $comp = (uc($author1) cmp uc($author2)) if ($byauthor &&
4036: $author1 && $author2);
4037: } else {
4038: $comp = ($log1 cmp $log2) if ($bylog && $log1 && $log2);
4039: $comp = ($author1 cmp $author2) if ($byauthor &&
4040: $author1 && $author2);
4041: }
3.120 scop 4042: }
4043:
4044: if ($comp == 0) {
4045:
4046: # Directories first, then files under version control,
4047: # then other, "rogue" files.
4048: # Sort by filename if no other criteria available.
4049:
4050: my $ad = (
4051: (-d "$fullname/$a")
4052: ? 'D'
4053: : (defined($fileinfo{$af}) ? 'F' : 'R')
4054: );
4055: my $bd = (
4056: (-d "$fullname/$b")
4057: ? 'D'
4058: : (defined($fileinfo{$bf}) ? 'F' : 'R')
4059: );
3.175 scop 4060: (my $c = $a) =~ s|.*/||;
4061: (my $d = $b) =~ s|.*/||;
3.144 scop 4062:
4063: my ($l, $r) = ("$ad$c", "$bd$d");
4064: $comp = $input{ignorecase} ? (uc($l) cmp uc($r)) : ($l cmp $r);
4065:
4066: # Parent dir is always first, then Attic.
4067: if ($comp != 0) {
4068: if ($l eq 'D..') {
3.149 scop 4069: $comp = -1;
3.144 scop 4070: } elsif ($r eq 'D..') {
3.149 scop 4071: $comp = 1;
3.144 scop 4072: } elsif ($l eq 'DAttic') {
3.149 scop 4073: $comp = -1;
3.144 scop 4074: } elsif ($r eq 'DAttic') {
3.149 scop 4075: $comp = 1;
3.144 scop 4076: }
4077: }
3.120 scop 4078: }
4079: return $comp;
3.1 knu 4080: }
4081:
3.220 scop 4082: #
4083: # Returns a URL to download the selected revision.
4084: #
3.120 scop 4085: sub download_url($$;$)
4086: {
4087: my ($url, $revision, $mimetype) = @_;
4088: $revision =~ s/\b0\.//;
3.1 knu 4089:
3.222 scop 4090: if (!defined($mimetype) || $mimetype !~ CVSWEBMARKUP) {
3.120 scop 4091: my $path = $where;
4092: $path =~ s|[^/]+$||;
3.222 scop 4093: $url = "$scriptname/$CheckoutMagic/${path}$url";
3.120 scop 4094: }
3.219 scop 4095: $url .= '?rev=' . uri_escape($revision);
4096: $url .= ';content-type=' . uri_escape($mimetype) if $mimetype;
3.67 knu 4097:
3.175 scop 4098: return $url;
3.1 knu 4099: }
4100:
3.175 scop 4101: #
3.220 scop 4102: # Returns a link to download the selected revision.
3.175 scop 4103: #
3.120 scop 4104: sub download_link($$$;$)
4105: {
4106: my ($url, $revision, $textlink, $mimetype) = @_;
3.175 scop 4107: my $fullurl = download_url($url, $revision, $mimetype);
3.220 scop 4108: return sprintf('<a href="%s" class="download-link">%s</a>',
4109: hrefquote("$fullurl$barequery"), htmlquote($textlink));
3.218 scop 4110: }
3.120 scop 4111:
3.219 scop 4112: #
4113: # Returns a URL to display the selected revision.
4114: #
4115: sub display_url($$;$)
4116: {
4117: my ($url, $revision, $mimetype) = @_;
4118: $url .= '?rev=' . uri_escape($revision);
4119: $url .= ';content-type=' . uri_escape($mimetype) if $mimetype;
4120: return $url;
4121: }
4122:
4123: #
4124: # Returns a link to display the selected revision.
4125: #
4126: sub display_link($$;$$)
4127: {
4128: my ($url, $revision, $textlink, $mtype) = @_;
4129: $textlink = $revision unless defined($textlink);
4130: return sprintf('<a href="%s" class="display-link">%s</a>',
4131: hrefquote(display_url($url, $revision, $mtype) . $barequery),
4132: htmlquote($textlink));
4133: }
3.132 scop 4134:
3.170 scop 4135: sub graph_link($;$)
3.132 scop 4136: {
3.170 scop 4137: my ($url, $text) = @_;
3.132 scop 4138: $text ||= $graphicon;
3.170 scop 4139: return sprintf('<a href="%s?graph=1%s">%s</a>',
4140: hrefquote($url), hrefquote($barequery), $text);
3.1 knu 4141: }
4142:
4143: # Returns a Query string with the
4144: # specified parameter toggled
3.140 scop 4145: sub toggleQuery($;$)
3.120 scop 4146: {
4147: my ($toggle, $value) = @_;
3.133 scop 4148:
4149: my %vars = %input;
3.120 scop 4150:
4151: if (defined($value)) {
4152: $vars{$toggle} = $value;
4153: } else {
4154: $vars{$toggle} = $vars{$toggle} ? 0 : 1;
4155: }
4156:
4157: # Build a new query of non-default paramenters
3.133 scop 4158: my $newquery = "";
4159: foreach my $var (@stickyvars) {
3.120 scop 4160: my ($value) = defined($vars{$var}) ? $vars{$var} : "";
4161: my ($default) = defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : "";
4162:
4163: if ($value ne $default) {
3.203 scop 4164: $newquery .= ';' if ($newquery ne "");
3.206 scop 4165: $newquery .= uri_escape($var) . '=' . uri_escape($value);
3.120 scop 4166: }
4167: }
4168:
4169: if ($newquery) {
4170: return '?' . $newquery;
4171: }
4172: return "";
4173: }
4174:
4175: sub urlencode($)
4176: {
4177: local ($_) = @_;
4178: s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge;
3.175 scop 4179: return $_;
3.120 scop 4180: }
4181:
4182: sub htmlquote($)
4183: {
4184: local ($_) = @_;
4185: # Special Characters; RFC 1866
4186: s/&/&/g;
4187: s/\"/"/g;
4188: s/</</g;
4189: s/>/>/g;
3.175 scop 4190: return $_;
3.120 scop 4191: }
4192:
4193: sub htmlunquote($)
4194: {
4195: local ($_) = @_;
4196: # Special Characters; RFC 1866
4197: s/"/\"/g;
4198: s/</</g;
4199: s/>/>/g;
4200: s/&/&/g;
3.175 scop 4201: return $_;
3.120 scop 4202: }
4203:
4204: sub hrefquote($)
4205: {
4206: local ($_) = @_;
4207:
4208: y/ /+/;
4209:
4210: htmlquote($_);
4211: }
4212:
3.163 scop 4213: sub http_header(;$$)
3.120 scop 4214: {
3.163 scop 4215: my ($content_type, $moddate) = @_;
4216: $content_type ||= 'text/html';
3.120 scop 4217:
4218: $content_type .= "; charset=$charset"
3.163 scop 4219: if ($charset && $content_type =~ m,^text/,);
3.120 scop 4220:
3.185 scop 4221: # Note that in the following, we explicitly join() and concatenate the
4222: # headers instead of printing them as an array. This is because some
4223: # systems, eg. early versions of mod_perl 2 don't quite get it if the
4224: # last \r\n\r\n isn't included in the last "payload" header print().
4225:
4226: my @headers = ();
4227: # TODO: ctime(3) from scalar gmtime() isn't HTTP compliant, see HTTP::Date.
4228: push(@headers, 'Last-Modified: ' . scalar gmtime($moddate) . ' GMT')
4229: if $moddate;
4230: push(@headers, 'Content-Type: ' . $content_type);
3.120 scop 4231:
4232: if ($allow_compress && $maycompress) {
3.222 scop 4233: if (HAS_ZLIB
3.120 scop 4234: || (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c")))
4235: {
4236:
3.185 scop 4237: push(@headers, 'Content-Encoding: x-gzip');
4238: push(@headers, 'Vary: Accept-Encoding'); # RFC 2616, 14.44
4239: print join("\r\n", @headers) . "\r\n\r\n";
4240:
3.120 scop 4241: $| = 1;
3.185 scop 4242: $| = 0; # Flush header output.
3.120 scop 4243:
3.222 scop 4244: tie(*GZIP, __PACKAGE__, \*STDOUT) if HAS_ZLIB;
3.120 scop 4245: select(GZIP);
4246: $gzip_open = 1;
4247:
4248: } else {
3.185 scop 4249:
4250: print join("\r\n", @headers) . "\r\n\r\n";
3.230 scop 4251: printf
4252: '<span style="font-size: smaller">Unable to find gzip binary in the <b>$command_path</b> (<code>%s</code>) to compress output</span><br />',
4253: htmlquote(join(':', @command_path));
3.120 scop 4254: }
3.185 scop 4255:
3.120 scop 4256: } else {
3.185 scop 4257: print join("\r\n", @headers) . "\r\n\r\n";
3.120 scop 4258: }
4259: }
4260:
3.131 scop 4261:
3.163 scop 4262: sub html_header($;$)
3.120 scop 4263: {
3.163 scop 4264: my ($title, $moddate) = @_;
4265: $title = htmlquote($title);
3.162 scop 4266: my $l = $logo || '';
3.163 scop 4267: http_header('text/html', $moddate);
3.120 scop 4268: print <<EOH;
3.100 knu 4269: $HTML_DOCTYPE
3.1 knu 4270: <html>
3.40 knu 4271: <head>
3.134 scop 4272: <title>$title</title>
3.144 scop 4273: $HTML_META$CSS</head>
3.129 scop 4274: <body>
3.182 scop 4275: $l <h1>$title</h1>
3.1 knu 4276: EOH
4277: }
4278:
3.120 scop 4279: sub html_footer()
4280: {
3.208 scop 4281: print "<hr />\n<address>$address</address>\n" if $address;
3.127 scop 4282: print "</body>\n</html>\n";
3.1 knu 4283: }
4284:
3.120 scop 4285: sub link_tags($)
4286: {
4287: my ($tags) = @_;
4288: my ($ret) = "";
4289: my ($fileurl, $filename);
4290:
4291: ($filename = $where) =~ s/^.*\///;
4292: $fileurl = './' . urlencode($filename);
4293:
4294: foreach my $sym (split (", ", $tags)) {
4295: $ret .= ",\n" if ($ret ne "");
3.136 scop 4296: $ret .= &link(htmlquote($sym),
4297: $fileurl . toggleQuery('only_with_tag', $sym));
3.120 scop 4298: }
3.219 scop 4299: return $ret;
3.1 knu 4300: }
4301:
3.175 scop 4302:
3.1 knu 4303: #
3.233 scop 4304: # See if a file/dir is listed in the config file's @ForbiddenFiles list.
4305: # Takes a full file system path or one relative to $cvsroot, and strips the
4306: # trailing ",v" if present, then compares. Returns 1 if forbidden, else 0.
3.221 scop 4307: #
3.233 scop 4308: sub forbidden($)
3.120 scop 4309: {
3.233 scop 4310: (my $path = canonpath(shift)) =~ s/,v$//;
4311: $path =~ s|^$cvsroot/+||;
3.175 scop 4312: for my $forbidden_re (@ForbiddenFiles) {
4313: return 1 if ($path =~ $forbidden_re);
3.120 scop 4314: }
4315: return 0;
3.174 scop 4316: }
4317:
4318:
4319: #
4320: # Starts a process using IPC::Run. All arguments are passed to
4321: # IPC::Run::start() as-is. Returns an array ($harness, $error) where
4322: # $harness is from IPC::Run if start() succeeds, undef otherwise. In case
3.184 scop 4323: # of an error, $error contains the error message.
3.174 scop 4324: #
3.191 scop 4325: sub startproc(@)
3.174 scop 4326: {
3.215 scop 4327: my $h = my $err = undef;
3.174 scop 4328: eval {
4329: local $SIG{__DIE__};
3.215 scop 4330: $h = IPC::Run::start(@_) or die("return code: $?");
3.174 scop 4331: };
3.215 scop 4332: if ($@) {
3.229 scop 4333: $h->finish() if $h;
3.215 scop 4334: $h = undef;
4335: $err = "'@{$_[0]}' failed: $@";
4336: }
3.174 scop 4337: return ($h, $err);
3.215 scop 4338: }
4339:
4340: #
4341: # Runs a process using IPC::Run. All arguments are passed to
4342: # IPC::Run::run() as-is. Returns an array ($exitcode, $errormsg).
4343: #
4344: sub runproc(@)
4345: {
4346: eval {
4347: local $SIG{__DIE__};
4348: IPC::Run::run(@_);
4349: };
4350: my $exitcode = $? >> 8;
4351: my $errormsg = undef;
4352: if ($@) {
4353: $exitcode ||= -1;
4354: $errormsg = "'@{$_[0]}' failed: $@";
4355: }
4356: return ($exitcode, $errormsg);
3.129 scop 4357: }
4358:
3.225 scop 4359: #
4360: # Check out a file to a temporary file.
4361: #
4362: sub checkout_to_temp($$$)
4363: {
4364: my ($cvsroot, $cvsname, $rev) = @_;
3.25 knu 4365:
3.225 scop 4366: # Pipe given cvs file into a temporary place.
4367: my ($temp_fh, $temp_fn) = tempfile('.cvsweb.XXXXXXXX', DIR => tmpdir());
4368:
4369: my @cmd = ($CMD{cvs}, @cvs_options, '-Qd', $cvsroot,
4370: 'co', '-p', "-r$rev", $cvsname);
4371:
4372: local (*DIFF_OUT);
4373: my ($h, $err) = startproc(\@cmd, \"", '>pipe', \*DIFF_OUT);
4374: if ($h) {
4375: local $/ = undef;
4376: print $temp_fh <DIFF_OUT>;
3.229 scop 4377: $h->finish();
3.225 scop 4378: close($temp_fh);
4379: } else {
4380: close($temp_fh);
4381: unlink($temp_fn);
4382: fatal('500 Internal Error',
4383: 'Checkout failure (exit status %s), output: <pre>%s</pre>',
4384: $? >> 8 || -1, $err);
4385: }
4386:
4387: return $temp_fn;
4388: }
4389:
4390: #
3.173 scop 4391: # Close the GZIP handle, and remove the tie.
3.225 scop 4392: #
3.120 scop 4393: sub gzipclose
4394: {
4395: if ($gzip_open) {
4396: select(STDOUT);
4397: close(GZIP);
4398: untie *GZIP;
CVSweb