ole 2 compound documents redo from Lester Hightower.

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 3a1a56c23aabd1c5884574ed4e2c1992d5b93c39..155e99efbac8b5324f60a1c9f72a260381fa4716 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -267,9 +267,6 @@
 #
 0      beshort         0x1010          PEX Binary Archive
 
-# Visio drawings
-03000  string  Visio\ (TM)\ Drawing    %s
-
 # Tgif files
 0      string  \%TGIF\ x               Tgif file version %s
 

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index 9524c86c7455b6f43c012999bcb003f827e12dda..0eeb33d2faa6ebab66e632ee010a35ba2a31c685 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -371,7 +371,6 @@
 0       string  PO^Q`                          Microsoft Word 6.0 Document
 #
 0      string  \376\067\0\043                  Microsoft Office Document
-0      string  \320\317\021\340\241\261\032\341        Microsoft Office Document
 0      string  \333\245-\0\0\0                 Microsoft Office Document
 #
 2080   string  Microsoft\ Excel\ 5.0\ Worksheet        %s

diff --git a/magic/Magdir/ole2compounddocs b/magic/Magdir/ole2compounddocs
new file mode 100644 (file)
index 0000000..ee07514
--- /dev/null
+++ b/magic/Magdir/ole2compounddocs
@@ -0,0 +1,13 @@
+
+#------------------------------------------------------------------------------
+# Microsoft OLE 2 Compound Documents : file(1) magic for Microsoft Structured
+# storage (http://en.wikipedia.org/wiki/Structured_Storage)
+# Additional tests for OLE 2 Compound Documents should be under this recipe.
+
+0   string  \320\317\021\340\241\261\032\341      OLE 2 Compound Document
+# - Microstation V8 DGN files (www.bentley.com)
+#   Last update on 10/23/2006 by Lester Hightower
+> 0x480  string  D\000g\000n\000~\000H                : Microstation V8 DGN
+# - Visio documents
+#   Last update on 10/23/2006 by Lester Hightower
+> 0x480  string  V\000i\000s\000i\000o\000D\000o\000c : Visio Document

diff --git a/magic/Makefile.in b/magic/Makefile.in
index bee55c84126d005cd4a2906a68a2b466d6f820c4..2e6c2d1a716cf961377391d7662ad71228c86f03 100644 (file)
--- a/magic/Makefile.in
+++ b/magic/Makefile.in
@@ -282,6 +282,7 @@ Magdir/nitpicker \
 Magdir/ocaml \
 Magdir/octave \
 Magdir/olf \
+Magdir/ole2compounddocs \
 Magdir/os2 \
 Magdir/os9 \
 Magdir/osf1 \