|
|
|
@ -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 |
|
|
|
|