diff options
| author | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
| commit | 2876046398950e59c3b3c460e67e6fec7ff2ba3c (patch) | |
| tree | 33b2b8b4b859960a6446ad19d0ada1c55f9cfcda /ext/fileinfo/libmagic/funcs.c | |
| parent | 3fb86b0b9e79e6a3312b694f30ee627e2e1b325c (diff) | |
| download | php-git-php-5.3.0alpha2.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_5_3_0alpha2'.php-5.3.0alpha2
Diffstat (limited to 'ext/fileinfo/libmagic/funcs.c')
| -rw-r--r-- | ext/fileinfo/libmagic/funcs.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c index 47ce20c344..67bd0d5b0e 100644 --- a/ext/fileinfo/libmagic/funcs.c +++ b/ext/fileinfo/libmagic/funcs.c @@ -151,7 +151,6 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const { int m; int mime = ms->flags & MAGIC_MIME; - const unsigned char *ubuf = buf; if (nb == 0) { if ((!mime || (mime & MAGIC_MIME_TYPE)) && @@ -183,15 +182,15 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const #if PHP_FILEINFO_UNCOMPRESS /* try compression stuff */ if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) != 0 || - (m = file_zmagic(ms, stream, inname, ubuf, nb)) == 0) + (m = file_zmagic(ms, stream, inname, buf, nb)) == 0) #endif { /* Check if we have a tar file */ - if ((ms->flags & MAGIC_NO_CHECK_TAR) != 0 || (m = file_is_tar(ms, ubuf, nb)) == 0) { + if ((ms->flags & MAGIC_NO_CHECK_TAR) != 0 || (m = file_is_tar(ms, buf, nb)) == 0) { /* try tests in /etc/magic (or surrogate magic file) */ - if ((ms->flags & MAGIC_NO_CHECK_SOFT) != 0 || (m = file_softmagic(ms, ubuf, nb, BINTEST)) == 0) { + if ((ms->flags & MAGIC_NO_CHECK_SOFT) != 0 || (m = file_softmagic(ms, buf, nb, BINTEST)) == 0) { /* try known keywords, check whether it is ASCII */ - if ((ms->flags & MAGIC_NO_CHECK_ASCII) != 0 || (m = file_ascmagic(ms, ubuf, nb)) == 0) { + if ((ms->flags & MAGIC_NO_CHECK_ASCII) != 0 || (m = file_ascmagic(ms, buf, nb)) == 0) { /* abandon hope, all ye who remain here */ if ((!mime || (mime & MAGIC_MIME_TYPE)) && file_printf(ms, mime ? "application/octet-stream" : "data") == -1) { return -1; @@ -212,7 +211,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const * information from the ELF headers that cannot easily * be extracted with rules in the magic file. */ - (void)file_tryelf(ms, stream, ubuf, nb); + (void)file_tryelf(ms, stream, buf, nb); } #endif return m; |