@@ -1,3 +1,8 @@

+Fri Nov 14 22:24:44 CET 2008 (tk)

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

+ * libclamav: drop cl_settempdir(); use cl_engine_set() with CL_ENGINE_TMPDIR

+	      and CL_ENGINE_KEEPTMP instead

+

 Fri Nov 14 18:40:50 EET 2008 (edwin)

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

  * libclamunrar/unrar.c: avoid rar_malloc warnings on damaged files

@@ -1815,7 +1815,13 @@ main(int argc, char **argv)

 		/* set the temporary dir */

 		if((cpt = cfgopt(copt, "TemporaryDirectory")) && cpt->enabled) {

 			tmpdir = cpt->strarg;

-			cl_settempdir(tmpdir, (short)(cfgopt(copt, "LeaveTemporaryFiles")->enabled));

+			/*

+			 * FIXME: replace this:

+			  cl_settempdir(tmpdir, (short)(cfgopt(copt, "LeaveTemporaryFiles")->enabled)); *

+			 * with:

+			 * cl_engine_set(engine, CL_ENGINE_TMPDIR, cpt->strarg);

+			 * somewhere...

+			 */

 		} else if((tmpdir = getenv("TMPDIR")) == (char *)NULL)

 			if((tmpdir = getenv("TMP")) == (char *)NULL)

 				if((tmpdir = getenv("TEMP")) == (char *)NULL)

@@ -5809,7 +5815,7 @@ quit(void)

 #endif

 	}

-	if(tmpdir && !cli_leavetemps_flag)

+	if(tmpdir)

 		if(rmdir(tmpdir) < 0)

 			perror(tmpdir);

@@ -293,13 +293,6 @@ int main(int argc, char **argv)

 	return 1;

     }

-    /* set the temporary dir */

-    if((cpt = cfgopt(copt, "TemporaryDirectory"))->enabled)

-	cl_settempdir(cpt->strarg, 0);

-

-    if(cfgopt(copt, "LeaveTemporaryFiles")->enabled)

-	cl_settempdir(NULL, 1);

-

     logg("#clamd daemon %s (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n", get_version());

 #ifndef C_WINDOWS

@@ -395,6 +388,22 @@ int main(int argc, char **argv)

 	logg("#Not loading PUA signatures.\n");

     }

+    /* set the temporary dir */

+    if((cpt = cfgopt(copt, "TemporaryDirectory"))->enabled) {

+	if((ret = cl_engine_set(engine, CL_ENGINE_TMPDIR, cpt->strarg))) {

+	    logg("!cli_engine_set(CL_ENGINE_TMPDIR) failed: %s\n", cl_strerror(ret));

+	    logg_close();

+	    freecfg(copt);

+	    cl_engine_free(engine);

+	    return 1;

+	}

+    }

+

+    if(cfgopt(copt, "LeaveTemporaryFiles")->enabled) {

+	val32 = 1;

+	cl_engine_set(engine, CL_ENGINE_KEEPTMP, &val32);

+    }

+

     if(cfgopt(copt, "PhishingSignatures")->enabled)

 	dboptions |= CL_DB_PHISHING;

     else

@@ -546,7 +546,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     snprintf(peer_addr, sizeof(peer_addr), "%s", inet_ntoa(peer.sin_addr));

     logg("*Accepted connection from %s on port %u, fd %d\n", peer_addr, port, acceptd);

-    if(cli_gentempfd(NULL, &tmpname, &tmpd)) {

+    if(cli_gentempfd(cfgopt(copt, "TemporaryDirectory")->strarg, &tmpname, &tmpd)) {

 	shutdown(sockfd, 2);

 	closesocket(sockfd);

 	closesocket(acceptd);

@@ -135,12 +135,6 @@ int main(int argc, char **argv)

     if(opt_check(opt, "bell"))

 	bell = 1;

-    if(opt_check(opt, "tempdir"))

-	cl_settempdir(opt_arg(opt, "tempdir"), 0);

-

-    if(opt_check(opt, "leave-temps"))

-	cl_settempdir(NULL, 1);

-

     /* initialize logger */

     if(opt_check(opt, "log")) {

 	logg_file = opt_arg(opt, "log");

@@ -278,7 +278,7 @@ static int scandirs(const char *dirname, struct cl_engine *engine, const struct

 }

-static int scanstdin(const struct cl_engine *engine, int options)

+static int scanstdin(const struct cl_engine *engine, const struct optstruct *opt, int options)

 {

 	int ret;

 	const char *virname, *tmpdir;

@@ -286,16 +286,19 @@ static int scanstdin(const struct cl_engine *engine, int options)

 	size_t bread;

 	FILE *fs;

+    if(opt_check(opt, "tempdir")) {

+	tmpdir = opt_arg(opt, "tempdir");

+    } else {

+	/* check write access */

+	tmpdir = getenv("TMPDIR");

-    /* check write access */

-    tmpdir = getenv("TMPDIR");

-

-    if(tmpdir == NULL)

+	if(tmpdir == NULL)

 #ifdef P_tmpdir

-	tmpdir = P_tmpdir;

+	    tmpdir = P_tmpdir;

 #else

-	tmpdir = "/tmp";

+	    tmpdir = "/tmp";

 #endif

+    }

     if(checkaccess(tmpdir, CLAMAVUSER, W_OK) != 1) {

 	logg("!Can't write to temporary directory\n");

@@ -349,6 +352,7 @@ int scanmanager(const struct optstruct *opt)

 	struct cl_engine *engine;

 	struct stat sb;

 	char *file, cwd[1024], *pua_cats = NULL, *argument;

+	const char *pt;

 	const struct optnode *optnode;

 #ifndef C_WINDOWS

 	struct rlimit rlim;

@@ -448,6 +452,20 @@ int scanmanager(const struct optstruct *opt)

 	cl_engine_set(engine, CL_ENGINE_AC_MAXDEPTH, &val32);

     }

+    if(opt_check(opt, "leave-temps")) {

+	val32 = 1;

+	cl_engine_set(engine, CL_ENGINE_KEEPTMP, &val32);

+    }

+

+    if(opt_check(opt, "tempdir")) {

+	pt = opt_arg(opt, "tempdir");

+	if((ret = cl_engine_set(engine, CL_ENGINE_TMPDIR, pt))) {

+	    logg("!cli_engine_set(CL_ENGINE_TMPDIR) failed: %s\n", cl_strerror(ret));

+	    cl_engine_free(engine);

+	    return 50;

+	}

+    }

+

     if(opt_check(opt, "database")) {

 	if((ret = cl_load(opt_arg(opt, "database"), engine, &info.sigs, dboptions))) {

 	    logg("!%s\n", cl_strerror(ret));

@@ -656,7 +674,7 @@ int scanmanager(const struct optstruct *opt)

 	    ret = scandirs(cwd, engine, opt, options, 1);

     } else if(!strcmp(opt->filename, "-")) { /* read data from stdin */

-	ret = scanstdin(engine, options);

+	ret = scanstdin(engine, opt, options);

     } else {

 	for (x = 0; (file = cli_strtok(opt->filename, x, "\t")) != NULL; x++) {

@@ -367,19 +367,19 @@ static int ea05(int desc, cli_ctx *ctx, char *tmpd) {

       return CL_EIO;

     }

     free(UNP.outputbuf);

-    if(cli_leavetemps_flag)

+    if(ctx->engine->keeptmp)

       cli_dbgmsg("autoit: file extracted to %s\n", tempfile);

     else 

       cli_dbgmsg("autoit: file successfully extracted\n");

     lseek(i, 0, SEEK_SET);

     if(cli_magic_scandesc(i, ctx) == CL_VIRUS) {

       close(i);

-      if(!cli_leavetemps_flag)

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

         if(cli_unlink(tempfile)) return CL_EIO;

       return CL_VIRUS;

     }

     close(i);

-    if(!cli_leavetemps_flag) 

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

       if (cli_unlink(tempfile)) return CL_EIO;

   }

   return ret;

@@ -877,19 +877,19 @@ static int ea06(int desc, cli_ctx *ctx, char *tmpd) {

       return CL_EIO;

     }

     free(buf);

-    if(cli_leavetemps_flag)

+    if(ctx->engine->keeptmp)

       cli_dbgmsg("autoit: %s extracted to %s\n", (script)?"script":"file", tempfile);

     else 

       cli_dbgmsg("autoit: %s successfully extracted\n", (script)?"script":"file");

     lseek(i, 0, SEEK_SET);

     if(cli_magic_scandesc(i, ctx) == CL_VIRUS) {

       close(i);

-      if(!cli_leavetemps_flag) 

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

         if (cli_unlink(tempfile)) return CL_EIO;

       return CL_VIRUS;

     }

     close(i);

-    if(!cli_leavetemps_flag)

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

       if (cli_unlink(tempfile)) return CL_EIO;

   }

   return ret;

@@ -912,14 +912,14 @@ int cli_scanautoit(int desc, cli_ctx *ctx, off_t offset) {

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

-  if (!(tmpd = cli_gentemp(NULL)))    

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

     return CL_ETMPDIR;

   if (mkdir(tmpd, 0700)) {

     cli_dbgmsg("autoit: Can't create temporary directory %s\n", tmpd);

     free(tmpd);

     return CL_ETMPDIR;

   }

-  if (cli_leavetemps_flag)

+  if (ctx->engine->keeptmp)

     cli_dbgmsg("autoit: Extracting files to %s\n", tmpd);

   switch(version) {

@@ -940,7 +940,7 @@ int cli_scanautoit(int desc, cli_ctx *ctx, off_t offset) {

     r = CL_CLEAN;

   }

-  if (!cli_leavetemps_flag)

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

     cli_rmdirs(tmpd);

   free(tmpd);

@@ -407,7 +407,7 @@ fileblobCreate(void)

 int

 fileblobScanAndDestroy(fileblob *fb)

 {

-	if(cli_leavetemps_flag) {

+	if(fb->ctx && fb->ctx->engine->keeptmp) {

 		/* Can't remove the file, the caller must scan */

 		fileblobDestroy(fb);

 		return CL_CLEAN;

@@ -509,7 +509,7 @@ fileblobPartialSet(fileblob *fb, const char *fullname, const char *arg)

 		close(fb->fd);

 		return;

 	}

-	blobSetFilename(&fb->b, NULL, fullname);

+	blobSetFilename(&fb->b, fb->ctx ? fb->ctx->engine->tmpdir : NULL, fullname);

 	if(fb->b.data)

 		if(fileblobAddData(fb, fb->b.data, fb->b.len) == 0) {

 			free(fb->b.data);

@@ -122,7 +122,9 @@ enum cl_engine_field {

     CL_ENGINE_DB_TIME,		    /* uint32_t */

     CL_ENGINE_AC_ONLY,		    /* uint32_t */

     CL_ENGINE_AC_MINDEPTH,	    /* uint32_t */

-    CL_ENGINE_AC_MAXDEPTH	    /* uint32_t */

+    CL_ENGINE_AC_MAXDEPTH,	    /* uint32_t */

+    CL_ENGINE_TMPDIR,		    /* (char *) */

+    CL_ENGINE_KEEPTMP		    /* uint32_t */

 };

 extern int cl_engine_set(struct cl_engine *engine, enum cl_engine_field field, const void *val);

@@ -184,7 +186,6 @@ extern unsigned int cl_retflevel(void);

 extern const char *cl_retver(void);

 /* others */

-extern void cl_settempdir(const char *dir, short leavetemps);

 extern const char *cl_strerror(int clerror);

 #ifdef __cplusplus

@@ -554,7 +554,7 @@ int cli_cvdload(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigne

     } else {

-	if(!(dir = cli_gentemp(NULL)))

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

 	    return CL_EMEM;

 	if(mkdir(dir, 0700)) {

@@ -18,7 +18,6 @@ CLAMAV_PUBLIC {

     cl_retver;

     cl_scandesc;

     cl_scanfile;

-    cl_settempdir;

     cl_statchkdir;

     cl_statfree;

     cl_statinidir;

@@ -3870,7 +3870,7 @@ rfc1341(message *m, const char *dir)

 					if(!dentry_idpart ||

 							strcmp(filename, dentry_idpart) != 0) {

-						if(!cli_leavetemps_flag)

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

 							continue;

 						if(stat(fullname, &statb) < 0)

 							continue;

@@ -3925,7 +3925,7 @@ rfc1341(message *m, const char *dir)

 					fclose(fin);

 					/* don't unlink if leave temps */

-					if(!cli_leavetemps_flag) {

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

 						if(cli_unlink(fullname)) {

 							fclose(fout);

 							cli_unlink(outname);

@@ -537,7 +537,7 @@ int cli_scannulsft(int desc, cli_ctx *ctx, off_t offset) {

     nsist.ifd = desc;

     nsist.off = offset;

-    if (!(nsist.dir = cli_gentemp(NULL)))

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

         return CL_ETMPDIR;

     if(mkdir(nsist.dir, 0700)) {

 	cli_dbgmsg("NSIS: Can't create temporary directory %s\n", nsist.dir);

@@ -545,7 +545,7 @@ 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);

+    if(ctx->engine->keeptmp) cli_dbgmsg("NSIS: Extracting files to %s\n", nsist.dir);

     do {

         ret = cli_nsis_unpack(&nsist, ctx);

@@ -557,7 +557,7 @@ int cli_scannulsft(int desc, cli_ctx *ctx, off_t offset) {

 	  else

 	    ret=cli_magic_scandesc(nsist.ofd, ctx);

 	  close(nsist.ofd);

-	  if(!cli_leavetemps_flag)

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

 	    if(cli_unlink(nsist.ofn)) ret = CL_EIO;

 	} else if(ret == CL_EMAXSIZE) {

 	    ret = nsist.solid ? CL_BREAK : CL_SUCCESS;

@@ -569,7 +569,7 @@ int cli_scannulsft(int desc, cli_ctx *ctx, off_t offset) {

     cli_nsis_free(&nsist);

-    if(!cli_leavetemps_flag)

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

         cli_rmdirs(nsist.dir);

     free(nsist.dir);

@@ -715,7 +715,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char

   print_ole2_property(prop);

-  if(!(tempfile = cli_gentemp(NULL)))

+  if(!(tempfile = cli_gentemp(ctx ? ctx->engine->tmpdir : NULL)))

     return CL_EMEM;

   if((ofd = open(tempfile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) {

@@ -813,7 +813,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char

   close(ofd);

   free(buff);

   cli_bitset_free(blk_bitset);

-  if(!cli_leavetemps_flag) {

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

     if (cli_unlink(tempfile)) {

       free(tempfile);

       return CL_EIO;

@@ -94,7 +94,7 @@ static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

 #define CL_FLEVEL 37 /* don't touch it */

-uint8_t cli_debug_flag = 0, cli_leavetemps_flag = 0;

+uint8_t cli_debug_flag = 0;

 #ifndef CLI_MEMFUNSONLY

 static unsigned char name_salt[16] = { 16, 38, 97, 12, 8, 4, 72, 196, 217, 144, 33, 124, 18, 11, 17, 253 };

@@ -337,6 +337,14 @@ int cl_engine_set(struct cl_engine *engine, enum cl_engine_field field, const vo

 	case CL_ENGINE_AC_MAXDEPTH:

 	    engine->ac_maxdepth = *((const uint32_t *) val);

 	    break;

+	case CL_ENGINE_TMPDIR:

+	    engine->tmpdir = cli_mp_strdup(engine->mempool, (const char *) val);

+	    if(!engine->tmpdir)

+		return CL_EMEM;

+	    break;

+	case CL_ENGINE_KEEPTMP:

+	    engine->keeptmp = *((const uint32_t *) val);

+	    break;

 	default:

 	    cli_errmsg("cl_engine_set: Incorrect field number\n");

 	    return CL_ENULLARG; /* FIXME */

@@ -388,6 +396,13 @@ int cl_engine_get(const struct cl_engine *engine, enum cl_engine_field field, vo

 	case CL_ENGINE_AC_MAXDEPTH:

 	    *((uint32_t *) val) = engine->ac_maxdepth;

 	    break;

+	case CL_ENGINE_TMPDIR:

+	    if(engine->tmpdir)

+		strncpy((char *) val, engine->tmpdir, 128);

+	    break;

+	case CL_ENGINE_KEEPTMP:

+	    *((uint32_t *) val) = engine->keeptmp;

+	    break;

 	default:

 	    cli_errmsg("cl_engine_get: Incorrect field number\n");

 	    return CL_ENULLARG; /* FIXME */

@@ -661,24 +676,6 @@ unsigned int cli_rndnum(unsigned int max)

     return 1 + (unsigned int) (max * (rand() / (1.0 + RAND_MAX)));

 }

-void cl_settempdir(const char *dir, short leavetemps)

-{

-	char *var;

-

-    if(dir) {

-	var = (char *) cli_malloc(8 + strlen(dir));

-	sprintf(var, "TMPDIR=%s", dir);

-	if(!putenv(var))

-	    cli_dbgmsg("Setting %s as global temporary directory\n", dir);

-	else

-	    cli_warnmsg("Can't set TMPDIR variable - insufficient space in the environment.\n");

-

-	/* WARNING: var must not be released - see putenv(3) */

-    }

-

-    cli_leavetemps_flag = leavetemps;

-}

-

 char *cli_gentemp(const char *dir)

 {

 	char *name, *tmp;

@@ -35,7 +35,7 @@

 #include "dconf.h"

 #include "libclamunrar_iface/unrar_iface.h"

-extern uint8_t cli_debug_flag, cli_leavetemps_flag;

+extern uint8_t cli_debug_flag;

 /*

  * CLI_ISCONTAINED(buf1, size1, buf2, size2) checks if buf2 is contained

@@ -100,6 +100,8 @@ struct cl_engine {

     uint32_t ac_only;

     uint32_t ac_mindepth;

     uint32_t ac_maxdepth;

+    char *tmpdir;

+    uint32_t keeptmp;

     /* Limits */

     uint64_t maxscansize;  /* during the scanning of archives this size

@@ -544,7 +544,7 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx, off_t offset)

 			rc = cli_magic_scandesc(fout, ctx);

 		}

 		close(fout);

-		if(!cli_leavetemps_flag)

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

 			if (cli_unlink(fullname)) rc = CL_EIO;

 		if(rc != CL_CLEAN) break;

 	}

@@ -91,7 +91,7 @@ if(cli_checklimits(NAME, ctx, (CHK), 0, 0)!=CL_CLEAN) {	\

 }

 #define CLI_UNPTEMP(NAME,FREEME) \

-if(!(tempfile = cli_gentemp(NULL))) { \

+if(!(tempfile = cli_gentemp(ctx->engine->tmpdir))) { \

     cli_multifree FREEME; \

     return CL_EMEM; \

 } \

@@ -102,7 +102,7 @@ if((ndesc = open(tempfile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) { \

     return CL_EIO; \

 }

-#define CLI_TMPUNLK() if(!cli_leavetemps_flag) { \

+#define CLI_TMPUNLK() if(!ctx->engine->keeptmp) { \

     if (cli_unlink(tempfile)) { \

 	free(tempfile); \

 	return CL_EIO; \

@@ -141,7 +141,7 @@ if((ndesc = open(tempfile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) { \

 #define CLI_UNPRESULTS_(NAME,FSGSTUFF,EXPR,GOOD,FREEME) \

     switch(EXPR) { \

     case GOOD: /* Unpacked and rebuilt */ \

-	if(cli_leavetemps_flag) \

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

 	    cli_dbgmsg(NAME": Unpacked and rebuilt executable saved in %s\n", tempfile); \

 	else \

 	    cli_dbgmsg(NAME": Unpacked and rebuilt executable\n"); \

@@ -1788,7 +1788,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

 	free(dest);

 	lseek(ndesc, 0, SEEK_SET);

-	if(cli_leavetemps_flag)

+	if(ctx->engine->keeptmp)

 	    cli_dbgmsg("UPX/FSG: Decompressed data saved in %s\n", tempfile);

 	cli_dbgmsg("***** Scanning decompressed file *****\n");

@@ -1981,6 +1981,9 @@ int cl_engine_free(struct cl_engine *engine)

     if(engine->pua_cats)

 	mp_free(engine->mempool, engine->pua_cats);

+    if(engine->tmpdir)

+	mp_free(engine->mempool, engine->tmpdir);

+

     cli_ftfree(engine);

     cli_freeign(engine);

 #ifdef USE_MPOOL

@@ -246,7 +246,7 @@ static int decode_and_scan(struct rtf_object_data* data, cli_ctx* ctx)

 	close(data->fd);

 	data->fd = -1;

 	if(data->name) {

-		if(!cli_leavetemps_flag)

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

 			if(cli_unlink(data->name)) ret = CL_EIO;

 		free(data->name);

 		data->name = NULL;

@@ -494,7 +494,7 @@ static void cleanup_stack(struct stack* stack,struct rtf_state* state,cli_ctx* c

 	tableDestroy(actiontable);\

 	cleanup_stack(&stack,&state,ctx);\

 	free(buff);\

-        if(!cli_leavetemps_flag)\

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

 		cli_rmdirs(tempname);\

 	free(tempname);\

 	free(stack.states);

@@ -534,7 +534,7 @@ int cli_scanrtf(int desc, cli_ctx *ctx)

 		return CL_EMEM;

 	}

-	if(!(tempname = cli_gentemp(NULL)))

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

 	    return CL_EMEM;

 	if(mkdir(tempname, 0700)) {

@@ -550,7 +550,7 @@ int cli_scanrtf(int desc, cli_ctx *ctx)

 		cli_dbgmsg("RTF: Unable to load rtf action table\n");

 		free(stack.states);

 		free(buff);

-		if(!cli_leavetemps_flag)

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

 			cli_rmdirs(tempname);

 		free(tempname);

 		tableDestroy(actiontable);

@@ -274,7 +274,7 @@ static int cli_scanrar(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

 	    return CL_EIO;

     /* generate the temporary directory */

-    if(!(dir = cli_gentemp(NULL)))

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

 	return CL_EMEM;

     if(mkdir(dir, 0700)) {

@@ -284,7 +284,7 @@ static int cli_scanrar(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

     }

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

-	if(!cli_leavetemps_flag)

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

 	    cli_rmdirs(dir);

 	free(dir);

 	if(ret == UNRAR_PASSWD) {

@@ -335,7 +335,7 @@ static int cli_scanrar(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

 	    lseek(rar_state.ofd,0,SEEK_SET);

 	    rc = cli_magic_scandesc(rar_state.ofd,ctx);

 	    close(rar_state.ofd);

-	    if(!cli_leavetemps_flag) 

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

 		if (cli_unlink(rar_state.filename)) ret = CL_EIO;

 	    if(rc == CL_VIRUS ) {

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

@@ -359,7 +359,7 @@ static int cli_scanrar(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

     cli_unrar_close(&rar_state);

-    if(!cli_leavetemps_flag)

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

         cli_rmdirs(dir);

     free(dir);

@@ -385,7 +385,7 @@ static int cli_scanarj(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

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

      /* generate the temporary directory */

-    if(!(dir = cli_gentemp(NULL)))

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

 	return CL_EMEM;

     if(mkdir(dir, 0700)) {

@@ -399,7 +399,7 @@ static int cli_scanarj(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

     ret = cli_unarj_open(desc, dir);

     if (ret != CL_SUCCESS) {

-	if(!cli_leavetemps_flag)

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

 	    cli_rmdirs(dir);

 	free(dir);

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

@@ -435,7 +435,7 @@ static int cli_scanarj(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

     } while(ret == CL_SUCCESS);

-    if(!cli_leavetemps_flag)

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

 	cli_rmdirs(dir);

     free(dir);

@@ -466,7 +466,7 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

 	return CL_EGZIP;

     }

-    if((ret = cli_gentempfd(NULL, &tmpname, &fd))) {

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

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

 	gzclose(gd);

 	return ret;

@@ -476,7 +476,7 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

 	cli_dbgmsg("GZip: Unable to malloc %u bytes.\n", FILEBUFF);

 	gzclose(gd);

 	close(fd);

-	if(!cli_leavetemps_flag) {

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

 	    if(cli_unlink(tmpname)) {

 	    	free(tmpname);

 		return CL_EIO;

@@ -494,7 +494,7 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

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

 	    cli_dbgmsg("GZip: Can't write to file.\n");

 	    close(fd);

-	    if(!cli_leavetemps_flag) {

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

 	    	if (cli_unlink(tmpname)) {

 		    free(tmpname);

 		    gzclose(gd);

@@ -514,7 +514,7 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

     if(ret == CL_VIRUS) {

 	close(fd);

-	if(!cli_leavetemps_flag)

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

 	    if (cli_unlink(tmpname)) ret = CL_EIO;

 	free(tmpname);	

 	return ret;

@@ -524,7 +524,7 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

     if((ret = cli_magic_scandesc(fd, ctx)) == CL_VIRUS ) {

 	cli_dbgmsg("GZip: Infected with %s\n", *ctx->virname);

 	close(fd);

-	if(!cli_leavetemps_flag) {

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

 	    if (cli_unlink(tmpname)) {

 	    	free(tmpname);

 		return CL_EIO;

@@ -534,7 +534,7 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

 	return CL_VIRUS;

     }

     close(fd);

-    if(!cli_leavetemps_flag)

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

 	if (cli_unlink(tmpname)) ret = CL_EIO;

     free(tmpname);	

@@ -577,7 +577,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)

 	return CL_EBZIP;

     }

-    if((ret = cli_gentempfd(NULL, &tmpname, &fd))) {

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

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

 	BZ2_bzReadClose(&bzerror, bfd);

 	fclose(fs);

@@ -587,7 +587,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)

     if(!(buff = (char *) cli_malloc(FILEBUFF))) {

 	cli_dbgmsg("Bzip: Unable to malloc %u bytes.\n", FILEBUFF);

 	close(fd);

-	if(!cli_leavetemps_flag) {

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

 	    if (cli_unlink(tmpname)) {

 	    	free(tmpname);

 		fclose(fs);

@@ -611,7 +611,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)

 	    cli_dbgmsg("Bzip: Can't write to file.\n");

 	    BZ2_bzReadClose(&bzerror, bfd);

 	    close(fd);

-	    if(!cli_leavetemps_flag) {

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

 		if (cli_unlink(tmpname)) {

 		    free(tmpname);

 		    free(buff);

@@ -631,7 +631,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)

     if(ret == CL_VIRUS) {

 	close(fd);

-	if(!cli_leavetemps_flag)

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

 	    if (cli_unlink(tmpname)) ret = CL_EIO;

 	free(tmpname);	

 	fclose(fs);

@@ -643,7 +643,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)

 	cli_dbgmsg("Bzip: Infected with %s\n", *ctx->virname);

     }

     close(fd);

-    if(!cli_leavetemps_flag)

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

 	if (cli_unlink(tmpname)) ret = CL_EIO;

     free(tmpname);	

     fclose(fs);

@@ -660,7 +660,7 @@ static int cli_scanszdd(int desc, cli_ctx *ctx)

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

-    if((ret = cli_gentempfd(NULL, &tmpname, &ofd))) {

+    if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) {

 	cli_dbgmsg("MSEXPAND: Can't generate temporary file/descriptor\n");

 	return ret;

     }

@@ -670,7 +670,7 @@ static int cli_scanszdd(int desc, cli_ctx *ctx)

     if(ret != CL_SUCCESS) { /* CL_VIRUS or some error */

 	close(ofd);

-	if(!cli_leavetemps_flag)

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

 	    if (cli_unlink(tmpname)) ret = CL_EIO;

 	free(tmpname);	

 	return ret;

@@ -680,7 +680,7 @@ static int cli_scanszdd(int desc, cli_ctx *ctx)

     lseek(ofd, 0, SEEK_SET);

     ret = cli_magic_scandesc(ofd, ctx);

     close(ofd);

-    if(!cli_leavetemps_flag)

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

 	if (cli_unlink(tmpname)) ret = CL_EIO;

     free(tmpname);	

@@ -707,7 +707,7 @@ static int cli_scanmscab(int desc, cli_ctx *ctx, off_t sfx_offset)

 	if(cli_checklimits("CAB", ctx, file->length, 0, 0)!=CL_CLEAN)

 	    continue;

-	if(!(tempname = cli_gentemp(NULL))) {

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

 	    ret = CL_EMEM;

 	    break;

 	}

@@ -717,7 +717,7 @@ static int cli_scanmscab(int desc, cli_ctx *ctx, off_t sfx_offset)

 	else

 	    ret = cli_scanfile(tempname, ctx);

-	if(!cli_leavetemps_flag) {

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

 	    if (cli_unlink(tempname)) {

 	    	free(tempname);

 		ret = CL_EIO;

@@ -797,11 +797,11 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx, struct uniq *U)

 	    vbaname[sizeof(vbaname)-1] = '\0';

 	    fd = open(vbaname, O_RDONLY|O_BINARY);

 	    if (fd == -1) continue;

-	    if ((fullname = cli_ppt_vba_read(fd))) {

+	    if ((fullname = cli_ppt_vba_read(fd, ctx))) {

 		if(cli_scandir(fullname, ctx, 0) == CL_VIRUS) {

 		    ret = CL_VIRUS;

 		}

-		if(!cli_leavetemps_flag)

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

 		    cli_rmdirs(fullname);

 		free(fullname);

 	    }

@@ -940,7 +940,7 @@ static int cli_scanhtml(int desc, cli_ctx *ctx)

 	return CL_CLEAN;

     }

-    if(!(tempname = cli_gentemp(NULL)))

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

 	return CL_EMEM;

     if(mkdir(tempname, 0700)) {

@@ -988,7 +988,7 @@ static int cli_scanhtml(int desc, cli_ctx *ctx)

 	ret = cli_scandir(fullname, ctx, 0);

     }

-    if(!cli_leavetemps_flag)

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

         cli_rmdirs(tempname);

     free(tempname);

@@ -1022,8 +1022,8 @@ static int cli_scanscript(int desc, cli_ctx *ctx)

 	/* dump to disk only if explicitly asked to,

 	 * otherwise we can process just in-memory */

-	if(cli_leavetemps_flag) {

-		if((ret = cli_gentempfd(NULL, &tmpname, &ofd))) {

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

+		if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) {

 			cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n");

 			return ret;

 		}

@@ -1065,7 +1065,7 @@ static int cli_scanscript(int desc, cli_ctx *ctx)

 		 * and using while(){} loop would mean code duplication */

 	} while (nread > 0);

-	if(cli_leavetemps_flag) {

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

 		free(tmpname);

 		close(ofd);

 	}

@@ -1082,7 +1082,7 @@ static int cli_scanhtml_utf16(int desc, cli_ctx *ctx)

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

-    if(!(tempname = cli_gentemp(NULL)))

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

 	return CL_EMEM;

     if((fd = open(tempname, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) {

@@ -1112,7 +1112,7 @@ static int cli_scanhtml_utf16(int desc, cli_ctx *ctx)

     ret = cli_scanhtml(fd, ctx);

     close(fd);

-    if(!cli_leavetemps_flag) {

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

 	if (cli_unlink(tempname)) ret = CL_EIO;

     } else

 	cli_dbgmsg("cli_scanhtml_utf16: Decoded HTML data saved in %s\n", tempname);

@@ -1133,7 +1133,7 @@ static int cli_scanole2(int desc, cli_ctx *ctx)

         return CL_EMAXREC;

     /* generate the temporary directory */

-    if(!(dir = cli_gentemp(NULL)))

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

 	return CL_EMEM;

     if(mkdir(dir, 0700)) {

@@ -1145,7 +1145,7 @@ static int cli_scanole2(int desc, cli_ctx *ctx)

     ret = cli_ole2_extract(desc, dir, ctx, &vba);

     if(ret!=CL_CLEAN && ret!=CL_VIRUS) {

 	cli_dbgmsg("OLE2: %s\n", cl_strerror(ret));

-	if(!cli_leavetemps_flag)

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

 	    cli_rmdirs(dir);

 	free(dir);

 	return ret;

@@ -1162,7 +1162,7 @@ static int cli_scanole2(int desc, cli_ctx *ctx)

 	ctx->recursion--;

     }

-    if(!cli_leavetemps_flag)

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

 	cli_rmdirs(dir);

     free(dir);

     return ret;

@@ -1177,7 +1177,7 @@ static int cli_scantar(int desc, cli_ctx *ctx, unsigned int posix)

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

     /* generate temporary directory */

-    if(!(dir = cli_gentemp(NULL)))

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

 	return CL_EMEM;

     if(mkdir(dir, 0700)) {

@@ -1188,7 +1188,7 @@ static int cli_scantar(int desc, cli_ctx *ctx, unsigned int posix)

     ret = cli_untar(dir, desc, posix, ctx);

-    if(!cli_leavetemps_flag)

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

 	cli_rmdirs(dir);

     free(dir);

@@ -1204,7 +1204,7 @@ static int cli_scanbinhex(int desc, cli_ctx *ctx)

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

     /* generate temporary directory */

-    if(!(dir = cli_gentemp(NULL)))

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

 	return CL_EMEM;

     if(mkdir(dir, 0700)) {

@@ -1218,7 +1218,7 @@ static int cli_scanbinhex(int desc, cli_ctx *ctx)

     else

 	ret = cli_scandir(dir, ctx, 0);

-    if(!cli_leavetemps_flag)

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

 	cli_rmdirs(dir);

     free(dir);

@@ -1234,7 +1234,7 @@ static int cli_scanmschm(int desc, cli_ctx *ctx)