summaryrefslogtreecommitdiffstats
path: root/applypatch
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-30 06:19:33 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-30 06:19:33 +0200
commit34d3a3d074e977cace29797c428795e1de5b3223 (patch)
treee2c357667b0e76e6fa5a43c7a7951c872c373e9c /applypatch
parentam 8c389e9c: Merge "Stop using adb_strtok, and check argument validity." (diff)
parentMerge "Check all lseek calls succeed." (diff)
downloadandroid_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar
android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.gz
android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.bz2
android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.lz
android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.xz
android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.zst
android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.zip
Diffstat (limited to '')
-rw-r--r--applypatch/applypatch.c51
1 files changed, 27 insertions, 24 deletions
diff --git a/applypatch/applypatch.c b/applypatch/applypatch.c
index 2c86e0984..6f02a38ee 100644
--- a/applypatch/applypatch.c
+++ b/applypatch/applypatch.c
@@ -422,20 +422,19 @@ int WriteToPartition(unsigned char* data, size_t len,
int attempt;
for (attempt = 0; attempt < 2; ++attempt) {
- lseek(fd, start, SEEK_SET);
+ if (TEMP_FAILURE_RETRY(lseek(fd, start, SEEK_SET)) == -1) {
+ printf("failed seek on %s: %s\n",
+ partition, strerror(errno));
+ return -1;
+ }
while (start < len) {
size_t to_write = len - start;
if (to_write > 1<<20) to_write = 1<<20;
- ssize_t written = write(fd, data+start, to_write);
- if (written < 0) {
- if (errno == EINTR) {
- written = 0;
- } else {
- printf("failed write writing to %s (%s)\n",
- partition, strerror(errno));
- return -1;
- }
+ ssize_t written = TEMP_FAILURE_RETRY(write(fd, data+start, to_write));
+ if (written == -1) {
+ printf("failed write writing to %s: %s\n", partition, strerror(errno));
+ return -1;
}
start += written;
}
@@ -460,13 +459,20 @@ int WriteToPartition(unsigned char* data, size_t len,
// won't just be reading the cache.
sync();
int dc = open("/proc/sys/vm/drop_caches", O_WRONLY);
- write(dc, "3\n", 2);
+ if (TEMP_FAILURE_RETRY(write(dc, "3\n", 2)) == -1) {
+ printf("write to /proc/sys/vm/drop_caches failed: %s\n", strerror(errno));
+ } else {
+ printf(" caches dropped\n");
+ }
close(dc);
sleep(1);
- printf(" caches dropped\n");
// verify
- lseek(fd, 0, SEEK_SET);
+ if (TEMP_FAILURE_RETRY(lseek(fd, 0, SEEK_SET)) == -1) {
+ printf("failed to seek back to beginning of %s: %s\n",
+ partition, strerror(errno));
+ return -1;
+ }
unsigned char buffer[4096];
start = len;
size_t p;
@@ -476,15 +482,12 @@ int WriteToPartition(unsigned char* data, size_t len,
size_t so_far = 0;
while (so_far < to_read) {
- ssize_t read_count = read(fd, buffer+so_far, to_read-so_far);
- if (read_count < 0) {
- if (errno == EINTR) {
- read_count = 0;
- } else {
- printf("verify read error %s at %zu: %s\n",
- partition, p, strerror(errno));
- return -1;
- }
+ ssize_t read_count =
+ TEMP_FAILURE_RETRY(read(fd, buffer+so_far, to_read-so_far));
+ if (read_count == -1) {
+ printf("verify read error %s at %zu: %s\n",
+ partition, p, strerror(errno));
+ return -1;
}
if ((size_t)read_count < to_read) {
printf("short verify read %s at %zu: %zd %zu %s\n",
@@ -625,8 +628,8 @@ ssize_t FileSink(const unsigned char* data, ssize_t len, void* token) {
ssize_t done = 0;
ssize_t wrote;
while (done < (ssize_t) len) {
- wrote = write(fd, data+done, len-done);
- if (wrote <= 0) {
+ wrote = TEMP_FAILURE_RETRY(write(fd, data+done, len-done));
+ if (wrote == -1) {
printf("error writing %d bytes: %s\n", (int)(len-done), strerror(errno));
return done;
}