logcat: clear when specifying file output
If -c and -f are both specified, clear the files rather
than notifying the logger to clear its data. The -f then
acts like a switch between clearing the in-memory log
data, or the on-disk logrotate data.
Bug: 28936216
Change-Id: Ib1d1fb46ea09f81a2fd9bebb6c8f0f9f2355f6e8
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index b8232cd..ea698c8 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -290,6 +290,7 @@
" tag thread threadtime time uid usec UTC year zone\n"
" -D, --dividers Print dividers between each log buffer\n"
" -c, --clear Clear (flush) the entire log and exit\n"
+ " if Log to File specified, clear fileset instead\n"
" -d Dump the log and then exit (don't block)\n"
" -e <expr>, --regex=<expr>\n"
" Only print lines where the log message matches <expr>\n"
@@ -1033,7 +1034,35 @@
}
if (clearLog) {
- if (android_logger_clear(dev->logger)) {
+ if (g_outputFileName) {
+ int maxRotationCountDigits =
+ (g_maxRotatedLogs > 0) ? (int) (floor(log10(g_maxRotatedLogs) + 1)) : 0;
+
+ for (int i = g_maxRotatedLogs ; i >= 0 ; --i) {
+ char *file;
+
+ if (i == 0) {
+ asprintf(&file, "%s", g_outputFileName);
+ } else {
+ asprintf(&file, "%s.%.*d", g_outputFileName, maxRotationCountDigits, i);
+ }
+
+ if (!file) {
+ perror("while clearing log files");
+ clearFail = clearFail ?: dev->device;
+ break;
+ }
+
+ err = unlink(file);
+
+ if (err < 0 && errno != ENOENT && clearFail == NULL) {
+ perror("while clearing log files");
+ clearFail = dev->device;
+ }
+
+ free(file);
+ }
+ } else if (android_logger_clear(dev->logger)) {
clearFail = clearFail ?: dev->device;
}
}