Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2009 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | /* |
| 18 | * This program constructs binary patches for images -- such as boot.img |
| 19 | * and recovery.img -- that consist primarily of large chunks of gzipped |
| 20 | * data interspersed with uncompressed data. Doing a naive bsdiff of |
| 21 | * these files is not useful because small changes in the data lead to |
| 22 | * large changes in the compressed bitstream; bsdiff patches of gzipped |
| 23 | * data are typically as large as the data itself. |
| 24 | * |
| 25 | * To patch these usefully, we break the source and target images up into |
| 26 | * chunks of two types: "normal" and "gzip". Normal chunks are simply |
| 27 | * patched using a plain bsdiff. Gzip chunks are first expanded, then a |
| 28 | * bsdiff is applied to the uncompressed data, then the patched data is |
| 29 | * gzipped using the same encoder parameters. Patched chunks are |
| 30 | * concatenated together to create the output file; the output image |
| 31 | * should be *exactly* the same series of bytes as the target image used |
| 32 | * originally to generate the patch. |
| 33 | * |
| 34 | * To work well with this tool, the gzipped sections of the target |
| 35 | * image must have been generated using the same deflate encoder that |
| 36 | * is available in applypatch, namely, the one in the zlib library. |
| 37 | * In practice this means that images should be compressed using the |
| 38 | * "minigzip" tool included in the zlib distribution, not the GNU gzip |
| 39 | * program. |
| 40 | * |
| 41 | * An "imgdiff" patch consists of a header describing the chunk structure |
| 42 | * of the file and any encoding parameters needed for the gzipped |
| 43 | * chunks, followed by N bsdiff patches, one per chunk. |
| 44 | * |
| 45 | * For a diff to be generated, the source and target images must have the |
| 46 | * same "chunk" structure: that is, the same number of gzipped and normal |
| 47 | * chunks in the same order. Android boot and recovery images currently |
| 48 | * consist of five chunks: a small normal header, a gzipped kernel, a |
| 49 | * small normal section, a gzipped ramdisk, and finally a small normal |
| 50 | * footer. |
| 51 | * |
| 52 | * Caveats: we locate gzipped sections within the source and target |
| 53 | * images by searching for the byte sequence 1f8b0800: 1f8b is the gzip |
| 54 | * magic number; 08 specifies the "deflate" encoding [the only encoding |
| 55 | * supported by the gzip standard]; and 00 is the flags byte. We do not |
| 56 | * currently support any extra header fields (which would be indicated by |
| 57 | * a nonzero flags byte). We also don't handle the case when that byte |
| 58 | * sequence appears spuriously in the file. (Note that it would have to |
| 59 | * occur spuriously within a normal chunk to be a problem.) |
| 60 | * |
| 61 | * |
| 62 | * The imgdiff patch header looks like this: |
| 63 | * |
| 64 | * "IMGDIFF1" (8) [magic number and version] |
| 65 | * chunk count (4) |
| 66 | * for each chunk: |
| 67 | * chunk type (4) [CHUNK_{NORMAL, GZIP, DEFLATE, RAW}] |
| 68 | * if chunk type == CHUNK_NORMAL: |
| 69 | * source start (8) |
| 70 | * source len (8) |
| 71 | * bsdiff patch offset (8) [from start of patch file] |
| 72 | * if chunk type == CHUNK_GZIP: (version 1 only) |
| 73 | * source start (8) |
| 74 | * source len (8) |
| 75 | * bsdiff patch offset (8) [from start of patch file] |
| 76 | * source expanded len (8) [size of uncompressed source] |
| 77 | * target expected len (8) [size of uncompressed target] |
| 78 | * gzip level (4) |
| 79 | * method (4) |
| 80 | * windowBits (4) |
| 81 | * memLevel (4) |
| 82 | * strategy (4) |
| 83 | * gzip header len (4) |
| 84 | * gzip header (gzip header len) |
| 85 | * gzip footer (8) |
| 86 | * if chunk type == CHUNK_DEFLATE: (version 2 only) |
| 87 | * source start (8) |
| 88 | * source len (8) |
| 89 | * bsdiff patch offset (8) [from start of patch file] |
| 90 | * source expanded len (8) [size of uncompressed source] |
| 91 | * target expected len (8) [size of uncompressed target] |
| 92 | * gzip level (4) |
| 93 | * method (4) |
| 94 | * windowBits (4) |
| 95 | * memLevel (4) |
| 96 | * strategy (4) |
| 97 | * if chunk type == RAW: (version 2 only) |
| 98 | * target len (4) |
| 99 | * data (target len) |
| 100 | * |
| 101 | * All integers are little-endian. "source start" and "source len" |
| 102 | * specify the section of the input image that comprises this chunk, |
| 103 | * including the gzip header and footer for gzip chunks. "source |
| 104 | * expanded len" is the size of the uncompressed source data. "target |
| 105 | * expected len" is the size of the uncompressed data after applying |
| 106 | * the bsdiff patch. The next five parameters specify the zlib |
| 107 | * parameters to be used when compressing the patched data, and the |
| 108 | * next three specify the header and footer to be wrapped around the |
| 109 | * compressed data to create the output chunk (so that header contents |
| 110 | * like the timestamp are recreated exactly). |
| 111 | * |
| 112 | * After the header there are 'chunk count' bsdiff patches; the offset |
| 113 | * of each from the beginning of the file is specified in the header. |
Doug Zongker | a3ccba6 | 2012-08-20 15:28:02 -0700 | [diff] [blame] | 114 | * |
| 115 | * This tool can take an optional file of "bonus data". This is an |
| 116 | * extra file of data that is appended to chunk #1 after it is |
| 117 | * compressed (it must be a CHUNK_DEFLATE chunk). The same file must |
| 118 | * be available (and passed to applypatch with -b) when applying the |
| 119 | * patch. This is used to reduce the size of recovery-from-boot |
| 120 | * patches by combining the boot image with recovery ramdisk |
| 121 | * information that is stored on the system partition. |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 122 | */ |
| 123 | |
| 124 | #include <errno.h> |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 125 | #include <inttypes.h> |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 126 | #include <stdio.h> |
| 127 | #include <stdlib.h> |
| 128 | #include <string.h> |
| 129 | #include <sys/stat.h> |
| 130 | #include <unistd.h> |
| 131 | #include <sys/types.h> |
| 132 | |
| 133 | #include "zlib.h" |
| 134 | #include "imgdiff.h" |
| 135 | #include "utils.h" |
| 136 | |
| 137 | typedef struct { |
| 138 | int type; // CHUNK_NORMAL, CHUNK_DEFLATE |
| 139 | size_t start; // offset of chunk in original image file |
| 140 | |
| 141 | size_t len; |
| 142 | unsigned char* data; // data to be patched (uncompressed, for deflate chunks) |
| 143 | |
| 144 | size_t source_start; |
| 145 | size_t source_len; |
| 146 | |
| 147 | off_t* I; // used by bsdiff |
| 148 | |
| 149 | // --- for CHUNK_DEFLATE chunks only: --- |
| 150 | |
| 151 | // original (compressed) deflate data |
| 152 | size_t deflate_len; |
| 153 | unsigned char* deflate_data; |
| 154 | |
| 155 | char* filename; // used for zip entries |
| 156 | |
| 157 | // deflate encoder parameters |
| 158 | int level, method, windowBits, memLevel, strategy; |
| 159 | |
| 160 | size_t source_uncompressed_len; |
| 161 | } ImageChunk; |
| 162 | |
| 163 | typedef struct { |
| 164 | int data_offset; |
| 165 | int deflate_len; |
| 166 | int uncomp_len; |
| 167 | char* filename; |
| 168 | } ZipFileEntry; |
| 169 | |
| 170 | static int fileentry_compare(const void* a, const void* b) { |
| 171 | int ao = ((ZipFileEntry*)a)->data_offset; |
| 172 | int bo = ((ZipFileEntry*)b)->data_offset; |
| 173 | if (ao < bo) { |
| 174 | return -1; |
| 175 | } else if (ao > bo) { |
| 176 | return 1; |
| 177 | } else { |
| 178 | return 0; |
| 179 | } |
| 180 | } |
| 181 | |
| 182 | // from bsdiff.c |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 183 | int bsdiff(u_char* old, off_t oldsize, off_t** IP, u_char* newdata, off_t newsize, |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 184 | const char* patch_filename); |
| 185 | |
| 186 | unsigned char* ReadZip(const char* filename, |
| 187 | int* num_chunks, ImageChunk** chunks, |
| 188 | int include_pseudo_chunk) { |
| 189 | struct stat st; |
| 190 | if (stat(filename, &st) != 0) { |
| 191 | printf("failed to stat \"%s\": %s\n", filename, strerror(errno)); |
| 192 | return NULL; |
| 193 | } |
| 194 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 195 | size_t sz = static_cast<size_t>(st.st_size); |
| 196 | unsigned char* img = reinterpret_cast<unsigned char*>(malloc(sz)); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 197 | FILE* f = fopen(filename, "rb"); |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 198 | if (fread(img, 1, sz, f) != sz) { |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 199 | printf("failed to read \"%s\" %s\n", filename, strerror(errno)); |
| 200 | fclose(f); |
| 201 | return NULL; |
| 202 | } |
| 203 | fclose(f); |
| 204 | |
| 205 | // look for the end-of-central-directory record. |
| 206 | |
| 207 | int i; |
| 208 | for (i = st.st_size-20; i >= 0 && i > st.st_size - 65600; --i) { |
| 209 | if (img[i] == 0x50 && img[i+1] == 0x4b && |
| 210 | img[i+2] == 0x05 && img[i+3] == 0x06) { |
| 211 | break; |
| 212 | } |
| 213 | } |
| 214 | // double-check: this archive consists of a single "disk" |
| 215 | if (!(img[i+4] == 0 && img[i+5] == 0 && img[i+6] == 0 && img[i+7] == 0)) { |
| 216 | printf("can't process multi-disk archive\n"); |
| 217 | return NULL; |
| 218 | } |
| 219 | |
| 220 | int cdcount = Read2(img+i+8); |
| 221 | int cdoffset = Read4(img+i+16); |
| 222 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 223 | ZipFileEntry* temp_entries = reinterpret_cast<ZipFileEntry*>(malloc( |
| 224 | cdcount * sizeof(ZipFileEntry))); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 225 | int entrycount = 0; |
| 226 | |
| 227 | unsigned char* cd = img+cdoffset; |
| 228 | for (i = 0; i < cdcount; ++i) { |
| 229 | if (!(cd[0] == 0x50 && cd[1] == 0x4b && cd[2] == 0x01 && cd[3] == 0x02)) { |
| 230 | printf("bad central directory entry %d\n", i); |
| 231 | return NULL; |
| 232 | } |
| 233 | |
| 234 | int clen = Read4(cd+20); // compressed len |
| 235 | int ulen = Read4(cd+24); // uncompressed len |
| 236 | int nlen = Read2(cd+28); // filename len |
| 237 | int xlen = Read2(cd+30); // extra field len |
| 238 | int mlen = Read2(cd+32); // file comment len |
| 239 | int hoffset = Read4(cd+42); // local header offset |
| 240 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 241 | char* filename = reinterpret_cast<char*>(malloc(nlen+1)); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 242 | memcpy(filename, cd+46, nlen); |
| 243 | filename[nlen] = '\0'; |
| 244 | |
| 245 | int method = Read2(cd+10); |
| 246 | |
| 247 | cd += 46 + nlen + xlen + mlen; |
| 248 | |
| 249 | if (method != 8) { // 8 == deflate |
| 250 | free(filename); |
| 251 | continue; |
| 252 | } |
| 253 | |
| 254 | unsigned char* lh = img + hoffset; |
| 255 | |
| 256 | if (!(lh[0] == 0x50 && lh[1] == 0x4b && lh[2] == 0x03 && lh[3] == 0x04)) { |
| 257 | printf("bad local file header entry %d\n", i); |
| 258 | return NULL; |
| 259 | } |
| 260 | |
| 261 | if (Read2(lh+26) != nlen || memcmp(lh+30, filename, nlen) != 0) { |
| 262 | printf("central dir filename doesn't match local header\n"); |
| 263 | return NULL; |
| 264 | } |
| 265 | |
| 266 | xlen = Read2(lh+28); // extra field len; might be different from CD entry? |
| 267 | |
| 268 | temp_entries[entrycount].data_offset = hoffset+30+nlen+xlen; |
| 269 | temp_entries[entrycount].deflate_len = clen; |
| 270 | temp_entries[entrycount].uncomp_len = ulen; |
| 271 | temp_entries[entrycount].filename = filename; |
| 272 | ++entrycount; |
| 273 | } |
| 274 | |
| 275 | qsort(temp_entries, entrycount, sizeof(ZipFileEntry), fileentry_compare); |
| 276 | |
| 277 | #if 0 |
| 278 | printf("found %d deflated entries\n", entrycount); |
| 279 | for (i = 0; i < entrycount; ++i) { |
| 280 | printf("off %10d len %10d unlen %10d %p %s\n", |
| 281 | temp_entries[i].data_offset, |
| 282 | temp_entries[i].deflate_len, |
| 283 | temp_entries[i].uncomp_len, |
| 284 | temp_entries[i].filename, |
| 285 | temp_entries[i].filename); |
| 286 | } |
| 287 | #endif |
| 288 | |
| 289 | *num_chunks = 0; |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 290 | *chunks = reinterpret_cast<ImageChunk*>(malloc((entrycount*2+2) * sizeof(ImageChunk))); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 291 | ImageChunk* curr = *chunks; |
| 292 | |
| 293 | if (include_pseudo_chunk) { |
| 294 | curr->type = CHUNK_NORMAL; |
| 295 | curr->start = 0; |
| 296 | curr->len = st.st_size; |
| 297 | curr->data = img; |
| 298 | curr->filename = NULL; |
| 299 | curr->I = NULL; |
| 300 | ++curr; |
| 301 | ++*num_chunks; |
| 302 | } |
| 303 | |
| 304 | int pos = 0; |
| 305 | int nextentry = 0; |
| 306 | |
| 307 | while (pos < st.st_size) { |
| 308 | if (nextentry < entrycount && pos == temp_entries[nextentry].data_offset) { |
| 309 | curr->type = CHUNK_DEFLATE; |
| 310 | curr->start = pos; |
| 311 | curr->deflate_len = temp_entries[nextentry].deflate_len; |
| 312 | curr->deflate_data = img + pos; |
| 313 | curr->filename = temp_entries[nextentry].filename; |
| 314 | curr->I = NULL; |
| 315 | |
| 316 | curr->len = temp_entries[nextentry].uncomp_len; |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 317 | curr->data = reinterpret_cast<unsigned char*>(malloc(curr->len)); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 318 | |
| 319 | z_stream strm; |
| 320 | strm.zalloc = Z_NULL; |
| 321 | strm.zfree = Z_NULL; |
| 322 | strm.opaque = Z_NULL; |
| 323 | strm.avail_in = curr->deflate_len; |
| 324 | strm.next_in = curr->deflate_data; |
| 325 | |
| 326 | // -15 means we are decoding a 'raw' deflate stream; zlib will |
| 327 | // not expect zlib headers. |
| 328 | int ret = inflateInit2(&strm, -15); |
| 329 | |
| 330 | strm.avail_out = curr->len; |
| 331 | strm.next_out = curr->data; |
| 332 | ret = inflate(&strm, Z_NO_FLUSH); |
| 333 | if (ret != Z_STREAM_END) { |
| 334 | printf("failed to inflate \"%s\"; %d\n", curr->filename, ret); |
| 335 | return NULL; |
| 336 | } |
| 337 | |
| 338 | inflateEnd(&strm); |
| 339 | |
| 340 | pos += curr->deflate_len; |
| 341 | ++nextentry; |
| 342 | ++*num_chunks; |
| 343 | ++curr; |
| 344 | continue; |
| 345 | } |
| 346 | |
| 347 | // use a normal chunk to take all the data up to the start of the |
| 348 | // next deflate section. |
| 349 | |
| 350 | curr->type = CHUNK_NORMAL; |
| 351 | curr->start = pos; |
| 352 | if (nextentry < entrycount) { |
| 353 | curr->len = temp_entries[nextentry].data_offset - pos; |
| 354 | } else { |
| 355 | curr->len = st.st_size - pos; |
| 356 | } |
| 357 | curr->data = img + pos; |
| 358 | curr->filename = NULL; |
| 359 | curr->I = NULL; |
| 360 | pos += curr->len; |
| 361 | |
| 362 | ++*num_chunks; |
| 363 | ++curr; |
| 364 | } |
| 365 | |
| 366 | free(temp_entries); |
| 367 | return img; |
| 368 | } |
| 369 | |
| 370 | /* |
| 371 | * Read the given file and break it up into chunks, putting the number |
| 372 | * of chunks and their info in *num_chunks and **chunks, |
| 373 | * respectively. Returns a malloc'd block of memory containing the |
| 374 | * contents of the file; various pointers in the output chunk array |
| 375 | * will point into this block of memory. The caller should free the |
| 376 | * return value when done with all the chunks. Returns NULL on |
| 377 | * failure. |
| 378 | */ |
| 379 | unsigned char* ReadImage(const char* filename, |
| 380 | int* num_chunks, ImageChunk** chunks) { |
| 381 | struct stat st; |
| 382 | if (stat(filename, &st) != 0) { |
| 383 | printf("failed to stat \"%s\": %s\n", filename, strerror(errno)); |
| 384 | return NULL; |
| 385 | } |
| 386 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 387 | size_t sz = static_cast<size_t>(st.st_size); |
| 388 | unsigned char* img = reinterpret_cast<unsigned char*>(malloc(sz + 4)); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 389 | FILE* f = fopen(filename, "rb"); |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 390 | if (fread(img, 1, sz, f) != sz) { |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 391 | printf("failed to read \"%s\" %s\n", filename, strerror(errno)); |
| 392 | fclose(f); |
| 393 | return NULL; |
| 394 | } |
| 395 | fclose(f); |
| 396 | |
| 397 | // append 4 zero bytes to the data so we can always search for the |
| 398 | // four-byte string 1f8b0800 starting at any point in the actual |
| 399 | // file data, without special-casing the end of the data. |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 400 | memset(img+sz, 0, 4); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 401 | |
| 402 | size_t pos = 0; |
| 403 | |
| 404 | *num_chunks = 0; |
| 405 | *chunks = NULL; |
| 406 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 407 | while (pos < sz) { |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 408 | unsigned char* p = img+pos; |
| 409 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 410 | if (sz - pos >= 4 && |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 411 | p[0] == 0x1f && p[1] == 0x8b && |
| 412 | p[2] == 0x08 && // deflate compression |
| 413 | p[3] == 0x00) { // no header flags |
| 414 | // 'pos' is the offset of the start of a gzip chunk. |
Johan Redestig | c68bd34 | 2015-04-14 21:20:06 +0200 | [diff] [blame] | 415 | size_t chunk_offset = pos; |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 416 | |
| 417 | *num_chunks += 3; |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 418 | *chunks = reinterpret_cast<ImageChunk*>(realloc(*chunks, |
| 419 | *num_chunks * sizeof(ImageChunk))); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 420 | ImageChunk* curr = *chunks + (*num_chunks-3); |
| 421 | |
| 422 | // create a normal chunk for the header. |
| 423 | curr->start = pos; |
| 424 | curr->type = CHUNK_NORMAL; |
| 425 | curr->len = GZIP_HEADER_LEN; |
| 426 | curr->data = p; |
| 427 | curr->I = NULL; |
| 428 | |
| 429 | pos += curr->len; |
| 430 | p += curr->len; |
| 431 | ++curr; |
| 432 | |
| 433 | curr->type = CHUNK_DEFLATE; |
| 434 | curr->filename = NULL; |
| 435 | curr->I = NULL; |
| 436 | |
| 437 | // We must decompress this chunk in order to discover where it |
| 438 | // ends, and so we can put the uncompressed data and its length |
| 439 | // into curr->data and curr->len. |
| 440 | |
| 441 | size_t allocated = 32768; |
| 442 | curr->len = 0; |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 443 | curr->data = reinterpret_cast<unsigned char*>(malloc(allocated)); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 444 | curr->start = pos; |
| 445 | curr->deflate_data = p; |
| 446 | |
| 447 | z_stream strm; |
| 448 | strm.zalloc = Z_NULL; |
| 449 | strm.zfree = Z_NULL; |
| 450 | strm.opaque = Z_NULL; |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 451 | strm.avail_in = sz - pos; |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 452 | strm.next_in = p; |
| 453 | |
| 454 | // -15 means we are decoding a 'raw' deflate stream; zlib will |
| 455 | // not expect zlib headers. |
| 456 | int ret = inflateInit2(&strm, -15); |
| 457 | |
| 458 | do { |
| 459 | strm.avail_out = allocated - curr->len; |
| 460 | strm.next_out = curr->data + curr->len; |
| 461 | ret = inflate(&strm, Z_NO_FLUSH); |
Johan Redestig | c68bd34 | 2015-04-14 21:20:06 +0200 | [diff] [blame] | 462 | if (ret < 0) { |
| 463 | printf("Error: inflate failed [%s] at file offset [%zu]\n" |
| 464 | "imgdiff only supports gzip kernel compression," |
| 465 | " did you try CONFIG_KERNEL_LZO?\n", |
| 466 | strm.msg, chunk_offset); |
| 467 | free(img); |
| 468 | return NULL; |
| 469 | } |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 470 | curr->len = allocated - strm.avail_out; |
| 471 | if (strm.avail_out == 0) { |
| 472 | allocated *= 2; |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 473 | curr->data = reinterpret_cast<unsigned char*>(realloc(curr->data, allocated)); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 474 | } |
| 475 | } while (ret != Z_STREAM_END); |
| 476 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 477 | curr->deflate_len = sz - strm.avail_in - pos; |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 478 | inflateEnd(&strm); |
| 479 | pos += curr->deflate_len; |
| 480 | p += curr->deflate_len; |
| 481 | ++curr; |
| 482 | |
| 483 | // create a normal chunk for the footer |
| 484 | |
| 485 | curr->type = CHUNK_NORMAL; |
| 486 | curr->start = pos; |
| 487 | curr->len = GZIP_FOOTER_LEN; |
| 488 | curr->data = img+pos; |
| 489 | curr->I = NULL; |
| 490 | |
| 491 | pos += curr->len; |
| 492 | p += curr->len; |
| 493 | ++curr; |
| 494 | |
| 495 | // The footer (that we just skipped over) contains the size of |
| 496 | // the uncompressed data. Double-check to make sure that it |
| 497 | // matches the size of the data we got when we actually did |
| 498 | // the decompression. |
| 499 | size_t footer_size = Read4(p-4); |
| 500 | if (footer_size != curr[-2].len) { |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 501 | printf("Error: footer size %zu != decompressed size %zu\n", |
| 502 | footer_size, curr[-2].len); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 503 | free(img); |
| 504 | return NULL; |
| 505 | } |
| 506 | } else { |
| 507 | // Reallocate the list for every chunk; we expect the number of |
| 508 | // chunks to be small (5 for typical boot and recovery images). |
| 509 | ++*num_chunks; |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 510 | *chunks = reinterpret_cast<ImageChunk*>(realloc(*chunks, *num_chunks * sizeof(ImageChunk))); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 511 | ImageChunk* curr = *chunks + (*num_chunks-1); |
| 512 | curr->start = pos; |
| 513 | curr->I = NULL; |
| 514 | |
| 515 | // 'pos' is not the offset of the start of a gzip chunk, so scan |
| 516 | // forward until we find a gzip header. |
| 517 | curr->type = CHUNK_NORMAL; |
| 518 | curr->data = p; |
| 519 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 520 | for (curr->len = 0; curr->len < (sz - pos); ++curr->len) { |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 521 | if (p[curr->len] == 0x1f && |
| 522 | p[curr->len+1] == 0x8b && |
| 523 | p[curr->len+2] == 0x08 && |
| 524 | p[curr->len+3] == 0x00) { |
| 525 | break; |
| 526 | } |
| 527 | } |
| 528 | pos += curr->len; |
| 529 | } |
| 530 | } |
| 531 | |
| 532 | return img; |
| 533 | } |
| 534 | |
| 535 | #define BUFFER_SIZE 32768 |
| 536 | |
| 537 | /* |
| 538 | * Takes the uncompressed data stored in the chunk, compresses it |
| 539 | * using the zlib parameters stored in the chunk, and checks that it |
| 540 | * matches exactly the compressed data we started with (also stored in |
| 541 | * the chunk). Return 0 on success. |
| 542 | */ |
| 543 | int TryReconstruction(ImageChunk* chunk, unsigned char* out) { |
| 544 | size_t p = 0; |
| 545 | |
| 546 | #if 0 |
| 547 | printf("trying %d %d %d %d %d\n", |
| 548 | chunk->level, chunk->method, chunk->windowBits, |
| 549 | chunk->memLevel, chunk->strategy); |
| 550 | #endif |
| 551 | |
| 552 | z_stream strm; |
| 553 | strm.zalloc = Z_NULL; |
| 554 | strm.zfree = Z_NULL; |
| 555 | strm.opaque = Z_NULL; |
| 556 | strm.avail_in = chunk->len; |
| 557 | strm.next_in = chunk->data; |
| 558 | int ret; |
| 559 | ret = deflateInit2(&strm, chunk->level, chunk->method, chunk->windowBits, |
| 560 | chunk->memLevel, chunk->strategy); |
| 561 | do { |
| 562 | strm.avail_out = BUFFER_SIZE; |
| 563 | strm.next_out = out; |
| 564 | ret = deflate(&strm, Z_FINISH); |
| 565 | size_t have = BUFFER_SIZE - strm.avail_out; |
| 566 | |
| 567 | if (memcmp(out, chunk->deflate_data+p, have) != 0) { |
| 568 | // mismatch; data isn't the same. |
| 569 | deflateEnd(&strm); |
| 570 | return -1; |
| 571 | } |
| 572 | p += have; |
| 573 | } while (ret != Z_STREAM_END); |
| 574 | deflateEnd(&strm); |
| 575 | if (p != chunk->deflate_len) { |
| 576 | // mismatch; ran out of data before we should have. |
| 577 | return -1; |
| 578 | } |
| 579 | return 0; |
| 580 | } |
| 581 | |
| 582 | /* |
| 583 | * Verify that we can reproduce exactly the same compressed data that |
| 584 | * we started with. Sets the level, method, windowBits, memLevel, and |
| 585 | * strategy fields in the chunk to the encoding parameters needed to |
| 586 | * produce the right output. Returns 0 on success. |
| 587 | */ |
| 588 | int ReconstructDeflateChunk(ImageChunk* chunk) { |
| 589 | if (chunk->type != CHUNK_DEFLATE) { |
| 590 | printf("attempt to reconstruct non-deflate chunk\n"); |
| 591 | return -1; |
| 592 | } |
| 593 | |
| 594 | size_t p = 0; |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 595 | unsigned char* out = reinterpret_cast<unsigned char*>(malloc(BUFFER_SIZE)); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 596 | |
| 597 | // We only check two combinations of encoder parameters: level 6 |
| 598 | // (the default) and level 9 (the maximum). |
| 599 | for (chunk->level = 6; chunk->level <= 9; chunk->level += 3) { |
| 600 | chunk->windowBits = -15; // 32kb window; negative to indicate a raw stream. |
| 601 | chunk->memLevel = 8; // the default value. |
| 602 | chunk->method = Z_DEFLATED; |
| 603 | chunk->strategy = Z_DEFAULT_STRATEGY; |
| 604 | |
| 605 | if (TryReconstruction(chunk, out) == 0) { |
| 606 | free(out); |
| 607 | return 0; |
| 608 | } |
| 609 | } |
| 610 | |
| 611 | free(out); |
| 612 | return -1; |
| 613 | } |
| 614 | |
| 615 | /* |
| 616 | * Given source and target chunks, compute a bsdiff patch between them |
| 617 | * by running bsdiff in a subprocess. Return the patch data, placing |
| 618 | * its length in *size. Return NULL on failure. We expect the bsdiff |
| 619 | * program to be in the path. |
| 620 | */ |
| 621 | unsigned char* MakePatch(ImageChunk* src, ImageChunk* tgt, size_t* size) { |
| 622 | if (tgt->type == CHUNK_NORMAL) { |
| 623 | if (tgt->len <= 160) { |
| 624 | tgt->type = CHUNK_RAW; |
| 625 | *size = tgt->len; |
| 626 | return tgt->data; |
| 627 | } |
| 628 | } |
| 629 | |
| 630 | char ptemp[] = "/tmp/imgdiff-patch-XXXXXX"; |
| 631 | mkstemp(ptemp); |
| 632 | |
| 633 | int r = bsdiff(src->data, src->len, &(src->I), tgt->data, tgt->len, ptemp); |
| 634 | if (r != 0) { |
| 635 | printf("bsdiff() failed: %d\n", r); |
| 636 | return NULL; |
| 637 | } |
| 638 | |
| 639 | struct stat st; |
| 640 | if (stat(ptemp, &st) != 0) { |
| 641 | printf("failed to stat patch file %s: %s\n", |
| 642 | ptemp, strerror(errno)); |
| 643 | return NULL; |
| 644 | } |
| 645 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 646 | size_t sz = static_cast<size_t>(st.st_size); |
| 647 | // TODO: Memory leak on error return. |
| 648 | unsigned char* data = reinterpret_cast<unsigned char*>(malloc(sz)); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 649 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 650 | if (tgt->type == CHUNK_NORMAL && tgt->len <= sz) { |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 651 | unlink(ptemp); |
| 652 | |
| 653 | tgt->type = CHUNK_RAW; |
| 654 | *size = tgt->len; |
| 655 | return tgt->data; |
| 656 | } |
| 657 | |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 658 | *size = sz; |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 659 | |
| 660 | FILE* f = fopen(ptemp, "rb"); |
| 661 | if (f == NULL) { |
| 662 | printf("failed to open patch %s: %s\n", ptemp, strerror(errno)); |
| 663 | return NULL; |
| 664 | } |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 665 | if (fread(data, 1, sz, f) != sz) { |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 666 | printf("failed to read patch %s: %s\n", ptemp, strerror(errno)); |
| 667 | return NULL; |
| 668 | } |
| 669 | fclose(f); |
| 670 | |
| 671 | unlink(ptemp); |
| 672 | |
| 673 | tgt->source_start = src->start; |
| 674 | switch (tgt->type) { |
| 675 | case CHUNK_NORMAL: |
| 676 | tgt->source_len = src->len; |
| 677 | break; |
| 678 | case CHUNK_DEFLATE: |
| 679 | tgt->source_len = src->deflate_len; |
| 680 | tgt->source_uncompressed_len = src->len; |
| 681 | break; |
| 682 | } |
| 683 | |
| 684 | return data; |
| 685 | } |
| 686 | |
| 687 | /* |
| 688 | * Cause a gzip chunk to be treated as a normal chunk (ie, as a blob |
| 689 | * of uninterpreted data). The resulting patch will likely be about |
| 690 | * as big as the target file, but it lets us handle the case of images |
| 691 | * where some gzip chunks are reconstructible but others aren't (by |
| 692 | * treating the ones that aren't as normal chunks). |
| 693 | */ |
| 694 | void ChangeDeflateChunkToNormal(ImageChunk* ch) { |
| 695 | if (ch->type != CHUNK_DEFLATE) return; |
| 696 | ch->type = CHUNK_NORMAL; |
| 697 | free(ch->data); |
| 698 | ch->data = ch->deflate_data; |
| 699 | ch->len = ch->deflate_len; |
| 700 | } |
| 701 | |
| 702 | /* |
| 703 | * Return true if the data in the chunk is identical (including the |
| 704 | * compressed representation, for gzip chunks). |
| 705 | */ |
| 706 | int AreChunksEqual(ImageChunk* a, ImageChunk* b) { |
| 707 | if (a->type != b->type) return 0; |
| 708 | |
| 709 | switch (a->type) { |
| 710 | case CHUNK_NORMAL: |
| 711 | return a->len == b->len && memcmp(a->data, b->data, a->len) == 0; |
| 712 | |
| 713 | case CHUNK_DEFLATE: |
| 714 | return a->deflate_len == b->deflate_len && |
| 715 | memcmp(a->deflate_data, b->deflate_data, a->deflate_len) == 0; |
| 716 | |
| 717 | default: |
| 718 | printf("unknown chunk type %d\n", a->type); |
| 719 | return 0; |
| 720 | } |
| 721 | } |
| 722 | |
| 723 | /* |
| 724 | * Look for runs of adjacent normal chunks and compress them down into |
| 725 | * a single chunk. (Such runs can be produced when deflate chunks are |
| 726 | * changed to normal chunks.) |
| 727 | */ |
| 728 | void MergeAdjacentNormalChunks(ImageChunk* chunks, int* num_chunks) { |
| 729 | int out = 0; |
| 730 | int in_start = 0, in_end; |
| 731 | while (in_start < *num_chunks) { |
| 732 | if (chunks[in_start].type != CHUNK_NORMAL) { |
| 733 | in_end = in_start+1; |
| 734 | } else { |
| 735 | // in_start is a normal chunk. Look for a run of normal chunks |
| 736 | // that constitute a solid block of data (ie, each chunk begins |
| 737 | // where the previous one ended). |
| 738 | for (in_end = in_start+1; |
| 739 | in_end < *num_chunks && chunks[in_end].type == CHUNK_NORMAL && |
| 740 | (chunks[in_end].start == |
| 741 | chunks[in_end-1].start + chunks[in_end-1].len && |
| 742 | chunks[in_end].data == |
| 743 | chunks[in_end-1].data + chunks[in_end-1].len); |
| 744 | ++in_end); |
| 745 | } |
| 746 | |
| 747 | if (in_end == in_start+1) { |
| 748 | #if 0 |
| 749 | printf("chunk %d is now %d\n", in_start, out); |
| 750 | #endif |
| 751 | if (out != in_start) { |
| 752 | memcpy(chunks+out, chunks+in_start, sizeof(ImageChunk)); |
| 753 | } |
| 754 | } else { |
| 755 | #if 0 |
| 756 | printf("collapse normal chunks %d-%d into %d\n", in_start, in_end-1, out); |
| 757 | #endif |
| 758 | |
| 759 | // Merge chunks [in_start, in_end-1] into one chunk. Since the |
| 760 | // data member of each chunk is just a pointer into an in-memory |
| 761 | // copy of the file, this can be done without recopying (the |
| 762 | // output chunk has the first chunk's start location and data |
| 763 | // pointer, and length equal to the sum of the input chunk |
| 764 | // lengths). |
| 765 | chunks[out].type = CHUNK_NORMAL; |
| 766 | chunks[out].start = chunks[in_start].start; |
| 767 | chunks[out].data = chunks[in_start].data; |
| 768 | chunks[out].len = chunks[in_end-1].len + |
| 769 | (chunks[in_end-1].start - chunks[in_start].start); |
| 770 | } |
| 771 | |
| 772 | ++out; |
| 773 | in_start = in_end; |
| 774 | } |
| 775 | *num_chunks = out; |
| 776 | } |
| 777 | |
| 778 | ImageChunk* FindChunkByName(const char* name, |
| 779 | ImageChunk* chunks, int num_chunks) { |
| 780 | int i; |
| 781 | for (i = 0; i < num_chunks; ++i) { |
| 782 | if (chunks[i].type == CHUNK_DEFLATE && chunks[i].filename && |
| 783 | strcmp(name, chunks[i].filename) == 0) { |
| 784 | return chunks+i; |
| 785 | } |
| 786 | } |
| 787 | return NULL; |
| 788 | } |
| 789 | |
| 790 | void DumpChunks(ImageChunk* chunks, int num_chunks) { |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 791 | for (int i = 0; i < num_chunks; ++i) { |
| 792 | printf("chunk %d: type %d start %zu len %zu\n", |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 793 | i, chunks[i].type, chunks[i].start, chunks[i].len); |
| 794 | } |
| 795 | } |
| 796 | |
| 797 | int main(int argc, char** argv) { |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 798 | int zip_mode = 0; |
| 799 | |
Doug Zongker | a3ccba6 | 2012-08-20 15:28:02 -0700 | [diff] [blame] | 800 | if (argc >= 2 && strcmp(argv[1], "-z") == 0) { |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 801 | zip_mode = 1; |
| 802 | --argc; |
| 803 | ++argv; |
| 804 | } |
| 805 | |
Doug Zongker | a3ccba6 | 2012-08-20 15:28:02 -0700 | [diff] [blame] | 806 | size_t bonus_size = 0; |
| 807 | unsigned char* bonus_data = NULL; |
| 808 | if (argc >= 3 && strcmp(argv[1], "-b") == 0) { |
| 809 | struct stat st; |
| 810 | if (stat(argv[2], &st) != 0) { |
| 811 | printf("failed to stat bonus file %s: %s\n", argv[2], strerror(errno)); |
| 812 | return 1; |
| 813 | } |
| 814 | bonus_size = st.st_size; |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 815 | bonus_data = reinterpret_cast<unsigned char*>(malloc(bonus_size)); |
Doug Zongker | a3ccba6 | 2012-08-20 15:28:02 -0700 | [diff] [blame] | 816 | FILE* f = fopen(argv[2], "rb"); |
| 817 | if (f == NULL) { |
| 818 | printf("failed to open bonus file %s: %s\n", argv[2], strerror(errno)); |
| 819 | return 1; |
| 820 | } |
| 821 | if (fread(bonus_data, 1, bonus_size, f) != bonus_size) { |
| 822 | printf("failed to read bonus file %s: %s\n", argv[2], strerror(errno)); |
| 823 | return 1; |
| 824 | } |
| 825 | fclose(f); |
| 826 | |
| 827 | argc -= 2; |
| 828 | argv += 2; |
| 829 | } |
| 830 | |
| 831 | if (argc != 4) { |
| 832 | usage: |
| 833 | printf("usage: %s [-z] [-b <bonus-file>] <src-img> <tgt-img> <patch-file>\n", |
| 834 | argv[0]); |
| 835 | return 2; |
| 836 | } |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 837 | |
| 838 | int num_src_chunks; |
| 839 | ImageChunk* src_chunks; |
| 840 | int num_tgt_chunks; |
| 841 | ImageChunk* tgt_chunks; |
| 842 | int i; |
| 843 | |
| 844 | if (zip_mode) { |
| 845 | if (ReadZip(argv[1], &num_src_chunks, &src_chunks, 1) == NULL) { |
| 846 | printf("failed to break apart source zip file\n"); |
| 847 | return 1; |
| 848 | } |
| 849 | if (ReadZip(argv[2], &num_tgt_chunks, &tgt_chunks, 0) == NULL) { |
| 850 | printf("failed to break apart target zip file\n"); |
| 851 | return 1; |
| 852 | } |
| 853 | } else { |
| 854 | if (ReadImage(argv[1], &num_src_chunks, &src_chunks) == NULL) { |
| 855 | printf("failed to break apart source image\n"); |
| 856 | return 1; |
| 857 | } |
| 858 | if (ReadImage(argv[2], &num_tgt_chunks, &tgt_chunks) == NULL) { |
| 859 | printf("failed to break apart target image\n"); |
| 860 | return 1; |
| 861 | } |
| 862 | |
| 863 | // Verify that the source and target images have the same chunk |
| 864 | // structure (ie, the same sequence of deflate and normal chunks). |
| 865 | |
| 866 | if (!zip_mode) { |
| 867 | // Merge the gzip header and footer in with any adjacent |
| 868 | // normal chunks. |
| 869 | MergeAdjacentNormalChunks(tgt_chunks, &num_tgt_chunks); |
| 870 | MergeAdjacentNormalChunks(src_chunks, &num_src_chunks); |
| 871 | } |
| 872 | |
| 873 | if (num_src_chunks != num_tgt_chunks) { |
| 874 | printf("source and target don't have same number of chunks!\n"); |
| 875 | printf("source chunks:\n"); |
| 876 | DumpChunks(src_chunks, num_src_chunks); |
| 877 | printf("target chunks:\n"); |
| 878 | DumpChunks(tgt_chunks, num_tgt_chunks); |
| 879 | return 1; |
| 880 | } |
| 881 | for (i = 0; i < num_src_chunks; ++i) { |
| 882 | if (src_chunks[i].type != tgt_chunks[i].type) { |
| 883 | printf("source and target don't have same chunk " |
| 884 | "structure! (chunk %d)\n", i); |
| 885 | printf("source chunks:\n"); |
| 886 | DumpChunks(src_chunks, num_src_chunks); |
| 887 | printf("target chunks:\n"); |
| 888 | DumpChunks(tgt_chunks, num_tgt_chunks); |
| 889 | return 1; |
| 890 | } |
| 891 | } |
| 892 | } |
| 893 | |
| 894 | for (i = 0; i < num_tgt_chunks; ++i) { |
| 895 | if (tgt_chunks[i].type == CHUNK_DEFLATE) { |
| 896 | // Confirm that given the uncompressed chunk data in the target, we |
| 897 | // can recompress it and get exactly the same bits as are in the |
| 898 | // input target image. If this fails, treat the chunk as a normal |
| 899 | // non-deflated chunk. |
| 900 | if (ReconstructDeflateChunk(tgt_chunks+i) < 0) { |
| 901 | printf("failed to reconstruct target deflate chunk %d [%s]; " |
| 902 | "treating as normal\n", i, tgt_chunks[i].filename); |
| 903 | ChangeDeflateChunkToNormal(tgt_chunks+i); |
| 904 | if (zip_mode) { |
| 905 | ImageChunk* src = FindChunkByName(tgt_chunks[i].filename, src_chunks, num_src_chunks); |
| 906 | if (src) { |
| 907 | ChangeDeflateChunkToNormal(src); |
| 908 | } |
| 909 | } else { |
| 910 | ChangeDeflateChunkToNormal(src_chunks+i); |
| 911 | } |
| 912 | continue; |
| 913 | } |
| 914 | |
| 915 | // If two deflate chunks are identical (eg, the kernel has not |
| 916 | // changed between two builds), treat them as normal chunks. |
| 917 | // This makes applypatch much faster -- it can apply a trivial |
| 918 | // patch to the compressed data, rather than uncompressing and |
| 919 | // recompressing to apply the trivial patch to the uncompressed |
| 920 | // data. |
| 921 | ImageChunk* src; |
| 922 | if (zip_mode) { |
| 923 | src = FindChunkByName(tgt_chunks[i].filename, src_chunks, num_src_chunks); |
| 924 | } else { |
| 925 | src = src_chunks+i; |
| 926 | } |
| 927 | |
| 928 | if (src == NULL || AreChunksEqual(tgt_chunks+i, src)) { |
| 929 | ChangeDeflateChunkToNormal(tgt_chunks+i); |
| 930 | if (src) { |
| 931 | ChangeDeflateChunkToNormal(src); |
| 932 | } |
| 933 | } |
| 934 | } |
| 935 | } |
| 936 | |
| 937 | // Merging neighboring normal chunks. |
| 938 | if (zip_mode) { |
| 939 | // For zips, we only need to do this to the target: deflated |
| 940 | // chunks are matched via filename, and normal chunks are patched |
| 941 | // using the entire source file as the source. |
| 942 | MergeAdjacentNormalChunks(tgt_chunks, &num_tgt_chunks); |
| 943 | } else { |
| 944 | // For images, we need to maintain the parallel structure of the |
| 945 | // chunk lists, so do the merging in both the source and target |
| 946 | // lists. |
| 947 | MergeAdjacentNormalChunks(tgt_chunks, &num_tgt_chunks); |
| 948 | MergeAdjacentNormalChunks(src_chunks, &num_src_chunks); |
| 949 | if (num_src_chunks != num_tgt_chunks) { |
| 950 | // This shouldn't happen. |
| 951 | printf("merging normal chunks went awry\n"); |
| 952 | return 1; |
| 953 | } |
| 954 | } |
| 955 | |
| 956 | // Compute bsdiff patches for each chunk's data (the uncompressed |
| 957 | // data, in the case of deflate chunks). |
| 958 | |
Doug Zongker | a3ccba6 | 2012-08-20 15:28:02 -0700 | [diff] [blame] | 959 | DumpChunks(src_chunks, num_src_chunks); |
| 960 | |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 961 | printf("Construct patches for %d chunks...\n", num_tgt_chunks); |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 962 | unsigned char** patch_data = reinterpret_cast<unsigned char**>(malloc( |
| 963 | num_tgt_chunks * sizeof(unsigned char*))); |
| 964 | size_t* patch_size = reinterpret_cast<size_t*>(malloc(num_tgt_chunks * sizeof(size_t))); |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 965 | for (i = 0; i < num_tgt_chunks; ++i) { |
| 966 | if (zip_mode) { |
| 967 | ImageChunk* src; |
| 968 | if (tgt_chunks[i].type == CHUNK_DEFLATE && |
| 969 | (src = FindChunkByName(tgt_chunks[i].filename, src_chunks, |
| 970 | num_src_chunks))) { |
| 971 | patch_data[i] = MakePatch(src, tgt_chunks+i, patch_size+i); |
| 972 | } else { |
| 973 | patch_data[i] = MakePatch(src_chunks, tgt_chunks+i, patch_size+i); |
| 974 | } |
| 975 | } else { |
Doug Zongker | a3ccba6 | 2012-08-20 15:28:02 -0700 | [diff] [blame] | 976 | if (i == 1 && bonus_data) { |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 977 | printf(" using %zu bytes of bonus data for chunk %d\n", bonus_size, i); |
| 978 | src_chunks[i].data = reinterpret_cast<unsigned char*>(realloc(src_chunks[i].data, |
| 979 | src_chunks[i].len + bonus_size)); |
Doug Zongker | a3ccba6 | 2012-08-20 15:28:02 -0700 | [diff] [blame] | 980 | memcpy(src_chunks[i].data+src_chunks[i].len, bonus_data, bonus_size); |
| 981 | src_chunks[i].len += bonus_size; |
| 982 | } |
| 983 | |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 984 | patch_data[i] = MakePatch(src_chunks+i, tgt_chunks+i, patch_size+i); |
| 985 | } |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 986 | printf("patch %3d is %zu bytes (of %zu)\n", |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 987 | i, patch_size[i], tgt_chunks[i].source_len); |
| 988 | } |
| 989 | |
| 990 | // Figure out how big the imgdiff file header is going to be, so |
| 991 | // that we can correctly compute the offset of each bsdiff patch |
| 992 | // within the file. |
| 993 | |
| 994 | size_t total_header_size = 12; |
| 995 | for (i = 0; i < num_tgt_chunks; ++i) { |
| 996 | total_header_size += 4; |
| 997 | switch (tgt_chunks[i].type) { |
| 998 | case CHUNK_NORMAL: |
| 999 | total_header_size += 8*3; |
| 1000 | break; |
| 1001 | case CHUNK_DEFLATE: |
| 1002 | total_header_size += 8*5 + 4*5; |
| 1003 | break; |
| 1004 | case CHUNK_RAW: |
| 1005 | total_header_size += 4 + patch_size[i]; |
| 1006 | break; |
| 1007 | } |
| 1008 | } |
| 1009 | |
| 1010 | size_t offset = total_header_size; |
| 1011 | |
| 1012 | FILE* f = fopen(argv[3], "wb"); |
| 1013 | |
| 1014 | // Write out the headers. |
| 1015 | |
| 1016 | fwrite("IMGDIFF2", 1, 8, f); |
| 1017 | Write4(num_tgt_chunks, f); |
| 1018 | for (i = 0; i < num_tgt_chunks; ++i) { |
| 1019 | Write4(tgt_chunks[i].type, f); |
| 1020 | |
| 1021 | switch (tgt_chunks[i].type) { |
| 1022 | case CHUNK_NORMAL: |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 1023 | printf("chunk %3d: normal (%10zu, %10zu) %10zu\n", i, |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 1024 | tgt_chunks[i].start, tgt_chunks[i].len, patch_size[i]); |
| 1025 | Write8(tgt_chunks[i].source_start, f); |
| 1026 | Write8(tgt_chunks[i].source_len, f); |
| 1027 | Write8(offset, f); |
| 1028 | offset += patch_size[i]; |
| 1029 | break; |
| 1030 | |
| 1031 | case CHUNK_DEFLATE: |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 1032 | printf("chunk %3d: deflate (%10zu, %10zu) %10zu %s\n", i, |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 1033 | tgt_chunks[i].start, tgt_chunks[i].deflate_len, patch_size[i], |
| 1034 | tgt_chunks[i].filename); |
| 1035 | Write8(tgt_chunks[i].source_start, f); |
| 1036 | Write8(tgt_chunks[i].source_len, f); |
| 1037 | Write8(offset, f); |
| 1038 | Write8(tgt_chunks[i].source_uncompressed_len, f); |
| 1039 | Write8(tgt_chunks[i].len, f); |
| 1040 | Write4(tgt_chunks[i].level, f); |
| 1041 | Write4(tgt_chunks[i].method, f); |
| 1042 | Write4(tgt_chunks[i].windowBits, f); |
| 1043 | Write4(tgt_chunks[i].memLevel, f); |
| 1044 | Write4(tgt_chunks[i].strategy, f); |
| 1045 | offset += patch_size[i]; |
| 1046 | break; |
| 1047 | |
| 1048 | case CHUNK_RAW: |
Tao Bao | ba9a42a | 2015-06-23 23:23:33 -0700 | [diff] [blame] | 1049 | printf("chunk %3d: raw (%10zu, %10zu)\n", i, |
Doug Zongker | 512536a | 2010-02-17 16:11:44 -0800 | [diff] [blame] | 1050 | tgt_chunks[i].start, tgt_chunks[i].len); |
| 1051 | Write4(patch_size[i], f); |
| 1052 | fwrite(patch_data[i], 1, patch_size[i], f); |
| 1053 | break; |
| 1054 | } |
| 1055 | } |
| 1056 | |
| 1057 | // Append each chunk's bsdiff patch, in order. |
| 1058 | |
| 1059 | for (i = 0; i < num_tgt_chunks; ++i) { |
| 1060 | if (tgt_chunks[i].type != CHUNK_RAW) { |
| 1061 | fwrite(patch_data[i], 1, patch_size[i], f); |
| 1062 | } |
| 1063 | } |
| 1064 | |
| 1065 | fclose(f); |
| 1066 | |
| 1067 | return 0; |
| 1068 | } |