commit 634809a66d0e19b71dc5cedc61763e8c948036e4
author Mark Salyzyn <salyzyn@google.com> Fri Jun 12 22:43:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 12 22:43:08 2015 +0000
tree b2aa48959df5b7ba1cd39182c2cce2aef905397e
parent b8953938b7e1d93468c5075c0dc15a02aca04721
parent 78a8692e58bb083705338fbfd946c928b0e650ac

am de42d34c: Merge "logd: regression in log_strtok_r"

* commit 'de42d34cd5de2ca3ecc89b155ea866e98a5d5568':
  logd: regression in log_strtok_r

logd/LogKlog.cpp

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