put back localstuff processing.

diff --git a/ChangeLog b/ChangeLog
index b94a2bb3bbece74ff49e62c2dde04b650f4f1ca0..8c7e731363c425f487aceef1d771eb59727cfaa8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,10 @@
        
        * lint fixes and more from NetBSD
 
+2009-08-12  12:28  Robert Byrnes  <byrnes@wildpumpkin.net>
+
+       * Include Localstuff when compiling magic.
+
 2009-05-06  10:25  Christos Zoulas <christos@zoulas.com>
 
        * Avoid null dereference in cdf code (Drew Yao)

diff --git a/magic/Makefile.am b/magic/Makefile.am
index fadbea8a703f79dbaebae3cc0a86910a91569a98..5a6ce55325ce1db9864d58ff1ac1fcdf4cf9568a 100644 (file)
--- 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 4ac981fc07e41a5e6bd597fbf80b0e0e32b1d7c6..92cc1781d5463b2676413caec10d4c453bd2a793 100644 (file)
--- 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 <assert.h>
@@ -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