From: Christos Zoulas Date: Wed, 12 Aug 2009 17:22:22 +0000 (+0000) Subject: put back localstuff processing. X-Git-Tag: FILE5_05~164 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b27b260249683f25a3eae42fa910c19166b3213;p=file put back localstuff processing. --- diff --git a/ChangeLog b/ChangeLog index b94a2bb3..8c7e7313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,10 @@ * lint fixes and more from NetBSD +2009-08-12 12:28 Robert Byrnes + + * Include Localstuff when compiling magic. + 2009-05-06 10:25 Christos Zoulas * Avoid null dereference in cdf code (Drew Yao) diff --git a/magic/Makefile.am b/magic/Makefile.am index fadbea8a..5a6ce553 100644 --- a/magic/Makefile.am +++ b/magic/Makefile.am @@ -1,5 +1,5 @@ # -# $File: Makefile.am,v 1.45 2009/03/05 22:40:59 christos Exp $ +# $File: Makefile.am,v 1.46 2009/08/12 17:22:22 christos Exp $ # MAGIC_FRAGMENT_BASE = Magdir MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE) @@ -221,7 +221,7 @@ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel MAGIC = magic.mgc -CLEANFILES = ${MAGIC} +CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff # FIXME: Build file natively as well so that it can be used to compile # the target's magic file @@ -234,5 +234,6 @@ FILE_COMPILE_DEP = $(FILE_COMPILE) endif ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) + @cp -f Localstuff $(MAGIC_FRAGMENT_DIR) $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR) @mv $(MAGIC_FRAGMENT_BASE).mgc $@ diff --git a/src/cdf.c b/src/cdf.c index 4ac981fc..92cc1781 100644 --- a/src/cdf.c +++ b/src/cdf.c @@ -32,7 +32,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: cdf.c,v 1.33 2009/07/15 14:07:45 christos Exp $") +FILE_RCSID("@(#)$File: cdf.c,v 1.34 2009/08/12 17:22:22 christos Exp $") #endif #include @@ -524,7 +524,7 @@ cdf_read_sector_chain(const cdf_info_t *info, const cdf_header_t *h, cdf_secid_t sid, size_t len, cdf_stream_t *scn) { - if (len < h->h_min_size_standard_stream) + if (len < h->h_min_size_standard_stream && sst->sst_tab != NULL) return cdf_read_short_sector_chain(h, ssat, sst, sid, len, scn); else