commit d1dbb0508c47b61c3b45c9a0ddba84137972ad5c
author Mark Salyzyn <salyzyn@google.com> Fri Jun 12 22:37:21 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 12 22:37:22 2015 +0000
tree ddd0b920f39b8a28818495ff04142b508fe18959
parent 78a8692e58bb083705338fbfd946c928b0e650ac
parent 07d36e909aa6a32e23c1897f9665ff9f40826721

Merge "Revert "logd: regression in log_strtok_r""

logd/LogKlog.cpp

diff --git a/logd/LogKlog.cpp b/logd/LogKlog.cpp
index 4e0e896..7d14648 100644
--- a/logd/LogKlog.cpp
+++ b/logd/LogKlog.cpp
@@ -68,9 +68,6 @@
             continue;
         }
         if (!isdigit(c) && (c == ']')) {
-            if (first_period || (*s != ' ')) {
-                break;
-            }
             return s;
         }
     }
@@ -78,7 +75,7 @@
 }
 
 // Like strtok_r with "\r\n" except that we look for log signatures (regex)
-// \(\(<[0-9]+>\)\([[] *[0-9]+[.][0-9]+[]] \)\{0,1\}\|[[] *[0-9]+[.][0-9]+[]] \)
+//   \(\(<[0-9]+>\)\([[] *[0-9]+[]]\)\{0,1\}\|[[] *[0-9]+[]]\)
 // and split if we see a second one without a newline.
 
 #define SIGNATURE_MASK     0xF0