commit 6a70284e9fd726c638affc9fbdabe0e9bd9b288c
author Mark Salyzyn <salyzyn@google.com> Wed Mar 30 23:38:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 30 23:38:19 2016 +0000
tree ad46328a04b40058fbaac5f0db18a39551dd8605
parent 2b3d4525dfe221abcafbe0ab85e94427736cc07a
parent 5658ef12fc9e15d4ecc2f538f66b83797acefcec

Merge "logcat: support --regex on binary buffers as-is" am: c812057 am: 8dc8e5d
am: dac4870

* commit 'dac487029ed8d2cb4ad7a9ba8585519cc6c40802':
  logcat: support --regex on binary buffers as-is

Change-Id: I0cc1eccd9d557c98b1326e89159c6316f33847f4

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index df3eb66..6d20f4a 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -83,6 +83,7 @@
 static size_t g_maxCount;
 static size_t g_printCount;
 
+// if showHelp is set, newline required in fmt statement to transition to usage
 __noreturn static void logcat_panic(bool showHelp, const char *fmt, ...) __printflike(2,3);
 
 static int openLogFile (const char *pathname)
@@ -149,16 +150,12 @@
     TEMP_FAILURE_RETRY(write(g_outFD, buf, size));
 }
 
-static bool regexOk(const AndroidLogEntry& entry, log_id_t id)
+static bool regexOk(const AndroidLogEntry& entry)
 {
-    if (! g_regex) {
+    if (!g_regex) {
         return true;
     }
 
-    if (id == LOG_ID_EVENTS || id == LOG_ID_SECURITY) {
-        return false;
-    }
-
     std::string messageString(entry.message, entry.messageLen);
 
     return g_regex->PartialMatch(messageString);
@@ -193,7 +190,7 @@
     }
 
     if (android_log_shouldPrintLine(g_logformat, entry.tag, entry.priority) &&
-        regexOk(entry, buf->id())) {
+            regexOk(entry)) {
         bytesWritten = android_log_printLogLine(g_logformat, g_outFD, &entry);
 
         g_printCount++;
@@ -966,7 +963,7 @@
     }
 
     if (g_maxCount && got_t) {
-        logcat_panic(true, "Cannot use -m (--max-count) and -t together");
+        logcat_panic(true, "Cannot use -m (--max-count) and -t together\n");
     }
 
     if (!devices) {
@@ -1185,7 +1182,7 @@
     dev = NULL;
     log_device_t unexpected("unexpected", false);
 
-    while (!g_maxCount || g_printCount < g_maxCount) {
+    while (!g_maxCount || (g_printCount < g_maxCount)) {
         struct log_msg log_msg;
         log_device_t* d;
         int ret = android_logger_list_read(logger_list, &log_msg);