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

+Tue Oct  7 15:52:06 CEST 2008 (acab)

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

+  * misc: add missing EOL to dbg/warn messages - bb#1219

+

 Tue Oct  7 13:21:04 CEST 2008 (acab)

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

   * libclamav/unzip.c: error path fixes, handle bzip2's deflate in a special manner - bb#1220

@@ -4796,7 +4796,7 @@ connect2clamd(struct privdata *privdata)

 		buf[nbytes] = '\0';

 #ifdef	CL_DEBUG

 		if(debug_level >= 4)

-			cli_dbgmsg("Received: %s", buf);

+			cli_dbgmsg("Received: %s\n", buf);

 #endif

 		if(sscanf(buf, "PORT %hu\n", &p) != 1) {

 			logg(_("!Expected port information from clamd, got '%s'\n"),

@@ -4830,7 +4830,7 @@ connect2clamd(struct privdata *privdata)

 		if(connect(privdata->dataSocket, (struct sockaddr *)&reply, sizeof(struct sockaddr_in)) < 0) {

 			perror("connect");

-			cli_dbgmsg("Failed to connect to port %d given by clamd",

+			cli_dbgmsg("Failed to connect to port %d given by clamd\n",

 				p);

 			/* 0.4 - use better error message */

 #ifdef HAVE_STRERROR_R

@@ -560,7 +560,7 @@ static int read_sys_control(int fd, chm_metadata_t *metadata, lzx_control_t *lzx

 	lzx_control->cache_size = chm_endian_convert_32(lzx_control->cache_size);

 	if (strncmp((const char *) "LZXC", (const char *) lzx_control->signature, 4) != 0) {

-		cli_dbgmsg("bad sys_control signature");

+		cli_dbgmsg("bad sys_control signature\n");

 		return FALSE;

 	}

 	switch(lzx_control->version) {

@@ -912,7 +912,7 @@ int cli_chm_open(int fd, const char *dirname, chm_metadata_t *metadata)

 	while (metadata->num_chunks) {

 		if (read_chunk(metadata, fd) != CL_SUCCESS) {

-			cli_dbgmsg("read_chunk failed");

+			cli_dbgmsg("read_chunk failed\n");

 			goto abort;

 		}

 		if (read_control_entries(metadata) == FALSE) {

@@ -923,7 +923,7 @@ int cli_chm_open(int fd, const char *dirname, chm_metadata_t *metadata)

 	}

 	if (!metadata->sys_content.length || !metadata->sys_control.length || !metadata->sys_reset.length) {

-		cli_dbgmsg("sys file missing");

+		cli_dbgmsg("sys file missing\n");

 		goto abort;

 	}

@@ -313,7 +313,7 @@ static int iconv(iconv_t iconv_struct,char **inbuf, size_t *inbytesleft,

 					else if( (input[i]&0xF8) == 0xF0) {

 						if((input[i+1]&0xC0) == 0x80 && (input[i+2]&0xC0) == 0x80 && (input[i+3]&0xC0) == 0x80) {

 							/* 4 bytes long 11110www 10xxxxxx 10yyyyyy 10zzzzzz -> 000wwwxx xxxxyyyy yyzzzzzz*/

-							cli_dbgmsg(MODULE_NAME "UTF8 character out of UTF16 range encountered");

+							cli_dbgmsg(MODULE_NAME "UTF8 character out of UTF16 range encountered\n");

 							output[j++] = 0xff;

 							output[j++] = 0xff;

@@ -1079,7 +1079,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 					if(dconf_js && !js_state) {

 						js_state = cli_js_init();

 						if(!js_state) {

-							cli_dbgmsg("htmlnorm: Failed to initialize js parser");

+							cli_dbgmsg("htmlnorm: Failed to initialize js parser\n");

 						}

 						js_begin = ptr;

 						js_end = NULL;

@@ -832,7 +832,7 @@ static void run_decoders(struct parser_state *state)

 		/* initialize embedded context */

 		memset(&state->tokens, 0, sizeof(state->tokens));

 		if(++state->rec > 16)

-			cli_dbgmsg(MODULE "recursion limit reached");

+			cli_dbgmsg(MODULE "recursion limit reached\n");

 		else {

 			cli_js_process_buffer(state, res.txtbuf.data, res.txtbuf.pos);

 			--state->rec;

@@ -896,7 +896,7 @@ void cli_js_output(struct parser_state *state, const char *tempdir)

 	if(buf.pos < 9 || memcmp(buf.buf + buf.pos - 9, "</script>", 9))

 		buf_outs("</script>", &buf);

 	if(write(buf.outfd, buf.buf, buf.pos) < 0) {

-		cli_dbgmsg(MODULE "I/O error");

+		cli_dbgmsg(MODULE "I/O error\n");

 	}

 	close(buf.outfd);

 	cli_dbgmsg(MODULE "dumped/appended normalized script to: %s\n",filename);

@@ -936,7 +936,7 @@ void cli_js_process_buffer(struct parser_state *state, const char *buf, size_t n

 	if(!state->global) {

 		/* this state has either not been initialized,

 		 * or cli_js_parse_done() was already called on it */

-		cli_warnmsg(MODULE "invalid state");

+		cli_warnmsg(MODULE "invalid state\n");

 		return;

 	}

 	yyb = yy_scan_bytes(buf, n, state->scanner);

@@ -2765,7 +2765,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 				}

 			} else if(strcasecmp(mimeSubtype, "external-body") == 0)

 				/* TODO */

-				cli_warnmsg("Attempt to send Content-type message/external-body trapped");

+				cli_warnmsg("Attempt to send Content-type message/external-body trapped\n");

 			else

 				cli_warnmsg("Unsupported message format `%s' - if you believe this file contains a virus, submit it to www.clamav.net\n", mimeSubtype);

@@ -2777,7 +2777,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 			return rc;

 		default:

-			cli_dbgmsg("Message received with unknown mime encoding - assume application");

+			cli_dbgmsg("Message received with unknown mime encoding - assume application\n");

 			/*

 			 * Some Yahoo emails attach as

 			 * Content-Type: X-unknown/unknown;

@@ -643,7 +643,7 @@ flatedecode(unsigned char *buf, off_t len, int fout, cli_ctx *ctx)

 	zstat = inflateInit(&stream);

 	if(zstat != Z_OK) {

-		cli_warnmsg("cli_pdf: inflateInit failed");

+		cli_warnmsg("cli_pdf: inflateInit failed\n");

 		return CL_EMEM;

 	}

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

     cli_dbgmsg("NumberOfSections: %d\n", nsections);

     timestamp = (time_t) EC32(file_hdr.TimeDateStamp);

-    cli_dbgmsg("TimeDateStamp: %s", cli_ctime(&timestamp, timestr, sizeof(timestr)));

+    cli_dbgmsg("TimeDateStamp: %s\n", cli_ctime(&timestamp, timestr, sizeof(timestr)));

     cli_dbgmsg("SizeOfOptionalHeader: %x\n", EC16(file_hdr.SizeOfOptionalHeader));