mirror of
https://github.com/php/php-src.git
synced 2024-12-14 12:26:19 +08:00
Update bundled libmagic to 5.03
This commit is contained in:
parent
506bbf398d
commit
5aa273d0ad
@ -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.4 2009/05/04 20:52:43 scottmac
|
||||
* Update libmagic to 5.02
|
||||
*
|
||||
* Revision 1.3 2009/03/15 23:02:35 scottmac
|
||||
* Update fileinfo to libmagic 5.00 and remove dependency on dirent.h on Windows
|
||||
*
|
||||
|
@ -155,15 +155,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
|
||||
if (cdf_unpack_summary_info(sst, &si, &info, &count) == -1)
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (si.si_byte_order != 0xfffe)
|
||||
return 0;
|
||||
|
||||
if (NOTMIME(ms)) {
|
||||
if (file_printf(ms, "CDF V2 Document") == -1)
|
||||
@ -255,7 +248,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
|
||||
|
Loading…
Reference in New Issue
Block a user