am be971215: Merge "logcat: add pstore read"
* commit 'be9712156bdcf8cff774a78a3afdb0c562998c73':
logcat: add pstore read
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index d831d66..cd5003e 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -237,6 +237,7 @@
" -T '<time>' print most recent lines since specified time (not imply -d)\n"
" count is pure numerical, time is 'MM-DD hh:mm:ss.mmm'\n"
" -g get the size of the log's ring buffer and exit\n"
+ " -L dump logs from prior to last reboot\n"
" -b <buffer> Request alternate ring buffer, 'main', 'system', 'radio',\n"
" 'events', 'crash' or 'all'. Multiple -b parameters are\n"
" allowed and results are interleaved. The default is\n"
@@ -348,7 +349,7 @@
for (;;) {
int ret;
- ret = getopt(argc, argv, "cdDt:T:gG:sQf:r:n:v:b:BSpP:");
+ ret = getopt(argc, argv, "cdDLt:T:gG:sQf:r:n:v:b:BSpP:");
if (ret < 0) {
break;
@@ -365,6 +366,10 @@
mode |= ANDROID_LOG_WRONLY;
break;
+ case 'L':
+ mode |= ANDROID_LOG_PSTORE;
+ break;
+
case 'd':
mode |= ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK;
break;