summaryrefslogtreecommitdiffstats
path: root/updater/blockimg.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-02-10 20:46:57 +0100
committerTao Bao <tbao@google.com>2016-02-10 20:46:57 +0100
commit4f0eb3e23a8f13d782a79bf76f95869d403b46e5 (patch)
tree1a14d63ad6963d8987195f1e308a06361cd6e361 /updater/blockimg.cpp
parentMerge "applypatch: Add a Makefile to build imgdiff in Chrome OS." (diff)
parentMerge "IO fault injection for OTA packages" (diff)
downloadandroid_bootable_recovery-4f0eb3e23a8f13d782a79bf76f95869d403b46e5.tar
android_bootable_recovery-4f0eb3e23a8f13d782a79bf76f95869d403b46e5.tar.gz
android_bootable_recovery-4f0eb3e23a8f13d782a79bf76f95869d403b46e5.tar.bz2
android_bootable_recovery-4f0eb3e23a8f13d782a79bf76f95869d403b46e5.tar.lz
android_bootable_recovery-4f0eb3e23a8f13d782a79bf76f95869d403b46e5.tar.xz
android_bootable_recovery-4f0eb3e23a8f13d782a79bf76f95869d403b46e5.tar.zst
android_bootable_recovery-4f0eb3e23a8f13d782a79bf76f95869d403b46e5.zip
Diffstat (limited to 'updater/blockimg.cpp')
-rw-r--r--updater/blockimg.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index e9c8ddbc0..44de4e031 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -554,7 +554,7 @@ static int LoadStash(const std::string& base, const std::string& id, bool verify
return -1;
}
- int fd = TEMP_FAILURE_RETRY(open(fn.c_str(), O_RDONLY));
+ int fd = TEMP_FAILURE_RETRY(ota_open(fn.c_str(), O_RDONLY));
unique_fd fd_holder(fd);
if (fd == -1) {
@@ -611,7 +611,7 @@ static int WriteStash(const std::string& base, const std::string& id, int blocks
fprintf(stderr, " writing %d blocks to %s\n", blocks, cn.c_str());
- int fd = TEMP_FAILURE_RETRY(open(fn.c_str(), O_WRONLY | O_CREAT | O_TRUNC, STASH_FILE_MODE));
+ int fd = TEMP_FAILURE_RETRY(ota_open(fn.c_str(), O_WRONLY | O_CREAT | O_TRUNC, STASH_FILE_MODE));
unique_fd fd_holder(fd);
if (fd == -1) {
@@ -635,7 +635,7 @@ static int WriteStash(const std::string& base, const std::string& id, int blocks
}
std::string dname = GetStashFileName(base, "", "");
- int dfd = TEMP_FAILURE_RETRY(open(dname.c_str(), O_RDONLY | O_DIRECTORY));
+ int dfd = TEMP_FAILURE_RETRY(ota_open(dname.c_str(), O_RDONLY | O_DIRECTORY));
unique_fd dfd_holder(dfd);
if (dfd == -1) {
@@ -1347,7 +1347,7 @@ static Value* PerformBlockImageUpdate(const char* name, State* state, int /* arg
return StringValue(strdup(""));
}
- params.fd = TEMP_FAILURE_RETRY(open(blockdev_filename->data, O_RDWR));
+ params.fd = TEMP_FAILURE_RETRY(ota_open(blockdev_filename->data, O_RDWR));
unique_fd fd_holder(params.fd);
if (params.fd == -1) {
@@ -1615,7 +1615,7 @@ Value* RangeSha1Fn(const char* name, State* state, int /* argc */, Expr* argv[])
return StringValue(strdup(""));
}
- int fd = open(blockdev_filename->data, O_RDWR);
+ int fd = ota_open(blockdev_filename->data, O_RDWR);
unique_fd fd_holder(fd);
if (fd < 0) {
ErrorAbort(state, "open \"%s\" failed: %s", blockdev_filename->data, strerror(errno));
@@ -1669,7 +1669,7 @@ Value* CheckFirstBlockFn(const char* name, State* state, int argc, Expr* argv[])
return StringValue(strdup(""));
}
- int fd = open(arg_filename->data, O_RDONLY);
+ int fd = ota_open(arg_filename->data, O_RDONLY);
unique_fd fd_holder(fd);
if (fd == -1) {
ErrorAbort(state, "open \"%s\" failed: %s", arg_filename->data, strerror(errno));