X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fcvslog.cgi;fp=cgi-bin%2Fcvslog.cgi;h=0f86725d0380cbdd2846b99b4aa928726758ef2f;hb=0ead3b0afdf3a2e53409ba00e77ecacbfc9c0376;hp=bdf0bcd6ab08598a5b4236948bf4b4229a3355f4;hpb=13312df1a63c94f6698dff3fd5daf8f1b19b6ff9;p=www.i-scream.org.git diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi index bdf0bcd..0f86725 100755 --- a/cgi-bin/cvslog.cgi +++ b/cgi-bin/cvslog.cgi @@ -116,13 +116,13 @@ foreach my $module (@modules) { print HTML_encode("$2"); print "\n\n" } - elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) { - my ($file, $rest, $ext) = ($1, $2, $3); + elsif($line =~ /([^\s]+) (\([^,^\)]+(,[^\)]+)?\))([,:])/) { + my ($file, $rev, $tags, $ext) = ($1, $2, $3, $4); print ""; print ""; print HTML_encode($file); print " "; - if($rest =~ /\((\S+)\.(\d+)(.*)\)/) { + if($rev =~ /\(([^\s]+)\.(\d+)(.*)\)/) { my $start = $1; my $end = $2; my $other = $3; @@ -145,17 +145,17 @@ foreach my $module (@modules) { print HTML_encode("$other)"); } else { - print HTML_encode($rest); + print HTML_encode($rev); } } else { - print HTML_encode($rest); + print HTML_encode($rev); } print HTML_encode($ext); print "
\n" } else { - chop $line; + chomp $line; print ""; print HTML_encode($line); print "
\n"