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

+Thu Jan 10 15:17:19 CET 2008 (tk)

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

+  * libclamav: fix printing of size_t and off_t vars (bb#444);

+	       reported by Anton Yuzhaninov <citrin*rambler-co.ru>

+

 Thu Jan 10 14:29:28 CET 2008 (tk)

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

   * clamdscan: remove dependendcy on libclamav (bb#750), patch from Edwin

@@ -823,7 +823,7 @@ int cli_chm_extract_file(int fd, char *dirname, chm_metadata_t *metadata)

 		return CL_EIO;

 	}

 	if (chm_copy_file_data(metadata->ufd, metadata->ofd, metadata->file_length) != metadata->file_length) {

-		cli_dbgmsg("failed to copy %lu bytes\n", (long unsigned int) metadata->file_length);

+		cli_dbgmsg("failed to copy %ju bytes\n", (uintmax_t) metadata->file_length);

 		close(metadata->ofd);

 		return CL_EIO;

 	}

@@ -234,11 +234,11 @@ int cli_validatesig(cli_file_t ftype, const char *offstr, off_t fileoff, struct

 	if(maxshift) {

 	    if((fileoff < offset) || (fileoff > offset + (off_t) maxshift)) {

-		cli_dbgmsg("Signature offset: %lu, expected: [%lu..%lu] (%s)\n", fileoff, offset, offset + maxshift, virname);

+		cli_dbgmsg("Signature offset: %ju, expected: [%ju..%ju] (%s)\n", (uintmax_t) fileoff, (uintmax_t) offset, (uintmax_t) (offset + maxshift), virname);

 		return 0;

 	    }

 	} else if(fileoff != offset) {

-	    cli_dbgmsg("Signature offset: %lu, expected: %lu (%s)\n", fileoff, offset, virname);

+	    cli_dbgmsg("Signature offset: %ju, expected: %ju (%s)\n", (uintmax_t) fileoff, (uintmax_t) offset, virname);

 	    return 0;

 	}

     }

@@ -610,7 +610,7 @@ static int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const

 		if (!name) {

 			return FALSE;

 		}

-		snprintf(name, 11, "%.10ld", i + (long int) prop);

+		snprintf(name, 11, "%.10jd", (intmax_t) (i + (long int) prop));

 	} else {

 		/* Sanitize the file name */

 		sanitiseName(name);

@@ -304,7 +304,7 @@ static int rtf_object_process(struct rtf_state* state, const unsigned char* inpu

 						 cli_dbgmsg("RTF: waiting for magic\n");

 						 for(i=0; i<out_cnt && data->bread < rtf_data_magic_len; i++, data->bread++)

 							 if(rtf_data_magic[data->bread] != out_data[i]) {

-								 cli_dbgmsg("Warning: rtf objdata magic number not matched, expected:%d, got: %d, at pos:%lu\n",rtf_data_magic[i],out_data[i],data->bread);

+								 cli_dbgmsg("Warning: rtf objdata magic number not matched, expected:%d, got: %d, at pos:%ju\n",rtf_data_magic[i],out_data[i], (uintmax_t) data->bread);

 							 }

 						 out_cnt  -= i;

 						 if(data->bread == rtf_data_magic_len) {

@@ -324,7 +324,7 @@ static int rtf_object_process(struct rtf_state* state, const unsigned char* inpu

 							    out_data += i;

 							    data->bread=0;

 							    if(data->desc_len > 64) {

-								    cli_dbgmsg("Description length too big (%lu), showing only 64 bytes of it\n",data->desc_len);

+								    cli_dbgmsg("Description length too big (%ju), showing only 64 bytes of it\n", (uintmax_t) data->desc_len);

 								    data->desc_name = cli_malloc(65);

 							    }

 							    else

@@ -333,7 +333,7 @@ static int rtf_object_process(struct rtf_state* state, const unsigned char* inpu

 								    return CL_EMEM;

 							    }

 							    data->internal_state = WAIT_DESC;

-							    cli_dbgmsg("RTF: description length:%lu\n",data->desc_len);

+							    cli_dbgmsg("RTF: description length:%ju\n", (uintmax_t) data->desc_len);

 						    }

 						    break;

 					    }

@@ -392,7 +392,7 @@ static int rtf_object_process(struct rtf_state* state, const unsigned char* inpu

 						    if(data->bread == 4) {

 							    out_data += i;

 							    data->bread=0;

-							    cli_dbgmsg("Dumping rtf embedded object of size:%lu\n",data->desc_len);

+							    cli_dbgmsg("Dumping rtf embedded object of size:%ju\n", (uintmax_t) data->desc_len);

 							    if((ret = cli_gentempfd(data->tmpdir, &data->name, &data->fd)))

 								    return ret;

 							    data->internal_state = DUMP_DATA;