Annotation of cvsweb/cvsweb.cgi, Revision 3.240
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.237 scop 123: $VERSION = '2.9.3-dev';
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.222 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 =
752: ($CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', $tag, $module);
753: my $export_err;
754: my ($errcode, $err) = runproc(\@cmd, '2>', \$export_err);
755: if ($errcode) {
756: @fatal =
757: ('500 Internal Error',
758: 'Export failure (exit status %s), output: <pre>%s</pre>',
759: $errcode, $err || $export_err);
3.191 scop 760:
3.215 scop 761: } else {
3.191 scop 762:
3.120 scop 763: $| = 1; # Essential to get the buffering right.
3.191 scop 764: local (*TAR_OUT);
3.120 scop 765:
3.191 scop 766: my (@cmd, $ctype);
767: if ($istar) {
768: my @tar = ($CMD{tar}, @tar_options, '-cf', '-', $basedir);
769: my @gzip = ($CMD{gzip}, @gzip_options, '-c');
770: push(@cmd, \@tar, '|', \@gzip);
771: $ctype = 'application/x-gzip';
772: } elsif ($iszip) {
773: my @zip = ($CMD{zip}, @zip_options, '-r', '-', $basedir);
774: push(@cmd, \@zip, \'');
775: $ctype = 'application/zip';
776: }
3.229 scop 777: push(@cmd, '>pipe', \*TAR_OUT);
3.191 scop 778:
779: my ($h, $err) = startproc(@cmd);
780: if ($h) {
781: print "Content-Type: $ctype\r\n\r\n";
782: local $/ = undef;
783: print <TAR_OUT>;
3.229 scop 784: $h->finish();
3.120 scop 785: } else {
3.215 scop 786: @fatal = ('500 Internal Error',
787: '%s failure (exit status %s), output: <pre>%s</pre>',
788: $istar ? 'Tar' : 'Zip', $? >> 8 || -1, $err);
3.120 scop 789: }
790: }
3.46 knu 791:
3.171 scop 792: # Clean up.
793: rmtree($tmpexportdir);
3.46 knu 794:
3.120 scop 795: &fatal(@fatal) if @fatal;
3.46 knu 796:
3.120 scop 797: exit;
3.46 knu 798: }
799:
3.1 knu 800: ##############################
801: # View a directory
802: ###############################
3.46 knu 803: if (-d $fullname) {
3.233 scop 804:
3.120 scop 805: my $dh = do { local (*DH); };
806: opendir($dh, $fullname) or fatal("404 Not Found", '%s: %s', $where, $!);
3.233 scop 807: my @dir = grep(!forbidden(catfile($fullname, $_)), readdir($dh));
3.120 scop 808: closedir($dh);
809: my @subLevelFiles = findLastModifiedSubdirs(@dir)
810: if ($show_subdir_lastmod);
3.150 scop 811: my @unreadable = getDirLogs($cvsroot, $where, @subLevelFiles);
3.120 scop 812:
813: if ($where eq '/') {
814: html_header($defaulttitle);
815: $long_intro =~ s/!!CVSROOTdescr!!/$CVSROOTdescr{$cvstree}/g;
816: print $long_intro;
817: } else {
818: html_header($where);
3.212 scop 819: my $html = (-f catfile($fullname, 'README.cvs.html,v') ||
820: -f catfile($fullname, 'Attic', 'README.cvs.html,v'));
821: my $text = (!$html &&
822: (-f catfile($fullname, 'README.cvs,v') ||
823: -f catfile($fullname, 'Attic', 'README.cvs,v')));
824: if ($html || $text) {
825: my $rev = $input{only_with_tag} || 'HEAD';
826: my $cr = abs_path($cvsroot) || $cvsroot;
827: my $co = "$where/README.cvs.html" if $html;
828: $co ||= "$where/README.cvs" if $text;
829: # abs_path() taints when run as a CGI...
830: if ($cr =~ VALID_PATH) {
831: $cr = $1;
832: } else {
833: fatal('500 Internal Error', 'Illegal CVS root: <code>%s</code>', $cr);
834: }
835: my @cmd = ($CMD{cvs}, @cvs_options, '-d', $cr, 'co', '-p', "-r$rev",$co);
836: local (*CVS_OUT, *CVS_ERR);
837: my ($h, $err) = startproc(\@cmd, \"", '>pipe', \*CVS_OUT,
3.229 scop 838: '2>pipe', \*CVS_ERR);
3.212 scop 839: fatal('500 Internal Error', $err) unless $h;
840: if ($html) {
841: local $/ = undef;
842: print <CVS_OUT>;
843: } else {
844: print "<p>\n";
845: while (<CVS_OUT>) {
846: chomp;
847: print htmlquote($_), '<br />';
848: }
849: print "</p>";
850: }
3.229 scop 851: $h->finish();
3.212 scop 852: }
3.120 scop 853: print $short_instruction;
854: }
855:
3.165 scop 856: if ($use_descriptions &&
857: open(DESC, '<', catfile($cvsroot, 'CVSROOT', 'descriptions'))) {
3.120 scop 858: while (<DESC>) {
859: chomp;
860: my ($dir, $description) = /(\S+)\s+(.*)/;
861: $descriptions{$dir} = $description;
862: }
863: close(DESC);
864: }
865:
866: print "<p><a name=\"dirlist\"></a></p>\n";
867:
868: # give direct access to dirs
869: if ($where eq '/') {
870: chooseMirror();
871: chooseCVSRoot();
872: } else {
873: print "<p>Current directory: <b>", &clickablePath($where, 0), "</b></p>\n";
874:
3.153 scop 875: print "<p>Current tag: <b>", htmlquote($input{only_with_tag}), "</b></p>\n"
3.120 scop 876: if $input{only_with_tag};
877:
878: }
879:
3.208 scop 880: print "<hr />\n";
3.120 scop 881:
3.179 scop 882: my $infocols = 1;
3.131 scop 883:
3.199 scop 884: printf(<<EOF, htmlquote("Index of $where"));
3.182 scop 885: <table class="dir" width="100%%" cellspacing="0" cellpadding="$tablepadding" summary="%s">
3.179 scop 886: <tr>
887: EOF
3.199 scop 888: printf('<th colspan="2"%s>', ($byfile ? ' class="sorted"' : ''));
3.131 scop 889:
890: if ($byfile) {
891: print 'File';
892: } else {
893: print &link('File',
894: sprintf('./%s#dirlist', toggleQuery('sortby', 'file')));
895: }
896: print "</th>\n";
3.120 scop 897:
3.131 scop 898: # Do not display the other column headers if we do not have any files
899: # with revision information.
900: if (scalar(%fileinfo)) {
3.120 scop 901: $infocols++;
3.199 scop 902: printf('<th%s>', ($byrev ? ' class="sorted"' : ''));
3.120 scop 903:
3.131 scop 904: if ($byrev) {
905: print 'Rev.';
3.120 scop 906: } else {
3.131 scop 907: print &link('Rev.',
908: sprintf('./%s#dirlist', toggleQuery('sortby', 'rev')));
3.120 scop 909: }
910: print "</th>\n";
3.131 scop 911: $infocols++;
3.199 scop 912: printf('<th%s>', ($bydate ? ' class="sorted"' : ''));
3.120 scop 913:
3.131 scop 914: if ($bydate) {
915: print 'Age';
916: } else {
917: print &link('Age',
918: sprintf('./%s#dirlist', toggleQuery('sortby', 'date')));
919: }
920: print "</th>\n";
3.120 scop 921:
3.131 scop 922: if ($show_author) {
3.120 scop 923: $infocols++;
3.199 scop 924: printf('<th%s>', ($byauthor ? ' class="sorted"' : ''));
3.120 scop 925:
3.131 scop 926: if ($byauthor) {
927: print 'Author';
3.120 scop 928: } else {
3.131 scop 929: print
930: &link('Author',
931: sprintf('./%s#dirlist', toggleQuery('sortby', 'author')));
3.120 scop 932: }
933: print "</th>\n";
3.131 scop 934: }
935: $infocols++;
3.199 scop 936: printf('<th%s>', ($bylog ? ' class="sorted"' : ''));
3.120 scop 937:
3.131 scop 938: if ($bylog) {
939: print 'Last log entry';
940: } else {
941: print &link('Last log entry',
942: sprintf('./%s#dirlist', toggleQuery('sortby', 'log')));
3.120 scop 943: }
3.131 scop 944: print "</th>\n";
945: } elsif ($use_descriptions) {
3.199 scop 946: print "<th>Description</th>\n";
3.131 scop 947: $infocols++;
3.120 scop 948: }
3.131 scop 949: print "</tr>\n";
950:
3.120 scop 951: my $dirrow = 0;
952:
953: my $i;
954: lookingforattic:
955: for ($i = 0; $i <= $#dir; $i++) {
956: if ($dir[$i] eq "Attic") {
957: last lookingforattic;
958: }
959: }
960:
961: if (!$input{'hideattic'}
962: && ($i <= $#dir)
963: && opendir($dh, $fullname . '/Attic'))
964: {
965: splice(@dir, $i, 1, grep((s|^|Attic/|, !m|/\.|), readdir($dh)));
966: closedir($dh);
967: }
968:
969: my $hideAtticToggleLink =
970: $input{'hideattic'}
971: ? ''
3.239 scop 972: : &link('[hide]', sprintf('./%s#dirlist', &toggleQuery('hideattic')));
3.120 scop 973:
974: # Sort without the Attic/ pathname.
975: # place directories first
976:
977: my $attic;
978: my $url;
979: my $fileurl;
980: my $filesexists;
981: my $filesfound;
982:
983: foreach my $file (sort { &fileSortCmp } @dir) {
984:
3.196 scop 985: next if ($file eq curdir());
3.120 scop 986:
987: # ignore CVS lock and stale NFS files
988: next if ($file =~ /^\#cvs\.|^,|^\.nfs/); # \# for XEmacs cperl-mode...
989:
990: # Check whether to show the CVSROOT path
3.234 scop 991: next if ($input{'hidecvsroot'} && $where eq '/' && $file eq 'CVSROOT');
3.120 scop 992:
3.150 scop 993: # Is it a directory?
3.232 scop 994: my $isdir = -d catdir($fullname, $file);
3.150 scop 995:
996: # Ignore non-readable files and directories?
997: next if ($input{'hidenonreadable'} && (! -r _ || ($isdir && ! -x _)));
3.120 scop 998:
999: if ($file =~ s|^Attic/||) {
3.239 scop 1000: $attic = ' <span class="attic">(in the Attic) ' .
1001: $hideAtticToggleLink . '</span>';
3.120 scop 1002: } else {
1003: $attic = '';
1004: }
1005:
3.196 scop 1006: if ($file eq updir() || $isdir) {
1007: next if ($file eq updir() && $where eq '/');
3.152 scop 1008: my ($rev, $date, $log, $author, $filename, $keywordsubst) =
1009: @{$fileinfo{$file}} if (defined($fileinfo{$file}));
3.239 scop 1010: printf "<tr class=\"%s\">\n<td class=\"dir\" colspan=\"2\">",
3.132 scop 1011: ($dirrow % 2) ? 'even' : 'odd';
3.120 scop 1012:
3.196 scop 1013: if ($file eq updir()) {
3.120 scop 1014: $url = "../$query";
1015: if ($nofilelinks) {
1016: print $backicon;
1017: } else {
1018: print &link($backicon, $url);
1019: }
1020: print ' ', &link("Parent Directory", $url);
1021: } else {
1022: $url = './' . urlencode($file) . "/$query";
3.136 scop 1023: print '<a name="', hrefquote($file), '"></a>';
3.120 scop 1024:
1025: if ($nofilelinks) {
1026: print $diricon;
1027: } else {
1028: print &link($diricon, $url);
1029: }
3.136 scop 1030: print ' ', &link(htmlquote("$file/"), $url), $attic;
3.120 scop 1031:
1032: if ($file eq "Attic") {
3.239 scop 1033: print ' <span class="attic">',
1034: &link('[show]',
1035: sprintf('./%s#dirlist', &toggleQuery('hideattic'))),
1036: '</span>';
3.120 scop 1037: }
1038: }
1039:
1040: # Show last change in dir
1041: if ($filename) {
3.199 scop 1042: print "</td>\n<td> </td>\n<td class=\"age\">";
1043: print readableTime(time() - $date, 0) if $date;
1044: print "</td>\n<td class=\"author\">", htmlquote($author)
1045: if $show_author;
1046: print "</td>\n<td class=\"log\">";
3.120 scop 1047: $filename =~ s%^[^/]+/%%;
3.199 scop 1048: print &link(htmlquote("$filename/$rev"),
1049: sprintf('%s/%s%s#rev%s',
3.206 scop 1050: uri_escape($file), uri_escape($filename),
3.208 scop 1051: $query, $rev)), '<br />';
3.120 scop 1052: if ($log) {
3.199 scop 1053: print htmlify(substr($log, 0, $shortLogLen), $allow_dir_extra);
3.120 scop 1054: print '...' if (length($log) > 80);
1055: }
3.199 scop 1056:
3.120 scop 1057: } else {
1058: my $dwhere = ($where ne '/' ? $where : '') . $file;
1059:
1060: if ($use_descriptions && defined $descriptions{$dwhere}) {
3.199 scop 1061: print '<td colspan="', ($infocols - 1), '">';
3.120 scop 1062: print $descriptions{$dwhere};
1063:
3.131 scop 1064: } elsif ($infocols > 1) {
3.120 scop 1065:
1066: # close the row with the appropriate number of
1067: # columns, so that the vertical seperators are visible
1068: my ($cols) = $infocols;
1069: while ($cols > 1) {
1070: print "</td>\n<td> ";
1071: $cols--;
1072: }
1073: }
1074: }
1075:
3.131 scop 1076: print "</td>\n</tr>\n";
3.120 scop 1077: $dirrow++;
3.131 scop 1078:
3.120 scop 1079: } elsif ($file =~ s/,v$//) {
1080:
1081: $fileurl = ($attic ? 'Attic/' : '') . urlencode($file);
1082: $url = './' . $fileurl . $query;
1083: $filesexists++;
1084: next if (!defined($fileinfo{$file}));
3.152 scop 1085: my ($rev, $date, $log, $author, $filename, $keywordsubst) =
1086: @{$fileinfo{$file}};
3.156 scop 1087: my $isbinary = $keywordsubst eq 'b' ? 1 : 0;
3.120 scop 1088: $filesfound++;
3.156 scop 1089:
3.199 scop 1090: printf "<tr class=\"%s\">\n", ($dirrow % 2) ? 'even' : 'odd';
3.239 scop 1091: printf '<td class="file"%s>', $allow_cvsgraph ? '' : ' colspan="2"';
3.120 scop 1092:
3.156 scop 1093: my $icon = $isbinary ? $binfileicon : $fileicon;
3.120 scop 1094: if ($nofilelinks) {
3.152 scop 1095: print $icon;
3.120 scop 1096: } else {
3.152 scop 1097: print &link($icon, $url);
3.120 scop 1098: }
1099: print ' ', &link(htmlquote($file), $url), $attic;
3.199 scop 1100: print '</td><td class="graph">', graph_link($fileurl) if $allow_cvsgraph;
3.219 scop 1101: print "</td>\n<td width=\"30\">", display_link($fileurl, $rev);
3.199 scop 1102: print "</td>\n<td class=\"age\">";
1103: print readableTime(time() - $date, 0) if $date;
1104: print "</td>\n<td class=\"author\">", htmlquote($author) if $show_author;
1105: print "</td>\n<td class=\"log\">";
3.120 scop 1106:
1107: if ($log) {
3.199 scop 1108: print htmlify(substr($log, 0, $shortLogLen), $allow_dir_extra);
3.120 scop 1109: print '...' if (length $log > 80);
1110: }
3.131 scop 1111: print "</td>\n</tr>";
3.120 scop 1112: $dirrow++;
1113: }
1114: print "\n";
1115: }
1116:
3.131 scop 1117: print "</table>\n";
3.120 scop 1118:
3.150 scop 1119: if ((my $num = scalar(@unreadable)) && ! $input{hidenonreadable}) {
1120: printf(<<EOF, $num, htmlquote(join(', ', @unreadable)));
1121: <p>
3.208 scop 1122: <b>NOTE:</b> The following %d unreadable files were ignored:<br />
3.150 scop 1123: <em>%s</em>
1124: </p>
1125: EOF
1126: }
1127:
3.120 scop 1128: if ($filesexists && !$filesfound) {
3.150 scop 1129: my $currtag = defined($input{only_with_tag}) ?
1130: sprintf(' (%s)', htmlquote($input{only_with_tag})) : '';
1131: printf(<<EOF, $filesexists, $currtag);
1132: <p>
1133: <b>NOTE:</b> There are %d files, but none matches the current tag%s.
1134: </p>
1135: EOF
3.120 scop 1136: }
1137:
1138: if ($input{only_with_tag} && (!%tags || !$tags{$input{only_with_tag}})) {
1139: %tags = %alltags;
1140: }
1141:
1142: if (scalar %tags
1143: || $input{only_with_tag}
1144: || $edit_option_form
1145: || defined($input{"options"}))
1146: {
3.208 scop 1147: print "<hr />\n";
3.120 scop 1148: }
1149:
1150: if (scalar %tags || $input{only_with_tag}) {
3.208 scop 1151: print "<form method=\"get\" action=\"./\">\n<p>\n";
3.120 scop 1152: foreach my $var (@stickyvars) {
3.208 scop 1153: printf("<input type=\"hidden\" name=\"$var\" value=\"%s\" />\n",
3.154 scop 1154: htmlquote($input{$var}))
3.120 scop 1155: if (defined($input{$var})
1156: && (!defined($DEFAULTVALUE{$var})
1157: || $input{$var} ne $DEFAULTVALUE{$var})
1158: && $var ne 'only_with_tag');
1159: }
3.208 scop 1160: printf(<<EOF, ($use_java_script ? ' onchange="this.form.submit()"' : ''));
3.239 scop 1161: <span class="nowrap">
3.208 scop 1162: <label for="only_with_tag" accesskey="T">Show only files with tag:
1163: <select id="only_with_tag" name="only_with_tag"%s>
1164: <option value="">All tags / default branch</option>
1165: EOF
3.120 scop 1166: foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) {
3.136 scop 1167: my $selected =
1168: defined($input{only_with_tag}) && $input{only_with_tag} eq $tag;
1169: printf("<option%s>%s</option>\n",
3.208 scop 1170: $selected ? ' selected="selected"' : '',
3.136 scop 1171: htmlquote($tag));
3.120 scop 1172: }
3.208 scop 1173: printf(<<EOF, htmlquote($where));
1174: </select>
3.239 scop 1175: </label></span> <span class="nowrap">
1176: <label for="path" accesskey="P">Module path or alias:
3.208 scop 1177: <input type="text" id="path" name="path" value="%s" size="15" /></label>
3.239 scop 1178: </span>
3.208 scop 1179: <input type="submit" value="Go" accesskey="G" />
1180: </p>
1181: </form>
1182: EOF
3.120 scop 1183: }
1184:
3.188 scop 1185: if ($allow_tar && $filesfound) {
3.120 scop 1186: my ($basefile) = ($where =~ m,(?:.*/)?([^/]+),);
3.192 scop 1187: my $havetar = $CMD{tar} && $CMD{gzip};
1188: my $havezip = $CMD{zip};
1189: if (defined($basefile) && $basefile ne '' && ($havetar || $havezip)) {
3.203 scop 1190: my $q = ($query ? "$query;" : '?') . 'tarball=1';
3.208 scop 1191: print "<hr />\n",
3.189 scop 1192: '<div style="text-align: center">Download this directory in ';
3.192 scop 1193: # Mangle the filename so browsers show a reasonable filename to download.
1194: my @types = ();
1195: push(@types, &link('tarball', "$basefile.tar.gz$q")) if $havetar;
1196: push(@types, &link('zip archive', "$basefile.zip$q")) if $havezip;
1197: print join(' or ', @types), "</div>\n";
3.120 scop 1198: }
1199: }
1200:
1201: if ($edit_option_form || defined($input{"options"})) {
1202:
1203: my $formwhere = $scriptwhere;
1204: $formwhere =~ s|Attic/?$|| if ($input{'hideattic'});
1205:
3.149 scop 1206: print <<EOF;
1207: <form method="get" action="${formwhere}">
3.189 scop 1208: <fieldset>
1209: <legend>General options</legend>
3.208 scop 1210: <input type="hidden" name="copt" value="1" />
3.149 scop 1211: EOF
3.120 scop 1212: if ($cvstree ne $cvstreedefault) {
3.208 scop 1213: print "<input type=\"hidden\" name=\"cvsroot\" value=\"$cvstree\" />\n";
3.120 scop 1214: }
3.149 scop 1215: print <<EOF;
3.189 scop 1216: <table>
3.149 scop 1217: <tr>
3.189 scop 1218: <td class="opt-label">
1219: <label for="sortby" accesskey="F">Sort files by:</label>
1220: </td>
1221: <td class="opt-value">
3.149 scop 1222: <select id="sortby" name="sortby">
1223: <option value="">File</option>
1224: EOF
3.208 scop 1225: print "<option", $bydate ? ' selected="selected"' : '',
3.120 scop 1226: " value=\"date\">Age</option>\n";
3.208 scop 1227: print "<option", $byauthor ? ' selected="selected"' : '',
3.120 scop 1228: " value=\"author\">Author</option>\n"
3.140 scop 1229: if $show_author;
3.208 scop 1230: print "<option", $byrev ? ' selected="selected"' : '',
3.120 scop 1231: " value=\"rev\">Revision</option>\n";
3.208 scop 1232: print "<option", $bylog ? ' selected="selected"' : '',
3.120 scop 1233: " value=\"log\">Log message</option>\n";
3.189 scop 1234: print <<EOF;
1235: </select>,
1236: <label for="ignorecase" accesskey="I">case-insensitive:
1237: EOF
1238: print '<input id="ignorecase" name="ignorecase" type="checkbox"',
3.208 scop 1239: $input{ignorecase} ? ' checked="checked"' : '',
1240: " value=\"1\" /></label>\n";
3.189 scop 1241: print <<EOF;
1242: </td>
1243: <td class="opt-label">
1244: <label for="hideattic" accesskey="A">Hide files in Attic:</label>
1245: </td>
1246: <td class="opt-value">
1247: EOF
1248: print '<input id="hideattic" name="hideattic" type="checkbox"',
3.208 scop 1249: $input{hideattic} ? ' checked="checked"' : '', ' value="1" />';
3.189 scop 1250: print <<EOF;
1251: </td>
1252: </tr>
1253: <tr>
1254: <td class="opt-label">
1255: <label for="logsort" accesskey="L">Sort log by:</label>
1256: </td>
1257: <td class="opt-value">
1258: EOF
3.120 scop 1259: printLogSortSelect(0);
3.189 scop 1260: print <<EOF;
1261: </td>
1262: <td class="opt-label">
1263: <label for="ln" accesskey="N">Show line numbers:</label>
1264: </td>
1265: <td class="opt-value">
1266: EOF
1267: print '<input id="ln" name="ln" type="checkbox"',
3.208 scop 1268: $input{ln} ? ' checked="checked"' : '', " value=\"1\" />\n";
3.189 scop 1269: print <<EOF;
1270: </td>
1271: </tr>
1272: <tr>
1273: <td class="opt-label">
1274: <label for="f" accesskey="D">Diff format:</label>
1275: </td>
1276: <td>
1277: EOF
3.120 scop 1278: printDiffSelect(0);
3.149 scop 1279: print <<EOF;
3.189 scop 1280: </td>
1281: <td colspan="2" class="opt-label">
3.208 scop 1282: <input type="submit" value="Change Options" accesskey="C" />
3.189 scop 1283: </td>
3.149 scop 1284: </tr>
1285: </table>
3.189 scop 1286: </fieldset>
3.149 scop 1287: </form>
1288: EOF
3.120 scop 1289: }
1290: html_footer();
3.80 knu 1291: }
3.1 knu 1292:
1293: ###############################
1294: # View Files
1295: ###############################
3.80 knu 1296: elsif (-f $fullname . ',v') {
3.114 scop 1297:
3.120 scop 1298: if (defined($input{'rev'}) || $doCheckout) {
3.228 scop 1299: my $rev = defined($input{rev}) ? $input{rev} : '.';
1300: &doCheckout($fullname, $rev);
3.120 scop 1301: gzipclose();
1302: exit;
1303: }
1304:
1305: if (defined($input{'annotate'}) && $allow_annotate) {
1306: &doAnnotate($input{'annotate'});
1307: gzipclose();
1308: exit;
1309: }
1310:
1311: if (defined($input{'r1'}) && defined($input{'r2'})) {
1312: &doDiff($fullname, $input{'r1'}, $input{'tr1'},
1313: $input{'r2'}, $input{'tr2'}, $input{'f'});
1314: gzipclose();
1315: exit;
1316: }
3.132 scop 1317:
3.170 scop 1318: if ($allow_cvsgraph && $input{graph}) {
1319: if ($input{makeimage}) {
1320: doGraph();
3.132 scop 1321: } else {
3.170 scop 1322: doGraphView();
3.132 scop 1323: }
1324: gzipclose();
1325: exit;
1326: }
1327:
3.120 scop 1328: &doLog($fullname);
1329:
1330: ##############################
1331: # View Diff
1332: ##############################
1333: } elsif ($fullname =~ s/\.diff$//
1334: && -f $fullname . ",v"
1335: && $input{'r1'}
1336: && $input{'r2'})
1337: {
1338:
1339: # $where-diff-removal if 'cvs rdiff' is used
1340: # .. but 'cvs rdiff'doesn't support some options
1341: # rcsdiff does (-w and -p), so it is disabled
1342: # $where =~ s/\.diff$//;
1343:
3.189 scop 1344: # Allow diffs using the ".diff" extension so that browsers that default
1345: # to the filename in the URL when saving don't save diffs as eg. foo.c.
3.120 scop 1346: &doDiff($fullname, $input{'r1'}, $input{'tr1'},
1347: $input{'r2'}, $input{'tr2'}, $input{'f'});
1348: gzipclose();
1349: exit;
1350: } elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1|
1351: && -f $newname . ",v")
1352: {
1353:
1354: # The file has been removed and is in the Attic.
1355: # Send a redirect pointing to the file in the Attic.
1356: (my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|;
1357: if ($ENV{QUERY_STRING} ne "") {
1358: redirect("${newplace}?$ENV{QUERY_STRING}");
1359: } else {
1360: redirect($newplace);
1361: }
1362: exit;
3.80 knu 1363: } elsif (0 && (my @files = &safeglob($fullname . ",v"))) {
3.120 scop 1364: http_header("text/plain");
1365: print "You matched the following files:\n";
1366: print join ("\n", @files);
3.80 knu 1367:
3.120 scop 1368: # Find the tags from each file
1369: # Display a form offering diffs between said tags
3.80 knu 1370: } else {
3.120 scop 1371: my $fh = do { local (*FH); };
3.233 scop 1372: my $module;
3.80 knu 1373:
3.120 scop 1374: # Assume it's a module name with a potential path following it.
3.233 scop 1375: my $xtra = (($module = $where) =~ s|/.*||) ? $& : '';
3.80 knu 1376:
3.120 scop 1377: # Is there an indexed version of modules?
1378: if (open($fh, "< $cvsroot/CVSROOT/modules")) {
1379: while (<$fh>) {
1380: if (/^(\S+)\s+(\S+)/o
1381: && $module eq $1
1382: && -d "$cvsroot/$2"
1383: && $module ne $2)
1384: {
1385: redirect("$scriptname/$2$xtra$query");
1386: }
1387: }
1388: }
1389: fatal("404 Not Found", '%s: no such file or directory', $where);
3.80 knu 1390: }
3.23 knu 1391:
3.25 knu 1392: gzipclose();
3.80 knu 1393:
3.1 knu 1394: ## End MAIN
1395:
3.175 scop 1396:
3.120 scop 1397: sub printDiffSelect($)
1398: {
1399: my ($use_java_script) = @_;
1400:
1401: print '<select id="f" name="f"';
1402: print ' onchange="this.form.submit()"' if $use_java_script;
1403: print ">\n";
1404:
3.175 scop 1405: for my $difftype (@DIFFTYPES) {
3.120 scop 1406: printf("<option value=\"%s\"%s>%s</option>\n",
3.208 scop 1407: $difftype, $input{f} eq $difftype ? ' selected="selected"' : '',
3.175 scop 1408: "\u$DIFFTYPES{$difftype}{descr}");
3.120 scop 1409: }
1410:
1411: print "</select>";
1412: }
1413:
3.175 scop 1414:
3.168 scop 1415: sub printDiffSelectStickyVars()
1416: {
1417: while (my ($key, $val) = each %input) {
1418: next if ($key eq 'f');
1419: next if (defined($DEFAULTVALUE{$key}) && $DEFAULTVALUE{$key} eq $val);
3.206 scop 1420: print "<input type=\"hidden\" name=\"", htmlquote($key), "\" value=\"",
3.208 scop 1421: htmlquote($val), "\" />\n";
3.168 scop 1422: }
1423: }
1424:
3.175 scop 1425:
3.120 scop 1426: sub printLogSortSelect($)
1427: {
1428: my ($use_java_script) = @_;
1429:
1430: print '<select id="logsort" name="logsort"';
1431: print ' onchange="this.form.submit()"' if $use_java_script;
1432: print ">\n";
1433:
3.175 scop 1434: for my $sortkey (@LOGSORTKEYS) {
3.120 scop 1435: printf("<option value=\"%s\"%s>%s</option>\n",
3.208 scop 1436: $sortkey, $logsort eq $sortkey ? ' selected="selected"' : '',
3.175 scop 1437: "\u$LOGSORTKEYS{$sortkey}{descr}");
3.120 scop 1438: }
1439:
1440: print "</select>";
1441: }
1442:
3.175 scop 1443:
3.197 scop 1444: #
1445: # Find the last modified, version controlled files in the given directories.
1446: # Compares solely based on modification timestamps. Files in the returned list
1447: # are without the ,v suffix, and unreadable files have been filtered out.
1448: #
3.120 scop 1449: sub findLastModifiedSubdirs(@)
1450: {
1451: my (@dirs) = @_;
1452:
3.175 scop 1453: my @files;
1454: foreach my $dirname (@dirs) {
3.196 scop 1455: next if ($dirname eq curdir() || $dirname eq updir());
1456: my $dir = catdir($fullname, $dirname);
3.120 scop 1457: next if (!-d $dir);
1458:
1459: my $dh = do { local (*DH); };
1460: opendir($dh, $dir) or next;
3.233 scop 1461: my (@filenames) = grep(!forbidden(catfile($dir, $_)), readdir($dh));
3.120 scop 1462: closedir($dh);
1463:
3.175 scop 1464: my $lastmod = undef;
1465: my $lastmodtime = undef;
3.120 scop 1466: foreach my $filename (@filenames) {
3.197 scop 1467: ($filename) =
1468: (catfile($dirname, $filename) =~ VALID_PATH) or next; # untaint
3.196 scop 1469: my ($file) = catfile($fullname, $filename);
3.197 scop 1470: next if ($filename !~ /,v$/o || !-f $file || !-r _);
1471: my $modtime = -M _;
3.120 scop 1472: if (!defined($lastmod) || $modtime < $lastmodtime) {
3.233 scop 1473: ($lastmod = $filename) =~ s/,v$//;
3.120 scop 1474: $lastmodtime = $modtime;
1475: }
1476: }
3.175 scop 1477: push(@files, $lastmod) if (defined($lastmod));
3.120 scop 1478: }
1479: return @files;
1480: }
1481:
3.175 scop 1482:
3.120 scop 1483: sub htmlify_sub(&$)
1484: {
1485: (my $proc, local $_) = @_;
1486: my @a = split (m`(<a [^>]+>[^<]*</a>)`i);
1487: my $linked;
1488: my $result = '';
1489:
1490: while (($_, $linked) = splice(@a, 0, 2)) {
1491: &$proc();
1492: $result .= $_ if defined($_);
1493: $result .= $linked if defined($linked);
1494: }
1495:
3.175 scop 1496: return $result;
3.120 scop 1497: }
1498:
3.175 scop 1499:
3.120 scop 1500: sub htmlify($;$)
1501: {
1502: (local $_, my $extra) = @_;
1503:
1504: $_ = htmlquote($_);
1505:
1506: # get URL's as link
1507: s{
3.130 scop 1508: ((https?|ftp)://.+?)([\s\']|&(quot|[lg]t);)
3.120 scop 1509: }{
3.130 scop 1510: &link($1, htmlunquote($1)) . $3
3.120 scop 1511: }egx;
1512:
1513: # get e-mails as link
1514: $_ = htmlify_sub {
1515: s<
1516: [\w+=\-.!]+@[\w\-]+(\.[\w\-]+)+
1517: ><
1518: &link($&, "mailto:$&")
1519: >egix;
1520: } $_;
1521:
1522: if ($extra) {
1523:
1524: # get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"
1525: if (defined($prcgi) && defined($re_prkeyword)) {
1526: my $prev;
1527:
1528: do {
1529: $prev = $_;
1530:
1531: $_ = htmlify_sub {
1532: s{
1533: (\b$re_prkeyword[:\#]?\s*
1534: (?:
1535: \#?
1536: \d+[,\s]\s*
1537: )*
1538: \#?)
1539: (\d+)\b
1540: }{
1541: $1 . &link($2, sprintf($prcgi, $2))
1542: }egix;
1543: } $_;
1544: } while ($_ ne $prev);
1545:
1546: if (defined($re_prcategories)) {
1547: $_ = htmlify_sub {
1548: s{
1549: (\b$re_prcategories/(\d+)\b)
1550: }{
1551: &link($1, sprintf($prcgi, $2))
1552: }egox;
1553: } $_;
1554: }
1555: }
1556:
1557: # get manpage specs as link: "foo.1" "foo(1)"
1558: if (defined($mancgi)) {
1559: $_ = htmlify_sub {
1560: s{
3.143 knu 1561: (
1562: \b ( \w[\w+\-.]* (?: ::\w[\w+\-.]*)* )
3.120 scop 1563: (?:
3.143 knu 1564: \( ([0-9n]) \) \B
3.120 scop 1565: |
3.143 knu 1566: \. ([0-9n]) \b
3.120 scop 1567: )
1568: )
1569: }{
3.149 scop 1570: my($text, $name, $section) = ($1, $2, defined($3) ? $3 : $4);
1571: ($name =~ /[A-Za-z]/ && $name !~ /\.(:|$)/)
1572: ? &link($text, sprintf($mancgi, $section, $name))
1573: : $text;
3.120 scop 1574: }egx;
1575: } $_;
1576: }
1577: }
1578:
3.175 scop 1579: return $_;
3.120 scop 1580: }
1581:
3.175 scop 1582:
3.120 scop 1583: sub spacedHtmlText($;$)
1584: {
3.175 scop 1585: (local $_, my $ts) = @_;
3.224 scop 1586: return '' unless defined($_);
3.175 scop 1587: $ts ||= $tabstop;
3.120 scop 1588:
1589: # Cut trailing spaces and tabs
1590: s/[ \t]+$//;
1591:
1592: if (defined($ts)) {
1593:
1594: # Expand tabs
1595: 1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e;
1596: }
1597:
1598: # replace <tab> and <space> (\001 is to protect us from htmlify)
1599: # gzip can make excellent use of this repeating pattern :-)
1600: if ($hr_breakable) {
1601:
1602: # make every other space 'breakable'
1603: s/ / \001nbsp;/g; # 2 * <space>
1604: # leave single space as it is
1605: } else {
1606: s/ /\001nbsp;/g;
1607: }
1608:
1609: $_ = htmlify($_, $allow_source_extra);
1610:
1611: # unescape
1612: y/\001/&/;
1613:
1614: return $_;
1615: }
1616:
3.175 scop 1617:
3.120 scop 1618: # Note that this doesn't htmlquote the first argument...
1619: sub link($$)
1620: {
1621: my ($name, $url) = @_;
1622:
1623: $url =~ s/:/sprintf("%%%02x", ord($&))/eg
1624: if $url =~ /^[^a-z]/; # relative
1625:
1626: sprintf '<a href="%s">%s</a>', hrefquote($url), $name;
1627: }
1628:
3.175 scop 1629:
3.120 scop 1630: sub revcmp($$)
1631: {
1632: my ($rev1, $rev2) = @_;
1633:
1634: # make no comparison for a tag or a branch
1635: return 0 if $rev1 =~ /[^\d.]/ || $rev2 =~ /[^\d.]/;
1636:
1637: my (@r1) = split (/\./, $rev1);
1638: my (@r2) = split (/\./, $rev2);
1639: my ($a, $b);
1640:
1641: while (($a = shift (@r1)) && ($b = shift (@r2))) {
1642: if ($a != $b) {
1643: return $a <=> $b;
1644: }
1645: }
1646: if (@r1) { return 1; }
1647: if (@r2) { return -1; }
1648: return 0;
1649: }
1650:
3.175 scop 1651:
3.120 scop 1652: sub fatal($$@)
1653: {
1654: my ($errcode, $format, @args) = @_;
3.185 scop 1655: print "Status: $errcode\r\n";
3.131 scop 1656: html_header('Error');
3.215 scop 1657: print '<div id="error">Error: ',
1658: sprintf($format, map(htmlquote($_), @args)), "</div>\n";
3.120 scop 1659: html_footer();
1660: exit(1);
1661: }
1662:
3.175 scop 1663:
3.120 scop 1664: sub redirect($)
1665: {
1666: my ($url) = @_;
3.185 scop 1667: print "Status: 301 Moved\r\n", "Location: $url\r\n";
3.131 scop 1668: html_header('Moved');
3.120 scop 1669: print "<p>This document is located ", &link('here', $url), "</p>\n";
1670: html_footer();
1671: exit(1);
1672: }
1673:
3.175 scop 1674:
3.120 scop 1675: sub safeglob($)
1676: {
1677: my ($filename) = @_;
1678:
3.175 scop 1679: (my $dirname = $filename) =~ s|/[^/]+$||;
3.120 scop 1680: $filename =~ s|.*/||;
1681:
3.175 scop 1682: my @results;
1683: my $dh = do { local (*DH); };
3.120 scop 1684: if (opendir($dh, $dirname)) {
1685: my $glob = $filename;
1686: my $t;
1687:
3.149 scop 1688: # transform filename from glob to regex. Deal with:
1689: # [, {, ?, * as glob chars
1690: # make sure to escape all other regex chars
3.120 scop 1691: $glob =~ s/([\.\(\)\|\+])/\\$1/g;
1692: $glob =~ s/\*/.*/g;
1693: $glob =~ s/\?/./g;
1694: $glob =~ s/{([^}]+)}/($t = $1) =~ s-,-|-g; "($t)"/eg;
3.222 scop 1695: $glob = qr/^$glob$/;
1696:
3.120 scop 1697: foreach (readdir($dh)) {
3.222 scop 1698: if ($_ =~ $glob && $_ =~ VALID_PATH) {
3.194 scop 1699: push(@results, catfile($dirname, $1)); # untaint
3.120 scop 1700: }
1701: }
1702: closedir($dh);
1703: }
1704:
3.175 scop 1705: return @results;
3.120 scop 1706: }
1707:
3.160 scop 1708:
3.227 scop 1709: #
3.230 scop 1710: # Searches @command_path for the given executable file.
3.227 scop 1711: #
3.120 scop 1712: sub search_path($)
1713: {
1714: my ($command) = @_;
3.230 scop 1715: for my $d (@command_path) {
3.227 scop 1716: my $cmd = catfile($d, $command);
1717: return $cmd if (-x $cmd && !-d _);
3.120 scop 1718: }
1719: return '';
1720: }
1721:
3.156 scop 1722:
3.219 scop 1723: #
1724: # Gets the enscript(1) highlight mode corresponding to the given filename,
1725: # or undef if unsupported.
1726: #
1727: sub getEnscriptHL($)
1728: {
1729: return undef unless $allow_enscript;
1730: my ($filename) = @_;
1731: while (my ($hl, $regex) = each %enscript_types) {
1732: return $hl if ($filename =~ $regex);
1733: }
1734: return undef;
1735: }
1736:
1737:
1738: #
1739: # Gets the MIME type for the given file name.
1740: #
3.156 scop 1741: sub getMimeType($;$)
3.120 scop 1742: {
3.156 scop 1743: my ($fullname, $binary) = @_;
1744: $binary = ($keywordsubstitution && $keywordsubstitution =~ /b/)
1745: unless defined($binary);
1746:
1747: (my $suffix = $fullname) =~ s/^.*\.([^.]*)$/$1/;
1748:
1749: my $mimetype = $MTYPES{$suffix};
1750: $mimetype ||= $MimeTypes->mimeTypeOf($fullname) if defined($MimeTypes);
1751:
1752: if (!$mimetype && $suffix ne '*' && -f $mime_types && -r _) {
1753: my $fh = do { local (*FH); };
1754: if (open($fh, $mime_types)) {
1755: my $re = sprintf('^\s*(\S+\/\S+)\s.+\b%s\b', quotemeta($suffix));
3.222 scop 1756: $re = qr/$re/;
3.156 scop 1757: while (my $line = <$fh>) {
1758: if ($line =~ $re) {
1759: $mimetype = $1;
1760: $MTYPES{$suffix} = $mimetype;
1761: last;
1762: }
3.120 scop 1763: }
3.156 scop 1764: close($fh);
1765: } else {
1766: warn("Can't open MIME types file $mime_types for reading: $!");
3.120 scop 1767: }
1768: }
1769:
3.156 scop 1770: $mimetype ||= $MTYPES{'*'};
1771: $mimetype ||= $binary ? 'application/octet-stream' : 'text/plain';
3.120 scop 1772: return $mimetype;
3.1 knu 1773: }
1774:
3.156 scop 1775:
3.1 knu 1776: ###############################
3.24 knu 1777: # read first lines like head(1)
1778: ###############################
3.120 scop 1779: sub head($;$)
1780: {
3.175 scop 1781: my ($fh, $linecount) = @_;
1782: $linecount ||= 10;
3.24 knu 1783:
3.120 scop 1784: my @buf;
1785: if ($linecount > 0) {
3.184 scop 1786: for (my $i = 0; !eof($fh) && $i < $linecount; $i++) {
3.120 scop 1787: push @buf, scalar <$fh>;
1788: }
1789: } else {
1790: @buf = <$fh>;
1791: }
3.175 scop 1792: return @buf;
1793: }
3.120 scop 1794:
3.24 knu 1795:
1796: ###############################
1797: # scan vim and Emacs directives
1798: ###############################
3.120 scop 1799: sub scan_directives(@)
1800: {
1801: my $ts = undef;
3.24 knu 1802:
3.120 scop 1803: for (@_) {
1804: $ts = $1 if /\b(?:ts|tabstop|tab-width)[:=]\s*([1-9]\d*)\b/;
1805: }
3.24 knu 1806:
3.120 scop 1807: ('tabstop' => $ts);
3.24 knu 1808: }
1809:
3.175 scop 1810:
3.120 scop 1811: sub openOutputFilter()
1812: {
3.175 scop 1813: return unless $output_filter;
3.86 knu 1814:
3.120 scop 1815: open(STDOUT, "|-") and return;
3.86 knu 1816:
3.120 scop 1817: # child of child
3.165 scop 1818: open(STDERR, '>', devnull());
3.120 scop 1819: exec($output_filter) or exit -1;
3.86 knu 1820: }
1821:
3.175 scop 1822:
3.24 knu 1823: ###############################
3.1 knu 1824: # show Annotation
1825: ###############################
3.133 scop 1826: sub doAnnotate($)
3.120 scop 1827: {
1828: my ($rev) = @_;
3.174 scop 1829: (my $pathname = $where) =~ s/(Attic\/)?[^\/]*$//;
1830: (my $filename = $where) =~ s/^.*\///;
3.126 scop 1831:
3.174 scop 1832: # This annotate version is based on the cvs annotate-demo Perl script by
1833: # Cyclic Software. It was written by Cyclic Software,
1834: # http://www.cyclic.com/, and is in the public domain.
1835: # We could abandon the use of rlog, rcsdiff and co using
1836: # the cvs server in a similiar way one day (..after rewrite).
1837:
1838: local (*CVS_IN, *CVS_OUT);
3.215 scop 1839: my $annotate_err;
3.174 scop 1840: my ($h, $err) =
1841: startproc([ $CMD{cvs}, @annotate_options, 'server' ],
3.215 scop 1842: '<pipe', \*CVS_IN, '>pipe', \*CVS_OUT,
3.229 scop 1843: '2>', \$annotate_err);
3.215 scop 1844: fatal('500 Internal Error',
1845: 'Annotate failure (exit status %s), output: <pre>%s</pre>',
1846: $? >> 8 || -1, $err)
1847: unless $h;
3.120 scop 1848:
1849: # OK, first send the request to the server. A simplified example is:
1850: # Root /home/kingdon/zwork/cvsroot
1851: # Argument foo/xx
1852: # Directory foo
1853: # /home/kingdon/zwork/cvsroot/foo
1854: # Directory .
1855: # /home/kingdon/zwork/cvsroot
1856: # annotate
1857: # although as you can see there are a few more details.
1858:
3.174 scop 1859: print CVS_IN "Root $cvsroot\n";
1860: print CVS_IN
3.120 scop 1861: "Valid-responses ok error Valid-requests Checked-in Updated Merged Removed M E\n";
1862:
1863: # Don't worry about sending valid-requests, the server just needs to
1864: # support "annotate" and if it doesn't, there isn't anything to be done.
3.174 scop 1865: print CVS_IN "UseUnchanged\n";
1866: print CVS_IN "Argument -r\n";
1867: print CVS_IN "Argument $rev\n";
1868: print CVS_IN "Argument $where\n";
3.120 scop 1869:
1870: # The protocol requires us to fully fake a working directory (at
1871: # least to the point of including the directories down to the one
1872: # containing the file in question).
3.123 scop 1873: # So if $where is "dir/sdir/file", then dirs will be ("dir","sdir","file")
1874: my $path = '';
1875: foreach my $dir (split('/', $where)) {
3.120 scop 1876:
1877: if ($path eq "") {
3.123 scop 1878: # In our example, $dir is "dir".
1879: $path = $dir;
3.120 scop 1880: } else {
3.174 scop 1881: print CVS_IN "Directory $path\n";
1882: print CVS_IN "$cvsroot/$path\n";
3.120 scop 1883:
1884: # In our example, $_ is "sdir" and $path becomes "dir/sdir"
1885: # And the next time, "file" and "dir/sdir/file" (which then gets
1886: # ignored, because we don't need to send Directory for the file).
3.123 scop 1887: $path .= "/$dir";
3.120 scop 1888: }
1889: }
3.123 scop 1890: undef $path;
3.120 scop 1891:
1892: # And the last "Directory" before "annotate" is the top level.
3.174 scop 1893: print CVS_IN "Directory .\n";
1894: print CVS_IN "$cvsroot\n";
3.120 scop 1895:
3.174 scop 1896: print CVS_IN "annotate\n";
3.120 scop 1897:
1898: # OK, we've sent our command to the server. Thing to do is to
3.215 scop 1899: # close the writer side and get all the responses.
1900: if (!close(CVS_IN)) {
3.229 scop 1901: $h->finish();
3.215 scop 1902: fatal('500 Internal Error',
1903: 'Annotate failure (exit status %s): <code>%s</code>, output: ' .
1904: '<pre>%s</pre>', $? >> 8, $!, $annotate_err);
1905: }
3.120 scop 1906:
3.133 scop 1907: navigateHeader($scriptwhere, $pathname, $filename, $rev, 'annotate');
3.120 scop 1908:
3.136 scop 1909: print '<h3 style="text-align: center">Annotation of ',
1910: htmlquote("$pathname$filename"), ", revision $rev</h3>\n";
3.120 scop 1911:
1912: # Ready to get the responses from the server.
1913: # For example:
1914: # E Annotations for foo/xx
1915: # E ***************
1916: # M 1.3 (kingdon 06-Sep-97): hello
1917: # ok
1918: my ($lineNr) = 0;
1919: my ($oldLrev, $oldLusr) = ("", "");
1920: my ($revprint, $usrprint);
1921:
1922: if ($annTable) {
3.179 scop 1923: print <<EOF;
1924: <table style="border: none" cellspacing="0" cellpadding="0" summary="Annotation">
1925: EOF
3.120 scop 1926: } else {
1927: print "<pre>";
1928: }
1929:
1930: # prefetch several lines
3.174 scop 1931: my @buf = head(*CVS_OUT);
3.120 scop 1932:
1933: my %d = scan_directives(@buf);
1934:
3.174 scop 1935: while (@buf || !eof(*CVS_OUT)) {
3.197 scop 1936:
3.174 scop 1937: $_ = @buf ? shift @buf : <CVS_OUT>;
3.120 scop 1938: my @words = split;
1939:
1940: # Adding one is for the (single) space which follows $words[0].
1941: my $rest = substr($_, length($words[0]) + 1);
1942: if ($words[0] eq "E") {
1943: next;
1944: } elsif ($words[0] eq "M") {
1945: $lineNr++;
1946: (my $lrev = substr($_, 2, 13)) =~ y/ //d;
1947: (my $lusr = substr($_, 16, 9)) =~ y/ //d;
1948: my $line = substr($_, 36);
1949: my $isCurrentRev = ($rev eq $lrev);
1950:
1951: # we should parse the date here ..
1952: if ($lrev eq $oldLrev) {
1953: $revprint = sprintf('%-8s', '');
1954: } else {
1955: $revprint = sprintf('%-8s', $lrev);
1956: $revprint =~ s`\S+`&link($&, "$scriptwhere$query#rev$&")`e; # `
1957: $oldLusr = '';
1958: }
1959:
1960: if ($lusr eq $oldLusr) {
1961: $usrprint = '';
1962: } else {
1963: $usrprint = $lusr;
1964: }
1965: $oldLrev = $lrev;
1966: $oldLusr = $lusr;
1967:
1968: # Set bold for text-based browsers only - graphical
1969: # browsers show bold fonts a bit wider than regular fonts,
1970: # so it looks irregular.
1971: print "<b>" if ($isCurrentRev && $is_textbased);
1972:
3.136 scop 1973: $usrprint = sprintf('%-8s', $usrprint);
1974: printf '%s%s %s %4d:', $revprint, $isCurrentRev ? '!' : ' ',
1975: htmlquote($usrprint), $lineNr;
3.120 scop 1976: print spacedHtmlText($line, $d{'tabstop'});
1977:
1978: print "</b>" if ($isCurrentRev && $is_textbased);
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.219 scop 2153: print "Version: <b>$rev</b><br />\n";
3.208 scop 2154: print "Tag: <b>", $input{only_with_tag}, "</b><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:
2314: # apply special options
2315: if ($showfunc) {
2316: push @difftype, '-p' if $f ne 's';
2317:
2318: my ($re1, $re2);
2319:
2320: while (($re1, $re2) = each %funcline_regexp) {
3.222 scop 2321: if ($fullname =~ $re1) {
3.120 scop 2322: push @difftype, '-F', $re2;
2323: last;
2324: }
2325: }
2326: }
2327:
2328: if ($human_readable) {
2329: if ($hr_ignwhite) {
2330: push @difftype, '-w';
2331: }
2332: if ($hr_ignkeysubst) {
2333: push @difftype, '-kk';
2334: }
2335: }
2336:
3.175 scop 2337: my $fh = do { local (*FH); };
3.120 scop 2338: if (!open($fh, "-|")) { # child
2339: open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
2340: openOutputFilter();
3.166 scop 2341: exec($CMD{rcsdiff}, @rcsdiff_options, @difftype, "-r$rev1", "-r$rev2",
2342: $fullname) or exit -1;
3.120 scop 2343: }
3.166 scop 2344:
3.120 scop 2345: if ($human_readable) {
3.168 scop 2346: #
2347: # Human readable diff.
2348: #
2349: human_readable_diff($fh, $rev2);
2350: html_footer();
2351: gzipclose();
2352: exit;
2353:
2354: } elsif ($f =~ /^([ucs])c$/) {
2355: #
2356: # Enscript colored diff.
2357: #
2358: my $hl = 'diff';
2359: $hl .= $1 if ($1 eq 'u' || $1 eq 's');
2360: (my $where_nd = $where) =~ s/\.diff$//;
2361: (my $pathname = $where_nd) =~ s|(Attic\/)?[^/]*$||;
2362: (my $filename = $where_nd) =~ s|^.*/||;
2363: (my $swhere = $scriptwhere) =~ s|\.diff$||;
2364: navigateHeader($swhere, $pathname, $filename, $rev2, 'diff');
2365: printf(<<EOF, $where_nd, $rev1, $rev2);
2366: <h3 style="text-align: center">Diff for /%s between versions %s and %s</h3>
2367: <pre>
2368: EOF
3.240 ! scop 2369: doEnscript(\$fh, $hl, 0, 'cvsweb_diff');
3.168 scop 2370: print <<EOF;
2371: </pre>
3.208 scop 2372: <hr style="width: 100%" />
3.168 scop 2373: <form method="get" action="$scriptwhere">
2374: EOF
2375: printDiffSelectStickyVars();
2376: print 'Diff format: ';
2377: printDiffSelect($use_java_script);
3.208 scop 2378: print "<input type=\"submit\" value=\"Show\" />\n</form>\n";
3.120 scop 2379: html_footer();
2380: gzipclose();
2381: exit;
3.168 scop 2382:
3.120 scop 2383: } else {
3.168 scop 2384: #
2385: # Plain diff.
2386: #
3.120 scop 2387: http_header("text/plain");
2388: }
2389:
2390: #
2391: #===================================================================
2392: #RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
2393: #retrieving revision 1.16
2394: #retrieving revision 1.17
2395: #diff -c -r1.16 -r1.17
2396: #*** /home/ncvs/src/sys/netinet/tcp_output.c 1995/11/03 22:08:08 1.16
2397: #--- /home/ncvs/src/sys/netinet/tcp_output.c 1995/12/05 17:46:35 1.17
2398: #
2399: # Ideas:
2400: # - nuke the stderr output if it's what we expect it to be
2401: # - Add "no differences found" if the diff command supplied no output.
2402: #
2403: #*** src/sys/netinet/tcp_output.c 1995/11/03 22:08:08 1.16
2404: #--- src/sys/netinet/tcp_output.c 1995/12/05 17:46:35 1.17 RELENG_2_1_0
2405: # (bogus example, but...)
2406: #
3.175 scop 2407: my ($f1, $f2);
3.120 scop 2408: if (grep { $_ eq '-u' } @difftype) {
2409: $f1 = '---';
2410: $f2 = '\+\+\+';
2411: } else {
2412: $f1 = '\*\*\*';
2413: $f2 = '---';
2414: }
2415:
2416: while (<$fh>) {
2417: if (m|^$f1 $cvsroot|o) {
2418: s|$cvsroot/||o;
2419: if ($sym1) {
2420: chop;
2421: $_ .= " $sym1\n";
2422: }
2423: } elsif (m|^$f2 $cvsroot|o) {
2424: s|$cvsroot/||o;
2425:
2426: if ($sym2) {
2427: chop;
2428: $_ .= " $sym2\n";
2429: }
2430: }
2431: print $_;
2432: }
2433: close($fh);
1.12 fenner 2434: }
2435:
3.175 scop 2436:
3.1 knu 2437: ###############################
2438: # Show Logs ..
2439: ###############################
3.120 scop 2440: sub getDirLogs($$@)
2441: {
2442: my ($cvsroot, $dirname, @otherFiles) = @_;
3.139 scop 2443: my $tag = $input{only_with_tag};
3.196 scop 2444: my $DirName = catdir($cvsroot, $where);
3.120 scop 2445:
3.139 scop 2446: my @files = &safeglob("$DirName/*,v");
2447: push (@files, &safeglob("$DirName/Attic/*,v")) if (!$input{'hideattic'});
3.120 scop 2448: foreach my $file (@otherFiles) {
3.196 scop 2449: push(@files, catfile($DirName, $file));
3.120 scop 2450: }
2451:
3.150 scop 2452: # Weed out unreadable files.
2453: my $i = 0;
2454: my @unreadable = ();
2455: while ($i < scalar(@files)) {
3.197 scop 2456: # Note: last modified files from subdirs returned by
2457: # findLastModifiedSubdirs() come without the ,v suffix so they're not
2458: # found here, but have already been checked for readability. *cough*
2459: if (-r $files[$i] || !-e _) {
3.150 scop 2460: $i++;
2461: } else {
2462: push(@unreadable, splice(@files, $i, 1));
2463: }
2464: }
2465:
3.139 scop 2466: # If there are no files, we're done.
3.150 scop 2467: return @unreadable unless @files;
3.120 scop 2468:
3.139 scop 2469: my @cmd = ($CMD{rlog});
2470: # Can't use -r<tag> as '-' is allowed in tagnames,
2471: # but misinterpreted by rlog.
2472: push(@cmd, '-r') unless defined($tag);
3.120 scop 2473:
3.139 scop 2474: my $fh = do { local (*FH); };
2475: if (!open($fh, '-|')) { # Child
3.165 scop 2476: open(STDERR, '>', devnull()); # Ignore rlog's complaints.
3.139 scop 2477: openOutputFilter();
2478: if ($file_list_len && $file_list_len > 1) {
2479: while (scalar(@files) > $file_list_len) { # Process files in chunks.
2480: system(@cmd, splice(@files, 0, $file_list_len)) == 0 or exit -1;
2481: }
3.120 scop 2482: }
3.139 scop 2483: exec(@cmd, @files) or exit -1;
2484: }
2485: undef @cmd;
3.120 scop 2486:
3.139 scop 2487: my $state = 'start';
2488: my ($date, $branchpoint, $branch, $log, @filetags);
3.152 scop 2489: my ($rev, $revision, $revwanted, $filename, $head, $author, $keywordsubst);
3.120 scop 2490:
2491: while (<$fh>) {
2492: if ($state eq "start") {
2493:
2494: #Next file. Initialize file variables
2495: $rev = '';
2496: $revwanted = '';
2497: $branch = '';
2498: $branchpoint = '';
2499: $filename = '';
2500: $log = '';
2501: $revision = '';
2502: %symrev = ();
2503: @filetags = ();
3.152 scop 2504: $keywordsubst= '';
3.120 scop 2505:
2506: #jump to head state
2507: $state = "head";
2508: }
3.144 scop 2509:
3.120 scop 2510: again:
2511:
2512: if ($state eq "head") {
2513:
2514: #$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet)
2515:
2516: if (/^Working file: (.+)$/) {
2517: $filename = $1;
2518: } elsif (/^head: (.+)$/) {
2519: $head = $1;
2520: } elsif (/^branch: (.+)$/) {
2521: $branch = $1;
3.152 scop 2522: } elsif (/^keyword substitution: (.+)$/) {
2523: $keywordsubst = $1;
3.120 scop 2524: } elsif (/^symbolic names:/) {
2525: $state = "tags";
2526: ($branch = $head) =~ s/\.\d+$//
2527: if $branch eq '';
2528: $branch =~ s/(\d+)$/0.$1/;
2529: $symrev{MAIN} = $branch;
2530: $symrev{HEAD} = $branch;
2531: $alltags{MAIN} = 1;
2532: $alltags{HEAD} = 1;
2533: push (@filetags, "MAIN", "HEAD");
3.222 scop 2534: } elsif ($_ =~ LOG_REVSEPR) {
3.120 scop 2535: $state = "log";
2536: $rev = '';
2537: $date = '';
2538: $log = '';
2539:
2540: # Try to reconstruct the relative filename if RCS spits out a full path
2541: $filename =~ s%^\Q$DirName\E/%%;
2542: }
2543: next;
2544: }
2545:
2546: if ($state eq "tags") {
2547: if (/^\s+([^:]+):\s+([\d\.]+)\s*$/) {
2548: push (@filetags, $1);
2549: $symrev{$1} = $2;
2550: $alltags{$1} = 1;
2551: next;
2552: } elsif (/^\S/) {
2553:
2554: if (defined($tag)) {
2555: if (defined($symrev{$tag}) || $tag eq "HEAD") {
2556: $revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};
2557: ($branch = $revwanted) =~ s/\b0\.//;
2558: ($branchpoint = $branch) =~ s/\.?\d+$//;
2559: $revwanted = '' if ($revwanted ne $branch);
2560: } elsif ($tag ne "HEAD") {
2561: $state = "skip";
2562: next;
2563: }
2564: }
2565:
2566: foreach my $tagfound (@filetags) {
2567: $tags{$tagfound} = 1;
2568: }
2569: $state = "head";
2570: goto again;
2571: }
2572: }
2573:
2574: if ($state eq "log") {
3.222 scop 2575: if ($_ =~ LOG_REVSEPR || $_ =~ LOG_FILESEPR) {
3.120 scop 2576:
2577: # End of a log entry.
2578: my $revbranch = $rev;
2579: $revbranch =~ s/\.\d+$//;
2580:
2581: if ($revwanted eq '' && $branch ne '' && $branch eq $revbranch
2582: || !defined($tag))
2583: {
2584: $revwanted = $rev;
2585: }
2586:
2587: if ($revwanted ne ''
2588: ? $rev eq $revwanted
2589: : $branchpoint ne ''
2590: ? $rev eq $branchpoint
2591: : 0
2592: && ($rev eq $head))
2593: { # Don't think head is needed here..
3.152 scop 2594: my @finfo = ($rev, $date, $log, $author, $filename, $keywordsubst);
2595: (my $name = $filename) =~ s%/.*%%;
3.120 scop 2596: $fileinfo{$name} = [@finfo];
2597: $state = "done" if ($rev eq $revwanted);
2598: }
2599: $rev = '';
2600: $date = '';
2601: $log = '';
2602: } elsif ($date eq ''
2603: && m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);|)
2604: {
3.172 scop 2605: my $yr = $1;
2606: $yr -= 1900 if ($yr > 100); # Damn 2-digit year routines :-)
2607: $date = timegm($6, $5, $4, $3, $2 - 1, $yr);
3.120 scop 2608: ($author) = /author: ([^;]+)/;
3.172 scop 2609: $state = 'log';
2610: $log = '';
3.120 scop 2611: next;
2612: } elsif ($rev eq '' && /^revision (\d+(?:\.\d+)+).*$/) {
2613: $rev = $1; # .*$ eats up the locker(lockers?) info, if any
2614: next;
2615: } else {
2616: $log .= $_;
2617: }
2618: }
2619:
3.222 scop 2620: if ($_ =~ LOG_FILESEPR) {
3.120 scop 2621: $state = "start";
2622: next;
2623: }
2624: }
2625:
3.139 scop 2626: my $linesread = $. || 0;
2627: close($fh);
2628:
2629: if ($linesread == 0) {
3.137 scop 2630: fatal('500 Internal Error',
3.230 scop 2631: '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>")',
2632: htmlquote(join(', ', @files)), join(':', @command_path));
3.120 scop 2633: }
3.150 scop 2634:
2635: return @unreadable;
3.120 scop 2636: }
2637:
3.175 scop 2638:
3.120 scop 2639: sub readLog($;$)
2640: {
2641: my ($fullname, $revision) = @_;
2642: my ($symnames, $head, $rev, $br, $brp, $branch, $branchrev);
2643:
3.144 scop 2644: $revision = defined($revision) ? "-r$revision" : '';
3.120 scop 2645:
2646: undef %symrev;
2647: undef %revsym;
2648: undef @allrevisions;
2649: undef %date;
2650: undef %author;
2651: undef %state;
2652: undef %difflines;
2653: undef %log;
3.152 scop 2654: $keywordsubstitution = '';
3.120 scop 2655:
3.175 scop 2656: my $fh = do { local (*FH); };
3.120 scop 2657: if (!open($fh, "-|")) { # child
2658: if ($revision ne '') {
2659: openOutputFilter();
2660: exec($CMD{rlog}, $revision, $fullname) or exit -1;
2661: } else {
2662: openOutputFilter();
2663: exec($CMD{rlog}, $fullname) or exit -1;
2664: }
2665: }
2666:
3.217 scop 2667: my $curbranch = undef;
3.120 scop 2668: while (<$fh>) {
2669: if ($symnames) {
2670: if (/^\s+([^:]+):\s+([\d\.]+)/) {
2671: $symrev{$1} = $2;
3.152 scop 2672: next;
3.120 scop 2673: } else {
2674: $symnames = 0;
2675: }
3.152 scop 2676: }
2677: if (/^head:\s+([\d\.]+)/) {
3.120 scop 2678: $head = $1;
2679: } elsif (/^branch:\s+([\d\.]+)/) {
2680: $curbranch = $1;
2681: } elsif (/^symbolic names/) {
2682: $symnames = 1;
3.152 scop 2683: } elsif (/^keyword substitution: (.+)$/) {
2684: $keywordsubstitution = $1;
3.120 scop 2685: } elsif (/^-----/) {
2686: last;
2687: }
2688: }
2689: ($curbranch = $head) =~ s/\.\d+$// if (!defined($curbranch));
2690:
2691: # each log entry is of the form:
2692: # ----------------------------
2693: # revision 3.7.1.1
2694: # date: 1995/11/29 22:15:52; author: fenner; state: Exp; lines: +5 -3
2695: # log info
2696: # ----------------------------
2697:
2698: # For a locked revision, the first line after the separator
2699: # becomes smth like
3.149 scop 2700: # revision 9.19 locked by: vassilii;
3.120 scop 2701:
2702: logentry:
2703:
3.222 scop 2704: while ($_ !~ LOG_FILESEPR) {
3.120 scop 2705: $_ = <$fh>;
2706: last logentry if (!defined($_)); # EOF
2707: if (/^revision (\d+(?:\.\d+)+)/) {
2708: $rev = $1;
2709: unshift (@allrevisions, $rev);
3.222 scop 2710: } elsif ($_ =~ LOG_FILESEPR || $_ =~ LOG_REVSEPR) {
3.120 scop 2711: next logentry;
2712: } else {
2713:
2714: # The rlog output is syntactically ambiguous. We must
2715: # have guessed wrong about where the end of the last log
2716: # message was.
2717: # Since this is likely to happen when people put rlog output
2718: # in their commit messages, don't even bother keeping
2719: # these lines since we don't know what revision they go with
2720: # any more.
2721: next logentry;
2722: }
2723: $_ = <$fh>;
2724: if (
2725: m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);\s+state:\s+(\S+);\s+(lines:\s+([0-9\s+-]+))?|
2726: )
2727: {
3.172 scop 2728: my $yr = $1;
2729: $yr -= 1900 if ($yr > 100); # Damn 2-digit year routines :-)
2730: $date{$rev} = timegm($6, $5, $4, $3, $2 - 1, $yr);
3.120 scop 2731: $author{$rev} = $7;
2732: $state{$rev} = $8;
2733: $difflines{$rev} = $10;
2734: } else {
2735: fatal("500 Internal Error", 'Error parsing RCS output: %s', $_);
2736: }
2737:
2738: line:
2739: while (<$fh>) {
2740: next line if (/^branches:\s/);
3.222 scop 2741: last line if ($_ =~ LOG_FILESEPR || $_ =~ LOG_REVSEPR);
3.120 scop 2742: $log{$rev} .= $_;
2743: }
2744: }
2745: close($fh);
2746:
2747: @revorder = reverse sort { revcmp($a, $b) } @allrevisions;
2748:
2749: #
2750: # HEAD is an artificial tag which is simply the highest tag number on the main
2751: # branch, unless there is a branch tag in the RCS file in which case it's the
2752: # highest revision on that branch. Find it by looking through @revorder; it
2753: # is the first commit listed on the appropriate branch.
2754: # This is not neccesary the same revision as marked as head in the RCS file.
2755: my $headrev = $curbranch || "1";
2756: ($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/;
2757:
2758: foreach $rev (@revorder) {
2759: if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
2760: $symrev{"HEAD"} = $rev;
2761: last;
2762: }
2763: }
2764: ($symrev{"HEAD"} = $headrev) =~ s/\.\d+$//
2765: if (!defined($symrev{"HEAD"}));
2766:
2767: #
2768: # Now that we know all of the revision numbers, we can associate
2769: # absolute revision numbers with all of the symbolic names, and
2770: # pass them to the form so that the same association doesn't have
2771: # to be built then.
2772: #
2773: undef @branchnames;
2774: undef %branchpoint;
2775: undef $sel;
2776:
2777: foreach (reverse sort keys %symrev) {
2778: $rev = $symrev{$_};
2779: if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
2780: push (@branchnames, $_);
2781:
2782: #
2783: # A revision number of A.B.0.D really translates into
2784: # "the highest current revision on branch A.B.D".
2785: #
2786: # If there is no branch A.B.D, then it translates into
2787: # the head A.B .
2788: #
2789: # This reasoning also applies to the main branch A.B,
2790: # with the branch number 0.A, with the exception that
2791: # it has no head to translate to if there is nothing on
2792: # the branch, but I guess this can never happen?
2793: #
2794: # (the code below gracefully forgets about the branch
2795: # if it should happen)
2796: #
2797: $head = defined($2) ? $2 : "";
2798: $branch = $3;
2799: $branchrev = $head . ($head ne "" ? "." : "") . $branch;
3.222 scop 2800: $rev = $head;
2801:
2802: my $regex = '^' . quotemeta($branchrev) . '\b';
2803: $regex = qr/$regex/;
3.120 scop 2804:
2805: foreach my $r (@revorder) {
3.222 scop 2806: if ($r =~ $regex) {
3.120 scop 2807: $rev = $branchrev;
2808: last;
2809: }
2810: }
2811: next if ($rev eq "");
2812:
2813: if ($rev ne $head && $head ne "") {
3.131 scop 2814: $branchpoint{$head} .= ', ' if ($branchpoint{$head});
3.120 scop 2815: $branchpoint{$head} .= $_;
2816: }
2817: }
2818: $revsym{$rev} .= ", " if ($revsym{$rev});
2819: $revsym{$rev} .= $_;
3.136 scop 2820: $sel .= sprintf("<option value=\"%s:%s\">%s</option>\n",
2821: htmlquote($rev), (htmlquote($_)) x 2);
3.120 scop 2822: }
2823:
2824: my ($onlyonbranch, $onlybranchpoint);
2825: if ($onlyonbranch = $input{'only_with_tag'}) {
2826: $onlyonbranch = $symrev{$onlyonbranch};
2827: if ($onlyonbranch =~ s/\b0\.//) {
2828: ($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
2829: } else {
2830: $onlybranchpoint = $onlyonbranch;
2831: }
2832:
2833: if (!defined($onlyonbranch) || $onlybranchpoint eq "") {
2834: fatal("404 Tag not found", 'Tag %s not defined',
3.131 scop 2835: $input{'only_with_tag'});
3.120 scop 2836: }
2837: }
2838:
2839: undef @revisions;
2840:
2841: foreach (@allrevisions) {
2842: ($br = $_) =~ s/\.\d+$//;
2843: ($brp = $br) =~ s/\.\d+$//;
2844: next if ($onlyonbranch
2845: && $br ne $onlyonbranch
2846: && $_ ne $onlybranchpoint);
2847: unshift (@revisions, $_);
2848: }
2849:
2850: if ($logsort eq "date") {
2851:
2852: # Sort the revisions in commit order an secondary sort on revision
2853: # (secondary sort needed for imported sources, or the first main
2854: # revision gets before the same revision on the 1.1.1 branch)
2855: @revdisplayorder =
2856: sort { $date{$b} <=> $date{$a} || -revcmp($a, $b) } @revisions;
2857: } elsif ($logsort eq "rev") {
2858:
2859: # Sort the revisions in revision order, highest first
2860: @revdisplayorder = reverse sort { revcmp($a, $b) } @revisions;
2861: } else {
2862:
2863: # No sorting. Present in the same order as rlog / cvs log
2864: @revdisplayorder = @revisions;
2865: }
2866:
3.217 scop 2867: return $curbranch;
3.120 scop 2868: }
2869:
3.175 scop 2870:
3.225 scop 2871: sub getDiffLinks($$$)
3.120 scop 2872: {
3.225 scop 2873: my ($url, $mimetype, $isbin) = @_;
2874:
2875: my @links = ();
2876: if (!$isbin) { # Offer ordinary diff only for non-binary files.
2877: push(@links, &link('preferred', $url));
2878: for my $difftype ($DIFFTYPES{$defaultDiffType}{colored} ? qw(u) : qw(h)) {
2879: my $f = $difftype eq $defaultDiffType ? '' : $difftype;
2880: push(@links,
2881: &link(htmlquote(lc($DIFFTYPES{$difftype}{descr})), "$url;f=$f"));
2882: }
2883: }
2884: if (my $extdiffs = $DIFF_COMMANDS{lc($mimetype)}) {
2885: for my $i (0 .. scalar(@$extdiffs)-1) {
2886: my $extdiff = $extdiffs->[$i];
2887: push(@links, &link(htmlquote($extdiff->{name}), "$url;f=ext$i"))
2888: if ($extdiff->{cmd} && $extdiff->{name});
2889: }
3.120 scop 2890: }
3.225 scop 2891: return @links;
3.120 scop 2892: }
2893:
3.175 scop 2894:
3.219 scop 2895: sub printLog($$$;$$)
3.120 scop 2896: {
3.219 scop 2897: # inlogview: 1 if in log view, otherwise in markup view.
2898: ($_, my $mimetype, my $isbin, my $inlogview, my $isSelected) = @_;
3.175 scop 2899: (my $br = $_) =~ s/\.\d+$//;
2900: (my $brp = $br) =~ s/\.?\d+$//;
3.120 scop 2901:
3.131 scop 2902: my $isDead = ($state{$_} eq 'dead');
2903:
3.219 scop 2904: (my $filename = $where) =~ s/^.*\///;
2905: my $fileurl = urlencode($filename);
3.120 scop 2906:
3.219 scop 2907: print "<a name=\"rev$_\"></a>";
2908: if (defined($revsym{$_})) {
2909: foreach my $sym (split (", ", $revsym{$_})) {
2910: print '<a name="', hrefquote($sym), '"></a>';
3.120 scop 2911: }
3.219 scop 2912: }
2913: if ($revsym{$br} && !defined($nameprinted{$br})) {
2914: foreach my $sym (split (", ", $revsym{$br})) {
2915: print '<a name="', hrefquote($sym), '"></a>';
3.120 scop 2916: }
3.219 scop 2917: $nameprinted{$br} = 1;
2918: }
3.120 scop 2919:
3.219 scop 2920: printf "\n Revision <b>%s</b>", htmlquote($_);
2921: if (/^1\.1\.1\.\d+$/) {
2922: print " <i>(vendor branch)</i>";
2923: }
2924: if (!$isDead) {
3.220 scop 2925: print ': ', download_link($fileurl, $_, 'download', $mimetype);
3.219 scop 2926:
2927: my @vlinks = ();
2928: push(@vlinks, display_link($fileurl, $_, 'text', 'text/plain'))
2929: unless $isbin;
2930: push(@vlinks, display_link($fileurl, $_, 'markup', 'text/x-cvsweb-markup'))
2931: if ($allow_markup && $inlogview && (!$isbin || viewable($mimetype)));
2932: if (!$isbin) {
2933: push(@vlinks,
2934: &link('annotated',
2935: sprintf('%s/%s?annotate=%s%s',
2936: $scriptname, urlencode($where), $_, $barequery)))
2937: if $allow_annotate;
2938: }
2939: print ' - view: ', join(', ', @vlinks) if @vlinks;
2940: undef @vlinks;
2941:
2942: if (!$isbin) {
2943: if ($inlogview && $allow_version_select) {
2944: print ' - ';
2945: if ($isSelected) {
2946: print '<b>[selected for diffs]</b>';
2947: } else {
2948: print &link('select for diffs',
2949: sprintf('%s?r1=%s%s#rev%s',
2950: $scriptwhere, $_, $barequery, $_));
2951: }
2952: } elsif ($allow_cvsgraph) {
2953: print ' - ', &graph_link('', 'graph');
3.120 scop 2954: }
2955: }
2956: }
3.219 scop 2957: print "<br />\n";
3.120 scop 2958:
3.219 scop 2959: print '<i>';
3.120 scop 2960: if (defined @mytz) {
2961: my ($est) = $mytz[(localtime($date{$_}))[8]];
3.219 scop 2962: print scalar localtime($date{$_}), " $est</i> (";
3.120 scop 2963: } else {
3.219 scop 2964: print scalar gmtime($date{$_}), " UTC</i> (";
3.120 scop 2965: }
3.136 scop 2966: print readableTime(time() - $date{$_}, 1), ' ago)';
3.208 scop 2967: print ' by <i>', htmlquote($author{$_}), "</i><br />\n";
3.136 scop 2968:
2969: if ($revsym{$br}) {
3.219 scop 2970: printf "Branches: %s<br />\n",
2971: $inlogview ? link_tags($revsym{$br}) : htmlquote($revsym{$br});
3.136 scop 2972: }
2973: if ($revsym{$_}) {
3.219 scop 2974: printf "CVS tags: %s<br />\n",
2975: $inlogview ? link_tags($revsym{$_}) : htmlquote($revsym{$_});
3.136 scop 2976: }
2977: if ($branchpoint{$_}) {
3.219 scop 2978: printf "Branch point for: %s<br />\n",
2979: $inlogview ? link_tags($branchpoint{$_}) : htmlquote($branchpoint{$_});
3.136 scop 2980: }
3.120 scop 2981:
2982: # Find the previous revision
3.175 scop 2983: my $prev;
3.120 scop 2984: my @prevrev = split (/\./, $_);
2985: do {
2986: if (--$prevrev[$#prevrev] <= 0) {
2987:
2988: # If it was X.Y.Z.1, just make it X.Y
2989: pop (@prevrev);
2990: pop (@prevrev);
2991: }
2992: $prev = join (".", @prevrev);
2993: } until (defined($date{$prev}) || $prev eq "");
2994:
2995: if ($isDead) {
3.219 scop 2996: print "<b><i>FILE REMOVED</i></b><br />\n";
2997: } elsif ($inlogview) {
3.120 scop 2998: my %diffrev = ();
2999: $diffrev{$_} = 1;
3000: $diffrev{""} = 1;
3001: my $diff = 'Diff';
3.219 scop 3002: my $printed = 0;
3.120 scop 3003:
3004: #
3005: # Offer diff to previous revision
3006: if ($prev) {
3007: $diffrev{$prev} = 1;
3008: my $url =
3.203 scop 3009: sprintf('%s.diff?r1=%s;r2=%s%s', $scriptwhere, $prev, $_, $barequery);
3.225 scop 3010: if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
3011: print $diff, ' to previous ', $prev, ': ', 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 a diff with the branch point.
3019: if ($revsym{$brp}
3020: && !/^1\.1\.1\.\d+$/
3021: && !defined($diffrev{$brp}))
3022: {
3023: my $url =
3.203 scop 3024: sprintf('%s.diff?r1=%s;r2=%s%s', $scriptwhere, $brp, $_, $barequery);
3.225 scop 3025: if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
3026: print $diff, ' to branchpoint ', $brp, ': ', join(', ', @dlinks);
3027: $diff = ''; $printed = 1;
3028: }
3.120 scop 3029: }
3030:
3031: #
3032: # Plus, if it's on a branch, and it's not a vendor branch,
3033: # offer to diff with the next revision of the higher branch.
3034: # (e.g. change gets committed and then brought
3035: # over to -stable)
3036: if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) {
3037: my ($i, $nextmain);
3038:
3039: for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++) {
3040: }
3041: my @tmp2 = split (/\./, $_);
3042: for ($nextmain = ""; $i > 0; $i--) {
3043: my $next = $revorder[$i - 1];
3044: my @tmp1 = split (/\./, $next);
3045:
3046: if (@tmp1 < @tmp2) {
3047: $nextmain = $next;
3048: last;
3049: }
3050:
3051: # Only the highest version on a branch should have
3052: # a diff for the "next main".
3053: last
3054: if (@tmp1 - 1 <= @tmp2
3055: && join (".", @tmp1[0 .. $#tmp1 - 1]) eq
3056: join (".", @tmp2[0 .. $#tmp1 - 1]));
3057: }
3058:
3059: if (!defined($diffrev{$nextmain})) {
3060: $diffrev{$nextmain} = 1;
3.203 scop 3061: my $url = sprintf('%s.diff?r1=%s;r2=%s%s',
3.120 scop 3062: $scriptwhere, $nextmain, $_, $barequery);
3.225 scop 3063: if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
3064: print $diff, ' next main ', $nextmain, ': ', join(', ', @dlinks);
3065: $diff = ''; $printed = 1;
3066: }
3.120 scop 3067: }
3068: }
3069:
3070: # Plus if user has selected only r1, then present a link
3071: # to make a diff to that revision
3072: if (defined($input{"r1"}) && !defined($diffrev{$input{"r1"}})) {
3073: $diffrev{$input{"r1"}} = 1;
3.203 scop 3074: my $url = sprintf('%s.diff?r1=%s;r2=%s%s',
3.120 scop 3075: $scriptwhere, $input{'r1'}, $_, $barequery);
3.225 scop 3076: if (my @dlinks = getDiffLinks($url, $mimetype, $isbin)) {
3077: print $diff, ' to selected ', $input{r1}, ': ', join(', ', @dlinks);
3078: $diff = ''; $printed = 1;
3079: }
3.120 scop 3080: }
3081:
3.219 scop 3082: print "<br />\n" if $printed;
3083: }
3084:
3085: if ($prev ne "" && $difflines{$_}) {
3086: printf "Changes since revision %s: %s lines<br />\n",
3087: htmlquote($prev), htmlquote($difflines{$_});
3.120 scop 3088: }
3.189 scop 3089:
3.219 scop 3090: print "<pre class=\"log\">\n";
3.120 scop 3091: print &htmlify($log{$_}, $allow_log_extra);
3092: print "</pre>\n";
3093: }
3094:
3.175 scop 3095:
3.132 scop 3096: #
3097: # Generates the HTML view for CvsGraph.
3098: #
3.170 scop 3099: sub doGraphView()
3.132 scop 3100: {
3101: (my $pathname = $where) =~ s|[^/]*$||;
3102: (my $filename = $where) =~ s|^.*/||;
3103:
3.170 scop 3104: navigateHeader($scriptwhere, $pathname, $filename, undef, 'graph');
3.132 scop 3105:
3.146 scop 3106: my $title = 'Revision graph of ' . htmlquote($pathname . $filename);
3.132 scop 3107: my $mapname = 'CvsGraphMap';
3108:
3.170 scop 3109: printf(<<EOF, $title, $mapname, $cvstree, $title);
3.146 scop 3110: <h3 style="text-align: center">%s</h3>
3.219 scop 3111: <div style="text-align: center"><img border="0" usemap="#%s" src="?cvsroot=%s;graph=1;makeimage=1" alt="%s" />
3.146 scop 3112: EOF
3.132 scop 3113:
3.181 scop 3114: my $qquery = hrefquote($barequery);
3.135 scop 3115: my @graph_cmd =
3116: ($CMD{cvsgraph},
3117: '-r', $cvsroot,
3118: '-i',
3119: '-M', $mapname,
3.208 scop 3120: '-x', 'x',
3.181 scop 3121: "-Omap_branch_href=\"href=\\\"./?only_with_tag=%(%t%)$qquery\\\"\"",
3.219 scop 3122: "-Omap_rev_href=\"href=\\\"?rev=%(%R%)$qquery\\\"\"",
3.146 scop 3123: "-Omap_diff_href=\"href=\\\"%(%F%).diff" .
3.203 scop 3124: "?r1=%(%P%);r2=%(%R%)$qquery\\\"\"",
3.135 scop 3125: );
3.132 scop 3126: push(@graph_cmd, '-c', $cvsgraph_config) if $cvsgraph_config;
3.174 scop 3127: push(@graph_cmd, catfile($pathname, $filename . ',v'));
3.132 scop 3128:
3.174 scop 3129: local *CVSGRAPH_OUT;
3130: my ($h, $err) =
3.229 scop 3131: startproc(\@graph_cmd, \"", '>pipe', \*CVSGRAPH_OUT);
3.174 scop 3132: fatal('500 Internal Error', $err) unless $h;
3133: {
3134: local $/ = undef;
3135: print <CVSGRAPH_OUT>;
3.132 scop 3136: }
3.229 scop 3137: $h->finish();
3.219 scop 3138: print "</div>\n";
3.132 scop 3139:
3140: html_footer();
3141: }
3142:
3.175 scop 3143:
3.132 scop 3144: #
3145: # Generates a graph using CvsGraph.
3146: #
3.170 scop 3147: sub doGraph()
3.132 scop 3148: {
3149: (my $pathname = $where) =~ s|[^/]*$||;
3150: (my $filename = $where) =~ s|^.*/||;
3151:
3152: http_header('image/png');
3153:
3154: my @graph_cmd = ($CMD{cvsgraph}, '-r', $cvsroot);
3155: push(@graph_cmd, '-c', $cvsgraph_config) if $cvsgraph_config;
3.174 scop 3156: push(@graph_cmd, catfile($pathname, $filename . ',v'));
3.132 scop 3157:
3.174 scop 3158: local *CVSGRAPH_OUT;
3159: my ($h, $err) =
3.229 scop 3160: startproc(\@graph_cmd, \"", '>pipe', \*CVSGRAPH_OUT);
3.174 scop 3161: fatal('500 Internal Error', $err) unless $h;
3.132 scop 3162: {
3163: local $/ = undef;
3164: binmode(\*STDOUT);
3.174 scop 3165: print <CVSGRAPH_OUT>;
3.132 scop 3166: }
3.229 scop 3167: $h->finish();
3.132 scop 3168: }
3169:
3170:
3.120 scop 3171: sub doLog($)
3172: {
3173: my ($fullname) = @_;
3174:
3.217 scop 3175: my $curbranch = readLog($fullname);
3.120 scop 3176:
3177: html_header("CVS log for $where");
3.144 scop 3178:
3179: (my $upwhere = $where) =~ s|(Attic/)?[^/]+$||;
3180: (my $filename = $where) =~ s|^.*/||;
3181: my $backurl = $scriptname . "/" . urlencode($upwhere) . $query;
3182:
3.219 scop 3183: my $isbin = $keywordsubstitution =~ /b/;
3184: my $mimetype = getMimeType($filename, $isbin);
3185:
3.120 scop 3186: print "<p>\n ";
3187: print &link($backicon, "$backurl#$filename"), " <b>Up to ",
3188: &clickablePath($upwhere, 1), "</b>\n</p>\n";
3189: print "<p>\n ";
3190: print &link('Request diff between arbitrary revisions', '#diff');
3.132 scop 3191: if ($allow_cvsgraph) {
3.219 scop 3192: print ' - ', &graph_link('', 'Display revisions graphically');
3.132 scop 3193: }
3.208 scop 3194: print "\n</p>\n<hr />\n";
3.120 scop 3195:
3196: print "<p>\n";
3.152 scop 3197:
3.219 scop 3198: my $explain = $isbin ? ' (i.e.: CVS considers this a binary file)' : '';
3.208 scop 3199: print "Keyword substitution: $keywordsubstitution$explain<br />\n";
3.217 scop 3200: if ($curbranch) {
3201: print "Default branch: ", ($revsym{$curbranch} || $curbranch);
3202: } else {
3203: print "No default branch";
3204: }
3.208 scop 3205: print "<br />\n";
3.120 scop 3206:
3.208 scop 3207: print 'Current tag: ', htmlquote($input{only_with_tag}), "<br />\n"
3.153 scop 3208: if $input{only_with_tag};
3.120 scop 3209: print "</p>\n";
3210:
3211: undef %nameprinted;
3212:
3.182 scop 3213: for my $r (@revdisplayorder) {
3.208 scop 3214: print "<hr />\n";
3.182 scop 3215: my $sel = (defined($input{r1}) && $input{r1} eq $r);
3216: print "<div class=\"diff-selected\">\n" if $sel;
3.219 scop 3217: printLog($r, $mimetype, $isbin, 1, $sel);
3.182 scop 3218: print "</div>\n" if $sel;
3.120 scop 3219: }
3220:
3.144 scop 3221: printf(<<EOF, $scriptwhere);
3.208 scop 3222: <hr />
3223: <form method="get" action="%s.diff" id="diff_select">
3.189 scop 3224: <fieldset>
3225: <legend>Diff request</legend>
3.144 scop 3226: <p>
3227: <a name="diff">
3.189 scop 3228: This form allows you to request diffs between any two revisions of a file.
3.144 scop 3229: You may select a symbolic revision name using the selection box or you may
3230: type in a numeric name using the type-in text box.
3231: </a>
3232: </p>
3233: EOF
3.120 scop 3234:
3235: foreach (@stickyvars) {
3.208 scop 3236: printf("<input type=\"hidden\" name=\"%s\" value=\"%s\" />\n",
3.154 scop 3237: $_, htmlquote($input{$_}))
3.194 scop 3238: if (defined($input{$_}) &&
3239: (!defined($DEFAULTVALUE{$_}) || $input{$_} ne $DEFAULTVALUE{$_}));
3.120 scop 3240: }
3.144 scop 3241:
3242: print <<EOF;
3.189 scop 3243: <table summary="Diff between arbitrary revisions">
3.144 scop 3244: <tr>
3.189 scop 3245: <td class="opt-label">
3246: <label for="r1" accesskey="1">Diffs between</label>
3247: </td>
3248: <td class="opt-value">
3.144 scop 3249: <select id="r1" name="r1">
3.208 scop 3250: <option value="text" selected="selected">Use Text Field</option>
3.144 scop 3251: EOF
3252: print $sel, "</select>\n";
3253:
3254: my $diffrev = defined($input{r1}) ?
3255: $input{r1} : $revdisplayorder[$#revdisplayorder];
3256:
3257: printf(<<EOF, $inputTextSize, $diffrev);
3.208 scop 3258: <input type="text" size="%s" name="tr1" value="%s" onchange="this.form.r1.selectedIndex=0" />
3.144 scop 3259: </td>
3.189 scop 3260: <td></td>
3261: </tr>
3262: <tr>
3263: <td class="opt-label">
3264: <label for="r2" accesskey="2">and</label>
3265: </td>
3266: <td class="opt-value">
3.144 scop 3267: <select id="r2" name="r2">
3.208 scop 3268: <option value="text" selected="selected">Use Text Field</option>
3.144 scop 3269: EOF
3270: print $sel, "</select>\n";
3271:
3272: $diffrev = defined($input{r2}) ? $input{r2} : $revdisplayorder[0];
3273:
3274: printf(<<EOF, $inputTextSize, $diffrev, $scriptwhere);
3.208 scop 3275: <input type="text" size="%s" name="tr2" value="%s" onchange="this.form.r2.selectedIndex=0" />
3.144 scop 3276: </td>
3.208 scop 3277: <td><input type="submit" value="Get Diffs" accesskey="G" /></td>
3.144 scop 3278: </tr>
3279: </table>
3.189 scop 3280: </fieldset>
3.144 scop 3281: </form>
3282: <form method="get" action="%s">
3.189 scop 3283: <fieldset>
3284: <legend>Log view options</legend>
3285: <table summary="Log view options">
3.144 scop 3286: <tr>
3.189 scop 3287: <td class="opt-label">
3288: <label for="f" accesskey="D">Preferred diff type:</label>
3289: </td>
3290: <td class="opt-value">
3.144 scop 3291: EOF
3.120 scop 3292: printDiffSelect($use_java_script);
3.144 scop 3293: print <<EOF;
3.189 scop 3294: </td>
3295: <td></td>
3.144 scop 3296: </tr>
3297: EOF
3.120 scop 3298:
3299: if (@branchnames) {
3.144 scop 3300:
3301: printf(<<EOF, $use_java_script ? ' onchange="this.form.submit()"' : '');
3302: <tr>
3.189 scop 3303: <td class="opt-label">
3.188 scop 3304: <label for="only_with_tag" accesskey="B">View only branch:</label>
3.189 scop 3305: </td>
3306: <td class="opt-value">
3307: <a name="branch">
3.144 scop 3308: <select id="only_with_tag" name="only_with_tag"%s>
3309: EOF
3.120 scop 3310:
3.193 scop 3311: my @tmp = ();
3312: my $selfound = 0;
3.120 scop 3313: foreach (reverse sort @branchnames) {
3.136 scop 3314: my $selected =
3315: (defined($input{"only_with_tag"}) && $input{"only_with_tag"} eq $_);
3.193 scop 3316: $selfound ||= $selected;
3317: push(@tmp, sprintf('<option%s>%s</option>',
3.208 scop 3318: $selected ? ' selected="selected"' : '',
3.193 scop 3319: htmlquote($_)));
3.120 scop 3320: }
3.193 scop 3321: printf("<option value=\"\"%s>Show all branches</option>\n",
3.208 scop 3322: $selfound ? '' : ' selected="selected"');
3.193 scop 3323: print join("\n", @tmp);
3324:
3.144 scop 3325: print <<EOF
3326: </select>
3.189 scop 3327: </a>
3.144 scop 3328: </td>
3329: <td></td>
3330: </tr>
3331: EOF
3.120 scop 3332: }
3333:
3.144 scop 3334: print <<EOF;
3.189 scop 3335: <tr>
3336: <td class="opt-label">
3337: <label for="logsort" accesskey="L">Sort log by:</label>
3338: </td>
3339: <td>
3.144 scop 3340: EOF
3.120 scop 3341: printLogSortSelect($use_java_script);
3.144 scop 3342: print <<EOF;
3.189 scop 3343: </td>
3.208 scop 3344: <td><input type="submit" value="Set" accesskey="S" /></td>
3.189 scop 3345: </tr>
3.144 scop 3346: </table>
3347: EOF
3.154 scop 3348: foreach (@stickyvars) {
3349: next if ($_ eq "f");
3350: next if ($_ eq "only_with_tag");
3351: next if ($_ eq "logsort");
3.208 scop 3352: printf("<input type=\"hidden\" name=\"$_\" value=\"%s\" />\n",
3.154 scop 3353: htmlquote($input{$_}))
3354: if (defined($input{$_})
3.194 scop 3355: && (!defined($DEFAULTVALUE{$_}) || $input{$_} ne $DEFAULTVALUE{$_}));
3.154 scop 3356: }
3.189 scop 3357: print "</fieldset>\n</form>\n";
3.120 scop 3358: html_footer();
3359: }
3360:
3.175 scop 3361:
3.120 scop 3362: sub flush_diff_rows($$$$)
3363: {
3364: my ($leftColRef, $rightColRef, $leftRow, $rightRow) = @_;
3365:
3.175 scop 3366: return unless defined($state);
3.120 scop 3367:
3368: if ($state eq "PreChangeRemove") { # we just got remove-lines before
3.133 scop 3369: for (my $j = 0; $j < $leftRow; $j++) {
3.144 scop 3370: printf(<<EOF, scalar(@$leftColRef[$j]));
3371: <tr>
3372: <td class="diff-removed"> %s</td>
3373: <td class="diff-empty"> </td>
3374: </tr>
3375: EOF
3.120 scop 3376: }
3377: } elsif ($state eq "PreChange") { # state eq "PreChange"
3378: # we got removes with subsequent adds
3.222 scop 3379: if (HAS_EDIFF) {
3.176 scop 3380: # construct the suffix tree
3381: my $left_diff = join("\n", @$leftColRef[0..$leftRow-1]);
3382: my $right_diff = join("\n", @$rightColRef[0..$rightRow-1]);
3383: my $diff_str = String::Ediff::ediff($left_diff, $right_diff);
3384:
3385: my @diff_str = split(/ /, $diff_str);
3386: my $INFINITY = 10000000;
3387: push(@diff_str, ($INFINITY) x 8);
3388: my ($idx, $b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3389: (0, @diff_str[0..7]);
3390: my ($l_cul, $r_cul) = (0, 0);
3391: my ($ldx, $rdx) = (0, 0);
3392: my (@left_html, @right_html);
3393: for (my $j = 0; $j < $leftRow; $j++) {
3394: my $line_len = length(@$leftColRef[$j]);
3395: my $line = @$leftColRef[$j];
3396: $l_cul += length($line) + 1; # includes "\n"
3397: my $l_culx = $l_cul - 1; # not includes "\n"
3398: if ($j < $lb1) {
3399: $line = spacedHtmlText($line);
3400: push(@left_html, "<td class=\"diff-changed\">$line</td>");
3401: } elsif ($lb1 == $j) {
3402: my $html_line;
3403: while ($lb1 == $j) {
3404: my $begin_char = $l_culx - $b1;
3405:
3406: $line =~ /^(.*)(.{$begin_char})$/;
3407: $html_line .= spacedHtmlText($1) .
3408: '</span><span class="diff-unchanged">';
3409: $line = $2;
3410: last if ($j != $le1);
3411:
3412: my $end_char = $l_culx - $e1;
3413: $line =~ /^(.*)(.{$end_char})$/;
3414: $html_line .= spacedHtmlText($1) .
3415: '</span><span class="diff-changed">';
3416: $line = $2;
3417:
3418: $idx++;
3419: my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
3420: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
3421: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3422: @diff_str[$idx*8..($idx+1)*8-1];
3423: $lb1 = $INFINITY if ($lb1 < 0);
3424: $lb2 = $INFINITY if ($lb2 < 0);
3425: $le1 = $INFINITY if ($le1 < 0);
3426: $le2 = $INFINITY if ($le2 < 0);
3427: if ($te1 > $b1) {
3428: ($b1, $lb1) = ($te1, $tle1);
3429: }
3430: if ($te2 > $b2) {
3431: ($b2, $lb2) = ($te2, $tle2);
3432: }
3433: }
3434: push(@left_html,
3435: sprintf('<td><span class="%s">%s%s</span></td>',
3436: 'diff-changed', $html_line, spacedHtmlText($line)));
3437: } elsif ($le1 == $j) {
3438: my $html_line;
3439: while ($le1 == $j) {
3440: my $end_char = $l_culx - $e1;
3441: $line =~ /^(.*)(.{$end_char})$/;
3442: $html_line .= spacedHtmlText($1) .
3443: '</span><span class="diff-changed">';
3444: $line = $2;
3445:
3446: $idx++;
3447: my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
3448: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
3449: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3450: @diff_str[$idx*8..($idx+1)*8-1];
3451: $lb1 = $INFINITY if ($lb1 < 0);
3452: $lb2 = $INFINITY if ($lb2 < 0);
3453: $le1 = $INFINITY if ($le1 < 0);
3454: $le2 = $INFINITY if ($le2 < 0);
3455: if ($te1 > $b1) {
3456: ($b1, $lb1) = ($te1, $tle1);
3457: }
3458: if ($te2 > $b2) {
3459: ($b2, $lb2) = ($te2, $tle2);
3460: }
3461:
3462: last if ($lb1 != $j);
3463:
3464: my $begin_char = $l_culx - $b1;
3465:
3466: $line =~ /^(.*)(.{$begin_char})$/;
3467: $html_line .= spacedHtmlText($1) .
3468: '</span><span class="diff-unchanged">';
3469: $line = $2;
3470: }
3471: push(@left_html,
3472: sprintf('<td><span class="%s">%s%s</span></td>',
3473: 'diff-unchanged', $html_line, spacedHtmlText($line)));
3474: } else {
3475: $line = spacedHtmlText($line);
3476: push(@left_html, "<td class=\"diff-unchanged\">$line</td>");
3477: }
3478: }
3479: ($idx, $b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3480: (0, @diff_str[0..7]);
3481: $lb1 = $INFINITY if ($lb1 < 0);
3482: $lb2 = $INFINITY if ($lb2 < 0);
3483: $le1 = $INFINITY if ($le1 < 0);
3484: $le2 = $INFINITY if ($le2 < 0);
3485: for (my $j = 0; $j < $rightRow; $j++) {
3486: my $line_len = length(@$rightColRef[$j]);
3487: my $line = @$rightColRef[$j];
3488: $r_cul += length($line) + 1; # includes "\n"
3489: my $r_culx = $r_cul - 1; # not includes "\n"
3490: if ($j < $lb2) {
3491: $line = spacedHtmlText($line);
3492: push(@right_html, "<td class=\"diff-changed\">$line</td>");
3493: } elsif ($lb2 == $j) {
3494: my $html_line;
3495: while ($lb2 == $j) {
3496: my $begin_char = $r_culx - $b2;
3497:
3498: $line =~ /^(.*)(.{$begin_char})$/;
3499: $html_line .= spacedHtmlText($1) .
3500: '</span><span class="diff-unchanged">';
3501: $line = $2;
3502:
3503: last if ($j != $le2);
3504:
3505: my $end_char = $r_culx - $e2;
3506: $line =~ /^(.*)(.{$end_char})$/;
3507: $html_line .= spacedHtmlText($1) .
3508: '</span><span class="diff-changed">';
3509: $line = $2;
3510:
3511: $idx++;
3512: my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
3513: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
3514: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3515: @diff_str[$idx*8..($idx+1)*8-1];
3516: $lb1 = $INFINITY if ($lb1 < 0);
3517: $lb2 = $INFINITY if ($lb2 < 0);
3518: $le1 = $INFINITY if ($le1 < 0);
3519: $le2 = $INFINITY if ($le2 < 0);
3520: if ($te1 > $b1) {
3521: ($b1, $lb1) = ($te1, $tle1);
3522: }
3523: if ($te2 > $b2) {
3524: ($b2, $lb2) = ($te2, $tle2);
3525: }
3526: }
3527: push(@right_html,
3528: sprintf('<td><span class="%s">%s%s</span></td>',
3529: 'diff-changed', $html_line, spacedHtmlText($line)));
3530: } elsif ($le2 == $j) {
3531: my $html_line;
3532: while ($le2 == $j) {
3533: my $end_char = $r_culx - $e2;
3534: $line =~ /^(.*)(.{$end_char})$/;
3535: $html_line .= spacedHtmlText($1) .
3536: '</span><span class="diff-changed">';
3537: $line = $2;
3538:
3539: $idx++;
3540: my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
3541: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
3542: ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
3543: @diff_str[$idx*8..($idx+1)*8-1];
3544: $lb1 = $INFINITY if ($lb1 < 0);
3545: $lb2 = $INFINITY if ($lb2 < 0);
3546: $le1 = $INFINITY if ($le1 < 0);
3547: $le2 = $INFINITY if ($le2 < 0);
3548: if ($te1 > $b1) {
3549: ($b1, $lb1) = ($te1, $tle1);
3550: }
3551: if ($te2 > $b2) {
3552: ($b2, $lb2) = ($te2, $tle2);
3553: }
3554:
3555: last if ($lb2 != $j);
3556:
3557: my $begin_char = $r_culx - $b2;
3558: $line =~ /^(.*)(.{$begin_char})$/;
3559: $html_line .= spacedHtmlText($1) .
3560: '</span><span class="diff-unchanged">';
3561: $line = $2;
3562: }
3563: push(@right_html,
3.208 scop 3564: sprintf('<td nowrap="nowrap"><span class="%s">%s%s</span></td>',
3.176 scop 3565: 'diff-unchanged', $html_line, spacedHtmlText($line)));
3566: } else {
3567: $line = spacedHtmlText ($line);
3568: push @right_html, "<td class=\"diff-unchanged\">$line</td>";
3569: }
3570: }
3571: for (my $j = 0; $j < $leftRow || $j < $rightRow ; $j++) { # dump out both cols
3572: print '<tr>';
3573: if ($j < $leftRow) {
3574: print $left_html[$j];
3575: } else {
3576: print '<td class="diff-changed-missing"> </td>';
3577: }
3578: if ($j < $rightRow) {
3579: print $right_html[$j];
3580: } else {
3581: print '<td class="diff-changed-missing"> </td>';
3582: }
3583: print "</tr>\n";
3.120 scop 3584: }
3.176 scop 3585: } else {
3586: for (my $j = 0; $j < $leftRow || $j < $rightRow; $j++) { # dump both cols
3587: print "<tr>\n";
3588: if ($j < $leftRow) {
3589: print '<td class="diff-changed"> ' .
3590: spacedHtmlText(@$leftColRef[$j]) . '</td>';
3591: } else {
3592: print '<td class="diff-changed-missing"> </td>';
3593: }
3594: print "\n";
3.120 scop 3595:
3.176 scop 3596: if ($j < $rightRow) {
3597: print '<td class="diff-changed"> ' .
3598: spacedHtmlText(@$rightColRef[$j]) . '</td>';
3599: } else {
3600: print '<td class="diff-changed-missing"> </td>';
3601: }
3602: print "\n</tr>\n";
3.120 scop 3603: }
3604: }
3605: }
3.1 knu 3606: }
3607:
3.175 scop 3608:
3.1 knu 3609: ##
3610: # Function to generate Human readable diff-files
3611: # human_readable_diff(String revision_to_return_to);
3612: ##
3.144 scop 3613: sub human_readable_diff($$)
3.120 scop 3614: {
3615: my ($fh, $rev) = @_;
3.144 scop 3616:
3.169 scop 3617: (my $where_nd = $where) =~ s|\.diff$||;
3618: (my $filename = $where_nd) =~ s|^.*/||;
3619: (my $pathname = $where_nd) =~ s|(Attic/)?[^/]*$||;
3620: (my $scriptwhere_nd = $scriptwhere) =~ s|\.diff$||;
3.120 scop 3621:
3.133 scop 3622: navigateHeader($scriptwhere_nd, $pathname, $filename, $rev, 'diff');
3.120 scop 3623:
3.178 scop 3624: # Read header to pick up read revision and date, if possible.
3625:
3626: my ($r1d, $r1r, $r2d, $r2r);
3.120 scop 3627: while (<$fh>) {
3628: ($r1d, $r1r) = /\t(.*)\t(.*)$/ if (/^--- /);
3629: ($r2d, $r2r) = /\t(.*)\t(.*)$/ if (/^\+\+\+ /);
3630: last if (/^\+\+\+ /);
3631: }
3632:
3.178 scop 3633: my ($rev1, $date1);
3.120 scop 3634: if (defined($r1r) && $r1r =~ /^(\d+\.)+\d+$/) {
3635: $rev1 = $r1r;
3636: $date1 = $r1d;
3637: }
3.178 scop 3638: my ($rev2, $date2);
3.120 scop 3639: if (defined($r2r) && $r2r =~ /^(\d+\.)+\d+$/) {
3640: $rev2 = $r2r;
3641: $date2 = $r2d;
3642: }
3.178 scop 3643: $rev1 = 'unknown-left' unless defined($rev1);
3644: $rev2 = 'unknown-right' unless defined($rev2);
3645: $date1 = defined($date1) ? ', ' . htmlquote($date1) : '';
3646: $date2 = defined($date2) ? ', ' . htmlquote($date2) : '';
3.120 scop 3647:
3.219 scop 3648: my $link = uri_escape($filename) . $query;
3.210 scop 3649:
3.144 scop 3650: # Using <table style=\"border: none\" here breaks NS 4.x badly...
3.210 scop 3651: print <<EOF;
3652: <h3 style="text-align: center">Diff for /$where_nd between versions $rev1 and $rev2</h3>
3653: <table border="0" cellspacing="0" cellpadding="0" width="100%" summary="Diff output">
3.144 scop 3654: <tr style="background-color: #ffffff">
3.210 scop 3655: <th style="text-align: center; vertical-align: top" width="50%">
3656: <a href="$link;rev=$rev1">version $rev1</a>$date1
3.178 scop 3657: </th>
3.210 scop 3658: <th style="text-align: center; vertical-align: top" width="50%">
3659: <a href="$link;rev=$rev2">version $rev2</a>$date2
3.144 scop 3660: </th>
3.178 scop 3661: </tr>
3.144 scop 3662: EOF
3.120 scop 3663:
3664: # Process diff text
3665: # prefetch several lines
3666: my @buf = head($fh);
3.144 scop 3667: my %d = scan_directives(@buf);
3.120 scop 3668:
3.144 scop 3669: my $leftRow = 0;
3670: my $rightRow = 0;
3671: my ($difftxt, @rightCol, @leftCol, $oldline, $newline, $funname);
3.120 scop 3672:
3.219 scop 3673: $link .= ';content-type=text%2Fx-cvsweb-markup';
3.210 scop 3674: $link .= ';ln=1' unless ($link =~ /\?.*\bln=1\b/);
3675:
3.120 scop 3676: while (@buf || !eof($fh)) {
3677: $difftxt = @buf ? shift @buf : <$fh>;
3678:
3679: if ($difftxt =~ /^@@/) {
3680: ($oldline, $newline, $funname) =
3681: $difftxt =~ /@@ \-([0-9]+).*\+([0-9]+).*@@(.*)/;
3682: $funname = htmlquote($funname);
3683: $funname =~ s/\s/ /go;
3.182 scop 3684: $funname &&= " <span style=\"font-size: smaller\">$funname</span>";
3.210 scop 3685: my $ol = $oldline || 1;
3686: my $nl = $newline || 1;
3.144 scop 3687:
3.210 scop 3688: print <<EOF;
3.182 scop 3689: <tr>
3.210 scop 3690: <td width="50%" class="diff-heading">
3691: <b><a href="$link;rev=$rev1#l$ol">Line $oldline</a></b>$funname
3.182 scop 3692: </td>
3.210 scop 3693: <td width="50%" class="diff-heading">
3694: <b><a href="$link;rev=$rev2#l$nl">Line $newline</a></b>$funname
3.144 scop 3695: </td>
3.208 scop 3696: </tr>
3.144 scop 3697: EOF
3698:
3.120 scop 3699: $state = "dump";
3700: $leftRow = 0;
3701: $rightRow = 0;
3702: } else {
3.224 scop 3703: my ($diffcode, $rest) = $difftxt =~ /^([-+ ])(.*)/;
3704: $diffcode = '' unless defined($diffcode);
3.176 scop 3705: $_ = $rest;
3.120 scop 3706:
3707: #########
3708: # little state machine to parse unified-diff output (Hen, zeller@think.de)
3709: # in order to get some nice 'ediff'-mode output
3710: # states:
3711: # "dump" - just dump the value
3712: # "PreChangeRemove" - we began with '-' .. so this could be the start of a 'change' area or just remove
3713: # "PreChange" - okey, we got several '-' lines and moved to '+' lines -> this is a change block
3714: ##########
3715:
3716: if ($diffcode eq '+') {
3717: if ($state eq "dump")
3718: { # 'change' never begins with '+': just dump out value
3.176 scop 3719: $_ = spacedHtmlText($rest, $d{'tabstop'});
3.144 scop 3720: printf(<<EOF, $_);
3721: <tr>
3722: <td class="diff-empty"> </td>
3723: <td class="diff-added"> %s</td>
3724: </tr>
3725: EOF
3.120 scop 3726: } else { # we got minus before
3727: $state = "PreChange";
3728: $rightCol[$rightRow++] = $_;
3729: }
3730: } elsif ($diffcode eq '-') {
3731: $state = "PreChangeRemove";
3732: $leftCol[$leftRow++] = $_;
3733: } else { # empty diffcode
3734: flush_diff_rows \@leftCol, \@rightCol, $leftRow, $rightRow;
3.176 scop 3735: $_ = spacedHtmlText($rest, $d{'tabstop'});
3.147 scop 3736: printf(<<EOF, $_, $_);
3.144 scop 3737: <tr>
3738: <td class="diff-same"> %s</td>
3739: <td class="diff-same"> %s</td>
3740: </tr>
3741: EOF
3.120 scop 3742: $state = "dump";
3743: $leftRow = 0;
3744: $rightRow = 0;
3745: }
3746: }
3747: }
3748: close($fh);
3749:
3750: flush_diff_rows \@leftCol, \@rightCol, $leftRow, $rightRow;
3751:
3752: # state is empty if we didn't have any change
3753: if (!$state) {
3.144 scop 3754: print <<EOF;
3755: <tr>
3756: <td colspan="2"> </td>
3757: </tr>
3758: <tr class="diff-empty">
3759: <td colspan="2" align="center"><b>- No viewable change -</b></td>
3760: </tr>
3761: EOF
3.120 scop 3762: }
3763:
3.182 scop 3764: printf(<<EOF, $scriptwhere);
3.144 scop 3765: </table>
3.208 scop 3766: <hr style="width: 100%%" />
3.144 scop 3767: <form method="get" action="%s">
3.182 scop 3768: <div style="float: left">
3.208 scop 3769: <label for="f">Diff format:<br />
3.144 scop 3770: EOF
3.168 scop 3771: printDiffSelectStickyVars();
3.120 scop 3772: printDiffSelect($use_java_script);
3.182 scop 3773: printf(<<EOF, $rev1, $rev2);
3.179 scop 3774: </label>
3.208 scop 3775: <input type="submit" value="Show" />
3.182 scop 3776: </div>
3777: <table style="float: right; border: thin outset" cellspacing="0" cellpadding="1" title="Legend" summary="Legend">
3778: <tr>
3779: <td align="center" class="diff-removed">Removed from v.%s</td>
3780: <td class="diff-empty"> </td>
3781: </tr><tr class="diff-changed">
3782: <td align="center" colspan="2">changed lines</td>
3783: </tr><tr>
3784: <td class="diff-empty"> </td>
3785: <td align="center" class="diff-added">Added in v.%s</td>
3786: </tr>
3.144 scop 3787: </table>
3788: </form>
3.208 scop 3789: <br clear="all" />
3.144 scop 3790: EOF
3.120 scop 3791: }
3.167 scop 3792:
3793:
3794: sub doEnscript($$$)
3795: {
3.240 ! scop 3796: my ($filehandle, $highlight, $linenumbers, $lang) = @_;
! 3797: $lang ||= 'cvsweb';
3.167 scop 3798:
3.174 scop 3799: my @cmd = ($CMD{enscript},
3800: @enscript_options,
3.240 ! scop 3801: '-q', "--language=$lang", '-o', '-', "--highlight=$highlight");
3.174 scop 3802:
3803: local *ENSCRIPT_OUT;
3804: my ($h, $err) =
3.229 scop 3805: startproc(\@cmd, $filehandle, '>pipe', \*ENSCRIPT_OUT);
3.174 scop 3806: fatal('500 Internal Error', $err) unless $h;
3807:
3808: # We could short-circuit and have enscript output directly to STDOUT above,
3809: # but that doesn't work with mod_perl (at least some 1.99 versions).
3810: if ($linenumbers) {
3811: my $ln = 0;
3812: while (<ENSCRIPT_OUT>) {
3813: printf '<a id="l%d" class="src">%5d: </a>', (++$ln) x 2;
3814: print $_;
3.167 scop 3815: }
3.174 scop 3816: } else {
3817: local $/ = undef;
3818: print <ENSCRIPT_OUT>;
3.167 scop 3819: }
3.229 scop 3820: $h->finish();
3.167 scop 3821: }
3822:
3.120 scop 3823:
3.163 scop 3824: sub navigateHeader($$$$$;$)
3.120 scop 3825: {
3.163 scop 3826: my ($swhere, $path, $filename, $rev, $title, $moddate) = @_;
3.120 scop 3827: $swhere = "" if ($swhere eq $scriptwhere);
3828: $swhere = './' . urlencode($filename) if ($swhere eq "");
3829:
3.136 scop 3830: my $qfile = htmlquote($filename);
3831: my $qpath = htmlquote($path);
3.170 scop 3832: my $trev = $rev ? " - $rev" : '';
3.100 knu 3833:
3.163 scop 3834: http_header('', $moddate);
3.133 scop 3835:
3.120 scop 3836: print <<EOF;
3.100 knu 3837: $HTML_DOCTYPE
3.89 knu 3838: <html>
3839: <head>
3.170 scop 3840: <title>$qpath$qfile - $title$trev</title>
3.144 scop 3841: $HTML_META$CSS</head>
3.129 scop 3842: <body class="src">
3.182 scop 3843: <table class="navigate-header" width="100%">
3.184 scop 3844: <tr>
3845: <td>
3.64 knu 3846: EOF
3847:
3.170 scop 3848: print &link($backicon, "$swhere$query" . ($rev ? "#rev$rev" : ''));
3.136 scop 3849: printf '<b>Return to %s CVS log',
3.205 scop 3850: &link($qfile, "$swhere$query" . ($rev ? "#rev$rev" : ''));
3.120 scop 3851: print "</b> $fileicon</td>";
3852:
3.144 scop 3853: printf(<<EOF, $diricon, &clickablePath($path, 1));
3.182 scop 3854: <td style="text-align: right">%s <b>Up to %s</b></td>
3.144 scop 3855: </tr>
3856: </table>
3857: EOF
3.120 scop 3858: }
3859:
3.175 scop 3860:
3.120 scop 3861: sub plural_write($$)
3862: {
3863: my ($num, $text) = @_;
3864: if ($num != 1) {
3865: $text .= "s";
3866: }
3867:
3868: if ($num > 0) {
3869: return join (' ', $num, $text);
3870: } else {
3871: return "";
3872: }
3.1 knu 3873: }
3874:
3.175 scop 3875:
3.1 knu 3876: ##
3877: # print readable timestamp in terms of
3878: # '..time ago'
3879: # H. Zeller <zeller@think.de>
3880: ##
3.120 scop 3881: sub readableTime($$)
3882: {
3883: my ($secs, $long) = @_;
3884:
3.175 scop 3885: # This function works correctly for time >= 2 seconds.
3886: return 'very little time' if ($secs < 2);
3.120 scop 3887:
3888: my %desc = (
3.133 scop 3889: 1 => 'second',
3890: 60 => 'minute',
3891: 3600 => 'hour',
3892: 86400 => 'day',
3893: 604800 => 'week',
3894: 2628000 => 'month',
3895: 31536000 => 'year'
3896: );
3897:
3.120 scop 3898: my @breaks = sort { $a <=> $b } keys %desc;
3.133 scop 3899: my $i = 0;
3.120 scop 3900:
3901: while ($i <= $#breaks && $secs >= 2 * $breaks[$i]) {
3902: $i++;
3903: }
3904: $i--;
3.133 scop 3905: my $break = $breaks[$i];
3906: my $retval = plural_write(int($secs / $break), $desc{$break});
3.120 scop 3907:
3908: if ($long == 1 && $i > 0) {
3909: my $rest = $secs % $break;
3910: $i--;
3911: $break = $breaks[$i];
3912: my $resttime = plural_write(int($rest / $break), $desc{$break});
3913: if ($resttime) {
3914: $retval .= ", $resttime";
3915: }
3916: }
3.1 knu 3917:
3.120 scop 3918: return $retval;
3.1 knu 3919: }
3920:
3.175 scop 3921:
3.1 knu 3922: ##
3923: # clickablePath(String pathname, boolean last_item_clickable)
3924: #
3925: # returns a html-ified path whereas each directory is a link for
3926: # faster navigation. last_item_clickable controls whether the
3927: # basename (last directory/file) is a link as well
3928: ##
3.120 scop 3929: sub clickablePath($$)
3930: {
3931: my ($pathname, $clickLast) = @_;
3932:
3.154 scop 3933: my $root = '[' . htmlquote($CVSROOTdescr{$cvstree} || $cvstree) . ']';
3934:
3.144 scop 3935: # This should never happen (see chooseCVSRoot()), but let's be sure...
3.154 scop 3936: return $root if ($pathname eq '/');
3.120 scop 3937:
3.144 scop 3938: my $retval =
3.154 scop 3939: ' ' . &link($root, sprintf('%s/%s#dirlist', $scriptname, $query));
3.144 scop 3940: my $wherepath = '';
3941: my ($lastslash) = $pathname =~ m|/$|;
3942:
3943: foreach (split (/\//, $pathname)) {
3944: $retval .= ' / ';
3945: $wherepath .= "/$_";
3946: my $last = "$wherepath/" eq "/$pathname" || $wherepath eq "/$pathname";
3947:
3948: if ($clickLast || !$last) {
3949: $retval .= &link(htmlquote($_),
3950: join ('',
3951: $scriptname, urlencode($wherepath),
3952: (!$last || $lastslash ? '/' : ''), $query,
3953: (!$last || $lastslash ? "#dirlist" : "")));
3954: } else { # do not make a link to the current dir
3955: $retval .= htmlquote($_);
3.120 scop 3956: }
3957: }
3958: return $retval;
3959: }
3960:
3.144 scop 3961:
3.120 scop 3962: sub chooseCVSRoot()
3963: {
3.208 scop 3964: print "<form method=\"get\" action=\"${scriptwhere}\">\n<p>\n";
3.120 scop 3965: if (2 <= @CVSROOT) {
3.133 scop 3966: foreach my $k (keys %input) {
3.208 scop 3967: printf("<input type=\"hidden\" name=\"%s\" value=\"%s\" />\n",
3.154 scop 3968: htmlquote($k), htmlquote($input{$k}))
3969: if ($input{$k} && $k ne 'cvsroot');
3.120 scop 3970: }
3971:
3.144 scop 3972: printf(<<EOF, $use_java_script ? ' onchange="this.form.submit()"' : '');
3.208 scop 3973: <label for="cvsroot" accesskey="C">CVS Root:
3.144 scop 3974: <select id="cvsroot" name="cvsroot"%s>
3975: EOF
3.120 scop 3976:
3.133 scop 3977: foreach my $k (@CVSROOT) {
3.136 scop 3978: printf("<option value=\"%s\"%s>%s</option>\n",
3979: htmlquote($k),
3.208 scop 3980: ($k eq $cvstree) ? ' selected="selected"' : '',
3.136 scop 3981: htmlquote($CVSROOTdescr{$k} || $k));
3.120 scop 3982: }
3.208 scop 3983: print '</select></label>';
3.120 scop 3984: } else {
3985:
3986: # no choice -- but we need the form to select module/path,
3987: # at least for Netscape
3.208 scop 3988: printf "CVS Root: <b>[%s]</b>",
3.154 scop 3989: htmlquote($CVSROOTdescr{$cvstree} || $cvstree);
3.120 scop 3990: }
3991:
3.144 scop 3992: print <<EOF;
3993: <label for="mpath" accesskey="M">
3994: Module path or alias:
3.208 scop 3995: <input type="text" id="mpath" name="path" value="" size="15" />
3.144 scop 3996: </label>
3.208 scop 3997: <input type="submit" value="Go" accesskey="O" />
3998: </p>
3999: </form>
3.144 scop 4000: EOF
3.120 scop 4001: }
4002:
3.175 scop 4003:
3.120 scop 4004: sub chooseMirror()
4005: {
4006: # This code comes from the original BSD-cvsweb
4007: # and may not be useful for your site; If you don't
4008: # set %MIRRORS this won't show up, anyway.
4009: scalar(%MIRRORS) or return;
4010:
4011: # Should perhaps exclude the current site somehow...
4012: print "\n<p>\nThis CVSweb is mirrored in\n";
4013:
4014: my @tmp = map(&link(htmlquote($_), $MIRRORS{$_}), sort keys %MIRRORS);
4015: my $tmp = pop (@tmp);
4016:
4017: if (scalar(@tmp)) {
4018: print join (', ', @tmp), ' and ';
4019: }
4020:
4021: print "$tmp.\n</p>\n";
4022: }
4023:
3.175 scop 4024:
3.120 scop 4025: sub fileSortCmp()
4026: {
3.175 scop 4027: (my $af = $a) =~ s/,v$//;
4028: (my $bf = $b) =~ s/,v$//;
3.120 scop 4029: my ($rev1, $date1, $log1, $author1, $filename1) = @{$fileinfo{$af}}
4030: if (defined($fileinfo{$af}));
4031: my ($rev2, $date2, $log2, $author2, $filename2) = @{$fileinfo{$bf}}
4032: if (defined($fileinfo{$bf}));
4033:
3.175 scop 4034: my $comp = 0;
3.140 scop 4035: if (defined($filename1) && defined($filename2) &&
4036: $af eq $filename1 && $bf eq $filename2)
3.120 scop 4037: {
4038:
4039: # Two files
3.140 scop 4040: $comp = -revcmp($rev1, $rev2) if ($byrev && $rev1 && $rev2);
4041: $comp = ($date2 <=> $date1) if ($bydate && $date1 && $date2);
4042: if ($input{ignorecase}) {
4043: $comp = (uc($log1) cmp uc($log2)) if ($bylog && $log1 && $log2);
4044: $comp = (uc($author1) cmp uc($author2)) if ($byauthor &&
4045: $author1 && $author2);
4046: } else {
4047: $comp = ($log1 cmp $log2) if ($bylog && $log1 && $log2);
4048: $comp = ($author1 cmp $author2) if ($byauthor &&
4049: $author1 && $author2);
4050: }
3.120 scop 4051: }
4052:
4053: if ($comp == 0) {
4054:
4055: # Directories first, then files under version control,
4056: # then other, "rogue" files.
4057: # Sort by filename if no other criteria available.
4058:
4059: my $ad = (
4060: (-d "$fullname/$a")
4061: ? 'D'
4062: : (defined($fileinfo{$af}) ? 'F' : 'R')
4063: );
4064: my $bd = (
4065: (-d "$fullname/$b")
4066: ? 'D'
4067: : (defined($fileinfo{$bf}) ? 'F' : 'R')
4068: );
3.175 scop 4069: (my $c = $a) =~ s|.*/||;
4070: (my $d = $b) =~ s|.*/||;
3.144 scop 4071:
4072: my ($l, $r) = ("$ad$c", "$bd$d");
4073: $comp = $input{ignorecase} ? (uc($l) cmp uc($r)) : ($l cmp $r);
4074:
4075: # Parent dir is always first, then Attic.
4076: if ($comp != 0) {
4077: if ($l eq 'D..') {
3.149 scop 4078: $comp = -1;
3.144 scop 4079: } elsif ($r eq 'D..') {
3.149 scop 4080: $comp = 1;
3.144 scop 4081: } elsif ($l eq 'DAttic') {
3.149 scop 4082: $comp = -1;
3.144 scop 4083: } elsif ($r eq 'DAttic') {
3.149 scop 4084: $comp = 1;
3.144 scop 4085: }
4086: }
3.120 scop 4087: }
4088: return $comp;
3.1 knu 4089: }
4090:
3.220 scop 4091: #
4092: # Returns a URL to download the selected revision.
4093: #
3.120 scop 4094: sub download_url($$;$)
4095: {
4096: my ($url, $revision, $mimetype) = @_;
4097: $revision =~ s/\b0\.//;
3.1 knu 4098:
3.222 scop 4099: if (!defined($mimetype) || $mimetype !~ CVSWEBMARKUP) {
3.120 scop 4100: my $path = $where;
4101: $path =~ s|[^/]+$||;
3.222 scop 4102: $url = "$scriptname/$CheckoutMagic/${path}$url";
3.120 scop 4103: }
3.219 scop 4104: $url .= '?rev=' . uri_escape($revision);
4105: $url .= ';content-type=' . uri_escape($mimetype) if $mimetype;
3.67 knu 4106:
3.175 scop 4107: return $url;
3.1 knu 4108: }
4109:
3.175 scop 4110: #
3.220 scop 4111: # Returns a link to download the selected revision.
3.175 scop 4112: #
3.120 scop 4113: sub download_link($$$;$)
4114: {
4115: my ($url, $revision, $textlink, $mimetype) = @_;
3.175 scop 4116: my $fullurl = download_url($url, $revision, $mimetype);
3.220 scop 4117: return sprintf('<a href="%s" class="download-link">%s</a>',
4118: hrefquote("$fullurl$barequery"), htmlquote($textlink));
3.218 scop 4119: }
3.120 scop 4120:
3.219 scop 4121: #
4122: # Returns a URL to display the selected revision.
4123: #
4124: sub display_url($$;$)
4125: {
4126: my ($url, $revision, $mimetype) = @_;
4127: $url .= '?rev=' . uri_escape($revision);
4128: $url .= ';content-type=' . uri_escape($mimetype) if $mimetype;
4129: return $url;
4130: }
4131:
4132: #
4133: # Returns a link to display the selected revision.
4134: #
4135: sub display_link($$;$$)
4136: {
4137: my ($url, $revision, $textlink, $mtype) = @_;
4138: $textlink = $revision unless defined($textlink);
4139: return sprintf('<a href="%s" class="display-link">%s</a>',
4140: hrefquote(display_url($url, $revision, $mtype) . $barequery),
4141: htmlquote($textlink));
4142: }
3.132 scop 4143:
3.170 scop 4144: sub graph_link($;$)
3.132 scop 4145: {
3.170 scop 4146: my ($url, $text) = @_;
3.132 scop 4147: $text ||= $graphicon;
3.170 scop 4148: return sprintf('<a href="%s?graph=1%s">%s</a>',
4149: hrefquote($url), hrefquote($barequery), $text);
3.1 knu 4150: }
4151:
4152: # Returns a Query string with the
4153: # specified parameter toggled
3.140 scop 4154: sub toggleQuery($;$)
3.120 scop 4155: {
4156: my ($toggle, $value) = @_;
3.133 scop 4157:
4158: my %vars = %input;
3.120 scop 4159:
4160: if (defined($value)) {
4161: $vars{$toggle} = $value;
4162: } else {
4163: $vars{$toggle} = $vars{$toggle} ? 0 : 1;
4164: }
4165:
4166: # Build a new query of non-default paramenters
3.133 scop 4167: my $newquery = "";
4168: foreach my $var (@stickyvars) {
3.120 scop 4169: my ($value) = defined($vars{$var}) ? $vars{$var} : "";
4170: my ($default) = defined($DEFAULTVALUE{$var}) ? $DEFAULTVALUE{$var} : "";
4171:
4172: if ($value ne $default) {
3.203 scop 4173: $newquery .= ';' if ($newquery ne "");
3.206 scop 4174: $newquery .= uri_escape($var) . '=' . uri_escape($value);
3.120 scop 4175: }
4176: }
4177:
4178: if ($newquery) {
4179: return '?' . $newquery;
4180: }
4181: return "";
4182: }
4183:
4184: sub urlencode($)
4185: {
4186: local ($_) = @_;
4187: s/[\000-+{-\377]/sprintf("%%%02x", ord($&))/ge;
3.175 scop 4188: return $_;
3.120 scop 4189: }
4190:
4191: sub htmlquote($)
4192: {
4193: local ($_) = @_;
4194: # Special Characters; RFC 1866
4195: s/&/&/g;
4196: s/\"/"/g;
4197: s/</</g;
4198: s/>/>/g;
3.175 scop 4199: return $_;
3.120 scop 4200: }
4201:
4202: sub htmlunquote($)
4203: {
4204: local ($_) = @_;
4205: # Special Characters; RFC 1866
4206: s/"/\"/g;
4207: s/</</g;
4208: s/>/>/g;
4209: s/&/&/g;
3.175 scop 4210: return $_;
3.120 scop 4211: }
4212:
4213: sub hrefquote($)
4214: {
4215: local ($_) = @_;
4216:
4217: y/ /+/;
4218:
4219: htmlquote($_);
4220: }
4221:
3.163 scop 4222: sub http_header(;$$)
3.120 scop 4223: {
3.163 scop 4224: my ($content_type, $moddate) = @_;
4225: $content_type ||= 'text/html';
3.120 scop 4226:
4227: $content_type .= "; charset=$charset"
3.163 scop 4228: if ($charset && $content_type =~ m,^text/,);
3.120 scop 4229:
3.185 scop 4230: # Note that in the following, we explicitly join() and concatenate the
4231: # headers instead of printing them as an array. This is because some
4232: # systems, eg. early versions of mod_perl 2 don't quite get it if the
4233: # last \r\n\r\n isn't included in the last "payload" header print().
4234:
4235: my @headers = ();
4236: # TODO: ctime(3) from scalar gmtime() isn't HTTP compliant, see HTTP::Date.
4237: push(@headers, 'Last-Modified: ' . scalar gmtime($moddate) . ' GMT')
4238: if $moddate;
4239: push(@headers, 'Content-Type: ' . $content_type);
3.120 scop 4240:
4241: if ($allow_compress && $maycompress) {
3.222 scop 4242: if (HAS_ZLIB
3.120 scop 4243: || (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c")))
4244: {
4245:
3.185 scop 4246: push(@headers, 'Content-Encoding: x-gzip');
4247: push(@headers, 'Vary: Accept-Encoding'); # RFC 2616, 14.44
4248: print join("\r\n", @headers) . "\r\n\r\n";
4249:
3.120 scop 4250: $| = 1;
3.185 scop 4251: $| = 0; # Flush header output.
3.120 scop 4252:
3.222 scop 4253: tie(*GZIP, __PACKAGE__, \*STDOUT) if HAS_ZLIB;
3.120 scop 4254: select(GZIP);
4255: $gzip_open = 1;
4256:
4257: } else {
3.185 scop 4258:
4259: print join("\r\n", @headers) . "\r\n\r\n";
3.230 scop 4260: printf
4261: '<span style="font-size: smaller">Unable to find gzip binary in the <b>$command_path</b> (<code>%s</code>) to compress output</span><br />',
4262: htmlquote(join(':', @command_path));
3.120 scop 4263: }
3.185 scop 4264:
3.120 scop 4265: } else {
3.185 scop 4266: print join("\r\n", @headers) . "\r\n\r\n";
3.120 scop 4267: }
4268: }
4269:
3.131 scop 4270:
3.163 scop 4271: sub html_header($;$)
3.120 scop 4272: {
3.163 scop 4273: my ($title, $moddate) = @_;
4274: $title = htmlquote($title);
3.162 scop 4275: my $l = $logo || '';
3.163 scop 4276: http_header('text/html', $moddate);
3.120 scop 4277: print <<EOH;
3.100 knu 4278: $HTML_DOCTYPE
3.1 knu 4279: <html>
3.40 knu 4280: <head>
3.134 scop 4281: <title>$title</title>
3.144 scop 4282: $HTML_META$CSS</head>
3.129 scop 4283: <body>
3.182 scop 4284: $l <h1>$title</h1>
3.1 knu 4285: EOH
4286: }
4287:
3.120 scop 4288: sub html_footer()
4289: {
3.208 scop 4290: print "<hr />\n<address>$address</address>\n" if $address;
3.127 scop 4291: print "</body>\n</html>\n";
3.1 knu 4292: }
4293:
3.120 scop 4294: sub link_tags($)
4295: {
4296: my ($tags) = @_;
4297: my ($ret) = "";
4298: my ($fileurl, $filename);
4299:
4300: ($filename = $where) =~ s/^.*\///;
4301: $fileurl = './' . urlencode($filename);
4302:
4303: foreach my $sym (split (", ", $tags)) {
4304: $ret .= ",\n" if ($ret ne "");
3.136 scop 4305: $ret .= &link(htmlquote($sym),
4306: $fileurl . toggleQuery('only_with_tag', $sym));
3.120 scop 4307: }
3.219 scop 4308: return $ret;
3.1 knu 4309: }
4310:
3.175 scop 4311:
3.1 knu 4312: #
3.233 scop 4313: # See if a file/dir is listed in the config file's @ForbiddenFiles list.
4314: # Takes a full file system path or one relative to $cvsroot, and strips the
4315: # trailing ",v" if present, then compares. Returns 1 if forbidden, else 0.
3.221 scop 4316: #
3.233 scop 4317: sub forbidden($)
3.120 scop 4318: {
3.233 scop 4319: (my $path = canonpath(shift)) =~ s/,v$//;
4320: $path =~ s|^$cvsroot/+||;
3.175 scop 4321: for my $forbidden_re (@ForbiddenFiles) {
4322: return 1 if ($path =~ $forbidden_re);
3.120 scop 4323: }
4324: return 0;
3.174 scop 4325: }
4326:
4327:
4328: #
4329: # Starts a process using IPC::Run. All arguments are passed to
4330: # IPC::Run::start() as-is. Returns an array ($harness, $error) where
4331: # $harness is from IPC::Run if start() succeeds, undef otherwise. In case
3.184 scop 4332: # of an error, $error contains the error message.
3.174 scop 4333: #
3.191 scop 4334: sub startproc(@)
3.174 scop 4335: {
3.215 scop 4336: my $h = my $err = undef;
3.174 scop 4337: eval {
4338: local $SIG{__DIE__};
3.215 scop 4339: $h = IPC::Run::start(@_) or die("return code: $?");
3.174 scop 4340: };
3.215 scop 4341: if ($@) {
3.229 scop 4342: $h->finish() if $h;
3.215 scop 4343: $h = undef;
4344: $err = "'@{$_[0]}' failed: $@";
4345: }
3.174 scop 4346: return ($h, $err);
3.215 scop 4347: }
4348:
4349: #
4350: # Runs a process using IPC::Run. All arguments are passed to
4351: # IPC::Run::run() as-is. Returns an array ($exitcode, $errormsg).
4352: #
4353: sub runproc(@)
4354: {
4355: eval {
4356: local $SIG{__DIE__};
4357: IPC::Run::run(@_);
4358: };
4359: my $exitcode = $? >> 8;
4360: my $errormsg = undef;
4361: if ($@) {
4362: $exitcode ||= -1;
4363: $errormsg = "'@{$_[0]}' failed: $@";
4364: }
4365: return ($exitcode, $errormsg);
3.129 scop 4366: }
4367:
3.225 scop 4368: #
4369: # Check out a file to a temporary file.
4370: #
4371: sub checkout_to_temp($$$)
4372: {
4373: my ($cvsroot, $cvsname, $rev) = @_;
3.25 knu 4374:
3.225 scop 4375: # Pipe given cvs file into a temporary place.
4376: my ($temp_fh, $temp_fn) = tempfile('.cvsweb.XXXXXXXX', DIR => tmpdir());
4377:
4378: my @cmd = ($CMD{cvs}, @cvs_options, '-Qd', $cvsroot,
4379: 'co', '-p', "-r$rev", $cvsname);
4380:
4381: local (*DIFF_OUT);
4382: my ($h, $err) = startproc(\@cmd, \"", '>pipe', \*DIFF_OUT);
4383: if ($h) {
4384: local $/ = undef;
4385: print $temp_fh <DIFF_OUT>;
3.229 scop 4386: $h->finish();
3.225 scop 4387: close($temp_fh);
4388: } else {
4389: close($temp_fh);
4390: unlink($temp_fn);
4391: fatal('500 Internal Error',
4392: 'Checkout failure (exit status %s), output: <pre>%s</pre>',
4393: $? >> 8 || -1, $err);
4394: }
4395:
4396: return $temp_fn;
4397: }
4398:
4399: #
3.173 scop 4400: # Close the GZIP handle, and remove the tie.
3.225 scop 4401: #
3.120 scop 4402: sub gzipclose
4403: {
4404: if ($gzip_open) {
4405: select(STDOUT);
4406: close(GZIP);
4407: untie *GZIP;
4408: $gzip_open = 0;
4409: }
3.23 knu 4410: }
4411:
4412: # implement a gzipped file handle via the Compress:Zlib compression
4413: # library.
4414:
4415: sub MAGIC1() { 0x1f }
4416: sub MAGIC2() { 0x8b }
3.80 knu 4417: sub OSCODE() { 3 }
3.23 knu 4418:
3.120 scop 4419: sub TIEHANDLE
4420: {
4421: my ($class, $out) = @_;
4422: my ($d) = Compress::Zlib::deflateInit(
4423: -Level => Compress::Zlib::Z_BEST_COMPRESSION(),
4424: -WindowBits => -Compress::Zlib::MAX_WBITS()
4425: )
4426: or return undef;
4427: my ($o) = { handle => $out,
4428: dh => $d,
4429: crc => 0,
4430: len => 0,
4431: };
4432: my ($header) = pack("c10",
4433: MAGIC1, MAGIC2, Compress::Zlib::Z_DEFLATED(),
4434: 0, 0, 0, 0, 0, 0, OSCODE);
4435: print {$o->{handle}} $header;
4436: return bless($o, $class);
4437: }
4438:
4439: sub PRINT
4440: {
4441: my ($o) = shift;
CVSweb