PR/73: enkeli: Require the actual central directory record, not just the

end of central directory for zip.

diff --git a/magic/Magdir/zip b/magic/Magdir/zip
index 17919a3d8b10775bf08c471e0c621c6a9c253d1b..f214ad0df550c54e66415c909f1e6cdf690d7d93 100644 (file)
--- a/magic/Magdir/zip
+++ b/magic/Magdir/zip
@@ -1,12 +1,12 @@
 #------------------------------------------------------------------------------
-# $File: zip,v 1.1 2017/11/03 23:36:17 christos Exp $
+# $File: zip,v 1.2 2019/04/09 18:34:15 christos Exp $
 # zip:  file(1) magic for zip files; this is not use
 # Note the version of magic in archive is currently stronger, this is
 # just an example until negative offsets are supported better
 
 # Zip Central Cirectory record
 0      name            zipcd
->0     string          PK\001\002
+>0     string          PK\001\002      Zip archive data
 >>4    leshort         x               \b, made by
 >>4    use             zipversion
 >>6    leshort         x               \b, extract using at least
@@ -53,7 +53,7 @@
 >>0    leshort         x               v?[%#x]
 
 # Zip End Of Central Directory record
--22    string          PK\005\006      Zip archive data
+-22    string          PK\005\006
 #>4    leshort         >1              \b, %d disks
 #>6    leshort         >1              \b, central directory disk %d
 #>8    leshort         >1              \b, %d central directories on this disk