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