Author: rmilecki
Date: 2016-05-09 14:54:46 +0200 (Mon, 09 May 2016)
New Revision: 49311
Modified:
branches/chaos_calmer/package/system/mtd/src/seama.c
Log:
mtd: seama: update MD5 using header in the first block buffer
This will allow separating first block buffer from a buffer used for MD5
calculation.
Signed-off-by: Rafa{U+0142} Mi{U+0142}ecki <[email protected]>
Backport of r49307
Modified: branches/chaos_calmer/package/system/mtd/src/seama.c
===================================================================
--- branches/chaos_calmer/package/system/mtd/src/seama.c 2016-05-09
12:54:42 UTC (rev 49310)
+++ branches/chaos_calmer/package/system/mtd/src/seama.c 2016-05-09
12:54:46 UTC (rev 49311)
@@ -51,9 +51,8 @@
ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset);
int
-seama_fix_md5(char *buf, size_t len)
+seama_fix_md5(struct seama_entity_header *shdr, char *buf, size_t len)
{
- struct seama_entity_header *shdr = (struct seama_entity_header *) buf;
char *data;
size_t msize;
size_t isize;
@@ -163,7 +162,7 @@
exit(1);
}
- if (seama_fix_md5(buf, mtdsize))
+ if (seama_fix_md5(shdr, buf, mtdsize))
goto out;
if (mtd_erase_block(fd, block_offset)) {
@@ -175,7 +174,7 @@
if (quiet < 2)
fprintf(stderr, "Rewriting block at 0x%x\n", block_offset);
- if (pwrite(fd, buf, erasesize, block_offset) != erasesize) {
+ if (pwrite(fd, first_block, erasesize, block_offset) != erasesize) {
fprintf(stderr, "Error writing block (%s)\n", strerror(errno));
exit(1);
}
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
