pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

logcat: clean up handling of logd control commands with -f and -L 

* Print an error if -c is provided with -f and -L since it is ambiguous
* Move the clear operation when -f is provided to a stand alone
  location, since there is no need to loop
* Prevent -g/-G, -S, and -p/-P with -f, since that combination doesn't
  make sense

Test: logpersist works
Change-Id: I6d8709bd61c898c47835470e99b0acff8c2692e4
This commit is contained in:
Tom Cherry 2019-12-04 14:37:38 -08:00
parent ab0b17c081
commit c30a3eede5
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
logcat/logcat.cpp
View File

@ -976,12 +976,47 @@ int Logcat::Run(int argc, char** argv) {
} }
if (mode & ANDROID_LOG_PSTORE) { if (mode & ANDROID_LOG_PSTORE) {
if (output_file_name_) {
LogcatPanic(HELP_FALSE, "-c is ambiguous with both -f and -L specified.\n");
}
if (setLogSize || getLogSize || printStatistics || getPruneList || setPruneList) {
LogcatPanic(HELP_TRUE, "-L is incompatible with -g/-G, -S, and -p/-P\n");
}
if (clearLog) { if (clearLog) {
unlink("/sys/fs/pstore/pmsg-ramoops-0"); unlink("/sys/fs/pstore/pmsg-ramoops-0");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
}
if (output_file_name_) {
if (setLogSize || getLogSize || printStatistics || getPruneList || setPruneList) { if (setLogSize || getLogSize || printStatistics || getPruneList || setPruneList) {
LogcatPanic(HELP_TRUE, "-L is incompatible with -g/-G, -S, and -p/-P"); LogcatPanic(HELP_TRUE, "-f is incompatible with -g/-G, -S, and -p/-P\n");
}
if (clearLog || setId) {
int max_rotation_count_digits =
max_rotated_logs_ > 0 ? (int)(floor(log10(max_rotated_logs_) + 1)) : 0;
for (int i = max_rotated_logs_; i >= 0; --i) {
std::string file;
if (!i) {
file = output_file_name_;
} else {
file = StringPrintf("%s.%.*d", output_file_name_, max_rotation_count_digits, i);
}
int err = unlink(file.c_str());
if (err < 0 && errno != ENOENT) {
fprintf(stderr, "failed to delete log file '%s': %s\n", file.c_str(),
strerror(errno));
}
}
}
if (clearLog) {
return EXIT_SUCCESS;
} }
} }
@ -1009,35 +1044,8 @@ int Logcat::Run(int argc, char** argv) {
continue; continue;
} }
if (clearLog || setId) { if (clearLog) {
if (output_file_name_) { if (android_logger_clear(logger)) {
int max_rotation_count_digits =
max_rotated_logs_ > 0 ? (int)(floor(log10(max_rotated_logs_) + 1)) : 0;
for (int i = max_rotated_logs_; i >= 0; --i) {
std::string file;
if (!i) {
file = output_file_name_;
} else {
file = StringPrintf("%s.%.*d", output_file_name_, max_rotation_count_digits,
i);
}
if (!file.length()) {
perror("while clearing log files");
ReportErrorName(buffer_name, security_buffer_selected, &clear_failures);
break;
}
int err = unlink(file.c_str());
if (err < 0 && errno != ENOENT) {
perror("while clearing log files");
ReportErrorName(buffer_name, security_buffer_selected, &clear_failures);
}
}
} else if (android_logger_clear(logger)) {
ReportErrorName(buffer_name, security_buffer_selected, &clear_failures); ReportErrorName(buffer_name, security_buffer_selected, &clear_failures);
} }
} }