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

+Fri Aug 27 14:58:56 BST 2004 (trog)

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

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

+

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

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

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

@@ -595,10 +595,11 @@ static int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const

 	} else {

 		/* Sanitize the file name */

                 for(newname = name; *newname; newname++) {

+#ifdef  C_DARWIN

+                        *newname &= '\200';

+#endif

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

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

-#elif   defined(C_DARWIN)

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

 #else

                         if(*newname == '/')

 #endif