File file-5.04-windows.diff of Package mingw64-file

Overview Repositories Revisions Requests Users Attributes Meta

File file-5.04-windows.diff of Package mingw64-file (Revision f87a73de5bdf8246fd2f0c6956e3dc25)

Currently displaying revision f87a73de5bdf8246fd2f0c6956e3dc25 , Show latest

--- configure.ac	2010-01-22 22:07:52.000000000 +0100
+++ configure.ac	2010-02-15 15:15:31.000000000 +0100
@@ -142,7 +142,7 @@
 fi])
 
 dnl Checks for functions
-AC_CHECK_FUNCS(mmap strerror strndup strtoul mbrtowc mkstemp utimes utime wcwidth strtof)
+AC_CHECK_FUNCS(fork mmap strerror strndup strtoul mbrtowc mkstemp utimes utime wcwidth strtof)
 
 dnl Provide implementation of some required functions if necessary
 AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat)
--- src/apprentice.c	2010-02-15 15:14:04.000000000 +0100
+++ src/apprentice.c	2010-02-15 15:15:39.000000000 +0100
@@ -50,6 +50,13 @@
 #endif
 #include <dirent.h>
 
+#ifdef _WIN32
+#include <mbstring.h>
+#include <wchar.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
 #define	EATAB {while (isascii((unsigned char) *l) && \
 		      isspace((unsigned char) *l))  ++l;}
 #define LOWCASE(l) (isupper((unsigned char) (l)) ? \
@@ -345,6 +352,69 @@
 	}
 }
 
+#ifdef _WIN32
+
+/* DllMain function needed to tuck away the DLL handle */
+
+static HMODULE dll;
+
+BOOL WINAPI
+DllMain(HINSTANCE hinstDLL,
+        DWORD     fdwReason,
+        LPVOID    lpvReserved)
+{
+  switch (fdwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+      dll = (HMODULE) hinstDLL;
+      break;
+    }
+
+  return TRUE;
+}
+
+/* Compare two mbstring pathnames taking case insensitivity and
+ * slash equivalence into consideration.
+ */
+static int
+pathnamecmp(const unsigned char * a, const unsigned char *b, size_t len)
+{
+	const unsigned char *pa = a, *pb = b;
+
+	do {
+		const unsigned char *qa, *qb, *q;
+		int na, nb;
+
+		qa = _mbschr(pa, '/');
+		q = _mbschr(pa, '\\');
+		if (q != NULL && (qa == NULL || q < qa))
+			qa = q;
+		if (qa == NULL)
+			na = strlen(pa);
+		else
+			na = qa - pa;
+
+		qb = _mbschr(pb, '/');
+		q = _mbschr(pb, '\\');
+		if (q != NULL && (qb == NULL || q < qb))
+			qb = q;
+		if (qb == NULL)
+			nb = strlen(pb);
+		else
+			nb = qb - pb;
+
+		if (na != nb || _mbsnbicmp(pa, pb, na) != 0)
+			return 0;
+
+		pa += na + 1;
+		pb += na + 1;
+	} while (pa < a + len && *pa && *pb);
+
+	return (pa == a + len);
+}
+
+#endif
+
 /* const char *fn: list of magic files and directories */
 protected struct mlist *
 file_apprentice(struct magic_set *ms, const char *fn, int action)
@@ -377,6 +447,30 @@
 			*p++ = '\0';
 		if (*fn == '\0')
 			break;
+#ifdef _WIN32
+		/* Map compile-time prefix to run-time */
+		if (pathnamecmp(fn, PREFIX, strlen(PREFIX)) == 0) {
+			wchar_t wprefix[MAXPATHLEN];
+			wchar_t *wp;
+			char prefix[MAXPATHLEN];
+			char *newfn;
+	
+			GetModuleFileNameW(dll, wprefix, sizeof(wprefix)/sizeof(wprefix[0]));
+	
+			wp = wcsrchr(wprefix, L'\\');
+			*wp = '\0';
+			wp = wcsrchr(wprefix, L'\\');
+	
+			if (wcsicmp(wp+1, L"bin") == 0)
+				wp[1] = '\0';
+	
+			wcstombs(prefix, wprefix, sizeof(prefix));
+			newfn = malloc(strlen(prefix) + strlen(fn + strlen(PREFIX) + 1) + 1);
+			strcpy(newfn, prefix);
+			strcat(newfn, fn + strlen(PREFIX) + 1);
+			fn = newfn;
+		}
+#endif
 		file_err = apprentice_1(ms, fn, action, mlist);
 		errs = MAX(errs, file_err);
 		fn = p;
@@ -2269,8 +2363,18 @@
 	char *buf;
 
 	if (strip) {
-		if ((p = strrchr(fn, '/')) != NULL)
+		if (
+#ifndef _WIN32
+		    (p = strrchr(fn, '/')) != NULL
+#else
+		    (p = _mbsrchr(fn, '/')) != NULL
+#endif
+						   )
 			fn = ++p;
+#ifdef _WIN32
+		if ((p = _mbsrchr(fn, '\\')) != NULL)
+			fn = ++p;
+#endif
 	}
 
 	for (q = fn; *q; q++)
--- src/compress.c	2009-05-08 19:41:58.000000000 +0200
+++ src/compress.c	2010-02-15 15:15:39.000000000 +0100
@@ -45,7 +45,9 @@
 #endif
 #include <string.h>
 #include <errno.h>
+#ifndef _WIN32
 #include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
@@ -380,6 +380,9 @@
 	if (method == 2)
 		return uncompressgzipped(ms, old, newch, n);
 #endif
+#ifndef HAVE_FORK
+       return NODATA;
+#else
 	(void)fflush(stdout);
 	(void)fflush(stderr);
 
@@ -493,4 +496,5 @@
 	    
 		return n;
 	}
+#endif
 }
--- src/file.c	2010-02-15 15:14:04.000000000 +0100
+++ src/file.c	2010-02-15 15:15:39.000000000 +0100
@@ -156,10 +156,20 @@
 	_wildcard(&argc, &argv);
 #endif
 
-	if ((progname = strrchr(argv[0], '/')) != NULL)
+	if (
+#ifdef _WIN32
+	    (progname = _mbsrchr(argv[0], '/')) != NULL
+#else
+	    (progname = strrchr(argv[0], '/')) != NULL
+#endif
+						      )
 		progname++;
 	else
 		progname = argv[0];
+#ifdef _WIN32
+	if (_mbsrchr(progname, '\\') != NULL)
+		progname = _mbsrchr(progname, '\\') + 1;
+#endif
 
 #ifdef S_IFLNK
 	flags |= getenv("POSIXLY_CORRECT") ? MAGIC_SYMLINK : 0;
--- src/file.h	2010-01-20 02:32:39.000000000 +0100
+++ src/file.h	2010-02-15 15:15:31.000000000 +0100
@@ -62,7 +62,7 @@
 #define MAGIC "/etc/magic"
 #endif
 
-#ifdef __EMX__
+#if defined(__EMX__) || defined(_WIN32)
 #define PATHSEP	';'
 #else
 #define PATHSEP	':'
--- src/fsmagic.c	2009-05-08 19:41:59.000000000 +0200
+++ src/fsmagic.c	2010-02-15 15:15:39.000000000 +0100
@@ -60,6 +60,10 @@
 #endif
 #undef HAVE_MAJOR
 
+#ifndef ELOOP
+# define ELOOP 123456
+#endif
+
 private int
 bad_link(struct magic_set *ms, int err, char *buf)
 {
--- src/magic.c	2009-09-14 19:50:38.000000000 +0200
+++ src/magic.c	2010-02-15 15:15:37.000000000 +0100
@@ -173,9 +173,11 @@
 	if (access(file, W_OK) == 0)
 		if (file_printf(ms, "writable, ") == -1)
 			return -1;
+#ifndef _WIN32
 	if (access(file, X_OK) == 0)
 		if (file_printf(ms, "executable, ") == -1)
 			return -1;
+#endif
 	if (S_ISREG(md))
 		if (file_printf(ms, "regular file, ") == -1)
 			return -1;
@@ -313,12 +315,12 @@
 			ispipe = 1;
 	} else {
 		int flags = O_RDONLY|O_BINARY;
-
+#ifdef O_NONBLOCK
 		if (stat(inname, &sb) == 0 && S_ISFIFO(sb.st_mode)) {
 			flags |= O_NONBLOCK;
 			ispipe = 1;
 		}
-
+#endif
 		errno = 0;
 		if ((fd = open(inname, flags)) < 0) {
 			if (unreadable_info(ms, sb.st_mode, inname) == -1)
--- src/cdf.h	2009-04-29 21:03:02.000000000 +0200
+++ src/cdf.h	2010-04-19 10:50:03.000000000 +0200
@@ -248,7 +248,22 @@
 	size_t i_len;
 } cdf_info_t;
 
+#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR)
+#ifndef _TIMESPEC_DEFINED
+#define _TIMESPEC_DEFINED
+struct timespec {
+  time_t  tv_sec;   /* Seconds */
+  long    tv_nsec;  /* Nanoseconds */
+};
+
+struct itimerspec {
+  struct timespec  it_interval;  /* Timer period */
+  struct timespec  it_value;     /* Timer expiration */
+};
+#endif
+#else
 struct timespec;
+#endif
 int cdf_timestamp_to_timespec(struct timespec *, cdf_timestamp_t);
 int cdf_timespec_to_timestamp(cdf_timestamp_t *, const struct timespec *);
 int cdf_read_header(const cdf_info_t *, cdf_header_t *);
--- src/Makefile.am	2010-02-15 15:14:04.000000000 +0100
+++ src/Makefile.am	2010-02-15 15:15:31.000000000 +0100
@@ -1,10 +1,10 @@
-MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic
+MAGIC = $(sysconfdir)/magic;$(pkgdatadir)/magic
 lib_LTLIBRARIES = libmagic.la
 include_HEADERS = magic.h
 
 bin_PROGRAMS = file
 
-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' -DPREFIX='"$(prefix)"'
 AM_CFLAGS = @WARNINGS@
 
 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
--- src/readelf.h	2010-02-15 15:14:04.000000000 +0100
+++ src/readelf.h	2010-02-15 15:15:39.000000000 +0100
@@ -34,10 +34,7 @@
 #ifndef __fake_elf_h__
 #define __fake_elf_h__
 
-#include <features.h>
-
 #if HAVE_STDINT_H
-__BEGIN_DECLS
 #include <stdint.h>
 #endif
 
@@ -312,5 +309,4 @@
 #define	AV_386_SSE4_1		0x00800000
 #define	AV_386_SSE4_2		0x01000000
 
-__END_DECLS
 #endif

Places

File file-5.04-windows.diff of Package mingw64-file (Revision f87a73de5bdf8246fd2f0c6956e3dc25)

Places