diff options
author | Doug Zongker <dougz@android.com> | 2009-07-03 00:24:19 +0200 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-03 00:24:19 +0200 |
commit | c457ff643627fb3edf0321a37fcffd6b520f931e (patch) | |
tree | b8f7c07d8384593fc55f7a96af856e9a9b990591 /mtdutils | |
parent | am d8f7c9b8: Merge change 5545 into donut (diff) | |
parent | skip over all-zero blocks when reading MTD partition (diff) | |
download | android_bootable_recovery-c457ff643627fb3edf0321a37fcffd6b520f931e.tar android_bootable_recovery-c457ff643627fb3edf0321a37fcffd6b520f931e.tar.gz android_bootable_recovery-c457ff643627fb3edf0321a37fcffd6b520f931e.tar.bz2 android_bootable_recovery-c457ff643627fb3edf0321a37fcffd6b520f931e.tar.lz android_bootable_recovery-c457ff643627fb3edf0321a37fcffd6b520f931e.tar.xz android_bootable_recovery-c457ff643627fb3edf0321a37fcffd6b520f931e.tar.zst android_bootable_recovery-c457ff643627fb3edf0321a37fcffd6b520f931e.zip |
Diffstat (limited to '')
-rw-r--r-- | mtdutils/mtdutils.c | 13 |
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; |