summaryrefslogtreecommitdiffstats
path: root/bootloader_message/bootloader_message.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-10-25 22:16:54 +0200
committerTianjie Xu <xunchang@google.com>2017-11-03 22:09:11 +0100
commita88cc5440ed79a0927f57bbd03377ff3ce04a760 (patch)
tree493507d15c2ec159ee74a3e21a0cee91bee58d28 /bootloader_message/bootloader_message.cpp
parentMerge "Add libbrotli as a dependency for libbsdiff" (diff)
downloadandroid_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.tar
android_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.tar.gz
android_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.tar.bz2
android_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.tar.lz
android_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.tar.xz
android_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.tar.zst
android_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.zip
Diffstat (limited to 'bootloader_message/bootloader_message.cpp')
-rw-r--r--bootloader_message/bootloader_message.cpp33
1 files changed, 17 insertions, 16 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp
index f91446b43..aaeffdc5c 100644
--- a/bootloader_message/bootloader_message.cpp
+++ b/bootloader_message/bootloader_message.cpp
@@ -159,14 +159,8 @@ bool clear_bootloader_message(std::string* err) {
bool write_bootloader_message(const std::vector<std::string>& options, std::string* err) {
bootloader_message boot = {};
- strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
- strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));
- for (const auto& s : options) {
- strlcat(boot.recovery, s.c_str(), sizeof(boot.recovery));
- if (s.back() != '\n') {
- strlcat(boot.recovery, "\n", sizeof(boot.recovery));
- }
- }
+ update_bootloader_message_in_struct(&boot, options);
+
return write_bootloader_message(boot, err);
}
@@ -175,20 +169,27 @@ bool update_bootloader_message(const std::vector<std::string>& options, std::str
if (!read_bootloader_message(&boot, err)) {
return false;
}
+ update_bootloader_message_in_struct(&boot, options);
- // Zero out the entire fields.
- memset(boot.command, 0, sizeof(boot.command));
- memset(boot.recovery, 0, sizeof(boot.recovery));
+ return write_bootloader_message(boot, err);
+}
+
+bool update_bootloader_message_in_struct(bootloader_message* boot,
+ const std::vector<std::string>& options) {
+ if (!boot) return false;
+ // Replace the command & recovery fields.
+ memset(boot->command, 0, sizeof(boot->command));
+ memset(boot->recovery, 0, sizeof(boot->recovery));
- strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
- strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));
+ strlcpy(boot->command, "boot-recovery", sizeof(boot->command));
+ strlcpy(boot->recovery, "recovery\n", sizeof(boot->recovery));
for (const auto& s : options) {
- strlcat(boot.recovery, s.c_str(), sizeof(boot.recovery));
+ strlcat(boot->recovery, s.c_str(), sizeof(boot->recovery));
if (s.back() != '\n') {
- strlcat(boot.recovery, "\n", sizeof(boot.recovery));
+ strlcat(boot->recovery, "\n", sizeof(boot->recovery));
}
}
- return write_bootloader_message(boot, err);
+ return true;
}
bool write_reboot_bootloader(std::string* err) {