Enable LZMA compression in bmpbklk_utility.

utility/bmpblk_util.c

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <lzma.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "bmpblk_util.h"
 #include "eficompress.h"
 
@@ skipping 114 matching lines @@
     free(obuf);
     free(sbuf);
     return 0;
   }
 
   free(sbuf);
   return obuf;
 }
 
 
+
+static void *do_lzma_decompress(ImageInfo *img) {
+  void *ibuf;
+  void *obuf;
+  uint32_t isize;
+  uint32_t osize;
+  lzma_stream stream = LZMA_STREAM_INIT;
+  lzma_ret result;
+
+  ibuf = ((void *)img) + sizeof(ImageInfo);

[Hung-Te, 2011/02/15 07:55:10]

We should not perform arithmetic operation to void* pointers because it does not
have size. (If this is C++, you'll get error)

Please use uint8_t* instead, or ibuf = (void*)(img + 1);

[Tom Wai-Hong Tam, 2011/02/16 10:58:03]

Done.

+  isize = img->compressed_size;
+  osize = img->original_size;
+  obuf = malloc(osize);

[Hung-Te, 2011/02/15 07:55:10]

Why not lzma_stream_buffer_bound?

[Tom Wai-Hong Tam, 2011/02/16 10:58:03]

Since the exact uncompressed size is filled in when compressing. No need to
guess an upper bound.

+  if (!obuf) {
+    fprintf(stderr, "Can't allocate %d bytes: %s\n",
+            osize,
+            strerror(errno));
+    return 0;
+  }
+
+  result = lzma_auto_decoder(&stream, -1, 0);
+  if (result != LZMA_OK) {
+    fprintf(stderr, "Unalbe to initialize auto decoder (error: %d)!\n", result);

[Hung-Te, 2011/02/15 07:55:10]

Unable, typo

[Tom Wai-Hong Tam, 2011/02/16 10:58:03]

Done.

+    free(obuf);
+    return 0;
+  }
+
+  stream.next_in = ibuf;
+  stream.avail_in = isize;
+  do {
+    stream.next_out = obuf;
+    stream.avail_out = osize;
+    result = lzma_code(&stream, LZMA_FINISH);
+    if (result != LZMA_OK && result != LZMA_STREAM_END) {
+      fprintf(stderr, "Unalbe to decode data (error: %d)!\n", result);
+      free(obuf);
+      return 0;
+    }
+  } while (result == LZMA_OK);
+  lzma_end(&stream);
+  return obuf;
+}
+
+
+
 // Show what's inside. If todir is NULL, just print. Otherwise unpack.
 int dump_bmpblock(const char *infile, int show_as_yaml,
                   const char *todir, int overwrite) {
   void *ptr, *data_ptr;
   size_t length = 0;
   BmpBlockHeader *hdr;
   ImageInfo *img;
   ScreenLayout *scr;
   int loc_num;
   int screen_num;
@@ skipping 107 matching lines @@
       case COMPRESS_EFIv1:
         data_ptr = do_efi_decompress(img);
         if (!data_ptr) {
           fclose(bfp);
           fclose(yfp);
           discard_file(ptr, length);
           return 1;
         }
         free_data = 1;
         break;
+      case COMPRESS_LZMA:
+        data_ptr = do_lzma_decompress(img);
+        if (!data_ptr) {
+          fclose(bfp);
+          fclose(yfp);
+          discard_file(ptr, length);
+          return 1;
+        }
+        free_data = 1;
+        break;
       default:
         fprintf(stderr, "Unsupported compression method encountered.\n");
         fclose(bfp);
         fclose(yfp);
         discard_file(ptr, length);
         return 1;
       }
       if (1 != fwrite(data_ptr, img->original_size, 1, bfp)) {
         fprintf(stderr, "Unable to write %s: %s\n", full_path_name,
                 strerror(errno));
@@ skipping 48 matching lines @@
   }
 
   if (todir)
     fclose(yfp);
 
   discard_file(ptr, length);
 
   return 0;
 }