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