--- web/cgi-bin/cvslog.cgi	2003/05/18 19:04:39	1.26
+++ web/cgi-bin/cvslog.cgi	2003/09/27 17:42:45	1.29
@@ -44,7 +44,7 @@ $modulelist = `ls $cvsroot` unless defined $modulelist
 $modulelist =~ s/[\r\n]/ /gm;
 
 my($cvs2clpath) = "/usr/local/bin/cvs2cl";
-my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
+my($cvs2clargs) = "--stdout --no-wrap --no-common-dir -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
 my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist";
 my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs";
 
@@ -104,7 +104,7 @@ foreach my $module (@modules) {
                 print "\n<font color=\"blue\">\n<b>";
                 print HTML_encode($1);
                 print "</b>\n<i>";
-                print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
+                print " committed by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
                 print HTML_encode("$2");
                 print "</a></i>\n</font>\n"
             }
@@ -112,17 +112,17 @@ foreach my $module (@modules) {
                 print "\n<font color=\"blue\">\n<b>";
                 print HTML_encode($1);
                 print "</b>\n<i>";
-                print " commited by ";
+                print " committed by ";
                 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"