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

+Thu Feb 22 15:32:33 GMT 2007 (njh)

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

+  * libclamav:	s/sanitiseFilename/cli_sanitise_filename/, patch from trog

+  		Changed some strdup to cli_strdup

+

 Thu Feb 22 15:43:33 CET 2007 (acab)

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

   * clamd: handle signals while polling in select mode

@@ -132,10 +132,10 @@ blobSetFilename(blob *b, const char *dir, const char *filename)

 	if(b->name)

 		free(b->name);

-	b->name = strdup(filename);

+	b->name = cli_strdup(filename);

 	if(b->name)

-		sanitiseName(b->name);

+		cli_sanitise_filename(b->name);

 }

 const char *

@@ -559,26 +559,3 @@ fileblobContainsVirus(const fileblob *fb)

 {

 	return fb->isInfected ? TRUE : FALSE;

 }

-

-/*

- * Different operating systems allow different characters in their filenames

- * FIXME: What does QNX want? There is no #ifdef C_QNX, but if there were

- *	it may be best to treat it like MSDOS

- */

-void

-sanitiseName(char *name)

-{

-	while(*name) {

-#ifdef	C_DARWIN

-		*name &= '\177';

-#endif

-		/* Also check for tab - "Heinz Martin" <Martin@hemag.ch> */

-#if	defined(MSDOS) || defined(C_CYGWIN) || defined(C_WINDOWS) || defined(C_OS2)

-		if(strchr("%/*?<>|\\\"+=,;:\t ~", *name))

-#else

-		if(*name == '/')

-#endif

-			*name = '_';

-		name++;

-	}

-}

@@ -65,7 +65,6 @@ const	char	*fileblobGetFilename(const fileblob *fb);

 void	fileblobSetCTX(fileblob *fb, cli_ctx *ctx);

 int	fileblobAddData(fileblob *fb, const unsigned char *data, size_t len);

 int	fileblobContainsVirus(const fileblob *fb);

-void	sanitiseName(char *name);

 /* Maximum filenames under various systems */

 #ifndef NAME_MAX	/* e.g. Linux */

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

 			char outname[NAME_MAX + 1];

 			time_t now;

-			sanitiseName(id);

+			cli_sanitise_filename(id);

 			snprintf(outname, sizeof(outname) - 1, "%s/%s", dir, id);

@@ -49,9 +49,6 @@

 #include "others.h"

 #include "ole2_extract.h"

-#include "mbox.h"

-#include "blob.h" /* sanitiseName() */

-

 #define ole2_endian_convert_16(v) le16_to_host(v)

 #define ole2_endian_convert_32(v) le32_to_host(v)

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

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

 	} else {

 		/* Sanitize the file name */

-		sanitiseName(name);

+		cli_sanitise_filename(name);

 	}

 	newname = (char *) cli_malloc(strlen(name) + strlen(dir) + 2);

@@ -923,3 +923,31 @@ int cli_bitset_test(bitset_t *bs, unsigned long bit_offset)

 	}

 	return (bs->bitset[char_offset] & ((unsigned char)1 << bit_offset));

 }

+

+

+/*

+ * Code from NJH

+ * Different operating systems allow different characters in their filenames

+ * FIXME: What does QNX want? There is no #ifdef C_QNX, but if there were

+ *      it may be best to treat it like MSDOS

+ */

+void

+cli_sanitise_filename(char *name)

+{

+	if(name == NULL)

+		return;

+

+	while(*name) {

+#ifdef  C_DARWIN

+		*name &= '\177';

+#endif

+		/* Also check for tab - "Heinz Martin" <Martin@hemag.ch> */

+#if     defined(MSDOS) || defined(C_CYGWIN) || defined(C_WINDOWS) || defined(C_OS2)

+		if(strchr("%/*?<>|\\\"+=,;:\t ~", *name))

+#else

+		if(*name == '/')

+#endif

+			*name = '_';

+		name++;

+	}

+}

@@ -177,4 +177,5 @@ bitset_t *cli_bitset_init(void);

 void cli_bitset_free(bitset_t *bs);

 int cli_bitset_set(bitset_t *bs, unsigned long bit_offset);

 int cli_bitset_test(bitset_t *bs, unsigned long bit_offset);

+void	cli_sanitise_filename(char *name);

 #endif

@@ -67,8 +67,6 @@ typedef	uint32_t	u_int32_t;

 #include "pst.h"

-#include "mbox.h"

-

 #define	DWORD	unsigned int

 #define DEBUG_VERSION 1

@@ -2116,7 +2114,7 @@ _pst_process(pst_num_array *list , pst_item *item)

       case PST_ATTRIB_HEADER: // CUSTOM attribute for saying the Extra Headers

 	cli_dbgmsg("Extra Field - ");

 	ef = (pst_item_extra_field*) cli_calloc(1, sizeof(pst_item_extra_field));

-	ef->field_name = strdup(list->items[x]->extra);

+	ef->field_name = cli_strdup(list->items[x]->extra);

 	LIST_COPY(ef->value, (char*));

 	ef->next = item->extra_fields;

 	item->extra_fields = ef;

@@ -4662,7 +4660,7 @@ check_filename(char *fname)

     *t = '_'; //replace them with an underscore

   }

 #endif

-	sanitiseName(fname);

+	cli_sanitise_filename(fname);

 	return fname;

 }

@@ -4990,7 +4988,7 @@ pst_decode(const char *dir, int desc)

 	 * exist

 	 */

 	if (item->file_as == NULL) {

-		item->file_as = strdup("clamav-pst");

+		item->file_as = cli_strdup("clamav-pst");

 		if(item->file_as == NULL) {

 			pst_close(&pstfile);

 			return CL_EMEM;

@@ -5013,7 +5011,7 @@ pst_decode(const char *dir, int desc)

 	}

 	sprintf(f->name, OUTPUT_TEMPLATE, item->file_as);

-	f->dname = strdup(item->file_as);

+	f->dname = cli_strdup(item->file_as);

     // if overwrite is set to 1 we keep the existing name and don't modify anything

     // we don't want to go changing the file name of the SEPERATE items

@@ -5101,7 +5099,7 @@ pst_decode(const char *dir, int desc)

 	  f->name = (char*) cli_malloc(strlen(item->file_as)+strlen(OUTPUT_TEMPLATE+1));

 	  sprintf(f->name, OUTPUT_TEMPLATE, item->file_as);

-	f->dname = strdup(item->file_as);

+	f->dname = cli_strdup(item->file_as);

 	  temp = (char*) cli_malloc (strlen(f->name)+10); //enough room for 10 digits

 	  strcpy(temp, f->name);

@@ -5456,8 +5454,8 @@ pst_decode(const char *dir, int desc)

 	  item->current_attach->next = item->attach;

 	  item->attach = item->current_attach;

 	  item->current_attach->data = (char *)lzfu_decompress((const unsigned char *)item->email->rtf_compressed, &nbytes);

-	  item->current_attach->filename2 = strdup(RTF_ATTACH_NAME);

-	  item->current_attach->mimetype = strdup(RTF_ATTACH_TYPE);

+	  item->current_attach->filename2 = cli_strdup(RTF_ATTACH_NAME);

+	  item->current_attach->mimetype = cli_strdup(RTF_ATTACH_TYPE);

 	  /*memcpy(&(item->current_attach->size), item->email->rtf_compressed+sizeof(int32_t), sizeof(int32_t));

 	  LE32_CPU(item->current_attach->size);*/

 	  item->current_attach->size = nbytes;

@@ -94,7 +94,7 @@ tableInsert(table_t *table, const char *key, int value)

 			for(tableItem = table->tableHead; tableItem; tableItem = tableItem->next)

 				if(tableItem->key == NULL) {

 					/* This item has been deleted */

-					tableItem->key = strdup(key);

+					tableItem->key = cli_strdup(key);

 					tableItem->value = value;

 					return value;

 				}

@@ -110,7 +110,7 @@ tableInsert(table_t *table, const char *key, int value)

 		return -1;

 	table->tableLast->next = NULL;

-	table->tableLast->key = strdup(key);

+	table->tableLast->key = cli_strdup(key);

 	table->tableLast->value = value;

 	return value;

@@ -41,8 +41,6 @@ static	char	const	rcsid[] = "$Id: untar.c,v 1.35 2007/02/12 20:46:09 njh Exp $";

 #include "clamav.h"

 #include "others.h"

 #include "untar.h"

-#include "mbox.h"

-#include "blob.h"

 #define BLOCKSIZE 512

@@ -200,7 +198,7 @@ cli_untar(const char *dir, int desc, unsigned int posix, const struct cl_limits

 			 * see also fileblobSetFilename()

 			 * TODO: check if the suffix needs to be put back

 			 */

-			sanitiseName(name);

+			cli_sanitise_filename(name);

 			suffix = strrchr(name, '.');

 			if(suffix == NULL)

 				suffix = "";