diff options
Diffstat (limited to 'ext/fileinfo')
| -rw-r--r-- | ext/fileinfo/fileinfo.c | 6 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic.patch | 4 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/apprentice.c | 8 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/magic.c | 4 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/softmagic.c | 1 |
5 files changed, 15 insertions, 8 deletions
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index 4c9665e56..95eca4c0b 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fileinfo.c 308327 2011-02-14 15:32:02Z bjori $ */ +/* $Id: fileinfo.c 314584 2011-08-09 05:11:19Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -172,7 +172,7 @@ zend_function_entry finfo_class_functions[] = { ZEND_ME_MAPPING(set_flags, finfo_set_flags,arginfo_finfo_method_set_flags, ZEND_ACC_PUBLIC) ZEND_ME_MAPPING(file, finfo_file, arginfo_finfo_method_file, ZEND_ACC_PUBLIC) ZEND_ME_MAPPING(buffer, finfo_buffer, arginfo_finfo_method_buffer, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ @@ -392,7 +392,7 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime long options = 0; char *ret_val = NULL, *buffer = NULL; int buffer_len; - struct php_fileinfo *finfo; + struct php_fileinfo *finfo = NULL; zval *zfinfo, *zcontext = NULL; zval *what; char mime_directory[] = "directory"; diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch index 276bb011c..a834c0039 100644 --- a/ext/fileinfo/libmagic.patch +++ b/ext/fileinfo/libmagic.patch @@ -2020,9 +2020,9 @@ diff -u libmagic.orig/magic.c libmagic/magic.c + if (!stream && inname) { + no_in_stream = 1; +#if PHP_API_VERSION < 20100412 -+ stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); ++ stream = php_stream_open_wrapper((char *)inname, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); +#else -+ stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS, NULL); ++ stream = php_stream_open_wrapper((char *)inname, "rb", REPORT_ERRORS, NULL); +#endif + } + diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c index 53fa8d5a1..eb1562e46 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -41,6 +41,14 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.151 2009/03/18 15:19:23 christos Exp $") #include "patchlevel.h" #include <stdlib.h> +#if defined(__hpux) && !defined(HAVE_STRTOULL) +#if SIZEOF_LONG == 8 +# define strtoull strtoul +#else +# define strtoull __strtoull +#endif +#endif + #ifdef PHP_WIN32 #include "win32/unistd.h" #if _MSC_VER <= 1300 diff --git a/ext/fileinfo/libmagic/magic.c b/ext/fileinfo/libmagic/magic.c index a8bf6d888..51cc67209 100644 --- a/ext/fileinfo/libmagic/magic.c +++ b/ext/fileinfo/libmagic/magic.c @@ -291,9 +291,9 @@ file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream) if (!stream && inname) { no_in_stream = 1; #if PHP_API_VERSION < 20100412 - stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); + stream = php_stream_open_wrapper((char *)inname, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); #else - stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS, NULL); + stream = php_stream_open_wrapper((char *)inname, "rb", REPORT_ERRORS, NULL); #endif } diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index 0a06d00f8..da65bfcf8 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -1652,7 +1652,6 @@ convert_libmagic_pattern(zval *pattern, int options) char *t; t = (char *) safe_emalloc(Z_STRLEN_P(pattern), 2, 5); - memset(t, '\0', sizeof(t)); t[j++] = '~'; |