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