From 61799baba3631f55469d2754542130255ce790cf Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Tue, 29 Mar 2016 14:33:35 -0700 Subject: uncrypt: remove --read-bcb option. Bug: 27897241 Change-Id: I4f52ada58e8f204dba8c974ea0ae03876411ecf0 --- uncrypt/uncrypt.cpp | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index e783b9e7a..8003f9029 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -425,24 +425,6 @@ static std::string get_misc_blk_device() { return ""; } -static int read_bootloader_message(bootloader_message* out) { - std::string misc_blk_device = get_misc_blk_device(); - if (misc_blk_device.empty()) { - ALOGE("failed to find /misc partition."); - return -1; - } - unique_fd fd(open(misc_blk_device.c_str(), O_RDONLY)); - if (!fd) { - ALOGE("failed to open %s: %s", misc_blk_device.c_str(), strerror(errno)); - return -1; - } - if (!android::base::ReadFully(fd.get(), out, sizeof(*out))) { - ALOGE("failed to read %s: %s", misc_blk_device.c_str(), strerror(errno)); - return -1; - } - return 0; -} - static int write_bootloader_message(const bootloader_message* in) { std::string misc_blk_device = get_misc_blk_device(); if (misc_blk_device.empty()) { @@ -570,23 +552,11 @@ static bool setup_bcb(const int socket) { return true; } -static int read_bcb() { - bootloader_message boot; - if (read_bootloader_message(&boot) != 0) { - ALOGE("failed to get bootloader message"); - return 1; - } - printf("bcb command: %s\n", boot.command); - printf("bcb recovery:\n%s\n", boot.recovery); - return 0; -} - static void usage(const char* exename) { fprintf(stderr, "Usage of %s:\n", exename); fprintf(stderr, "%s [ ] Uncrypt ota package.\n", exename); fprintf(stderr, "%s --clear-bcb Clear BCB data in misc partition.\n", exename); fprintf(stderr, "%s --setup-bcb Setup BCB data by command file.\n", exename); - fprintf(stderr, "%s --read-bcb Read BCB data from misc partition.\n", exename); } int main(int argc, char** argv) { @@ -598,8 +568,6 @@ int main(int argc, char** argv) { action = CLEAR_BCB; } else if (argc == 2 && strcmp(argv[1], "--setup-bcb") == 0) { action = SETUP_BCB; - } else if (argc ==2 && strcmp(argv[1], "--read-bcb") == 0) { - return read_bcb(); } else if (argc == 1) { action = UNCRYPT; } else if (argc == 3) { -- cgit v1.2.3