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