Sort out the revision matching regex. Merge the two regex's, and make it

[www.i-scream.org.git] / cgi-bin / cvslog.cgi

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index bdf0bcd6ab08598a5b4236948bf4b4229a3355f4..0f86725d0380cbdd2846b99b4aa928726758ef2f 100755 (executable)
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -116,13 +116,13 @@ foreach my $module (@modules) {
                 print HTML_encode("$2");
                 print "</i>\n</font>\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 "<code>";
                 print "<a href=\"http://cvs.i-scream.org/$file\" style=\"text-decoration: none;\">";
                 print HTML_encode($file);
                 print "</a> ";
-                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 "</code><br>\n"
             }
             else {
-                chop $line;
+                chomp $line;
                 print "<code>";
                 print HTML_encode($line);
                 print "</code><br>\n"