@@ -24,7 +24,7 @@

 /*

  * $Source: /tmp/cvsroot-15-2-2007/clamav-devel/libclamav/js/jsint.h,v $

- * $Id: jsint.h,v 1.3 2006/11/02 09:36:19 njh Exp $

+ * $Id: jsint.h,v 1.4 2006/11/10 20:17:43 njh Exp $

  */

 #ifndef JSINT_H

@@ -86,7 +86,7 @@

 #endif /* not WIN32 */

-#include <js.h>

+#include "js.h"

 #if __cplusplus

 extern "C" {

@@ -85,7 +85,7 @@ show_events_hook (int event, void *context)

 JSInterpPtr

-create_interp ()

+create_interp(JSIOFunc s_stdout)

 {

 	JSInterpOptions options;

 	JSInterpPtr interp;

@@ -136,6 +136,8 @@ create_interp ()

 		options.hook_operand_count_trigger = 1000000;

 	}

+	options.s_stdout = s_stdout;

+

 	interp = js_create_interp (&options);

 	if (interp == NULL) {

 		cli_errmsg("js: couldn't create interpreter\n");

@@ -19,7 +19,7 @@

  * Save the JavaScript embedded in an HTML file, then run the script, saving

  * the output in a file that is to be scanned, then remove the script file

  */

-static	char	const	rcsid[] = "$Id: jscript.c,v 1.3 2006/11/09 09:27:18 njh Exp $";

+static	char	const	rcsid[] = "$Id: jscript.c,v 1.4 2006/11/10 20:17:16 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -61,7 +61,7 @@ static	char	const	rcsid[] = "$Id: jscript.c,v 1.3 2006/11/09 09:27:18 njh Exp $"

 # endif

 #endif

-static	void	run_js(const char *filename, const char *dir);

+static	int	run_js(const char *filename, const char *dir);

 static	const	char	*cli_pmemstr(const char *haystack, size_t hs, const char *needle, size_t ns);

 int

@@ -153,7 +153,7 @@ cli_scanjs(const char *dir, int desc)

 					if(fout) {

 						fclose(fout);

 						fout = NULL;

-						run_js(script_filename, dir);

+						(void)run_js(script_filename, dir);

 						if(!cli_leavetemps_flag)

 							unlink(script_filename);

@@ -236,7 +236,7 @@ cli_scanjs(const char *dir, int desc)

 		cli_dbgmsg("No javascript was detected\n");

 	else if(fout) {

 		fclose(fout);

-		run_js(script_filename, dir);

+		rc = run_js(script_filename, dir);

 		if(!cli_leavetemps_flag)

 			unlink(script_filename);

@@ -244,32 +244,47 @@ cli_scanjs(const char *dir, int desc)

 	return rc;

 }

-static void

+#include "js/compiler.c"

+#include "js/iostream.c"

+#include "js/js.c"

+#include "js/main.c"

+#include "js/debug.c"

+#include "js/crc32.c"

+

+static	FILE *fout;

+

+static	int

+write_to_fout(void *context, unsigned char *buf, unsigned int len)

+{

+	return (int)fwrite(buf, (size_t)len, 1, fout);

+}

+

+static int

 run_js(const char *filename, const char *dir)

 {

 	JSInterpPtr interp;

-	FILE *real_stdout, *temp_stdout;

 	char *outputfilename;

 	cli_dbgmsg("run_js(%s)\n", filename);

-	fflush(stdout);

-	real_stdout = stdout;

 	outputfilename = cli_gentemp(dir);

-	if(outputfilename) {

-		temp_stdout = fopen(outputfilename, "wb");

-		if(temp_stdout) {

-			cli_dbgmsg("Redirecting JS VM stdout to %s\n",

-				outputfilename);

-			stdout = temp_stdout;

-		}

-	} else

-		temp_stdout = NULL;

+	if(outputfilename == NULL)

+		return CL_ETMPFILE;

+

+	fout = fopen(outputfilename, "wb");

+	if(fout == NULL) {

+		cli_warnmsg("Can't create %s\n", outputfilename);

+		free(outputfilename);

+		return CL_ETMPFILE;

+	}

+

+	cli_dbgmsg("Redirecting JS VM stdout to %s\n", outputfilename);

+	free(outputfilename);

 	/*

 	 * Run NGS on the file

 	 */

-	interp = create_interp();

+	interp = create_interp(write_to_fout);

 	if(!js_eval_file(interp, filename)) {

 		cli_warnmsg("JS failed: %s\n", js_error_message(interp));

@@ -278,20 +293,10 @@ run_js(const char *filename, const char *dir)

 	js_destroy_interp(interp);

-	if(temp_stdout) {

-		fclose(temp_stdout);

-		stdout = real_stdout;

-	}

-	if(outputfilename)

-		free(outputfilename);

-}

+	fclose(fout);

-#include "js/compiler.c"

-#include "js/iostream.c"

-#include "js/js.c"

-#include "js/main.c"

-#include "js/debug.c"

-#include "js/crc32.c"

+	return CL_SUCCESS;

+}

 /* Copied from pdf.c :-( */

 /*

@@ -18,7 +18,7 @@

  */

 #include "js/js.h"

+#include "js/jsint.h"

 int	cli_scanjs(const char *dir, int desc);

-

-JSInterpPtr	create_interp(void);

+JSInterpPtr	create_interp(JSIOFunc s_stdout);