Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 (e254b4e9) · Commits · e / tools / etwrp

recovery.cpp

+36 −31

Original line number	Diff line number	Diff line
		@@ -919,17 +919,13 @@ static bool brick_device() {
		}

		static void choose_recovery_file(Device* device) {
		if (!has_cache) {
		ui->Print("No /cache partition found.\n");
		return;
		}

		// "Back" + KEEP_LOG_COUNT * 2 + terminating nullptr entry
		char* entries[1 + KEEP_LOG_COUNT * 2 + 1];
		memset(entries, 0, sizeof(entries));

		unsigned int n = 0;

		if (has_cache) {
		// Add LAST_LOG_FILE + LAST_LOG_FILE.x
		// Add LAST_KMSG_FILE + LAST_KMSG_FILE.x
		for (int i = 0; i < KEEP_LOG_COUNT; i++) {
		@@ -960,6 +956,15 @@ static void choose_recovery_file(Device* device) {
		entries[n++] = kmsg_file;
		}
		}
		} else {
		// If cache partition is not found, view /tmp/recovery.log instead.
		ui->Print("No /cache partition found.\n");
		if (access(TEMPORARY_LOG_FILE, R_OK) == -1) {
		return;
		} else{
		entries[n++] = strdup(TEMPORARY_LOG_FILE);
		}
		}

		entries[n++] = strdup("Back");