summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2009-07-01 21:09:29 +0200
committerDoug Zongker <dougz@android.com>2009-07-01 21:09:29 +0200
commitbec02d57fb85cc7dd0196a54b0e9530e306623ac (patch)
tree88c0fc6a69cade6f9d4437666c6420e0f757e278
parentMerge change 5545 into donut (diff)
downloadandroid_bootable_recovery-bec02d57fb85cc7dd0196a54b0e9530e306623ac.tar
android_bootable_recovery-bec02d57fb85cc7dd0196a54b0e9530e306623ac.tar.gz
android_bootable_recovery-bec02d57fb85cc7dd0196a54b0e9530e306623ac.tar.bz2
android_bootable_recovery-bec02d57fb85cc7dd0196a54b0e9530e306623ac.tar.lz
android_bootable_recovery-bec02d57fb85cc7dd0196a54b0e9530e306623ac.tar.xz
android_bootable_recovery-bec02d57fb85cc7dd0196a54b0e9530e306623ac.tar.zst
android_bootable_recovery-bec02d57fb85cc7dd0196a54b0e9530e306623ac.zip
-rw-r--r--mtdutils/mtdutils.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/mtdutils/mtdutils.c b/mtdutils/mtdutils.c
index 2b0106f14..fc067669b 100644
--- a/mtdutils/mtdutils.c
+++ b/mtdutils/mtdutils.c
@@ -297,7 +297,14 @@ static int read_block(const MtdPartition *partition, int fd, char *data)
after.corrected - before.corrected,
after.failed - before.failed, pos);
} else {
- return 0; // Success!
+ int i;
+ for (i = 0; i < size; ++i) {
+ if (data[i] != 0) {
+ return 0; // Success!
+ }
+ }
+ fprintf(stderr, "mtd: read all-zero block at 0x%08lx; skipping\n",
+ pos);
}
pos += partition->erase_size;
@@ -326,6 +333,10 @@ ssize_t mtd_read_data(MtdReadContext *ctx, char *data, size_t len)
read += ctx->partition->erase_size;
}
+ if (read >= len) {
+ return read;
+ }
+
// Read the next block into the buffer
if (ctx->consumed == ctx->partition->erase_size && read < (int) len) {
if (read_block(ctx->partition, ctx->fd, ctx->buffer)) return -1;