libmagic: Follow up fixes for 5.43

Fixes possible build and runtime issues on Windows.`

Signed-off-by: Anatol Belski <ab@php.net>

Author: weltling

ext/fileinfo/libmagic/apprentice.c

@@ -48,7 +48,6 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.326 2022/09/13 18:46:07 christos Exp $")
 #ifdef QUICK
 #include <sys/mman.h>
 #endif
-#include <dirent.h>
 #include <limits.h>
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>

ext/fileinfo/libmagic/ascmagic.c

@@ -273,8 +273,8 @@ file_ascmagic_with_encoding(struct magic_set *ms, const struct buffer *b,
 				goto done;
 
 		if (has_long_lines)
-			if (file_printf(ms, ", with very long lines (%"
-			    SIZE_T_FORMAT "u)", has_long_lines) == -1)
+			if (file_printf(ms, ", with very long lines (%zu)",
+			    has_long_lines) == -1)
 				goto done;
 
 		/*

ext/fileinfo/libmagic/magic.c

@@ -25,11 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#ifdef WIN32
-#include <windows.h>
-#include <shlwapi.h>
-#endif
-
 #include "file.h"
 
 #ifndef	lint

ext/fileinfo/libmagic/softmagic.c

@@ -772,7 +772,7 @@ mprint(struct magic_set *ms, struct magic *m)
 		char *cp, *scp;
 		int rval;
 
-		cp = strndup(RCAST(const char *, ms->search.s),
+		cp = estrndup(RCAST(const char *, ms->search.s),
 		    ms->search.rm_len);
 		if (cp == NULL) {
 			file_oomem(ms, ms->search.rm_len);
@@ -782,7 +782,7 @@ mprint(struct magic_set *ms, struct magic *m)
 
 		rval = file_printf(ms, F(ms, desc, "%s"), file_printable(ms,
 		    sbuf, sizeof(sbuf), scp, ms->search.rm_len));
-		free(cp);
+		efree(cp);
 
 		if (rval == -1)
 			return -1;

ext/fileinfo/php_libmagic.h

@@ -36,7 +36,10 @@
 
 #define strtoull _strtoui64
 
+
+#define HAVE_ASCTIME_R 1
 #define asctime_r php_asctime_r
+#define HAVE_CTIME_R 1
 #define ctime_r php_ctime_r
 
 #else