commit aa730c1145a4670dead4973b791d47258a1c29f9
author Mark Salyzyn <salyzyn@google.com> Wed Mar 30 12:38:29 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Wed Mar 30 16:11:37 2016 -0700
tree a09232e8bd5c74fc7328072d7718f7b37710a811
parent c6d6652df52bb65984f6be1f8e57606d3f5a6e69

logcat: support --regex on binary buffers as-is

- Do not restrict regex on LOG_ID_EVENTS or LOG_ID_SECURITY.
- some logcat_panic messages need to incorporate a newline.
- deal with some coding standards issues.

Bug: 27706081
Change-Id: Ie647fd62d027b01004177559d68b8e5a346705e6

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);