From 5fbc17672ac1f2394703e1dd532c455cf0feb057 Mon Sep 17 00:00:00 2001
From: Nebuleon Fumika <nebuleon.fumika@gmail.com>
Date: Wed, 29 Jan 2014 21:41:59 +0000
Subject: [PATCH] Guard Z_BZIP2ED with #ifdef HAVE_BZIP2 in miniunz.c, unzip.c

---
 unzip/miniunz.c |  2 ++
 unzip/unzip.c   | 18 ++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/unzip/miniunz.c b/unzip/miniunz.c
index d871b3f2..b60b49e2 100644
--- a/unzip/miniunz.c
+++ b/unzip/miniunz.c
@@ -271,11 +271,13 @@ static int do_list(unzFile uf) {
             else if ((iLevel==2) || (iLevel==3))
               string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
         }
+#ifdef HAVE_BZIP2
         else
         if (file_info.compression_method==Z_BZIP2ED)
         {
               string_method="BZip2 ";
         }
+#endif
         else
             string_method="Unkn. ";
 
diff --git a/unzip/unzip.c b/unzip/unzip.c
index 7954a347..23bdee2d 100644
--- a/unzip/unzip.c
+++ b/unzip/unzip.c
@@ -1290,9 +1290,9 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
         err=UNZ_BADZIPFILE;
 
     if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
+#ifdef HAVE_BZIP2
                          (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
+#endif
                          (s->cur_file_info.compression_method!=Z_DEFLATED))
         err=UNZ_BADZIPFILE;
 
@@ -1396,9 +1396,9 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method,
     }
 
     if ((s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
+#ifdef HAVE_BZIP2
         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
+#endif
         (s->cur_file_info.compression_method!=Z_DEFLATED))
 
         err=UNZ_BADZIPFILE;
@@ -1413,10 +1413,10 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method,
 
     pfile_in_zip_read_info->stream.total_out = 0;
 
+#ifdef HAVE_BZIP2
     if ((s->cur_file_info.compression_method==Z_BZIP2ED) &&
         (!raw))
     {
-#ifdef HAVE_BZIP2
       pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
       pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
       pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
@@ -1437,11 +1437,9 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method,
         free(pfile_in_zip_read_info);
         return err;
       }
-#else
-      pfile_in_zip_read_info->raw=1;
-#endif
     }
     else
+#endif
     if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
         (!raw))
     {
@@ -1658,10 +1656,10 @@ extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, unsigned len) {
             pfile_in_zip_read_info->stream.total_out += uDoCopy;
             iRead += uDoCopy;
         }
+#ifdef HAVE_BZIP2
         else
 	if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
         {
-#ifdef HAVE_BZIP2
             uLong uTotalOutBefore,uTotalOutAfter;
             const Bytef *bufBefore;
             uLong uOutThis;
@@ -1700,8 +1698,8 @@ extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, unsigned len) {
               return (iRead==0) ? UNZ_EOF : iRead;
             if (err!=BZ_OK)
                 break;
-#endif
         }
+#endif
         else
         {
             ZPOS64_T uTotalOutBefore,uTotalOutAfter;