From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Mon, 11 Jan 2010 08:35:10 +0000 (+0000)
Subject: Apply patch reported by rudi@darx.com in bug #1626911
X-Git-Tag: v2_2_7~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=697028cc00cd5f128ba186bf722acc8a8faaf028;p=thirdparty%2Fsarg.git

Apply patch reported by rudi@darx.com in bug #1626911
---

diff --git a/log.c b/log.c
index fc48d50..624bb53 100644
--- a/log.c
+++ b/log.c
@@ -1096,7 +1096,9 @@ int main(int argc,char *argv[])
 #if 0
          if((str = strstr(user,"%20")) != NULL) {
             /*
-            Why is it necessary to truncate the user name at the first space ?
+            This is a patch introduced to solve bug #1624251 reported at sourceforge but
+            the side effect is to truncate the name at the first space and merge the reports
+            of people whose name is identical up to the first space.
 
             The old code used to truncate the user name at the first % if a %20 was
             found anywhere in the string. That means the string could be truncated
@@ -1119,7 +1121,7 @@ int main(int argc,char *argv[])
 
          for(str=user; *str; str++) {
             if(*str=='.') dotinuser++;
-            if(*str=='?' || *str=='.' || *str==':' || *str=='/' || *str=='\\')
+            if(*str=='?' || *str=='.' || *str==':' || *str=='/' || *str=='\\' || *str=='\'')
                *str='_';
          }