StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do a pass of normal-chunk-merging before comparing src and tgt files

Browse Source 
Merge the gzip footer and header together with any adjacent normal
chunks before comparing chunk structures; this should make the
recovery-from-boot diff not fail due to differences in the footer
after the ramdisk part of the image.
This commit is contained in:
Doug Zongker
2009-09-02 11:10:51 -07:00
parent 15604b84e2
commit d7d7ab00f5
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/applypatch/imgdiff.c
View File

@@ -784,6 +784,14 @@ ImageChunk* FindChunkByName(const char* name,
return NULL; return NULL;
} }
void DumpChunks(ImageChunk* chunks, int num_chunks) {
int i;
for (i = 0; i < num_chunks; ++i) {
printf("chunk %d: type %d start %d len %d\n",
i, chunks[i].type, chunks[i].start, chunks[i].len);
}
}
int main(int argc, char** argv) { int main(int argc, char** argv) {
if (argc != 4 && argc != 5) { if (argc != 4 && argc != 5) {
usage: usage:
@@ -829,14 +837,29 @@ int main(int argc, char** argv) {
// Verify that the source and target images have the same chunk // Verify that the source and target images have the same chunk
// structure (ie, the same sequence of deflate and normal chunks). // structure (ie, the same sequence of deflate and normal chunks).
if (!zip_mode) {
// Merge the gzip header and footer in with any adjacent
// normal chunks.
MergeAdjacentNormalChunks(tgt_chunks, &num_tgt_chunks);
MergeAdjacentNormalChunks(src_chunks, &num_src_chunks);
}
if (num_src_chunks != num_tgt_chunks) { if (num_src_chunks != num_tgt_chunks) {
fprintf(stderr, "source and target don't have same number of chunks!\n"); fprintf(stderr, "source and target don't have same number of chunks!\n");
printf("source chunks:\n");
DumpChunks(src_chunks, num_src_chunks);
printf("target chunks:\n");
DumpChunks(tgt_chunks, num_tgt_chunks);
return 1; return 1;
} }
for (i = 0; i < num_src_chunks; ++i) { for (i = 0; i < num_src_chunks; ++i) {
if (src_chunks[i].type != tgt_chunks[i].type) { if (src_chunks[i].type != tgt_chunks[i].type) {
fprintf(stderr, "source and target don't have same chunk " fprintf(stderr, "source and target don't have same chunk "
"structure! (chunk %d)\n", i); "structure! (chunk %d)\n", i);
printf("source chunks:\n");
DumpChunks(src_chunks, num_src_chunks);
printf("target chunks:\n");
DumpChunks(tgt_chunks, num_tgt_chunks);
return 1; return 1;
} }
} }