summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2013-07-09 22:34:55 +0200
committerDoug Zongker <dougz@android.com>2013-07-09 22:34:55 +0200
commit6d0d7ac051a0338c0e07e239e742b92e5ab8ea07 (patch)
tree7d936487a21df9107a8a5c7ade999fb25ad4c4ab
parentam 0ccaccf7: am 044a0b4d: recovery: try to write EMMC partitions more reliably (diff)
downloadandroid_bootable_recovery-6d0d7ac051a0338c0e07e239e742b92e5ab8ea07.tar
android_bootable_recovery-6d0d7ac051a0338c0e07e239e742b92e5ab8ea07.tar.gz
android_bootable_recovery-6d0d7ac051a0338c0e07e239e742b92e5ab8ea07.tar.bz2
android_bootable_recovery-6d0d7ac051a0338c0e07e239e742b92e5ab8ea07.tar.lz
android_bootable_recovery-6d0d7ac051a0338c0e07e239e742b92e5ab8ea07.tar.xz
android_bootable_recovery-6d0d7ac051a0338c0e07e239e742b92e5ab8ea07.tar.zst
android_bootable_recovery-6d0d7ac051a0338c0e07e239e742b92e5ab8ea07.zip
-rw-r--r--recovery.cpp78
1 files changed, 76 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp
index b7fb616ce..82cfc3f8d 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -61,6 +61,7 @@ static const struct option OPTIONS[] = {
#define LAST_LOG_FILE "/cache/recovery/last_log"
+static const char *CACHE_LOG_DIR = "/cache/recovery";
static const char *COMMAND_FILE = "/cache/recovery/command";
static const char *INTENT_FILE = "/cache/recovery/intent";
static const char *LOG_FILE = "/cache/recovery/log";
@@ -342,22 +343,95 @@ finish_recovery(const char *send_intent) {
sync(); // For good measure.
}
+typedef struct _saved_log_file {
+ char* name;
+ struct stat st;
+ unsigned char* data;
+ struct _saved_log_file* next;
+} saved_log_file;
+
static int
erase_volume(const char *volume) {
+ bool is_cache = (strcmp(volume, CACHE_ROOT) == 0);
+
ui->SetBackground(RecoveryUI::ERASING);
ui->SetProgressType(RecoveryUI::INDETERMINATE);
+
+ saved_log_file* head = NULL;
+
+ if (is_cache) {
+ // If we're reformatting /cache, we load any
+ // "/cache/recovery/last*" files into memory, so we can restore
+ // them after the reformat.
+
+ ensure_path_mounted(volume);
+
+ DIR* d;
+ struct dirent* de;
+ d = opendir(CACHE_LOG_DIR);
+ if (d) {
+ char path[PATH_MAX];
+ strcpy(path, CACHE_LOG_DIR);
+ strcat(path, "/");
+ int path_len = strlen(path);
+ while ((de = readdir(d)) != NULL) {
+ if (strncmp(de->d_name, "last", 4) == 0) {
+ saved_log_file* p = (saved_log_file*) malloc(sizeof(saved_log_file));
+ strcpy(path+path_len, de->d_name);
+ p->name = strdup(path);
+ if (stat(path, &(p->st)) == 0) {
+ // truncate files to 512kb
+ if (p->st.st_size > (1 << 19)) {
+ p->st.st_size = 1 << 19;
+ }
+ p->data = (unsigned char*) malloc(p->st.st_size);
+ FILE* f = fopen(path, "rb");
+ fread(p->data, 1, p->st.st_size, f);
+ fclose(f);
+ p->next = head;
+ head = p;
+ } else {
+ free(p);
+ }
+ }
+ }
+ closedir(d);
+ } else {
+ if (errno != ENOENT) {
+ printf("opendir failed: %s\n", strerror(errno));
+ }
+ }
+ }
+
ui->Print("Formatting %s...\n", volume);
ensure_path_unmounted(volume);
+ int result = format_volume(volume);
+
+ if (is_cache) {
+ while (head) {
+ FILE* f = fopen_path(head->name, "wb");
+ if (f) {
+ fwrite(head->data, 1, head->st.st_size, f);
+ fclose(f);
+ chmod(head->name, head->st.st_mode);
+ chown(head->name, head->st.st_uid, head->st.st_gid);
+ }
+ free(head->name);
+ free(head->data);
+ saved_log_file* temp = head->next;
+ free(head);
+ head = temp;
+ }
- if (strcmp(volume, "/cache") == 0) {
// Any part of the log we'd copied to cache is now gone.
// Reset the pointer so we copy from the beginning of the temp
// log.
tmplog_offset = 0;
+ copy_logs();
}
- return format_volume(volume);
+ return result;
}
static char*