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

+Mon Apr  2 18:47:30 CEST 2007 (tk)

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

+  * libclamav: revert patch from bb#245

+

 Sun Apr  1 11:12:20 CEST 2007 (tk)

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

   * libclamav/others.c: remove cli_sanitise_filename()

@@ -135,7 +135,7 @@ blobSetFilename(blob *b, const char *dir, const char *filename)

 	b->name = cli_strdup(filename);

 	if(b->name)

-		cli_sanitise_filename(b->name);

+		sanitiseName(b->name);

 }

 const char *

@@ -559,3 +559,26 @@ 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,5 +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);

 #endif /*_BLOB_H*/

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

 			char outname[NAME_MAX + 1];

 			time_t now;

-			cli_sanitise_filename(id);

+			sanitiseName(id);

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

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

 #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)

@@ -608,7 +611,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 */

-		cli_sanitise_filename(name);

+		sanitiseName(name);

 	}

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

@@ -4659,7 +4659,7 @@ check_filename(char *fname)

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

   }

 #endif

-	cli_sanitise_filename(fname);

+	sanitiseName(fname);

 	return fname;

 }

@@ -41,6 +41,8 @@ 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

@@ -194,7 +196,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

 			 */

-			cli_sanitise_filename(name);

+			sanitiseName(name);

 			suffix = strrchr(name, '.');

 			if(suffix == NULL)

 				suffix = "";