commit 4fb24dda34d6a2f527d8907fc3d04b38176c3903
author Mark Salyzyn <salyzyn@google.com> Fri Jun 12 22:36:57 2015 +0000
committer Mark Salyzyn <salyzyn@google.com> Fri Jun 12 22:36:57 2015 +0000
tree fae3cb75e4c30461b086ad5711a5eb6337906781
parent d3c5093a3ca98246d2036db36db5e9648c3e3345

Revert "logd: regression in log_strtok_r"

This reverts commit d3c5093a3ca98246d2036db36db5e9648c3e3345.

Change-Id: I52558fd0e9f75ba1cc6a151785fc91857c27ab9a

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