summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-02-19 02:09:10 +0100
committerTao Bao <tbao@google.com>2016-02-19 17:39:25 +0100
commit8559bbfb3b988b1b8790702d277715fc429cc1d8 (patch)
tree218f98fe01d4a4e20dbd2fb2353548baaf401e09
parentRevert "Byte swap to support BGRA in recovery mode" (diff)
downloadandroid_bootable_recovery-8559bbfb3b988b1b8790702d277715fc429cc1d8.tar
android_bootable_recovery-8559bbfb3b988b1b8790702d277715fc429cc1d8.tar.gz
android_bootable_recovery-8559bbfb3b988b1b8790702d277715fc429cc1d8.tar.bz2
android_bootable_recovery-8559bbfb3b988b1b8790702d277715fc429cc1d8.tar.lz
android_bootable_recovery-8559bbfb3b988b1b8790702d277715fc429cc1d8.tar.xz
android_bootable_recovery-8559bbfb3b988b1b8790702d277715fc429cc1d8.tar.zst
android_bootable_recovery-8559bbfb3b988b1b8790702d277715fc429cc1d8.zip
Diffstat (limited to '')
-rw-r--r--bootloader.cpp29
1 files changed, 22 insertions, 7 deletions
diff --git a/bootloader.cpp b/bootloader.cpp
index 600d238f5..1c2097983 100644
--- a/bootloader.cpp
+++ b/bootloader.cpp
@@ -21,9 +21,12 @@
#include "roots.h"
#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
#include <stdio.h>
#include <string.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
static int get_bootloader_message_mtd(struct bootloader_message *out, const Volume* v);
@@ -185,18 +188,30 @@ static int get_bootloader_message_block(struct bootloader_message *out,
static int set_bootloader_message_block(const struct bootloader_message *in,
const Volume* v) {
wait_for_device(v->blk_device);
- FILE* f = fopen(v->blk_device, "wb");
- if (f == NULL) {
+ int fd = open(v->blk_device, O_WRONLY | O_SYNC);
+ if (fd == -1) {
LOGE("Can't open %s\n(%s)\n", v->blk_device, strerror(errno));
return -1;
}
- int count = fwrite(in, sizeof(*in), 1, f);
- if (count != 1) {
- LOGE("Failed writing %s\n(%s)\n", v->blk_device, strerror(errno));
+ size_t written = 0;
+ const uint8_t* start = reinterpret_cast<const uint8_t*>(in);
+ size_t total = sizeof(*in);
+ while (written < total) {
+ ssize_t wrote = TEMP_FAILURE_RETRY(write(fd, start + written, total - written));
+ if (wrote == -1) {
+ LOGE("failed to write %" PRId64 " bytes: %s\n",
+ static_cast<off64_t>(written), strerror(errno));
+ return -1;
+ }
+ written += wrote;
+ }
+
+ if (fsync(fd) == -1) {
+ LOGE("failed to fsync \"%s\": %s\n", v->blk_device, strerror(errno));
return -1;
}
- if (fclose(f) != 0) {
- LOGE("Failed closing %s\n(%s)\n", v->blk_device, strerror(errno));
+ if (close(fd) == -1) {
+ LOGE("failed to close %s: %s\n", v->blk_device, strerror(errno));
return -1;
}
return 0;