diff options
author | Tianjie Xu <xunchang@google.com> | 2016-11-04 19:07:07 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-04 19:07:08 +0100 |
commit | e2d05c565816c4dd97354ac5804200d8afa6e5fa (patch) | |
tree | 96ddf35c8b0616520804814cbba6d6767615f351 /recovery-refresh.cpp | |
parent | Merge "updater: Fix a bug in DeleteFn()." (diff) | |
parent | Cleanup the duplicates of logs rotation functions (diff) | |
download | android_bootable_recovery-e2d05c565816c4dd97354ac5804200d8afa6e5fa.tar android_bootable_recovery-e2d05c565816c4dd97354ac5804200d8afa6e5fa.tar.gz android_bootable_recovery-e2d05c565816c4dd97354ac5804200d8afa6e5fa.tar.bz2 android_bootable_recovery-e2d05c565816c4dd97354ac5804200d8afa6e5fa.tar.lz android_bootable_recovery-e2d05c565816c4dd97354ac5804200d8afa6e5fa.tar.xz android_bootable_recovery-e2d05c565816c4dd97354ac5804200d8afa6e5fa.tar.zst android_bootable_recovery-e2d05c565816c4dd97354ac5804200d8afa6e5fa.zip |
Diffstat (limited to '')
-rw-r--r-- | recovery-refresh.cpp | 58 |
1 files changed, 1 insertions, 57 deletions
diff --git a/recovery-refresh.cpp b/recovery-refresh.cpp index b2ab52f7e..14565d3f4 100644 --- a/recovery-refresh.cpp +++ b/recovery-refresh.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "recovery-refresh" - // // Strictly to deal with reboot into system after OTA, then // reboot while in system before boot complete landing us back @@ -40,64 +38,11 @@ // #include <string.h> - #include <string> -#include <android/log.h> /* Android Log Priority Tags */ #include <private/android_logger.h> /* private pmsg functions */ -static const char LAST_KMSG_FILE[] = "recovery/last_kmsg"; -static const char LAST_LOG_FILE[] = "recovery/last_log"; - -static ssize_t logbasename( - log_id_t /* logId */, - char /* prio */, - const char *filename, - const char * /* buf */, size_t len, - void *arg) { - if (strstr(LAST_KMSG_FILE, filename) || - strstr(LAST_LOG_FILE, filename)) { - bool *doRotate = reinterpret_cast<bool *>(arg); - *doRotate = true; - } - return len; -} - -static ssize_t logrotate( - log_id_t logId, - char prio, - const char *filename, - const char *buf, size_t len, - void *arg) { - bool *doRotate = reinterpret_cast<bool *>(arg); - if (!*doRotate) { - return __android_log_pmsg_file_write(logId, prio, filename, buf, len); - } - - std::string name(filename); - size_t dot = name.find_last_of('.'); - std::string sub = name.substr(0, dot); - - if (!strstr(LAST_KMSG_FILE, sub.c_str()) && - !strstr(LAST_LOG_FILE, sub.c_str())) { - return __android_log_pmsg_file_write(logId, prio, filename, buf, len); - } - - // filename rotation - if (dot == std::string::npos) { - name += ".1"; - } else { - std::string number = name.substr(dot + 1); - if (!isdigit(number.data()[0])) { - name += ".1"; - } else { - auto i = std::stoull(number); - name = sub + "." + std::to_string(i + 1); - } - } - - return __android_log_pmsg_file_write(logId, prio, name.c_str(), buf, len); -} +#include "rotate_logs.h" int main(int argc, char **argv) { static const char filter[] = "recovery/"; @@ -105,7 +50,6 @@ int main(int argc, char **argv) { static const char rotate_flag[] = "--rotate"; ssize_t ret; bool doRotate = false; - // Take last pmsg contents and rewrite it to the current pmsg session. if ((argc <= 1) || !argv[1] || (((doRotate = strcmp(argv[1], rotate_flag))) && |