[chora] Support for Windows Usernames, Part 2

[GPHemsley at aol.com]

Spaces in Windows usernames are causing problems again. This time it's about 
Annotate. I had noticed a problem with it a while back, but only today did I 
realize that it was related to spaces in the username. The diffs of both RELENG 
of chora/ and HEAD of framework/ are included for your convenience. As 
before, please credit me as Gordon P. Hemsley, with the e-mail address as 
gphemsley at users.sourceforge.net.

On a semi-related note, are the usernames on Annotate supposed to be 
truncated? My username of "Gordon Hemsley" shows up in the Annotate Author column as 
"Gordon H". Not sure if that's a bug or not....

Gordon P. Hemsley
gphemsley at users.sourceforge.net
A Link to the Past • CMSformE
-------------- next part --------------
--- D:\Program Files\Apache Group\Apache\htdocs\horde\chora\lib\CVSLib\Annotate.bak	Sat Dec 28 13:53:05 2002
+++ D:\Program Files\Apache Group\Apache\htdocs\horde\chora\lib\CVSLib\Annotate.php	Sat May 15 11:59:59 2004
@@ -93,7 +93,7 @@
 
         $lineno = 1;
         while($line = fgets($fl, 4096)) {
-            if (preg_match('/^M\s+([\d\.]+)\s+\((\w+)\s+(\d+-\w+-\d+)\):.(.*)$/', $line, $regs)) {
+            if (preg_match('/^M\s+([\d\.]+)\s+\((\w.+)\s+(\d+-\w+-\d+)\):.(.*)$/', $line, $regs)) {
                 $entry = array();
                 $entry['rev']    = $regs[1];
                 $entry['author'] = $regs[2];
--- C:\Documents and Settings\Gordon Hemsley\Local Settings\Temp\framework-HEAD-2004-05-15\framework\VC\VC\cvs.bak	Mon May  3 04:00:14 2004
+++ C:\Documents and Settings\Gordon Hemsley\Local Settings\Temp\framework-HEAD-2004-05-15\framework\VC\VC\cvs.php	Sat May 15 12:28:43 2004
@@ -160,7 +160,7 @@
 
         $lineno = 1;
         while ($line = fgets($fl, 4096)) {
-            if (preg_match('/^M\s+([\d\.]+)\s+\((\w+)\s+(\d+-\w+-\d+)\):.(.*)$/', $line, $regs)) {
+            if (preg_match('/^M\s+([\d\.]+)\s+\((\w.+)\s+(\d+-\w+-\d+)\):.(.*)$/', $line, $regs)) {
                 $entry = array();
                 $entry['rev']    = $regs[1];
                 $entry['author'] = $regs[2];