Skip to content

Commit e6b727d

Browse files
weltlingweltling
committed
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
1 parent eff12e5 commit e6b727d

File tree

7 files changed

+29
-107
lines changed

7 files changed

+29
-107
lines changed

‎NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ PHP NEWS
1818
- Fileinfo:
1919
. Fixed bug #63248 (Load multiple magic files from a directory under Windows).
2020
(Anatoliy)
21+
. Fixed bug #63590 (Different results in TS and NTS under Windows).
22+
(Anatoliy)
2123

2224
- Imap:
2325
. Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)

‎ext/fileinfo/libmagic.patch

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
22
--- libmagic.orig/apprentice.c Sat Dec 17 18:17:18 2011
3-
+++ libmagic/apprentice.c Fri Nov 23 13:04:15 2012
3+
+++ libmagic/apprentice.c Tue Nov 27 16:25:57 2012
44
@@ -29,6 +29,8 @@
55
* apprentice - make one pass through /etc/magic, learning its secrets.
66
*/
@@ -267,11 +267,11 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
267267
- ssize_t len;
268268
+ size_t len;
269269
+ size_t lineno = 0;
270+
+
271+
+ php_stream *stream;
270272

271273
- FILE *f = fopen(ms->file = fn, "r");
272274
- if (f == NULL) {
273-
+ php_stream *stream;
274-
+
275275
+ TSRMLS_FETCH();
276276
+
277277
+#if PHP_API_VERSION < 20100412
@@ -765,14 +765,18 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
765765

766766
if (strip) {
767767
if ((p = strrchr(fn, '/')) != NULL)
768-
@@ -2370,14 +2405,14 @@
768+
@@ -2370,14 +2405,18 @@
769769
q++;
770770
/* Compatibility with old code that looked in .mime */
771771
if (ms->flags & MAGIC_MIME) {
772772
- asprintf(&buf, "%.*s.mime%s", (int)(q - fn), fn, ext);
773773
- if (access(buf, R_OK) != -1) {
774774
+ spprintf(&buf, MAXPATHLEN, "%.*s.mime%s", (int)(q - fn), fn, ext);
775+
+#ifdef PHP_WIN32
776+
+ if (VCWD_ACCESS(buf, R_OK) == 0) {
777+
+#else
775778
+ if (VCWD_ACCESS(buf, R_OK) != -1) {
779+
+#endif
776780
ms->flags &= MAGIC_MIME_TYPE;
777781
return buf;
778782
}
@@ -784,7 +788,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
784788

785789
/* Compatibility with old code that looked in .mime */
786790
if (strstr(p, ".mime") != NULL)
787-
@@ -2467,7 +2502,7 @@
791+
@@ -2467,7 +2506,7 @@
788792
m->offset = swap4((uint32_t)m->offset);
789793
m->in_offset = swap4((uint32_t)m->in_offset);
790794
m->lineno = swap4((uint32_t)m->lineno);
@@ -795,7 +799,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
795799
}
796800
diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
797801
--- libmagic.orig/ascmagic.c Sat Dec 17 18:17:18 2011
798-
+++ libmagic/ascmagic.c Wed Mar 28 15:35:25 2012
802+
+++ libmagic/ascmagic.c Tue Apr 10 09:46:33 2012
799803
@@ -139,10 +139,8 @@
800804
/* malloc size is a conservative overestimate; could be
801805
improved, or at least realloced after conversion. */
@@ -821,7 +825,7 @@ diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
821825
}
822826
diff -u libmagic.orig/cdf.c libmagic/cdf.c
823827
--- libmagic.orig/cdf.c Mon Feb 20 23:35:29 2012
824-
+++ libmagic/cdf.c Mon Apr 2 17:43:23 2012
828+
+++ libmagic/cdf.c Tue Apr 10 09:46:33 2012
825829
@@ -43,7 +43,17 @@
826830
#include <err.h>
827831
#endif
@@ -885,7 +889,7 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
885889
} else {
886890
diff -u libmagic.orig/cdf.h libmagic/cdf.h
887891
--- libmagic.orig/cdf.h Fri Feb 17 06:28:31 2012
888-
+++ libmagic/cdf.h Wed Mar 28 15:35:25 2012
892+
+++ libmagic/cdf.h Tue Apr 10 09:46:34 2012
889893
@@ -35,7 +35,7 @@
890894
#ifndef _H_CDF_
891895
#define _H_CDF_
@@ -923,7 +927,7 @@ diff -u libmagic.orig/cdf.h libmagic/cdf.h
923927
void cdf_unpack_header(cdf_header_t *, char *);
924928
diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
925929
--- libmagic.orig/cdf_time.c Tue Dec 13 14:48:41 2011
926-
+++ libmagic/cdf_time.c Wed Mar 28 15:35:25 2012
930+
+++ libmagic/cdf_time.c Tue Apr 10 09:46:34 2012
927931
@@ -96,7 +96,7 @@
928932
}
929933

@@ -982,7 +986,7 @@ diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
982986
char *p, *q;
983987
diff -u libmagic.orig/compress.c libmagic/compress.c
984988
--- libmagic.orig/compress.c Sat Dec 17 18:17:18 2011
985-
+++ libmagic/compress.c Mon Apr 2 17:43:23 2012
989+
+++ libmagic/compress.c Tue Apr 10 09:46:34 2012
986990
@@ -32,6 +32,7 @@
987991
* uncompress(method, old, n, newch) - uncompress old into new,
988992
* using method, return sizeof new
@@ -1145,7 +1149,7 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
11451149
+#endif /* if PHP_FILEINFO_UNCOMPRESS */
11461150
diff -u libmagic.orig/file.h libmagic/file.h
11471151
--- libmagic.orig/file.h Tue Sep 20 17:30:14 2011
1148-
+++ libmagic/file.h Sun Apr 22 20:06:21 2012
1152+
+++ libmagic/file.h Mon Apr 23 17:58:54 2012
11491153
@@ -33,11 +33,9 @@
11501154
#ifndef __file_h__
11511155
#define __file_h__
@@ -1320,7 +1324,7 @@ diff -u libmagic.orig/file.h libmagic/file.h
13201324
#endif /* __file_h__ */
13211325
diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
13221326
--- libmagic.orig/fsmagic.c Tue Aug 23 10:57:10 2011
1323-
+++ libmagic/fsmagic.c Wed Mar 28 15:35:26 2012
1327+
+++ libmagic/fsmagic.c Tue Apr 10 09:46:34 2012
13241328
@@ -59,27 +59,21 @@
13251329
# define minor(dev) ((dev) & 0xff)
13261330
#endif
@@ -1645,7 +1649,7 @@ diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
16451649
/*
16461650
diff -u libmagic.orig/funcs.c libmagic/funcs.c
16471651
--- libmagic.orig/funcs.c Sat Dec 17 18:17:18 2011
1648-
+++ libmagic/funcs.c Sun Apr 22 20:06:21 2012
1652+
+++ libmagic/funcs.c Mon Apr 23 17:58:54 2012
16491653
@@ -41,52 +41,42 @@
16501654
#if defined(HAVE_WCTYPE_H)
16511655
#include <wctype.h>
@@ -1941,7 +1945,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
19411945
+
19421946
diff -u libmagic.orig/magic.c libmagic/magic.c
19431947
--- libmagic.orig/magic.c Thu May 26 03:27:59 2011
1944-
+++ libmagic/magic.c Mon Apr 2 12:38:04 2012
1948+
+++ libmagic/magic.c Tue Apr 10 09:46:34 2012
19451949
@@ -25,11 +25,6 @@
19461950
* SUCH DAMAGE.
19471951
*/
@@ -2319,7 +2323,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
23192323
magic_error(struct magic_set *ms)
23202324
diff -u libmagic.orig/magic.h libmagic/magic.h
23212325
--- libmagic.orig/magic.h Sun Dec 18 15:54:43 2011
2322-
+++ libmagic/magic.h Wed Mar 28 15:35:26 2012
2326+
+++ libmagic/magic.h Tue Apr 10 09:46:34 2012
23232327
@@ -85,6 +85,7 @@
23242328

23252329
const char *magic_getpath(const char *, int);
@@ -2338,7 +2342,7 @@ diff -u libmagic.orig/magic.h libmagic/magic.h
23382342

23392343
diff -u libmagic.orig/print.c libmagic/print.c
23402344
--- libmagic.orig/print.c Tue Sep 20 17:28:09 2011
2341-
+++ libmagic/print.c Thu Apr 5 10:22:12 2012
2345+
+++ libmagic/print.c Tue Nov 27 16:24:35 2012
23422346
@@ -29,6 +29,9 @@
23432347
* print.c - debugging printout routines
23442348
*/
@@ -2533,7 +2537,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
25332537
protected const char *
25342538
diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
25352539
--- libmagic.orig/readcdf.c Mon Feb 20 21:04:58 2012
2536-
+++ libmagic/readcdf.c Wed Mar 28 15:35:26 2012
2540+
+++ libmagic/readcdf.c Tue Apr 10 09:46:34 2012
25372541
@@ -30,7 +30,11 @@
25382542
#endif
25392543

@@ -2581,7 +2585,7 @@ diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
25812585
*ec = '\0';
25822586
diff -u libmagic.orig/readelf.c libmagic/readelf.c
25832587
--- libmagic.orig/readelf.c Tue Aug 23 10:57:10 2011
2584-
+++ libmagic/readelf.c Mon Apr 2 17:43:23 2012
2588+
+++ libmagic/readelf.c Tue Apr 10 09:46:34 2012
25852589
@@ -49,7 +49,7 @@
25862590
off_t, int *, int);
25872591
private int doshn(struct magic_set *, int, int, int, off_t, int, size_t,
@@ -2738,7 +2742,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
27382742
if (fstat(fd, &st) == -1) {
27392743
diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
27402744
--- libmagic.orig/softmagic.c Sat Dec 17 18:17:18 2011
2741-
+++ libmagic/softmagic.c Fri May 25 09:48:22 2012
2745+
+++ libmagic/softmagic.c Fri May 25 09:59:25 2012
27422746
@@ -41,6 +41,11 @@
27432747
#include <stdlib.h>
27442748
#include <time.h>

‎ext/fileinfo/libmagic/apprentice.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2406,7 +2406,11 @@ mkdbname(struct magic_set *ms, const char *fn, int strip)
24062406
/* Compatibility with old code that looked in .mime */
24072407
if (ms->flags & MAGIC_MIME) {
24082408
spprintf(&buf, MAXPATHLEN, "%.*s.mime%s", (int)(q - fn), fn, ext);
2409+
#ifdef PHP_WIN32
2410+
if (VCWD_ACCESS(buf, R_OK) == 0) {
2411+
#else
24092412
if (VCWD_ACCESS(buf, R_OK) != -1) {
2413+
#endif
24102414
ms->flags &= MAGIC_MIME_TYPE;
24112415
return buf;
24122416
}

‎ext/fileinfo/tests/finfo_file_regex-win32.phpt

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎ext/fileinfo/tests/finfo_file_regex.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
Test finfo_file() function : regex rules
33
--SKIPIF--
44
<?php require_once(dirname(__FILE__) . '/skipif.inc');
5-
if (substr(PHP_OS, 0, 3) == 'WIN') {
6-
die('skip.. only for Non Windows Systems');
7-
}
85
?>
96
--FILE--
107
<?php

‎ext/fileinfo/tests/finfo_open_error-win32.phpt

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎ext/fileinfo/tests/finfo_open_error.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
Test finfo_open() function : error functionality
33
--SKIPIF--
44
<?php require_once(dirname(__FILE__) . '/skipif.inc');
5-
if(substr(PHP_OS, 0, 3) == 'WIN' )
6-
die("skip Not Valid for Windows");
7-
?>
85
--FILE--
96
<?php
107
/* Prototype : resource finfo_open([int options [, string arg]])

0 commit comments

Comments
 (0)