@@ -1,3 +1,6 @@

+Sun Sep  9 13:42:26 CEST 2007 (acab)

+  * libclamav/nsis: tidy

+

 Sat Sep  8 14:08:54 CEST 2007 (acab)

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

   * libclamav/pe.c: wrap in paretheses - bb#656, part 1/2

@@ -29,7 +29,6 @@

 #include <unistd.h>

 #endif

-#include "nulsft.h"

 #include "others.h"

 #include "cltypes.h"

 #include "nsis_bzlib.h"

@@ -52,6 +51,32 @@ enum {

   COMP_NOCOMP

 };

+struct nsis_st {

+  int ifd;

+  int ofd;

+  off_t off;

+  char *dir;

+  uint32_t asz;

+  uint32_t hsz;

+  uint32_t fno;

+  struct {

+    uint32_t avail_in;

+    unsigned char *next_in;

+    uint32_t avail_out;

+    unsigned char *next_out;

+  } nsis;

+  nsis_bzstream bz;

+  lzma_stream lz;

+  nsis_z_stream z;

+  unsigned char *freeme;

+  uint8_t comp;

+  uint8_t solid;

+  uint8_t freecomp;

+  uint8_t eof;

+  char ofn[1024];

+};

+

+

 #define LINESTR(x) #x

 #define LINESTR2(x) LINESTR(x)

 #define __AT__  " at "__FILE__":"LINESTR2(__LINE__)

@@ -372,7 +397,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

 }

-static uint8_t detcomp(const char *b) {

+static uint8_t nsis_detcomp(const char *b) {

   if (*b=='1') return COMP_BZIP2;

   if ((cli_readint32(b)&~0x80000000)==0x5d) return COMP_LZMA;

   return COMP_ZLIB;

@@ -410,11 +435,11 @@ static int nsis_headers(struct nsis_st *n, cli_ctx *ctx) {

     int32_t nextsz;

     if (cli_readn(n->ifd, buf+4, 4)!=4) return CL_EIO;

     nextsz=cli_readint32(buf+4);

-    if (!i) n->comp = detcomp(buf+4);

+    if (!i) n->comp = nsis_detcomp(buf+4);

     if (nextsz&0x80000000) {

       nextsz&=~0x80000000;

       if (cli_readn(n->ifd, buf+4, 4)!=4) return CL_EIO;

-      comps[detcomp(buf+4)]++;

+      comps[nsis_detcomp(buf+4)]++;

       nextsz-=4;

       pos+=4;

     }

@@ -473,6 +498,8 @@ int cli_scannulsft(int desc, cli_ctx *ctx, off_t offset) {

 	return CL_ETMPDIR;

     }

+    if(cli_leavetemps_flag) cli_dbgmsg("NSIS: Extracting files to %s\n", nsist.dir);

+

     ctx->arec++;

     do {

@@ -19,37 +19,6 @@

 #ifndef __NSIS_H

 #define __NSIS_H

-#include "cltypes.h"

-#include "nsis_bzlib.h"

-#include "LZMADecode.h"

-#include "nsis_zlib.h"

 #include "others.h"

-

-struct nsis_st {

-  int ifd;

-  int ofd;

-  off_t off;

-  char *dir;

-  uint32_t asz;

-  uint32_t hsz;

-  uint32_t fno;

-  struct {

-    uint32_t avail_in;

-    unsigned char *next_in;

-    uint32_t avail_out;

-    unsigned char *next_out;

-  } nsis;

-  nsis_bzstream bz;

-  lzma_stream lz;

-  nsis_z_stream z;

-  unsigned char *freeme;

-  uint8_t comp;

-  uint8_t solid;

-  uint8_t freecomp;

-  uint8_t eof;

-  char ofn[1024];

-};

-

-int cli_nsis_unpack(struct nsis_st *, cli_ctx *);

-void cli_nsis_free(struct nsis_st *);

+int cli_scannulsft(int desc, cli_ctx *ctx, off_t offset);

 #endif

@@ -85,6 +85,7 @@

 #include "cab.h"

 #include "rtf.h"

 #include "unarj.h"

+#include "nulsft.h"

 #ifdef HAVE_ZLIB_H

 #include <zlib.h>

@@ -103,7 +104,6 @@

 #define MAX_MAIL_RECURSION  15

-int cli_scannulsft(int desc, cli_ctx *ctx, off_t offset); /* FIXME */

 static int cli_scanfile(const char *filename, cli_ctx *ctx);

 static int cli_unrar_scanmetadata(int desc, rar_metadata_t *metadata, cli_ctx *ctx, unsigned int files, uint32_t* sfx_check)