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

+Fri Aug 27 10:42:54 BST 2004 (njh)

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

+  * libclamav/blob.c:	Better filename handling in MACOS/X.

+

 Fri Aug 27 02:14:07 CEST 2004 (tk)

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

   * libclamav/pe.c: include new function cli_peheader() (only dumps specific

@@ -16,6 +16,9 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  *

  * $Log: blob.c,v $

+ * Revision 1.18  2004/08/27 09:41:44  nigelhorne

+ * Better filename handling in MACOS/X

+ *

  * Revision 1.17  2004/08/23 10:23:58  nigelhorne

  * Fix compilation problem on Cygwin

  *

@@ -53,7 +56,7 @@

  * Change LOG to Log

  *

  */

-static	char	const	rcsid[] = "$Id: blob.c,v 1.17 2004/08/23 10:23:58 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: blob.c,v 1.18 2004/08/27 09:41:44 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -163,10 +166,11 @@ blobSetFilename(blob *b, const char *dir, const char *filename)

 		char *ptr;

 		for(ptr = b->name; *ptr; ptr++) {

+#ifdef	C_DARWIN

+			*ptr &= '\200';

+#endif

 #if	defined(MSDOS) || defined(C_CYGWIN) || defined(WIN32)

 			if(strchr("/*?<>|\"+=,;: ", *ptr))

-#elif   defined(C_DARWIN)

-			if((*ptr == '/') || (*ptr >= '\200'))

 #else

 			if(*ptr == '/')

 #endif