fixed #9 support check buffer

Author: Joungkyun

README.md

@@ -89,7 +89,7 @@ Name | Description
 
 ## Usage
 
-**Most common usage** :
+**Most common usage :**
 ```php
 <?php
 if ( ($buf = filemagic ('modules/magic.so')) != false )
@@ -100,7 +100,7 @@ Resutl:
 ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, BuildID[sha1]=0b1c92efa1398676c226544835a64d0edd68f491, not stripped
 ```
 
-**Execute with custom MAGIC file** :
+**Execute with custom MAGIC file :**
 ```php
 <?php
 if ( ($buf = filemagic ('modules/magic.so', '/usr/share/misc/magic.mgc')) != false )
@@ -111,7 +111,7 @@ Result:
 ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, BuildID[sha1]=0b1c92efa1398676c226544835a64d0edd68f491, not stripped
 ```
 
-**Get only file mime type** :
+**Get only file mime type :**
 ```php
 if ( ($buf = filemagic ('modules/magic.so', MAGIC_MIME_ENCODING)) != false )
     echo "$buf\n";
@@ -121,7 +121,7 @@ Result:
 binary
 ```
 
-**Get only file mime type with custom MAGIC file** :
+**Get only file mime type with custom MAGIC file :**
 ```php
 if ( ($buf = filemagic ('modules/magic.so', MAGIC_MIME, '/usr/share/misc/magic.mgc')) != false )
     echo "$buf\n";
@@ -131,7 +131,7 @@ Result:
 application/x-sharedlib; charset=binary
 ```
 
-**Can enable to swap 2th and 3th argument each other** :
+**Can enable to swap 2th and 3th argument each other :**
 ```php
 if ( ($buf = filemagic ('modules/magic.so', MAGIC_MIME, '/usr/share/misc/magic.mgc')) != false )
     echo "$buf\n";
@@ -141,6 +141,19 @@ Resut:
 application/x-sharedlib; charset=binary
 ```
 
+**filemagic buffer control :**
+```php
+$buf = file_get_contents ('./php_magic.h');
+if ( ($buf = filemagic ('DATA:' . $fbuf, MAGIC_MIME) != false ) {
+	echo $buf . "\n";
+}
+
+Result:
+text/x-c; charset=us-ascii
+```
+- if want to get file magic information with buffer data instead of file, use 'DATA:' prefix.
+
+
 **filemagic function error control :**
 ```php
 <?php

magic.c

@@ -249,18 +249,18 @@ static void magic_set_error (int type, const char * format, ...) {
 ZEND_FUNCTION(filemagic) {
 	zval         * zflag;
 	zval         * zpath; // path of Magic file
-	zend_string  * path = NULL;
-	char         * mpath = NULL;
-	const char   * type;
-	int            flags = 0,
-	               flag = 0,
+	zend_string  * path   = NULL;
+	char         * mpath  = NULL;
+	const char   * buf;
+	int            type   = MAGIC_FILE_SET,
+	               flags  = 0,
+	               flag   = 0,
 	               action = 0, // FILE_LOAD
-	               fargs = ZEND_NUM_ARGS ();
+	               fargs  = ZEND_NUM_ARGS ();
 
 	struct stat    filestat;
 	struct magic_set * mp = NULL;
 
-
 	HashTable    * args_arr = NULL;
 	HashPosition   pos;
 
@@ -279,7 +279,16 @@ ZEND_FUNCTION(filemagic) {
 		RETURN_FALSE;
 	}
 
-	if ( stat (ZSTR_VAL (path), &filestat) != 0 ) {
+	if ( strncmp (ZSTR_VAL (path), "DATA:", 5) == 0 ) {
+		type = MAGIC_DATA_SET;
+
+		if ( (ZSTR_LEN (path) - 5) < 1 ) {
+			magic_set_error (E_WARNING, "The value of 1st argument was empty.");
+			RETURN_FALSE;
+		}
+	}
+
+	if ( type == MAGIC_FILE_SET && stat (ZSTR_VAL (path), &filestat) != 0 ) {
 		magic_set_error (E_WARNING, "%s file not found.", ZSTR_VAL (path));
 		RETURN_FALSE;
 	}
@@ -328,13 +337,18 @@ ZEND_FUNCTION(filemagic) {
 		RETURN_FALSE;
 	}
 
-	if ( (type = magic_file (mp, ZSTR_VAL (path))) == NULL ) {
+	if ( type == MAGIC_FILE_SET )
+		buf = magic_file (mp, ZSTR_VAL (path));
+	else
+		buf = magic_buffer (mp, ZSTR_VAL (path) + 5, ZSTR_LEN (path) - 5);
+
+	if ( buf == NULL ) {
 		magic_set_error (E_WARNING, magic_error(mp));
 		magic_close (mp);
 		RETURN_FALSE;
 	}
 
-	RETVAL_STRING (type);
+	RETVAL_STRING (buf);
 	magic_close (mp);
 }
 /* }}} */

package.xml.tmpl

@@ -29,6 +29,8 @@
 		- #5 enhanced Warning messges
 		- #6 change package name to mod_magic from mod_filebin
 		- #7 improved usage documents
+		- #8 change return type of filemagic function
+		- #9 suport check buffer
 	</notes>
 	<contents>
 		<dir name="/">
@@ -71,6 +73,8 @@
 				- #5 enhanced Warning messges
 				- #6 change package name to mod_magic from mod_filebin
 				- #7 improved usage documents
+				- #8 change return type of filemagic function
+				- #9 suport check buffer
 			</notes>
 		</release>
 		<release>

php_magic.h

@@ -89,6 +89,9 @@ ZEND_FUNCTION(filemagic);
 #endif
 */
 
+#define MAGIC_FILE_SET 0
+#define MAGIC_DATA_SET 1
+
 #endif  /* _MOD_MAGIC_H */
 
 /*

sample.php

@@ -14,7 +14,7 @@
   *
   * execute with filemagic ('modules/magic.so');
   *
-
+  
 EOF;
 
 echo filemagic ('modules/magic.so') . "\n";
@@ -24,7 +24,7 @@
   *
   * execute with filemagic ('modules/magic.so', '/usr/share/misc/magic.mgc');
   *
-
+  
 EOF;
 
 echo filemagic ('modules/magic.so', '/usr/share/misc/magic.mgc') . "\n";
@@ -35,7 +35,7 @@
   *
   * execute with filemagic ('modules/magic.so', MAGIC_MIME_ENCODING);
   *
-
+  
 EOF;
 
 echo filemagic ('modules/magic.so', MAGIC_MIME_ENCODING) . "\n";
@@ -45,7 +45,7 @@
   *
   * execute with filemagic ('modules/magic.so', MAGIC_MIME, '/usr/share/misc/magic.mgc');
   *
-
+  
 EOF;
 
 echo filemagic ('modules/magic.so', MAGIC_MIME, '/usr/share/misc/magic.mgc') . "\n";
@@ -55,28 +55,44 @@
   *
   * execute with filemagic ('modules/magic.so', '/usr/share/misc/magic.mgc', MAGIC_MIME);
   *
-
+  
 EOF;
 
 echo filemagic ('modules/magic.so', '/usr/share/misc/magic.mgc', MAGIC_MIME) . "\n";
 
+echo <<<EOF
+
+  *
+  * \$buf = file_get_contents ('modules/magic.so');
+  * execute with filemagic ('DATA:' . \$buf, MAGIC_MIME);
+  *
+  
+EOF;
+
+$buf = file_get_contents ('modules/magic.so');
+echo filemagic ('DATA:' . $buf, '/usr/share/misc/magic.mgc', MAGIC_MIME) . "\n";
+
 echo <<<EOF
 
   *
   * error controls:
   *
   * if ( filemagic ('wrong_path', MAGIC_MIME) == false ) {
-  *     ini_set ('track_errors', true);
-  *     echo "## php_errormsg : " . \$php_errormsg . "\\n";
+  *     if ( version_compare (PHP_VERSION, '7.2.0', "<" ) ) {
+  *         ini_set ('track_errors', true);
+  *         echo "## php_errormsg : " . \$php_errormsg . "\\n";
+  *     }
   *     print_r (error_get_last ());
   * }
   *
   
 EOF;
 
 if ( filemagic ('wrong_path', MAGIC_MIME) == false ) {
-	ini_set ('track_errors', true);
-	echo "## php_errormsg : " . $php_errormsg . "\n";
+	if ( version_compare (PHP_VERSION, '7.2.0', "<" ) ) {
+		ini_set ('track_errors', true);
+		echo "## php_errormsg : " . $php_errormsg . "\n";
+	}
 	print_r (error_get_last ());
 }
 ?>

tests/009-data-control.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Check for data control
+--SKIPIF--
+<?php
+if ( ! extension_loaded ('magic') ) {
+    print 'skip';
+}
+?>
+--POST--
+--GET--
+--INI--
+--FILE--
+<?php
+$tmp = file_get_contents ('modules/magic.so');
+if ( ($buf = filemagic ('DATA:'. $tmp, MAGIC_MIME)) != false ) {
+	echo "$buf\n";
+}
+?>
+--EXPECT--
+application/x-sharedlib; charset=binary