@@ -1,3 +1,7 @@

+Sun May 20 22:23:46 CEST 2007 (acab)

+------------------------------------

+  * libclamav: NSIS support

+

 Mon May 14 17:43:27 CEST 2007 (tk)

 ----------------------------------

   * libclamav/scanners.c: if possible, only use ratio limit for files which

@@ -17,7 +17,7 @@

 #  MA 02110-1301, USA.

-INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar

+INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar -I@srcdir@/nsis

 libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@

@@ -126,6 +126,17 @@ libclamav_la_SOURCES = \

 	unrar/unrarcmd.c \

 	unrar/unrarfilter.h \

 	unrar/unrarppm.h \

+	nsis/LZMADecode.c \

+	nsis/LZMADecode.h \

+	nsis/bzlib.c \

+	nsis/bzlib_private.h \

+	nsis/infblock.c \

+	nsis/nsis_bzlib.h \

+	nsis/nsis_zconf.h \

+	nsis/nsis_zlib.h \

+	nsis/nsis_zutil.h \

+	nsis/nulsft.c \

+	nsis/nulsft.h \

 	pdf.c \

 	pdf.h \

 	spin.c \

@@ -85,8 +85,9 @@ am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher-ncore.lo \

 	petite.lo wwunpack.lo suecrypt.lo unsp.lo packlibs.lo fsg.lo \

 	mew.lo upack.lo line.lo untar.lo unzip.lo special.lo binhex.lo \

 	is_tar.lo tnef.lo unrar15.lo unrarvm.lo unrar.lo \

-	unrarfilter.lo unrarppm.lo unrar20.lo unrarcmd.lo pdf.lo \

-	spin.lo yc.lo elf.lo sis.lo uuencode.lo pst.lo phishcheck.lo \

+	unrarfilter.lo unrarppm.lo unrar20.lo unrarcmd.lo \

+	LZMADecode.lo bzlib.lo infblock.lo nulsft.lo pdf.lo spin.lo \

+	yc.lo elf.lo sis.lo uuencode.lo pst.lo phishcheck.lo \

 	phish_domaincheck_db.lo phish_whitelist.lo regex_list.lo \

 	sha256.lo mspack.lo cab.lo entconv.lo hashtab.lo dconf.lo \

 	lockdb.lo

@@ -234,7 +235,7 @@ target_alias = @target_alias@

 target_cpu = @target_cpu@

 target_os = @target_os@

 target_vendor = @target_vendor@

-INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar

+INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar -I@srcdir@/nsis

 libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@

 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

 include_HEADERS = clamav.h

@@ -339,6 +340,17 @@ libclamav_la_SOURCES = \

 	unrar/unrarcmd.c \

 	unrar/unrarfilter.h \

 	unrar/unrarppm.h \

+	nsis/LZMADecode.c \

+	nsis/LZMADecode.h \

+	nsis/bzlib.c \

+	nsis/bzlib_private.h \

+	nsis/infblock.c \

+	nsis/nsis_bzlib.h \

+	nsis/nsis_zconf.h \

+	nsis/nsis_zlib.h \

+	nsis/nsis_zutil.h \

+	nsis/nulsft.c \

+	nsis/nulsft.h \

 	pdf.c \

 	pdf.h \

 	spin.c \

@@ -450,8 +462,10 @@ mostlyclean-compile:

 distclean-compile:

 	-rm -f *.tab.c

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LZMADecode.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binhex.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blob.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bzlib.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cab.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chmunpack.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvd.Plo@am__quote@

@@ -463,6 +477,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsg.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtab.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlnorm.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infblock.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/is_tar.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lockdb.Plo@am__quote@

@@ -476,6 +491,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mew.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msexpand.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mspack.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nulsft.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ole2_extract.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/others.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packlibs.Plo@am__quote@

@@ -588,6 +604,34 @@ unrarcmd.lo: unrar/unrarcmd.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarcmd.lo `test -f 'unrar/unrarcmd.c' || echo '$(srcdir)/'`unrar/unrarcmd.c

+LZMADecode.lo: nsis/LZMADecode.c

+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT LZMADecode.lo -MD -MP -MF "$(DEPDIR)/LZMADecode.Tpo" -c -o LZMADecode.lo `test -f 'nsis/LZMADecode.c' || echo '$(srcdir)/'`nsis/LZMADecode.c; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/LZMADecode.Tpo" "$(DEPDIR)/LZMADecode.Plo"; else rm -f "$(DEPDIR)/LZMADecode.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/LZMADecode.c' object='LZMADecode.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o LZMADecode.lo `test -f 'nsis/LZMADecode.c' || echo '$(srcdir)/'`nsis/LZMADecode.c

+

+bzlib.lo: nsis/bzlib.c

+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bzlib.lo -MD -MP -MF "$(DEPDIR)/bzlib.Tpo" -c -o bzlib.lo `test -f 'nsis/bzlib.c' || echo '$(srcdir)/'`nsis/bzlib.c; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bzlib.Tpo" "$(DEPDIR)/bzlib.Plo"; else rm -f "$(DEPDIR)/bzlib.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/bzlib.c' object='bzlib.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bzlib.lo `test -f 'nsis/bzlib.c' || echo '$(srcdir)/'`nsis/bzlib.c

+

+infblock.lo: nsis/infblock.c

+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT infblock.lo -MD -MP -MF "$(DEPDIR)/infblock.Tpo" -c -o infblock.lo `test -f 'nsis/infblock.c' || echo '$(srcdir)/'`nsis/infblock.c; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/infblock.Tpo" "$(DEPDIR)/infblock.Plo"; else rm -f "$(DEPDIR)/infblock.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/infblock.c' object='infblock.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infblock.lo `test -f 'nsis/infblock.c' || echo '$(srcdir)/'`nsis/infblock.c

+

+nulsft.lo: nsis/nulsft.c

+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nulsft.lo -MD -MP -MF "$(DEPDIR)/nulsft.Tpo" -c -o nulsft.lo `test -f 'nsis/nulsft.c' || echo '$(srcdir)/'`nsis/nulsft.c; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/nulsft.Tpo" "$(DEPDIR)/nulsft.Plo"; else rm -f "$(DEPDIR)/nulsft.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/nulsft.c' object='nulsft.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nulsft.lo `test -f 'nsis/nulsft.c' || echo '$(srcdir)/'`nsis/nulsft.c

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -190,6 +190,7 @@ static const struct cli_smagic_s cli_smagic[] = {

     {"526172211a0700", "RAR-SFX", CL_TYPE_RARSFX},

     {"504b0304", "ZIP-SFX", CL_TYPE_ZIPSFX},

     {"4d534346", "CAB-SFX", CL_TYPE_CABSFX},

+    {"efbeadde4e756c6c736f6674496e7374", "NSIS", CL_TYPE_NULSFT},

     {"4d5a{180-300}50450000", "PE", CL_TYPE_MSEXE},

@@ -61,7 +61,8 @@ typedef enum {

     CL_TYPE_SFX, /* foo SFX marker */

     CL_TYPE_ZIPSFX, /* on the fly */

     CL_TYPE_RARSFX, /* on the fly */

-    CL_TYPE_CABSFX

+    CL_TYPE_CABSFX,

+    CL_TYPE_NULSFT /* on the fly */

 } cli_file_t;

new file mode 100644

@@ -0,0 +1,557 @@

+/*

+ * LZMADecode.c

+ * 

+ * This file is a part of LZMA compression module for NSIS.

+ * 

+ * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov

+ * Modifications Copyright (C) 2003-2007 Amir Szekely <kichik@netvision.net.il>

+ * 

+ * Licensed under the Common Public License version 1.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * 

+ * Licence details can be found in the file COPYING.

+ * 

+ * This software is provided 'as-is', without any express or implied

+ * warranty.

+ */

+

+#include <stdlib.h>

+#include "LZMADecode.h"

+

+#define LEAVE { goto saveStateAndReturn; }

+#define NEED_BYTE(c) case c: if (!avail_in) { mode = c; LEAVE; }

+#define NEED_BYTE_ if (!avail_in) LEAVE;

+#define NEXT_BYTE (avail_in--, *next_in++)

+#define NEED_OUT(c) case c: if (!avail_out) { mode = c; LEAVE; }

+#define PUT_BYTE_(b) { *next_out = b; next_out++; avail_out--; }

+#define PUT_BYTE(b) { totalOut++; PUT_BYTE_(b) }

+#define DECODE_BIT(c, x) prob = x; last = c; goto _LZMA_C_RDBD; case c:

+#define DECODE_LEN(c, x) probs = x; last2 = c; goto _LZMA_C_LEND; case c:

+#define DECODE_BIT_TREE(c, x, y) probs = x; numLevels = y; last3 = c; goto _LZMA_C_BTD; case c:

+

+enum {

+  /*  0 */ LZMA_C_INIT = 0,

+  /*  1 */ LZMA_C_GETDICT,

+  /*  2 */ LZMA_C_BLOCK,

+  /*  3 */ LZMA_C_RDI, /* RangeDecoderInit */

+  /*  4 */ LZMA_C_RDBD, /* RangeDecoderBitDecode */

+  /*  5 */ LZMA_C_RDBD_IN, /* RangeDecoderBitDecode */

+  /*  6 */ LZMA_C_TYPE,

+  /*  7 */ LZMA_C_ISREP,

+  /*  8 */ LZMA_C_ISREPG0,

+  /*  9 */ LZMA_C_ISREP0LONG,

+  /* 10 */ LZMA_C_ISREPG1,

+  /* 11 */ LZMA_C_ISREPG2,

+  /* 12 */ LZMA_C_NORM,

+  /* 13 */ LZMA_C_LITDM1, /* LzmaLiteralDecodeMatch */

+  /* 14 */ LZMA_C_LITDM2, /* LzmaLiteralDecodeMatch */

+  /* 15 */ LZMA_C_LITD, /* LzmaLiteralDecode */

+  /* 16 */ LZMA_C_RDRBTD, /* RangeDecoderReverseBitTreeDecode */

+  /* 17 */ LZMA_C_LEND, /* LzmaLenDecode */

+  /* 18 */ LZMA_C_LEND1, /* LzmaLenDecode */

+  /* 19 */ LZMA_C_LEND2, /* LzmaLenDecode */

+  /* 20 */ LZMA_C_LEND_RES, /* LzmaLenDecode */

+  /* 21 */ LZMA_C_LEND_C1,

+  /* 22 */ LZMA_C_LEND_C2,

+  /* 23 */ LZMA_C_BTD, /* RangeDecoderBitTreeDecode */

+  /* 24 */ LZMA_C_BTD_LOOP,

+  /* 25 */ LZMA_C_BTD_C1,

+  /* 26 */ LZMA_C_OUTPUT_1,

+  /* 27 */ LZMA_C_OUTPUT_2,

+  /* 28 */ LZMA_C_OUTPUT_3

+};

+

+#define kNumTopBits 24

+#define kTopValue ((UInt32)1 << kNumTopBits)

+

+#define kNumBitModelTotalBits 11

+#define kBitModelTotal (1 << kNumBitModelTotalBits)

+#define kNumMoveBits 5

+

+#define RC_NORMALIZE(c) if (range < kTopValue) { NEED_BYTE(c); range <<= 8; code = (code << 8) | NEXT_BYTE; }

+

+#define RC_GET_BIT2(c, prob, mi, A0, A1) { \

+  UInt32 bound = (range >> kNumBitModelTotalBits) * *prob; \

+  if (code < bound) \

+    { A0; range = bound; *prob += (kBitModelTotal - *prob) >> kNumMoveBits; mi <<= 1; } \

+  else \

+    { A1; range -= bound; code -= bound; *prob -= (*prob) >> kNumMoveBits; mi = (mi + mi) + 1; } \

+  RC_NORMALIZE(c) \

+}

+

+#define RC_GET_BIT(c, prob, mi) RC_GET_BIT2(c, prob, mi, ; , ;)

+

+#define kNumPosBitsMax 4

+#define kNumPosStatesMax (1 << kNumPosBitsMax)

+

+#define kLenNumLowBits 3

+#define kLenNumLowSymbols (1 << kLenNumLowBits)

+#define kLenNumMidBits 3

+#define kLenNumMidSymbols (1 << kLenNumMidBits)

+#define kLenNumHighBits 8

+#define kLenNumHighSymbols (1 << kLenNumHighBits)

+

+#define LenChoice 0

+#define LenChoice2 (LenChoice + 1)

+#define LenLow (LenChoice2 + 1)

+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))

+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))

+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)

+

+#define kNumStates 12

+

+#define kStartPosModelIndex 4

+#define kEndPosModelIndex 14

+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))

+

+#define kNumPosSlotBits 6

+#define kNumLenToPosStates 4

+

+#define kNumAlignBits 4

+#define kAlignTableSize (1 << kNumAlignBits)

+

+#define kMatchMinLen 2

+

+#define IsMatch 0

+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))

+#define IsRepG0 (IsRep + kNumStates)

+#define IsRepG1 (IsRepG0 + kNumStates)

+#define IsRepG2 (IsRepG1 + kNumStates)

+#define IsRep0Long (IsRepG2 + kNumStates)

+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))

+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))

+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)

+#define LenCoder (Align + kAlignTableSize)

+#define RepLenCoder (LenCoder + kNumLenProbs)

+#define Literal (RepLenCoder + kNumLenProbs)

+

+#define LZMA_BASE_SIZE 1846

+#define LZMA_LIT_SIZE 768

+

+#if Literal != LZMA_BASE_SIZE

+StopCompilingDueBUG

+#endif

+

+void lzmaInit(lzma_stream *s)

+{

+  /* size of lzma_stream minus the size of the two allocated buffer pointers.

+     we don't want to lose to pointer or else we won't be able to free them. */

+  size_t i = sizeof(lzma_stream) - (sizeof(unsigned char *) * 2);

+  while (i--)

+    ((lzByte *)s)[i] = 0;

+

+  s->rep0 = s->rep1 = s->rep2 = s->rep3 = 1;

+  s->range = (0xFFFFFFFF);

+}

+

+int lzmaDecode(lzma_stream *s)

+{

+  /* restore decoder state */

+  lzma_stream _s = *s;

+

+#define mode _s.mode

+#define last _s.last

+#define last2 _s.last2

+#define last3 _s.last3

+

+#define p (*(CProb **) &_s.dynamicData)

+#define dynamicDataSize _s.dynamicDataSize

+

+#define state _s.state

+#define isPreviousMatch _s.isPreviousMatch

+#define previousByte _s.previousByte

+#define rep0 _s.rep0

+#define rep1 _s.rep1

+#define rep2 _s.rep2

+#define rep3 _s.rep3

+#define lc _s.lc

+#define len _s.len

+#define totalOut _s.totalOut

+

+#define dictionary _s.dictionary

+#define dictionarySize _s.dictionarySize

+#define dictionaryPos _s.dictionaryPos

+

+#define posStateMask _s.posStateMask

+#define literalPosMask _s.literalPosMask

+

+#define avail_in _s.avail_in

+#define next_in _s.next_in

+#define avail_out _s.avail_out

+#define next_out _s.next_out

+

+#define range _s.range

+#define code _s.code

+

+#define probs _s.probs

+#define prob _s.prob

+

+#define symbol _s.temp2

+#define bit _s.temp3

+#define matchBit _s.temp1

+#define i _s.temp1

+#define result _s.temp2

+#define numLevels _s.temp3

+#define posSlot _s.temp2

+#define newDictionarySize (*(UInt32*) &_s.temp3)

+

+#define matchByte _s.matchByte

+#define mi _s.mi

+#define posState _s.posState

+

+  if (len == -1)

+    return LZMA_STREAM_END;

+

+  for (;;) switch (mode)

+  {

+  case LZMA_C_INIT:

+    {

+      lzByte firstByte;

+      UInt32 newDynamicDataSize;

+      UInt32 numProbs;

+      int lp;

+      int pb;

+

+      NEED_BYTE_;

+

+      firstByte = NEXT_BYTE;

+

+      if (firstByte > (9*5*5))

+        return LZMA_DATA_ERROR;

+

+      pb = firstByte / (9*5);

+      firstByte %= (9*5);

+      lp = firstByte / 9;

+      firstByte %= 9;

+      lc = firstByte;

+

+      posStateMask = (1 << (pb)) - 1;

+      literalPosMask = (1 << (lp)) - 1;

+

+      numProbs = Literal + (LZMA_LIT_SIZE << (lc + pb));

+      newDynamicDataSize = numProbs * sizeof(CProb);

+

+      if (newDynamicDataSize != dynamicDataSize)

+      {

+        if (p)

+          lzmafree(p);

+        p = lzmaalloc(newDynamicDataSize);

+        if (!p)

+          return LZMA_NOT_ENOUGH_MEM;

+        dynamicDataSize = newDynamicDataSize;

+      }

+

+      while (numProbs--)

+        p[numProbs] = kBitModelTotal >> 1;

+

+      for (i = 0, newDictionarySize = 0; i < 4; i++)

+      {

+        NEED_BYTE(LZMA_C_GETDICT);

+        newDictionarySize |= NEXT_BYTE << (i * 8);

+      }

+

+      if (newDictionarySize != dictionarySize)

+      {

+        dictionarySize = newDictionarySize;

+        if (dictionary)

+          lzmafree(dictionary);

+        dictionary = lzmaalloc(dictionarySize);

+        if (!dictionary)

+          return LZMA_NOT_ENOUGH_MEM;

+      }

+

+      dictionary[dictionarySize - 1] = 0;

+

+      i = 5;

+      while (i--)

+      {

+        NEED_BYTE(LZMA_C_RDI);

+        code = (code << 8) | NEXT_BYTE;

+      }

+    }

+  case LZMA_C_BLOCK:

+    posState = (int)(totalOut & posStateMask);

+    DECODE_BIT(LZMA_C_TYPE, p + IsMatch + (state << kNumPosBitsMax) + posState);

+    if (bit == 0)

+    {

+      probs = p + Literal + (LZMA_LIT_SIZE *

+        (((totalOut & literalPosMask) << lc) + (previousByte >> (8 - lc))));

+

+      if (state < 4) state = 0;

+      else if (state < 10) state -= 3;

+      else state -= 6;

+      if (isPreviousMatch)

+      {

+        UInt32 pos = dictionaryPos - rep0;

+        if (pos >= dictionarySize)

+          pos += dictionarySize;

+        matchByte = dictionary[pos];

+        {

+          symbol = 1;

+          do

+          {

+            matchBit = (matchByte >> 7) & 1;

+            matchByte <<= 1;

+            {

+              prob = probs + ((1 + matchBit) << 8) + symbol;

+              RC_GET_BIT2(LZMA_C_LITDM1, prob, symbol, bit = 0, bit = 1)

+            }

+            if (matchBit != bit)

+            {

+              while (symbol < 0x100)

+              {

+                prob = probs + symbol;

+                RC_GET_BIT(LZMA_C_LITDM2, prob, symbol)

+              }

+              break;

+            }

+          }

+          while (symbol < 0x100);

+          previousByte = symbol;

+        }

+        isPreviousMatch = 0;

+      }

+      else

+      {

+        symbol = 1;

+        do

+        {

+          prob = probs + symbol;

+          RC_GET_BIT(LZMA_C_LITD, prob, symbol)

+        }

+        while (symbol < 0x100);

+        previousByte = symbol;

+      }

+      NEED_OUT(LZMA_C_OUTPUT_1);

+      PUT_BYTE(previousByte);

+      dictionary[dictionaryPos] = previousByte;

+      dictionaryPos = (dictionaryPos + 1) % dictionarySize;

+    }

+    /* bit == 1 */

+    else

+    {

+      isPreviousMatch = 1;

+      DECODE_BIT(LZMA_C_ISREP, p + IsRep + state);

+      if (bit == 1)

+      {

+        DECODE_BIT(LZMA_C_ISREPG0, p + IsRepG0 + state);

+        if (bit == 0)

+        {

+          DECODE_BIT(LZMA_C_ISREP0LONG, p + IsRep0Long + (state << kNumPosBitsMax) + posState);

+          if (bit == 0)

+          {

+            UInt32 pos;

+            if (totalOut == 0)

+              return LZMA_DATA_ERROR;

+            state = state < 7 ? 9 : 11;

+            NEED_OUT(LZMA_C_OUTPUT_2);

+            pos = dictionaryPos - rep0;

+            if (pos >= dictionarySize)

+              pos += dictionarySize;

+            previousByte = dictionary[pos];

+            dictionary[dictionaryPos] = previousByte;

+            dictionaryPos = (dictionaryPos + 1) % dictionarySize;

+            PUT_BYTE(previousByte);

+            mode = LZMA_C_BLOCK;

+            break;

+          }

+        }

+        else

+        {

+          UInt32 distance;

+          DECODE_BIT(LZMA_C_ISREPG1, p + IsRepG1 + state);

+          if (bit == 0)

+          {

+            distance = rep1;

+          }

+          else

+          {

+            DECODE_BIT(LZMA_C_ISREPG2, p + IsRepG2 + state);

+            if (bit == 0)

+              distance = rep2;

+            else

+            {

+              distance = rep3;

+              rep3 = rep2;

+            }

+            rep2 = rep1;

+          }

+          rep1 = rep0;

+          rep0 = distance;

+        }

+        DECODE_LEN(LZMA_C_LEND_C1, p + RepLenCoder);

+        state = state < 7 ? 8 : 11;

+      }

+      else

+      {

+        rep3 = rep2;

+        rep2 = rep1;

+        rep1 = rep0;

+        state = state < 7 ? 7 : 10;

+        DECODE_LEN(LZMA_C_LEND_C2, p + LenCoder);

+        DECODE_BIT_TREE(

+          LZMA_C_BTD_C1,

+          p + PosSlot + ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits),

+          kNumPosSlotBits

+        );

+        if (posSlot >= kStartPosModelIndex)

+        {

+          int numDirectBits = ((posSlot >> 1) - 1);

+          rep0 = ((2 | ((UInt32)posSlot & 1)) << numDirectBits);

+          if (posSlot < kEndPosModelIndex)

+          {

+            probs = p + SpecPos + rep0 - posSlot - 1;

+            numLevels = numDirectBits;

+          }

+          else

+          {

+            int numTotalBits = numDirectBits - kNumAlignBits;

+            result = 0;

+            for (i = numTotalBits; i > 0; i--)

+            {

+              /* UInt32 t; */

+              range >>= 1;

+

+              result <<= 1;

+              if (code >= range)

+              {

+                code -= range;

+                result |= 1;

+              }

+              /*

+              t = (code - range) >> 31;

+              t &= 1;

+              code -= range & (t - 1);

+              result = (result + result) | (1 - t);

+              */

+              RC_NORMALIZE(LZMA_C_NORM)

+            }

+            rep0 += result << kNumAlignBits;

+            probs = p + Align;

+            numLevels = kNumAlignBits;

+          }

+          mi = 1;

+          symbol = 0;

+          for(i = 0; i < numLevels; i++)

+          {

+            prob = probs + mi;

+            RC_GET_BIT2(LZMA_C_RDRBTD, prob, mi, ; , symbol |= (1 << i));

+          }

+          rep0 += symbol;

+        }

+        else

+          rep0 = posSlot;

+        rep0++;

+      }

+      if (rep0 == (UInt32)(0))

+      {

+        len = -1;

+        LEAVE;

+      }

+      if (rep0 > totalOut)

+      {

+        return LZMA_DATA_ERROR;

+      }

+      len += kMatchMinLen;

+      totalOut += len;

+      do

+      {

+        UInt32 pos;

+        NEED_OUT(LZMA_C_OUTPUT_3);

+        pos = dictionaryPos - rep0;

+        if (pos >= dictionarySize)

+          pos += dictionarySize;

+        previousByte = dictionary[pos];

+        dictionary[dictionaryPos] = previousByte;

+        dictionaryPos = (dictionaryPos + 1) % dictionarySize;

+        PUT_BYTE_(previousByte);

+        len--;

+      }

+      while(len > 0);

+    }

+    mode = LZMA_C_BLOCK;

+    break;

+  case LZMA_C_RDBD:

+  _LZMA_C_RDBD:

+    {

+      UInt32 bound = (range >> kNumBitModelTotalBits) * *prob;

+      if (code < bound)

+      {

+        range = bound;

+        *prob += (kBitModelTotal - *prob) >> kNumMoveBits;

+        bit = 0;

+      }

+      else

+      {

+        range -= bound;

+        code -= bound;

+        *prob -= (*prob) >> kNumMoveBits;

+        bit = 1;

+      }

+      RC_NORMALIZE(LZMA_C_RDBD_IN);

+    }

+    mode = last;

+    break;

+  case LZMA_C_LEND:

+  _LZMA_C_LEND:

+      DECODE_BIT(LZMA_C_LEND1, probs + LenChoice);

+      if (bit == 0)

+      {

+        len = 0;

+        probs += LenLow + (posState << kLenNumLowBits);

+        numLevels = kLenNumLowBits;

+      }

+      else {

+        DECODE_BIT(LZMA_C_LEND2, probs + LenChoice2);

+        if (bit == 0)

+        {

+          len = kLenNumLowSymbols;

+          probs += + LenMid + (posState << kLenNumMidBits);

+          numLevels = kLenNumMidBits;

+        }

+        else

+        {

+          len = kLenNumLowSymbols + kLenNumMidSymbols;

+          probs += LenHigh;

+          numLevels = kLenNumHighBits;

+        }

+      }

+

+      last3 = LZMA_C_LEND_RES;

+  case LZMA_C_BTD:

+  _LZMA_C_BTD:

+    mi = 1;

+    for(i = numLevels; i > 0; i--)

+    {

+      prob = probs + mi;

+      RC_GET_BIT(LZMA_C_BTD_LOOP, prob, mi)

+    }

+    result = mi - (1 << numLevels);

+    mode = last3;

+    break;

+  case LZMA_C_LEND_RES:

+    len += result;

+    mode = last2;

+    break;

+  default:

+    return LZMA_DATA_ERROR;

+  }

+

+saveStateAndReturn:

+

+  /* save decoder state */

+  *s = _s;

+

+  return LZMA_OK;

+}

+

+

+/* aCaB */

+void lzmaShutdown(lzma_stream *s) {

+  lzma_stream _s = *s;

+  if (p) lzmafree(p);

+  if (dictionary) lzmafree(dictionary);

+  p = NULL;

+  dictionary = NULL;

+  *s = _s;

+}

new file mode 100644

@@ -0,0 +1,126 @@

+/*

+ * LZMADecode.c

+ * 

+ * This file is a part of LZMA compression module for NSIS.

+ * 

+ * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov

+ * Modifications Copyright (C) 2003-2007 Amir Szekely <kichik@netvision.net.il>

+ * 

+ * Licensed under the Common Public License version 1.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * 

+ * Licence details can be found in the file COPYING.

+ * 

+ * This software is provided 'as-is', without any express or implied

+ * warranty.

+ */

+

+#ifndef __LZMADECODE_H

+#define __LZMADECODE_H

+

+/* #define _LZMA_PROB32 */

+/* It can increase speed on some 32-bit CPUs, 

+   but memory usage will be doubled in that case */

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#include "others.h"

+

+#ifndef lzmaalloc

+#define lzmaalloc cli_malloc

+#endif

+

+#ifndef lzmafree

+#define lzmafree free

+#endif

+

+#ifndef LZMACALL

+#  define LZMACALL

+#endif

+

+#ifndef UInt32

+#ifdef _LZMA_UINT32_IS_ULONG

+#define UInt32 unsigned long

+#else

+#define UInt32 unsigned int

+#endif

+#endif

+

+#ifdef _LZMA_PROB32

+#define CProb UInt32

+#else

+#define CProb unsigned short

+#endif

+

+typedef unsigned char lzByte;

+

+#define LZMA_STREAM_END 1

+#define LZMA_OK 0

+#define LZMA_DATA_ERROR -1

+/* we don't really care what the problem is... */

+/* #define LZMA_RESULT_NOT_ENOUGH_MEM -2 */

+#define LZMA_NOT_ENOUGH_MEM -1

+

+typedef struct

+{

+  /* mode control */

+  int mode;

+  int last;

+  int last2;

+  int last3;

+

+  /* properties */

+  UInt32 dynamicDataSize;

+  UInt32 dictionarySize;

+

+  /* io */

+  lzByte *next_in;    /* next input byte */

+  UInt32 avail_in;  /* number of bytes available at next_in */

+

+  lzByte *next_out;   /* next output byte should be put there */

+  UInt32 avail_out; /* remaining free space at next_out */

+

+  UInt32 totalOut;  /* total output - not always correct when lzmaDecode returns */

+

+  /* saved state */

+  lzByte previousByte;

+  lzByte matchByte;

+  CProb *probs;

+  CProb *prob;

+  int mi;

+  int posState;

+  int temp1;

+  int temp2;

+  int temp3;

+  int lc;

+  int state;

+  int isPreviousMatch;

+  int len;

+  UInt32 rep0;

+  UInt32 rep1;

+  UInt32 rep2;

+  UInt32 rep3;

+  UInt32 posStateMask;

+  UInt32 literalPosMask;

+  UInt32 dictionaryPos;

+

+  /* range coder */

+  UInt32 range;

+  UInt32 code;

+

+  /* allocated buffers */

+  lzByte *dictionary;

+  lzByte *dynamicData;

+} lzma_stream;

+

+void LZMACALL lzmaInit(lzma_stream *);

+int LZMACALL lzmaDecode(lzma_stream *);

+void LZMACALL lzmaShutdown(lzma_stream *); /* aCaB */

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

new file mode 100644

@@ -0,0 +1,1112 @@

+

+/*-------------------------------------------------------------*/

+/*--- Library top-level functions.                          ---*/

+/*---                                               bzlib.c ---*/

+/*-------------------------------------------------------------*/

+

+/* ------------------------------------------------------------------

+   This file is part of bzip2/libbzip2, a program and library for

+   lossless, block-sorting data compression.

+

+   bzip2/libbzip2 version 1.0.4 of 20 December 2006

+   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>

+

+   Please read the WARNING, DISCLAIMER and PATENTS sections in the 

+   README file.

+

+   This program is released under the terms of the license contained

+   in the file LICENSE.

+   ------------------------------------------------------------------ */

+

+/* CHANGES

+   0.9.0    -- original version.

+   0.9.0a/b -- no changes in this file.

+   0.9.0c   -- made zero-length BZ_FLUSH work correctly in bzCompress().

+     fixed bzWrite/bzRead to ignore zero-length requests.

+     fixed bzread to correctly handle read requests after EOF.

+     wrong parameter order in call to bzDecompressInit in

+     bzBuffToBuffDecompress.  Fixed.

+*/