PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "uncrypt: remove --read-bcb option."

Browse Source
This commit is contained in:
Yabin Cui
2016-03-30 01:19:25 +00:00
committed by Gerrit Code Review
parent 3568004cba 6507265906
commit ebd22be4f7
1 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
uncrypt/uncrypt.cpp
View File

@@ -363,24 +363,6 @@ static std::string get_misc_blk_device() {
return ""; 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;
}
android::base::unique_fd fd(open(misc_blk_device.c_str(), O_RDONLY));
if (fd == -1) {
ALOGE("failed to open %s: %s", misc_blk_device.c_str(), strerror(errno));
return -1;
}
if (!android::base::ReadFully(fd, 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) { static int write_bootloader_message(const bootloader_message* in) {
std::string misc_blk_device = get_misc_blk_device(); std::string misc_blk_device = get_misc_blk_device();
if (misc_blk_device.empty()) { if (misc_blk_device.empty()) {
@@ -530,24 +512,12 @@ static int setup_bcb(const std::string& command_file, const std::string& status_
return 0; return 0;
} }
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) { static void usage(const char* exename) {
fprintf(stderr, "Usage of %s:\n", exename); fprintf(stderr, "Usage of %s:\n", exename);
fprintf(stderr, "%s [<package_path> <map_file>] Uncrypt ota package.\n", exename); fprintf(stderr, "%s [<package_path> <map_file>] Uncrypt ota package.\n", exename);
fprintf(stderr, "%s --reboot Clear BCB data and reboot to recovery.\n", exename); fprintf(stderr, "%s --reboot Clear BCB data and reboot to recovery.\n", exename);
fprintf(stderr, "%s --clear-bcb Clear BCB data in misc partition.\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 --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) { int main(int argc, char** argv) {
@@ -558,8 +528,6 @@ int main(int argc, char** argv) {
return clear_bcb(STATUS_FILE); return clear_bcb(STATUS_FILE);
} else if (strcmp(argv[1], "--setup-bcb") == 0) { } else if (strcmp(argv[1], "--setup-bcb") == 0) {
return setup_bcb(COMMAND_FILE, STATUS_FILE); return setup_bcb(COMMAND_FILE, STATUS_FILE);
} else if (strcmp(argv[1], "--read-bcb") == 0) {
return read_bcb();
} }
} else if (argc == 1 || argc == 3) { } else if (argc == 1 || argc == 3) {
const char* input_path = nullptr; const char* input_path = nullptr;