@@ -213,7 +213,7 @@ static int cli_tgzload(int fd, struct cl_engine *engine, unsigned int *signo, un

 	unsigned int type, size, pad, compr = 1;

 	off_t off;

 	struct cli_dbinfo *db;

-	unsigned char hash[32];

+	char hash[32];

     cli_dbgmsg("in cli_tgzload()\n");

@@ -2341,13 +2341,13 @@ inline static int ac_special_altstr(const char *hexpr, uint8_t sigopts, struct c

         for (i = 0; i < num; i++) {

             if (num == 1) {

-                c = (char *) cli_mpool_hex2str(root->mempool, hexprcpy);

+                c = cli_mpool_hex2str(root->mempool, hexprcpy);

             } else {

                 if(!(h = cli_strtok(hexprcpy, i, "|"))) {

                     free(hexprcpy);

                     return CL_EMEM;

                 }

-                c = (char *) cli_mpool_hex2str(root->mempool, h);

+                c = cli_mpool_hex2str(root->mempool, h);

                 free(h);

             }

             if (!c) {

@@ -2356,10 +2356,10 @@ inline static int ac_special_altstr(const char *hexpr, uint8_t sigopts, struct c

             }

             if (special->type == AC_SPECIAL_ALT_CHAR) {

-                (special->alt).byte[i] = *c;

+                (special->alt).byte[i] = (unsigned char)*c;

                 mpool_free(root->mempool, c);

             } else {

-                (special->alt).f_str[i] = c;

+                (special->alt).f_str[i] = (unsigned char*)c;

             }

             special->num++;

         }

@@ -756,8 +756,8 @@ void *mpool_realloc2(struct MP *mp, void *ptr, size_t size) {

     return NULL;

 }

-unsigned char *cli_mpool_hex2str(mpool_t *mp, const char *hex) {

-    unsigned char *str;

+char *cli_mpool_hex2str(mpool_t *mp, const char *hex) {

+    char *str;

     size_t len = strlen((const char*)hex);

     if (len&1) {

@@ -770,7 +770,7 @@ unsigned char *cli_mpool_hex2str(mpool_t *mp, const char *hex) {

 	cli_errmsg("cli_mpool_hex2str(): Can't allocate memory (%lu bytes).\n", (unsigned long)(len/2 + 1));

 	return NULL;

     }

-    if (cli_hex2str_to(hex, (char*)str, len) == -1) {

+    if (cli_hex2str_to(hex, str, len) == -1) {

 	mpool_free(mp, str);

 	return NULL;

     }

@@ -34,7 +34,7 @@ void mpool_free(mpool_t *mpool, void *ptr);

 void *mpool_calloc(mpool_t *mpool, size_t nmemb, size_t size);

 void *mpool_realloc(mpool_t *mpool, void *ptr, size_t size);

 void *mpool_realloc2(mpool_t *mpool, void *ptr, size_t size);

-unsigned char *cli_mpool_hex2str(mpool_t* mpool, const char *src);

+char *cli_mpool_hex2str(mpool_t* mpool, const char *src);

 char *cli_mpool_strdup(mpool_t *mpool, const char *s);

 char *cli_mpool_strndup(mpool_t *mpool, const char *s, size_t n);

 char *cli_mpool_virname(mpool_t *mpool, const char *virname, unsigned int official);

@@ -234,7 +234,7 @@ struct icon_matcher {

 struct cli_dbinfo {

     char *name;

-    unsigned char *hash;

+    char *hash;

     size_t size;

     struct cl_cvd *cvd;

     struct cli_dbinfo *next;

@@ -249,7 +249,7 @@ typedef enum {

 struct cli_pwdb {

     char *name;

-    unsigned char *passwd;

+    char *passwd;

     uint16_t length;

     struct cli_pwdb *next;

 };

@@ -2193,8 +2193,8 @@ static int cli_loadinfo(FILE *fs, struct cl_engine *engine, unsigned int options

 	const char *tokens[INFO_TOKENS + 1];

 	char buffer[FILEBUFF];

 	unsigned int line = 0, tokens_count, len;

-	unsigned char hash[32];

-        struct cli_dbinfo *last = NULL, *new;

+	char hash[32];

+    struct cli_dbinfo *last = NULL, *new;

 	int ret = CL_SUCCESS, dsig = 0;

     void *ctx;

@@ -2213,7 +2213,7 @@ static int cli_loadinfo(FILE *fs, struct cl_engine *engine, unsigned int options

 	if(!(options & CL_DB_UNSIGNED) && !strncmp(buffer, "DSIG:", 5)) {

 	    dsig = 1;

 	    cl_finish_hash(ctx, hash);

-	    if(cli_versig2(hash, buffer + 5, INFO_NSTR, INFO_ESTR) != CL_SUCCESS) {

+	    if(cli_versig2((unsigned char*)hash, buffer + 5, INFO_NSTR, INFO_ESTR) != CL_SUCCESS) {

 		cli_errmsg("cli_loadinfo: Incorrect digital signature\n");

 		ret = CL_EMALFDB;

 	    }

@@ -2262,7 +2262,7 @@ static int cli_loadinfo(FILE *fs, struct cl_engine *engine, unsigned int options

 	    ret = CL_EMALFDB;

 	    break;

 	}

-        new = (struct cli_dbinfo *) mpool_calloc(engine->mempool, 1, sizeof(struct cli_dbinfo));

+    new = (struct cli_dbinfo *) mpool_calloc(engine->mempool, 1, sizeof(struct cli_dbinfo));

 	if(!new) {

 	    ret = CL_EMEM;

 	    break;

@@ -2381,7 +2381,7 @@ static int cli_loadign(FILE *fs, struct cl_engine *engine, unsigned int options,

 	    break;

 	}

 	if(hash) {

-	    if(strlen(hash) != 32 || !(new->virname = (char *) cli_mpool_hex2str(engine->mempool, hash))) {

+	    if(strlen(hash) != 32 || !(new->virname = cli_mpool_hex2str(engine->mempool, hash))) {

 		cli_errmsg("cli_loadign: Malformed MD5 string at line %u\n", line);

 		mpool_free(engine->mempool, new->pattern);

 		mpool_free(engine->mempool, new);

@@ -32,10 +32,10 @@

 #include <errno.h>

 #include <sys/types.h>

 #include <sys/stat.h>

-#ifdef	HAVE_UNISTD_H

+#ifdef HAVE_UNISTD_H

 #include <unistd.h>

 #endif

-#ifdef	HAVE_SYS_PARAM_H

+#ifdef HAVE_SYS_PARAM_H

 #include <sys/param.h>

 #endif

 #include <fcntl.h>

@@ -44,9 +44,9 @@

 #include <sys/times.h>

 #endif

-#define DCONF_ARCH  ctx->dconf->archive

-#define DCONF_DOC   ctx->dconf->doc

-#define DCONF_MAIL  ctx->dconf->mail

+#define DCONF_ARCH ctx->dconf->archive

+#define DCONF_DOC ctx->dconf->doc

+#define DCONF_MAIL ctx->dconf->mail

 #define DCONF_OTHER ctx->dconf->other

 #include "clamav.h"

@@ -122,112 +122,133 @@ static int cli_scanfile(const char *filename, cli_ctx *ctx);

 static int cli_scandir(const char *dirname, cli_ctx *ctx)

 {

-	DIR *dd;

-	struct dirent *dent;

+    DIR *dd;

+    struct dirent *dent;

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

-	union {

-	    struct dirent d;

-	    char b[offsetof(struct dirent, d_name) + NAME_MAX + 1];

-	} result;

+    union {

+        struct dirent d;

+        char b[offsetof(struct dirent, d_name) + NAME_MAX + 1];

+    } result;

 #endif

-	STATBUF statbuf;

-	char *fname;

-	unsigned int viruses_found = 0;

+    STATBUF statbuf;

+    char *fname;

+    unsigned int viruses_found = 0;

-    if((dd = opendir(dirname)) != NULL) {

+    if ((dd = opendir(dirname)) != NULL)

+    {

 #ifdef HAVE_READDIR_R_3

-	while(!readdir_r(dd, &result.d, &dent) && dent) {

+        while (!readdir_r(dd, &result.d, &dent) && dent)

+        {

 #elif defined(HAVE_READDIR_R_2)

-	while((dent = (struct dirent *) readdir_r(dd, &result.d))) {

+        while ((dent = (struct dirent *)readdir_r(dd, &result.d)))

+        {

 #else

-	while((dent = readdir(dd))) {

+        while ((dent = readdir(dd)))

+        {

 #endif

-	    if(dent->d_ino)

-	    {

-		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

-		    /* build the full name */

-		    fname = cli_malloc(strlen(dirname) + strlen(dent->d_name) + 2);

-		    if(!fname) {

-			closedir(dd);

-            cli_dbgmsg("cli_scandir: Unable to allocate memory for filename\n");

-			return CL_EMEM;

-		    }

-

-		    sprintf(fname, "%s"PATHSEP"%s", dirname, dent->d_name);

-

-		    /* stat the file */

-		    if(LSTAT(fname, &statbuf) != -1) {

-			if(S_ISDIR(statbuf.st_mode) && !S_ISLNK(statbuf.st_mode)) {

-			    if(cli_scandir(fname, ctx) == CL_VIRUS) {

-				free(fname);

-

-				if (SCAN_ALL) {

-				    viruses_found++;

-				    continue;

-				}

+            if (dent->d_ino)

+            {

+                if (strcmp(dent->d_name, ".") && strcmp(dent->d_name, ".."))

+                {

+                    /* build the full name */

+                    fname = cli_malloc(strlen(dirname) + strlen(dent->d_name) + 2);

+                    if (!fname)

+                    {

+                        closedir(dd);

+                        cli_dbgmsg("cli_scandir: Unable to allocate memory for filename\n");

+                        return CL_EMEM;

+                    }

+

+                    sprintf(fname, "%s" PATHSEP "%s", dirname, dent->d_name);

+

+                    /* stat the file */

+                    if (LSTAT(fname, &statbuf) != -1)

+                    {

+                        if (S_ISDIR(statbuf.st_mode) && !S_ISLNK(statbuf.st_mode))

+                        {

+                            if (cli_scandir(fname, ctx) == CL_VIRUS)

+                            {

+                                free(fname);

+

+                                if (SCAN_ALL)

+                                {

+                                    viruses_found++;

+                                    continue;

+                                }

                                 closedir(dd);

                                 return CL_VIRUS;

- 			    }

-			} else {

-			    if(S_ISREG(statbuf.st_mode)) {

-				if(cli_scanfile(fname, ctx) == CL_VIRUS) {

-				    free(fname);

-

-				    if (SCAN_ALL) {

-					viruses_found++;

-					continue;

-				    }

+                            }

+                        }

+                        else

+                        {

+                            if (S_ISREG(statbuf.st_mode))

+                            {

+                                if (cli_scanfile(fname, ctx) == CL_VIRUS)

+                                {

+                                    free(fname);

+

+                                    if (SCAN_ALL)

+                                    {

+                                        viruses_found++;

+                                        continue;

+                                    }

                                     closedir(dd);

                                     return CL_VIRUS;

- 				}

-			    }

-			}

-		    }

-		    free(fname);

-		}

-	    }

-	} 

-    } else {

-	cli_dbgmsg("cli_scandir: Can't open directory %s.\n", dirname);

-	return CL_EOPEN;

+                                }

+                            }

+                        }

+                    }

+                    free(fname);

+                }

+            }

+        }

+    }

+    else

+    {

+        cli_dbgmsg("cli_scandir: Can't open directory %s.\n", dirname);

+        return CL_EOPEN;

     }

     closedir(dd);

     if (SCAN_ALL && viruses_found)

-	return CL_VIRUS;

+        return CL_VIRUS;

     return CL_CLEAN;

 }

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

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

 {

-	int ret = CL_SUCCESS;

-        int virus_found = 0;

+    int ret = CL_SUCCESS;

+    int virus_found = 0;

-    if(files == 1 && sfx_check) {

-	if(*sfx_check == metadata->crc)

-	    return CL_BREAK;/* break extract loop */

-	else

-	    *sfx_check = metadata->crc;

+    if (files == 1 && sfx_check)

+    {

+        if (*sfx_check == metadata->crc)

+            return CL_BREAK; /* break extract loop */

+        else

+            *sfx_check = metadata->crc;

     }

     cli_dbgmsg("RAR: %s, crc32: 0x%x, encrypted: %u, compressed: %u, normal: %u, method: %u, ratio: %u\n",

-	metadata->filename, metadata->crc, metadata->encrypted, (unsigned int) metadata->pack_size,

-	(unsigned int) metadata->unpack_size, metadata->method,

-	metadata->pack_size ? (unsigned int) (metadata->unpack_size / metadata->pack_size) : 0);

+               metadata->filename, metadata->crc, metadata->encrypted, (unsigned int)metadata->pack_size,

+               (unsigned int)metadata->unpack_size, metadata->method,

+               metadata->pack_size ? (unsigned int)(metadata->unpack_size / metadata->pack_size) : 0);

-    if(cli_matchmeta(ctx, metadata->filename, metadata->pack_size, metadata->unpack_size, metadata->encrypted, files, metadata->crc, NULL) == CL_VIRUS) {

+    if (cli_matchmeta(ctx, metadata->filename, metadata->pack_size, metadata->unpack_size, metadata->encrypted, files, metadata->crc, NULL) == CL_VIRUS)

+    {

         if (!SCAN_ALL)

             return CL_VIRUS;

         virus_found = 1;

     }

-    if(DETECT_ENCRYPTED && metadata->encrypted) {

-	cli_dbgmsg("RAR: Encrypted files found in archive.\n");

-	ret = cli_scandesc(desc, ctx, 0, 0, NULL, AC_SCAN_VIR, NULL);

-	if(ret != CL_VIRUS) {

-	    if (CL_VIRUS == cli_append_virus(ctx, "Heuristics.Encrypted.RAR"))

+    if (DETECT_ENCRYPTED && metadata->encrypted)

+    {

+        cli_dbgmsg("RAR: Encrypted files found in archive.\n");

+        ret = cli_scandesc(desc, ctx, 0, 0, NULL, AC_SCAN_VIR, NULL);

+        if (ret != CL_VIRUS)

+        {

+            if (CL_VIRUS == cli_append_virus(ctx, "Heuristics.Encrypted.RAR"))

                 return CL_VIRUS;

         }

     }

@@ -239,147 +260,165 @@ static int cli_unrar_scanmetadata(int desc, unrar_metadata_t *metadata, cli_ctx

 static int cli_scanrar(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_check)

 {

-	int ret = CL_CLEAN;

-	unrar_metadata_t *metadata, *metadata_tmp;

-	char *dir;

-	unrar_state_t rar_state;

-	unsigned int viruses_found = 0;

+    int ret = CL_CLEAN;

+    unrar_metadata_t *metadata, *metadata_tmp;

+    char *dir;

+    unrar_state_t rar_state;

+    unsigned int viruses_found = 0;

     cli_dbgmsg("in scanrar()\n");

-    if(sfx_offset)

-	if(lseek(desc, sfx_offset, SEEK_SET) == -1)

-	    return CL_ESEEK;

+    if (sfx_offset)

+        if (lseek(desc, sfx_offset, SEEK_SET) == -1)

+            return CL_ESEEK;

     /* generate the temporary directory */

-    if(!(dir = cli_gentemp(ctx->engine->tmpdir)))

-	return CL_EMEM;

-

-    if(mkdir(dir, 0700)) {

-	cli_dbgmsg("RAR: Can't create temporary directory %s\n", dir);

-	free(dir);

-	return CL_ETMPDIR;

-    }

-

-    if((ret = cli_unrar_open(desc, dir, &rar_state)) != UNRAR_OK) {

-	if(!ctx->engine->keeptmp)

-	    cli_rmdirs(dir);

-	free(dir);

-	if(ret == UNRAR_PASSWD) {

-	    cli_dbgmsg("RAR: Encrypted main header\n");

-	    if(DETECT_ENCRYPTED) {

-		if (lseek(desc, 0, SEEK_SET) == -1) {

+    if (!(dir = cli_gentemp(ctx->engine->tmpdir)))

+        return CL_EMEM;

+

+    if (mkdir(dir, 0700))

+    {

+        cli_dbgmsg("RAR: Can't create temporary directory %s\n", dir);

+        free(dir);

+        return CL_ETMPDIR;

+    }

+

+    if ((ret = cli_unrar_open(desc, dir, &rar_state)) != UNRAR_OK)

+    {

+        if (!ctx->engine->keeptmp)

+            cli_rmdirs(dir);

+        free(dir);

+        if (ret == UNRAR_PASSWD)

+        {

+            cli_dbgmsg("RAR: Encrypted main header\n");

+            if (DETECT_ENCRYPTED)

+            {

+                if (lseek(desc, 0, SEEK_SET) == -1)

+                {

                     cli_dbgmsg("RAR: call to lseek() failed\n");

                     return CL_ESEEK;

                 }

-		ret = cli_scandesc(desc, ctx, 0, 0, NULL, AC_SCAN_VIR, NULL);

-		if(ret != CL_VIRUS)

-		    if (CL_VIRUS == cli_append_virus(ctx, "Heuristics.Encrypted.RAR"))

+                ret = cli_scandesc(desc, ctx, 0, 0, NULL, AC_SCAN_VIR, NULL);

+                if (ret != CL_VIRUS)

+                    if (CL_VIRUS == cli_append_virus(ctx, "Heuristics.Encrypted.RAR"))

                         return CL_VIRUS;

-	    }

-	    return CL_CLEAN;

-	} if(ret == UNRAR_EMEM) {

-	    return CL_EMEM;

-	} else {

-	    return CL_EUNPACK;

-	}

-    }

-

-    do {

-	int rc;

-	rar_state.ofd = -1;

-	ret = cli_unrar_extract_next_prepare(&rar_state,dir);

-	if(ret != UNRAR_OK) {

-	    if(ret == UNRAR_BREAK)

-		ret = CL_BREAK;

-	    else if(ret == UNRAR_EMEM)

-		ret = CL_EMEM;

-	    else

-		ret = CL_EUNPACK;

-	    break;

-	}

-	if(ctx->engine->maxscansize && ctx->scansize >= ctx->engine->maxscansize) {

-	    free(rar_state.file_header->filename);

-	    free(rar_state.file_header);

-	    ret = CL_CLEAN;

-	    break;

-	}

-	if(ctx->engine->maxscansize && ctx->scansize + ctx->engine->maxfilesize >= ctx->engine->maxscansize)

-	    rar_state.maxfilesize = ctx->engine->maxscansize - ctx->scansize;

-	else

-	    rar_state.maxfilesize = ctx->engine->maxfilesize;

-

-	ret = cli_unrar_extract_next(&rar_state,dir);

-	if(ret == UNRAR_OK)

-	    ret = CL_SUCCESS;

-	else if(ret == UNRAR_EMEM)

-	    ret = CL_EMEM;

-	else

-	    ret = CL_EFORMAT;

-

-	if(rar_state.ofd > 0) {

-	    if (lseek(rar_state.ofd,0,SEEK_SET) == -1) {

-            cli_dbgmsg("RAR: Call to lseek() failed\n");

-            ret = CL_ESEEK;

-        }

-	    rc = cli_magic_scandesc(rar_state.ofd,ctx);

-	    close(rar_state.ofd);

-	    if(!ctx->engine->keeptmp) 

-		if (cli_unlink(rar_state.filename)) ret = CL_EUNLINK;

-	    if(rc == CL_VIRUS ) {

-		cli_dbgmsg("RAR: infected with %s\n", cli_get_last_virus(ctx));

-		ret = CL_VIRUS;

-		viruses_found++;

-	    }

-	}

-

-	if(ret == CL_VIRUS) {

-	    if(SCAN_ALL)

-		ret = CL_SUCCESS;

-	    else

-		break;

-	}

-

-	if(ret == CL_SUCCESS)

-	    ret = cli_unrar_scanmetadata(desc,rar_state.metadata_tail, ctx, rar_state.file_count, sfx_check);

-

-    } while(ret == CL_SUCCESS);

-

-    if(ret == CL_BREAK)

-	ret = CL_CLEAN;

-

-    metadata = metadata_tmp = rar_state.metadata; 

-

-    if(cli_scandir(rar_state.comment_dir, ctx) == CL_VIRUS)

-	ret = CL_VIRUS;

+            }

+            return CL_CLEAN;

+        }

+        if (ret == UNRAR_EMEM)

+        {

+            return CL_EMEM;

+        }

+        else

+        {

+            return CL_EUNPACK;

+        }

+    }

+

+    do

+    {

+        int rc;

+        rar_state.ofd = -1;

+        ret = cli_unrar_extract_next_prepare(&rar_state, dir);

+        if (ret != UNRAR_OK)

+        {

+            if (ret == UNRAR_BREAK)

+                ret = CL_BREAK;

+            else if (ret == UNRAR_EMEM)

+                ret = CL_EMEM;

+            else

+                ret = CL_EUNPACK;

+            break;

+        }

+        if (ctx->engine->maxscansize && ctx->scansize >= ctx->engine->maxscansize)

+        {

+            free(rar_state.file_header->filename);

+            free(rar_state.file_header);

+            ret = CL_CLEAN;

+            break;

+        }

+        if (ctx->engine->maxscansize && ctx->scansize + ctx->engine->maxfilesize >= ctx->engine->maxscansize)

+            rar_state.maxfilesize = ctx->engine->maxscansize - ctx->scansize;

+        else

+            rar_state.maxfilesize = ctx->engine->maxfilesize;

+

+        ret = cli_unrar_extract_next(&rar_state, dir);

+        if (ret == UNRAR_OK)

+            ret = CL_SUCCESS;

+        else if (ret == UNRAR_EMEM)

+            ret = CL_EMEM;

+        else

+            ret = CL_EFORMAT;

+

+        if (rar_state.ofd > 0)

+        {

+            if (lseek(rar_state.ofd, 0, SEEK_SET) == -1)

+            {

+                cli_dbgmsg("RAR: Call to lseek() failed\n");

+                ret = CL_ESEEK;

+            }

+            rc = cli_magic_scandesc(rar_state.ofd, ctx);

+            close(rar_state.ofd);

+            if (!ctx->engine->keeptmp)

+                if (cli_unlink(rar_state.filename))

+                    ret = CL_EUNLINK;

+            if (rc == CL_VIRUS)

+            {

+                cli_dbgmsg("RAR: infected with %s\n", cli_get_last_virus(ctx));

+                ret = CL_VIRUS;

+                viruses_found++;

+            }

+        }

+

+        if (ret == CL_VIRUS)

+        {

+            if (SCAN_ALL)

+                ret = CL_SUCCESS;

+            else

+                break;

+        }

+

+        if (ret == CL_SUCCESS)

+            ret = cli_unrar_scanmetadata(desc, rar_state.metadata_tail, ctx, rar_state.file_count, sfx_check);

+

+    } while (ret == CL_SUCCESS);

+

+    if (ret == CL_BREAK)

+        ret = CL_CLEAN;

+

+    metadata = metadata_tmp = rar_state.metadata;

+

+    if (cli_scandir(rar_state.comment_dir, ctx) == CL_VIRUS)

+        ret = CL_VIRUS;

     cli_unrar_close(&rar_state);

-    if(!ctx->engine->keeptmp)

+    if (!ctx->engine->keeptmp)

         cli_rmdirs(dir);

     free(dir);

     metadata = metadata_tmp;

-    while (metadata) {

-    	metadata_tmp = metadata->next;

-    	free(metadata->filename);

-    	free(metadata);

-    	metadata = metadata_tmp;

+    while (metadata)

+    {

+        metadata_tmp = metadata->next;

+        free(metadata->filename);

+        free(metadata);

+        metadata = metadata_tmp;

     }

     cli_dbgmsg("RAR: Exit code: %d\n", ret);

     if (SCAN_ALL && viruses_found)

-	return CL_VIRUS;

+        return CL_VIRUS;

     return ret;

 }

 static int cli_scanarj(cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_check)

 {

-	int ret = CL_CLEAN, rc, file = 0;

-	arj_metadata_t metadata;

-	char *dir;

-        int virus_found = 0;

+    int ret = CL_CLEAN, rc, file = 0;

+    arj_metadata_t metadata;

+    char *dir;

+    int virus_found = 0;

     UNUSEDPARAM(sfx_check);

@@ -387,35 +426,41 @@ static int cli_scanarj(cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_check)

     memset(&metadata, 0, sizeof(arj_metadata_t));

-     /* generate the temporary directory */

-    if(!(dir = cli_gentemp(ctx->engine->tmpdir)))

-	return CL_EMEM;

+    /* generate the temporary directory */

+    if (!(dir = cli_gentemp(ctx->engine->tmpdir)))

+        return CL_EMEM;

-    if(mkdir(dir, 0700)) {

-	cli_dbgmsg("ARJ: Can't create temporary directory %s\n", dir);

-	free(dir);

-	return CL_ETMPDIR;

+    if (mkdir(dir, 0700))

+    {

+        cli_dbgmsg("ARJ: Can't create temporary directory %s\n", dir);

+        free(dir);

+        return CL_ETMPDIR;

     }

     ret = cli_unarj_open(*ctx->fmap, dir, &metadata, sfx_offset);

-    if (ret != CL_SUCCESS) {

-	if(!ctx->engine->keeptmp)

-	    cli_rmdirs(dir);

-	free(dir);

-	cli_dbgmsg("ARJ: Error: %s\n", cl_strerror(ret));

-	return ret;

-    }

-    

-   do {

+    if (ret != CL_SUCCESS)

+    {

+        if (!ctx->engine->keeptmp)

+            cli_rmdirs(dir);

+        free(dir);

+        cli_dbgmsg("ARJ: Error: %s\n", cl_strerror(ret));

+        return ret;

+    }

+

+    do

+    {

         metadata.filename = NULL;

-	ret = cli_unarj_prepare_file(dir, &metadata);

-	if (ret != CL_SUCCESS) {

-	   cli_dbgmsg("ARJ: cli_unarj_prepare_file Error: %s\n", cl_strerror(ret));

-	   break;

-	}

-	file++;

-	if(cli_matchmeta(ctx, metadata.filename, metadata.comp_size, metadata.orig_size, metadata.encrypted, file, 0, NULL) == CL_VIRUS) {

-            if (!SCAN_ALL) {

+        ret = cli_unarj_prepare_file(dir, &metadata);

+        if (ret != CL_SUCCESS)

+        {

+            cli_dbgmsg("ARJ: cli_unarj_prepare_file Error: %s\n", cl_strerror(ret));

+            break;

+        }

+        file++;

+        if (cli_matchmeta(ctx, metadata.filename, metadata.comp_size, metadata.orig_size, metadata.encrypted, file, 0, NULL) == CL_VIRUS)

+        {

+            if (!SCAN_ALL)

+            {

                 cli_rmdirs(dir);

                 free(dir);

                 return CL_VIRUS;

@@ -424,27 +469,34 @@ static int cli_scanarj(cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_check)

             ret = CL_SUCCESS;

         }

-	if ((ret = cli_checklimits("ARJ", ctx, metadata.orig_size, metadata.comp_size, 0))!=CL_CLEAN) {

-	    ret = CL_SUCCESS;

-	    if (metadata.filename)

-		free(metadata.filename);

-	    continue;

-	}

-	ret = cli_unarj_extract_file(dir, &metadata);

-	if (ret != CL_SUCCESS) {

-	   cli_dbgmsg("ARJ: cli_unarj_extract_file Error: %s\n", cl_strerror(ret));

-	}

-	if (metadata.ofd >= 0) {

-	    if (lseek(metadata.ofd, 0, SEEK_SET) == -1) {

-            cli_dbgmsg("ARJ: call to lseek() failed\n");

-        }

-	    rc = cli_magic_scandesc(metadata.ofd, ctx);

-	    close(metadata.ofd);

-	    if (rc == CL_VIRUS) {

-		cli_dbgmsg("ARJ: infected with %s\n", cli_get_last_virus(ctx));

-                if (!SCAN_ALL) {

+        if ((ret = cli_checklimits("ARJ", ctx, metadata.orig_size, metadata.comp_size, 0)) != CL_CLEAN)

+        {

+            ret = CL_SUCCESS;

+            if (metadata.filename)

+                free(metadata.filename);

+            continue;

+        }

+        ret = cli_unarj_extract_file(dir, &metadata);

+        if (ret != CL_SUCCESS)

+        {

+            cli_dbgmsg("ARJ: cli_unarj_extract_file Error: %s\n", cl_strerror(ret));

+        }

+        if (metadata.ofd >= 0)

+        {

+            if (lseek(metadata.ofd, 0, SEEK_SET) == -1)

+            {

+                cli_dbgmsg("ARJ: call to lseek() failed\n");

+            }

+            rc = cli_magic_scandesc(metadata.ofd, ctx);

+            close(metadata.ofd);

+            if (rc == CL_VIRUS)

+            {

+                cli_dbgmsg("ARJ: infected with %s\n", cli_get_last_virus(ctx));

+                if (!SCAN_ALL)

+                {

                     ret = CL_VIRUS;

-                    if (metadata.filename) {

+                    if (metadata.filename)

+                    {

                         free(metadata.filename);

                         metadata.filename = NULL;

                     }

@@ -452,199 +504,229 @@ static int cli_scanarj(cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_check)

                 }

                 virus_found = 1;

                 ret = CL_SUCCESS;

-	    }

-	}

-	if (metadata.filename) {

-		free(metadata.filename);

-		metadata.filename = NULL;

-	}

-

-    } while(ret == CL_SUCCESS);

-    

-    if(!ctx->engine->keeptmp)

-	cli_rmdirs(dir);

+            }

+        }

+        if (metadata.filename)

+        {

+            free(metadata.filename);

+            metadata.filename = NULL;

+        }

+

+    } while (ret == CL_SUCCESS);

+

+    if (!ctx->engine->keeptmp)

+        cli_rmdirs(dir);

     free(dir);

-    if (metadata.filename) {

-	free(metadata.filename);

+    if (metadata.filename)

+    {

+        free(metadata.filename);

     }

     if (virus_found != 0)

         ret = CL_VIRUS;

     cli_dbgmsg("ARJ: Exit code: %d\n", ret);

     if (ret == CL_BREAK)

-	ret = CL_CLEAN;

+        ret = CL_CLEAN;

     return ret;

 }

-

-static int cli_scangzip_with_zib_from_the_80s(cli_ctx *ctx, unsigned char *buff) {

+static int cli_scangzip_with_zib_from_the_80s(cli_ctx *ctx, unsigned char *buff)

+{

     int fd, ret, outsize = 0, bytes;

     fmap_t *map = *ctx->fmap;

     char *tmpname;

     gzFile gz;

     ret = fmap_fd(map);

-    if(ret < 0)

-	return CL_EDUP;

+    if (ret < 0)

+        return CL_EDUP;

     fd = dup(ret);

-    if(fd < 0)

-	return CL_EDUP;

-

-    if(!(gz = gzdopen(fd, "rb"))) {

-	close(fd);

-	return CL_EOPEN;

-    }

-

-    if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &fd)) != CL_SUCCESS) {

-	cli_dbgmsg("GZip: Can't generate temporary file.\n");

-	gzclose(gz);

-	close(fd);

-	return ret;

-    }

-    

-    while((bytes = gzread(gz, buff, FILEBUFF)) > 0) {

-	outsize += bytes;

-	if(cli_checklimits("GZip", ctx, outsize, 0, 0)!=CL_CLEAN)

-	    break;

-	if(cli_writen(fd, buff, bytes) != bytes) {

-	    close(fd);

-	    gzclose(gz);

-	    if(cli_unlink(tmpname)) {

-		free(tmpname);

-		return CL_EUNLINK;

-	    }

-	    free(tmpname);

-	    return CL_EWRITE;

-	}

+    if (fd < 0)

+        return CL_EDUP;

+

+    if (!(gz = gzdopen(fd, "rb")))

+    {

+        close(fd);

+        return CL_EOPEN;

+    }

+

+    if ((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &fd)) != CL_SUCCESS)

+    {

+        cli_dbgmsg("GZip: Can't generate temporary file.\n");

+        gzclose(gz);

+        close(fd);

+        return ret;

+    }

+

+    while ((bytes = gzread(gz, buff, FILEBUFF)) > 0)

+    {

+        outsize += bytes;

+        if (cli_checklimits("GZip", ctx, outsize, 0, 0) != CL_CLEAN)

+            break;

+        if (cli_writen(fd, buff, bytes) != bytes)

+        {

+            close(fd);

+            gzclose(gz);

+            if (cli_unlink(tmpname))

+            {

+                free(tmpname);