Merge branch 'PHP-5.4'

* PHP-5.4: - Fixed magic file regex support
php · May 24, 2012 · 3bd0a52 · 3bd0a52
2 parents 7c297ca + 84b2c39
commit 3bd0a52
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
@@ -1654,29 +1654,6 @@ convert_libmagic_pattern(zval *pattern, int options)
 
 		for (i=0; i<Z_STRLEN_P(pattern); i++, j++) {
 			switch (Z_STRVAL_P(pattern)[i]) {
-				case '?':
-					t[j] = '.';
-					break;
-				case '*':
-					t[j++] = '.';
-					t[j] = '*';
-					break;
-				case '.':
-					t[j++] = '\\';
-					t[j] = '.';
-					break;
-				case '\\':
-					t[j++] = '\\';
-					t[j] = '\\';
-					break;
-				case '(':
-					t[j++] = '\\';
-					t[j] = '(';
-					break;
-				case ')':
-					t[j++] = '\\';
-					t[j] = ')';
-					break;
 				case '~':
 					t[j++] = '\\';
 					t[j] = '~';
@@ -1873,7 +1850,7 @@ magiccheck(struct magic_set *ms, struct magic *m)
 
 		convert_libmagic_pattern(pattern, options);
 
-		l = 0;
+		l = v = 0;
 #if (PHP_MAJOR_VERSION < 6)
 		if ((pce = pcre_get_compiled_regex_cache(Z_STRVAL_P(pattern), Z_STRLEN_P(pattern) TSRMLS_CC)) == NULL) {
 #else

diff --git a/ext/fileinfo/tests/finfo_file_002.phpt b/ext/fileinfo/tests/finfo_file_002.phpt
@@ -18,9 +18,11 @@ ksort($results);
 var_dump($results);
 ?>
 --EXPECTF--
-array(6) {
+array(7) {
   ["%s/resources/dir.zip"]=>
   string(15) "application/zip"
+  ["%s/resources/test.awk"]=>
+  string(10) "text/plain"
   ["%s/resources/test.bmp"]=>
   string(14) "image/x-ms-bmp"
   ["%s/resources/test.gif"]=>

diff --git a/ext/fileinfo/tests/finfo_file_regex.phpt b/ext/fileinfo/tests/finfo_file_regex.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Test finfo_file() function : regex rules
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--FILE--
+<?php
+/**
+ * Works with the unix file command:
+ * $ file -m magic resources/test.awk
+ * resources/test.awk: awk script, ASCII text
+ */
+$magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
+$finfo = finfo_open( FILEINFO_MIME, $magicFile );
+
+echo "*** Testing finfo_file() : regex rules ***\n";
+
+// Calling finfo_file() with all possible arguments
+$file = __DIR__ . '/resources/test.awk';
+var_dump( finfo_file( $finfo, $file ) );
+var_dump( finfo_file( $finfo, $file, FILEINFO_CONTINUE ) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing finfo_file() : regex rules ***
+string(28) "text/plain; charset=us-ascii"
+string(22) "awk script, ASCII text"
+===DONE===
diff --git a/ext/fileinfo/tests/resources/test.awk b/ext/fileinfo/tests/resources/test.awk
@@ -0,0 +1 @@
+BEGIN { print "START" }