From 684696c3f463d4dc27151863fe5c78b173e332ec Mon Sep 17 00:00:00 2001 From: philz-cwm6 Date: Mon, 16 Sep 2013 22:31:28 +0200 Subject: [PATCH] Fix extract of tgz multi volumes corruption at split point Remove roots.c dead code New lines Misc formatting Change-Id: I445fe240b3e5d1fff4c4dbce25e286cec66f69fc --- extendedcommands.c | 4 ++-- extendedcommands.h | 3 --- flashutils/flashutils.c | 2 +- nandroid.c | 10 +++++----- recovery.c | 24 ++++++++++++------------ roots.c | 1 - 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/extendedcommands.c b/extendedcommands.c index 4e590a440..39a380f48 100644 --- a/extendedcommands.c +++ b/extendedcommands.c @@ -303,7 +303,7 @@ char** gather_files(const char* directory, const char* fileExtensionOrDirectory, } if(closedir(dir) < 0) { - LOGE("Failed to close directory."); + LOGE("Failed to close directory.\n"); } if (total==0) { @@ -653,7 +653,7 @@ int format_device(const char *device, const char *path, const char *fs_type) { reset_ext4fs_info(); int result = make_ext4fs(device, length, v->mount_point, sehandle); if (result != 0) { - LOGE("format_volume: make_extf4fs failed on %s\n", device); + LOGE("format_volume: make_ext4fs failed on %s\n", device); return -1; } return 0; diff --git a/extendedcommands.h b/extendedcommands.h index 7887ec01d..8acc3cd1c 100644 --- a/extendedcommands.h +++ b/extendedcommands.h @@ -41,9 +41,6 @@ int format_device(const char *device, const char *path, const char *fs_type); int format_unknown_device(const char *device, const char* path, const char *fs_type); -void -wipe_battery_stats(); - void create_fstab(); int has_datadata(); diff --git a/flashutils/flashutils.c b/flashutils/flashutils.c index de45e87b8..860945e82 100644 --- a/flashutils/flashutils.c +++ b/flashutils/flashutils.c @@ -90,7 +90,7 @@ int backup_raw_partition(const char* partitionType, const char *partition, const case BML: return cmd_bml_backup_raw_partition(partition, filename); default: - printf("unable to detect device type"); + printf("unable to detect device type\n"); return -1; } } diff --git a/nandroid.c b/nandroid.c index 0f9995d5e..311a44bd8 100644 --- a/nandroid.c +++ b/nandroid.c @@ -64,7 +64,7 @@ static void ensure_directory(const char* dir) { } static int print_and_error(const char* message) { - ui_print("%s", message); + ui_print("%s\n", message); return 1; } @@ -347,8 +347,8 @@ int nandroid_backup_partition(const char* backup_path, const char* root) { strcpy(tmp, "/proc/self/fd/1"); else sprintf(tmp, "%s/%s.img", backup_path, name); - ui_print("Backing up %s image...\n", name); + ui_print("Backing up %s image...\n", name); if (0 != (ret = backup_raw_partition(vol->fs_type, vol->blk_device, tmp))) { ui_print("Error while backing up %s image!", name); return ret; @@ -537,7 +537,7 @@ static int do_tar_extract(char* command, int callback) { static int tar_gzip_extract_wrapper(const char* backup_file_image, const char* backup_path, int callback) { char tmp[PATH_MAX]; - sprintf(tmp, "cd $(dirname %s) ; pigz -d -c %s* | tar xv ; exit $?", backup_path, backup_file_image); + sprintf(tmp, "cd $(dirname %s) ; cat %s* | pigz -d -c | tar xv ; exit $?", backup_path, backup_file_image); return do_tar_extract(tmp, callback); } @@ -765,7 +765,7 @@ int nandroid_restore_partition(const char* backup_path, const char* root) { ui_print("Restoring %s image...\n", name); if (0 != (ret = restore_raw_partition(vol->fs_type, vol->blk_device, tmp))) { - ui_print("Error while flashing %s image!", name); + ui_print("Error while flashing %s image!\n", name); return ret; } return 0; @@ -961,7 +961,7 @@ int nandroid_main(int argc, char** argv) return nandroid_usage(); return nandroid_restore(argv[2], 1, 1, 1, 1, 1, 0); } - + if (strcmp("dump", argv[1]) == 0) { if (argc != 3) diff --git a/recovery.c b/recovery.c index 2f43d584e..0e64b6156 100644 --- a/recovery.c +++ b/recovery.c @@ -678,12 +678,12 @@ wipe_data(int confirm) { } static void headless_wait() { - ui_show_text(0); - const char** headers = prepend_title((const char**)MENU_HEADERS); - for (;;) { - finish_recovery(NULL); - get_menu_selection(headers, MENU_ITEMS, 0, 0); - } + ui_show_text(0); + const char** headers = prepend_title((const char**)MENU_HEADERS); + for(;;) { + finish_recovery(NULL); + get_menu_selection(headers, MENU_ITEMS, 0, 0); + } } int ui_menu_level = 1; @@ -889,7 +889,7 @@ main(int argc, char **argv) { // If these fail, there's not really anywhere to complain... freopen(TEMPORARY_LOG_FILE, "a", stdout); setbuf(stdout, NULL); freopen(TEMPORARY_LOG_FILE, "a", stderr); setbuf(stderr, NULL); - printf("Starting recovery on %s", ctime(&start)); + printf("Starting recovery on %s\n", ctime(&start)); device_ui_init(&ui_parameters); ui_init(); @@ -995,7 +995,7 @@ main(int argc, char **argv) { } else if (sideload) { signature_check_enabled = 0; if (!headless) - ui_set_show_text(1); + ui_set_show_text(1); if (0 == apply_from_adb()) { status = INSTALL_SUCCESS; ui_set_show_text(0); @@ -1009,10 +1009,10 @@ main(int argc, char **argv) { script_assert_enabled = 0; is_user_initiated_recovery = 1; if (!headless) { - ui_set_show_text(1); - ui_set_background(BACKGROUND_ICON_CLOCKWORK); + ui_set_show_text(1); + ui_set_background(BACKGROUND_ICON_CLOCKWORK); } - + if (extendedcommand_file_exists()) { LOGI("Running extendedcommand...\n"); int ret; @@ -1029,7 +1029,7 @@ main(int argc, char **argv) { } if (headless) { - headless_wait(); + headless_wait(); } if (status != INSTALL_SUCCESS && !is_user_initiated_recovery) { ui_set_show_text(1); diff --git a/roots.c b/roots.c index 5d86c1f0e..b4250beda 100644 --- a/roots.c +++ b/roots.c @@ -276,7 +276,6 @@ int ensure_path_mounted_at_mount_point(const char* path, const char* mount_point return __system(mount_cmd); } - LOGE("unknown fs_type \"%s\" for %s\n", v->fs_type, mount_point); return -1; }