archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MFH Update bundled libmagic to 5.03

Browse source
This commit is contained in:
Scott MacVicar 2009-05-09 20:34:37 +00:00
parent 558f3861ec
commit 2d183dcc1d
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/fileinfo/libmagic/patchlevel.h
View file

@ -1,11 +1,14 @@
#define FILE_VERSION_MAJOR 5
#define patchlevel 2
#define patchlevel 3
/*
* Patchlevel file for Ian Darwin's MAGIC command.
* $File: patchlevel.h,v 1.68 2008/03/22 21:39:43 christos Exp $
*
* $Log$
* Revision 1.1.2.3 2009/05/04 20:54:53 scottmac
* MFH Update libmagic to 5.02
*
* Revision 1.1.2.2 2009/03/15 23:04:18 scottmac
* MFH Update fileinfo to libmagic 5.00 and remove dependency on dirent.h on Windows
*

13
ext/fileinfo/libmagic/readcdf.c
View file

@ -157,15 +157,8 @@ cdf_file_summary_info(struct magic_set *ms, const cdf_stream_t *sst)
size_t count;
int m;
if (cdf_unpack_summary_info(sst, &si, &info, &count) == -1) {
if (si.si_byte_order != 0xfffe)
return 0;
else
return -1;
}
if (si.si_byte_order != 0xfffe)
return 0;
if (cdf_unpack_summary_info(sst, &si, &info, &count) == -1)
return -1;
if (NOTMIME(ms)) {
if (file_printf(ms, "CDF V2 Document") == -1)
@ -257,7 +250,7 @@ file_trycdf(struct magic_set *ms, int fd, const unsigned char *buf,
if ((i = cdf_read_summary_info(&info, &h, &sat, &ssat, &sst, &dir,
&scn)) == -1) {
expn = "";
expn = "Cannot read summary info";
goto out4;
}
#ifdef CDF_DEBUG