new magic

diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index 99391ccf491b7752f648edda014236e0c821584e..eadfeb3a8bbf799a1917e07a509ec2f33d1af365 100644 (file)
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -1185,15 +1185,28 @@
 >>>>>>>>&0      bedate          =0                      full dump
 >>>>>>>>&0      bedate          !0                      incremental since: %s
 
+#----------------------------------------------------------
 # VMS backup savesets - gerardo.cacciari@gmail.com
-# had to comment out GEM Image and G3 raw data  entries due to conflict
-#0            byte    x
-#>(0.s+16)    string  \x01\x01
-#>>&(&0.b+8)  byte    0x42       OpenVMS backup saveset data
-#>>>40        lelong  x          (block size %d
-#>>>49        string  >\0        original name '%s')
+#
+4            string  \x01\x00\x01\x00\x01\x00
+>(0.s+16)    string  \x01\x01
+>>&(&0.b+8)  byte    0x42       OpenVMS backup saveset data
+>>>40        lelong  x          (block size %d,
+>>>49        string  >\0        original name '%s',
+>>>2         short   1024       VAX generated)
+>>>2         short   2048       AXP generated)
+>>>2         short   4096       I64 generated)
 
 # Compaq/HP RILOE floppy image
 # From: Dirk Jagdmann <doj@cubic.org>
 0      string  CPQRFBLO        Compaq/HP RILOE floppy image
 
+#------------------------------------------------------------------------------
+# Files-11 On-Disk Structure (OpenVMS file system) - gerardo.cacciari@gmail.com
+# These bits come from LBN 1 (home block) of ODS-2 and ODS-5 volumes, which is
+# mapped to VBN 2 of [000000]INDEXF.SYS;1
+#
+1008    string          DECFILE11B      Files-11 On-Disk Structure
+>525    byte            x               Level %d
+>525    byte            x               (ODS-%d OpenVMS file system),
+>984    string          x               volume label is '%-12.12s'

diff --git a/magic/Magdir/os400 b/magic/Magdir/os400
index bee36606512358ce2218b0fe5d80b116fa0f31ac..3dc05bf906e7e7b2a23bbf3820ede0c6acfed093 100644 (file)
--- a/magic/Magdir/os400
+++ b/magic/Magdir/os400
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 # os400:  file(1) magic for IBM OS/400 files
-
+#
 # IBM OS/400 (i5/OS) Save file (SAVF) - gerardo.cacciari@gmail.com
 # In spite of its quite variable format (due to internal memory page
 # length differences between CISC and RISC versions of the OS) the
@@ -9,24 +9,29 @@
 # so we must search in a somewhat large area for a particular string
 # that represents the EBCDIC encoding of 'QSRDSSPC' (save/restore
 # descriptor space) preceded by a two byte constant.
-40      string         @@@@@@@@
->1089   search/7394    \x19\xDB\xD8\xE2\xD9\xC4\xE2\xE2\xD7\xC3 IBM OS/400 save file data
->>&212  byte           0x01                     \b, created with SAVOBJ
->>&212  byte           0x02                     \b, created with SAVLIB
->>&212  byte           0x07                     \b, created with SAVCFG
->>&212  byte           0x0B                     \b, created with SAVDLO
->>&213  byte           0x43                     \b, at least V5R3 to open
->>&213  byte           0x42                     \b, at least V5R2 to open
->>&213  byte           0x41                     \b, at least V5R1 to open
->>&213  byte           0x40                     \b, at least V4R5 to open
->>&213  byte           0x3F                     \b, at least V4R4 to open
->>&213  byte           0x3E                     \b, at least V4R3 to open
->>&213  byte           0x3C                     \b, at least V4R2 to open
->>&213  byte           0x3D                     \b, at least V4R1M4 to open
->>&213  byte           0x3B                     \b, at least V4R1 to open
->>&213  byte           0x3A                     \b, at least V3R7 to open
->>&213  byte           0x35                     \b, at least V3R6 to open
->>&213  byte           0x36                     \b, at least V3R2 to open
->>&213  byte           0x34                     \b, at least V3R1 to open
->>&213  byte           0x31                     \b, at least V3R0M5 to open
->>&213  byte           0x30                     \b, at least V2R3 to open
+#
+1090    search/7393    \x19\xDB\xD8\xE2\xD9\xC4\xE2\xE2\xD7\xC3 IBM OS/400 save file data
+>&212   byte           0x01                     \b, created with SAVOBJ
+>&212   byte           0x02                     \b, created with SAVLIB
+>&212   byte           0x07                     \b, created with SAVCFG
+>&212   byte           0x08                     \b, created with SAVSECDTA
+>&212   byte           0x0A                     \b, created with SAVSECDTA
+>&212   byte           0x0B                     \b, created with SAVDLO
+>&212   byte           0x0D                     \b, created with SAVLICPGM
+>&212   byte           0x11                     \b, created with SAVCHGOBJ
+>&213   byte           0x44                     \b, at least V5R4 to open
+>&213   byte           0x43                     \b, at least V5R3 to open
+>&213   byte           0x42                     \b, at least V5R2 to open
+>&213   byte           0x41                     \b, at least V5R1 to open
+>&213   byte           0x40                     \b, at least V4R5 to open
+>&213   byte           0x3F                     \b, at least V4R4 to open
+>&213   byte           0x3E                     \b, at least V4R3 to open
+>&213   byte           0x3C                     \b, at least V4R2 to open
+>&213   byte           0x3D                     \b, at least V4R1M4 to open
+>&213   byte           0x3B                     \b, at least V4R1 to open
+>&213   byte           0x3A                     \b, at least V3R7 to open
+>&213   byte           0x35                     \b, at least V3R6 to open
+>&213   byte           0x36                     \b, at least V3R2 to open
+>&213   byte           0x34                     \b, at least V3R1 to open
+>&213   byte           0x31                     \b, at least V3R0M5 to open
+>&213   byte           0x30                     \b, at least V2R3 to open