]> granicus.if.org Git - file/commitdiff
Remove version check from zip Sander Marechal <s.marechal@jejik.com>
authorChristos Zoulas <christos@zoulas.com>
Wed, 1 Jul 2009 00:07:41 +0000 (00:07 +0000)
committerChristos Zoulas <christos@zoulas.com>
Wed, 1 Jul 2009 00:07:41 +0000 (00:07 +0000)
magic/Magdir/archive

index 9175aac9c5c0dffaff6610fdf392caa58ad50ae9..fe15f9c8d96be26bd43a1e950ea2b30968ff59d0 100644 (file)
 
 # ZIP archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
 0      string          PK\003\004
->4     byte            0x00            Zip archive data
+>30    ubelong         !0x6d696d65
+>>4    byte            0x00            Zip archive data
 !:mime application/zip
->    byte            0x09            Zip archive data, at least v0.9 to extract
+>>4    byte            0x09            Zip archive data, at least v0.9 to extract
 !:mime application/zip
->    byte            0x0a            Zip archive data, at least v1.0 to extract
+>>4    byte            0x0a            Zip archive data, at least v1.0 to extract
 !:mime application/zip
->    byte            0x0b            Zip archive data, at least v1.1 to extract
+>>4    byte            0x0b            Zip archive data, at least v1.1 to extract
 !:mime application/zip
->0x161 string          WINZIP          Zip archive data, WinZIP self-extracting
+>>0x161        string          WINZIP          Zip archive data, WinZIP self-extracting
 !:mime application/zip
->4     byte            0x14
->>30   ubelong         !0x6d696d65     Zip archive data, at least v2.0 to extract
->0x161 string          WINZIP          Zip archive data, WinZIP self-extracting
+>>4    byte            0x14            Zip archive data, at least v2.0 to extract
 !:mime application/zip
 
 # OpenOffice.org / KOffice / StarOffice documents
 # Listed here because they ARE zip files
 #
 # From: Abel Cheung <abel@oaka.org>
->4     byte            0x14
->>30   string          mimetype
+>30    string          mimetype
 
 # KOffice (1.2 or above) formats
->>>50  string  vnd.kde.                KOffice (>=1.2)
->>>>58 string  karbon                  Karbon document
->>>>58 string  kchart                  KChart document
->>>>58 string  kformula                KFormula document
->>>>58 string  kivio                   Kivio document
->>>>58 string  kontour                 Kontour document
->>>>58 string  kpresenter              KPresenter document
->>>>58 string  kspread                 KSpread document
->>>>58 string  kword                   KWord document
+>>50   string  vnd.kde.                KOffice (>=1.2)
+>>>58  string  karbon                  Karbon document
+>>>58  string  kchart                  KChart document
+>>>58  string  kformula                KFormula document
+>>>58  string  kivio                   Kivio document
+>>>58  string  kontour                 Kontour document
+>>>58  string  kpresenter              KPresenter document
+>>>58  string  kspread                 KSpread document
+>>>58  string  kword                   KWord document
 
 # OpenOffice formats (for OpenOffice 1.x / StarOffice 6/7)
->>>50  string  vnd.sun.xml.            OpenOffice.org 1.x
->>>>62 string  writer                  Writer
->>>>>68        byte    !0x2e                   document
->>>>>68        string  .template               template
->>>>>68        string  .global                 global document
->>>>62 string  calc                    Calc
->>>>>66        byte    !0x2e                   spreadsheet
->>>>>66        string  .template               template
->>>>62 string  draw                    Draw
->>>>>66        byte    !0x2e                   document
->>>>>66        string  .template               template
->>>>62 string  impress                 Impress
->>>>>69        byte    !0x2e                   presentation
->>>>>69        string  .template               template
->>>>62 string  math                    Math document
->>>>62 string  base                    Database file
+>>50   string  vnd.sun.xml.            OpenOffice.org 1.x
+>>>62  string  writer                  Writer
+>>>>68 byte    !0x2e                   document
+>>>>68 string  .template               template
+>>>>68 string  .global                 global document
+>>>62  string  calc                    Calc
+>>>>66 byte    !0x2e                   spreadsheet
+>>>>66 string  .template               template
+>>>62  string  draw                    Draw
+>>>>66 byte    !0x2e                   document
+>>>>66 string  .template               template
+>>>62  string  impress                 Impress
+>>>>69 byte    !0x2e                   presentation
+>>>>69 string  .template               template
+>>>62  string  math                    Math document
+>>>62  string  base                    Database file
 
 # OpenDocument formats (for OpenOffice 2.x / StarOffice >= 8)
 # http://lists.oasis-open.org/archives/office/200505/msg00006.html
->>>50  string  vnd.oasis.opendocument. OpenDocument
->>>>73 string  text
->>>>>77        byte    !0x2d                   Text
+>>50   string  vnd.oasis.opendocument. OpenDocument
+>>>73  string  text
+>>>>77 byte    !0x2d                   Text
 !:mime application/vnd.oasis.opendocument.text
->>>>>77        string  -template               Text Template
->>>>>77        string  -web                    HTML Document Template
->>>>>77        string  -master                 Master Document
->>>>73 string  graphics                Drawing
->>>>>81        string  -template               Template
->>>>73 string  presentation            Presentation
->>>>>85        string  -template               Template
->>>>73 string  spreadsheet             Spreadsheet
->>>>>84        string  -template               Template
->>>>73 string  chart                   Chart
->>>>>78        string  -template               Template
->>>>73 string  formula                 Formula
->>>>>80        string  -template               Template
->>>>73 string  database                Database
->>>>73 string  image                   Image
+>>>>77 string  -template               Text Template
+!:mime application/vnd.oasis.opendocument.text-template
+>>>>77 string  -web                    HTML Document Template
+!:mime application/vnd.oasis.opendocument.text-web
+>>>>77 string  -master                 Master Document
+!:mime application/vnd.oasis.opendocument.text-master
+>>>73  string  graphics
+>>>>81 byte    !0x2d                   Drawing
+!:mime application/vnd.oasis.opendocument.graphics
+>>>>81 string  -template               Template
+!:mime application/vnd.oasis.opendocument.graphics-template
+>>>73  string  presentation
+>>>>85 byte    !0x2d                   Presentation
+!:mime application/vnd.oasis.opendocument.presentation
+>>>>85 string  -template               Template
+!:mime application/vnd.oasis.opendocument.presentation-template
+>>>73  string  spreadsheet
+>>>>84 byte    !0x2d                   Spreadsheet
+!:mime application/vnd.oasis.opendocument.spreadsheet
+>>>>84 string  -template               Template
+!:mime application/vnd.oasis.opendocument.spreadsheet-template
+>>>73  string  chart
+>>>>78 byte    !0x2d                   Chart
+!:mime application/vnd.oasis.opendocument.chart
+>>>>78 string  -template               Template
+!:mime application/vnd.oasis.opendocument.chart-template
+>>>73  string  formula
+>>>>80 byte    !0x2d                   Formula
+!:mime application/vnd.oasis.opendocument.formula
+>>>>80 string  -template               Template
+!:mime application/vnd.oasis.opendocument.formula-template
+>>>73  string  database                Database
+!:mime application/vnd.oasis.opendocument.database
+>>>73  string  image
+>>>>78 byte    !0x2d                   Image
+!:mime application/vnd.oasis.opendocument.image
+>>>>78 string  -template               Template
+!:mime application/vnd.oasis.opendocument.image-template
 
 # Zoo archiver
 20     lelong          0xfdc4a7dc      Zoo archive data
 >24    belong  0               no checksum
 >24    belong  1               SHA-1 checksum
 >24    belong  2               MD5 checksum
-