|
 |
840325 |
diff --git a/magic/Magdir/archive b/magic/Magdir/archive
|
|
|
840325 |
index 99798b0..945f536 100644
|
|
|
840325 |
--- a/magic/Magdir/archive
|
|
|
840325 |
+++ b/magic/Magdir/archive
|
|
|
840325 |
@@ -150,7 +150,7 @@
|
|
|
840325 |
# Incremental snapshot gnu-tar format from:
|
|
|
840325 |
# https://www.gnu.org/software/tar/manual/html_node/Snapshot-Files.html
|
|
|
840325 |
0 string GNU\ tar- GNU tar incremental snapshot data
|
|
|
840325 |
->&0 regex [0-9]\.[0-9]+-[0-9]+ version %s
|
|
|
840325 |
+>&0 regex [0-9]\\.[0-9]+-[0-9]+ version %s
|
|
|
840325 |
|
|
|
840325 |
# cpio archives
|
|
|
840325 |
#
|
|
|
840325 |
diff --git a/magic/Magdir/ctf b/magic/Magdir/ctf
|
|
|
840325 |
index ebea8f3..d91684d 100644
|
|
|
840325 |
--- a/magic/Magdir/ctf
|
|
|
840325 |
+++ b/magic/Magdir/ctf
|
|
|
840325 |
@@ -20,4 +20,4 @@
|
|
|
840325 |
# CTF metadata (plain text)
|
|
|
840325 |
0 string /*\x20CTF\x20 Common Trace Format (CTF) plain text metadata
|
|
|
840325 |
!:strength + 5 # this is to make sure we beat C
|
|
|
840325 |
->&0 regex [0-9]+\.[0-9]+ \b, v%s
|
|
|
840325 |
+>&0 regex [0-9]+\\.[0-9]+ \b, v%s
|
|
|
840325 |
diff --git a/magic/Magdir/geo b/magic/Magdir/geo
|
|
|
840325 |
index d72e514..dda5f73 100644
|
|
|
840325 |
--- a/magic/Magdir/geo
|
|
|
840325 |
+++ b/magic/Magdir/geo
|
|
|
840325 |
@@ -1,6 +1,6 @@
|
|
|
840325 |
|
|
|
840325 |
#------------------------------------------------------------------------------
|
|
|
840325 |
-# $File: geo,v 1.7 2019/04/19 00:42:27 christos Exp $
|
|
|
840325 |
+# $File: geo,v 1.8 2022/03/24 15:48:58 christos Exp $
|
|
|
840325 |
# Geo- files from Kurt Schwehr <schwehr@ccom.unh.edu>
|
|
|
840325 |
|
|
|
840325 |
######################################################################
|
|
|
840325 |
@@ -28,8 +28,8 @@
|
|
|
840325 |
# Knudsen subbottom chirp profiler - Binary File Format: B9
|
|
|
840325 |
# KEB D409-03167 V1.75 Huffman
|
|
|
840325 |
0 string KEB\ Knudsen seismic KEL binary (KEB) -
|
|
|
840325 |
->4 regex [-A-Z0-9]* Software: %s
|
|
|
840325 |
->>&1 regex V[0-9]*\.[0-9]* version %s
|
|
|
840325 |
+>4 regex [-A-Z0-9]+ Software: %s
|
|
|
840325 |
+>>&1 regex V[0-9]+\\.[0-9]+ version %s
|
|
|
840325 |
|
|
|
840325 |
######################################################################
|
|
|
840325 |
#
|
|
|
840325 |
@@ -40,7 +40,7 @@
|
|
|
840325 |
|
|
|
840325 |
# Caris LIDAR format for LADS comes as two parts... ascii location file and binary waveform data
|
|
|
840325 |
0 string HCA LADS Caris Ascii Format (CAF) bathymetric lidar
|
|
|
840325 |
->4 regex [0-9]*\.[0-9]* version %s
|
|
|
840325 |
+>4 regex [0-9]+\\.[0-9]+ version %s
|
|
|
840325 |
|
|
|
840325 |
0 string HCB LADS Caris Binary Format (CBF) bathymetric lidar waveform data
|
|
|
840325 |
>3 byte x version %d .
|
|
|
840325 |
@@ -69,7 +69,7 @@
|
|
|
840325 |
|
|
|
840325 |
# mb121 https://www.saic.com/maritime/gsf/
|
|
|
840325 |
8 string GSF-v SAIC generic sensor format (GSF) sonar data,
|
|
|
840325 |
->&0 regex [0-9]*\.[0-9]* version %s
|
|
|
840325 |
+>&0 regex [0-9]+\\.[0-9]+ version %s
|
|
|
840325 |
|
|
|
840325 |
# MGD77 - https://www.ngdc.noaa.gov/mgg/dat/geodas/docs/mgd77.htm
|
|
|
840325 |
# mb161
|
|
|
840325 |
diff --git a/magic/Magdir/windows b/magic/Magdir/windows
|
|
|
840325 |
index 8a7923f..1247e03 100644
|
|
|
840325 |
--- a/magic/Magdir/windows
|
|
|
840325 |
+++ b/magic/Magdir/windows
|
|
|
840325 |
@@ -358,7 +358,7 @@
|
|
|
840325 |
# skip space at beginning
|
|
|
840325 |
>0 string \040
|
|
|
840325 |
# name without extension and greater character or name with hlp extension
|
|
|
840325 |
->>1 regex/c \^([^\xd>]*|.*\.hlp) MS Windows help file Content, based "%s"
|
|
|
840325 |
+>>1 regex/c \^([^\xd>]*|.*\\.hlp) MS Windows help file Content, based "%s"
|
|
|
840325 |
!:mime text/plain
|
|
|
840325 |
!:apple ????TEXT
|
|
|
840325 |
!:ext cnt
|
|
|
840325 |
@@ -535,7 +535,7 @@
|
|
|
840325 |
# http://www.winfaq.de/faq_html/Content/tip2500/onlinefaq.php?h=tip2653.htm
|
|
|
840325 |
# https://msdn.microsoft.com/en-us/library/windows/desktop/cc144102.aspx
|
|
|
840325 |
# .ShellClassInfo DeleteOnCopy LocalizedFileNames ASCII coded case-independent
|
|
|
840325 |
->>&0 regex/c \^(\.ShellClassInfo|DeleteOnCopy|LocalizedFileNames)] Windows desktop.ini
|
|
|
840325 |
+>>&0 regex/1024c \^(\\.ShellClassInfo|DeleteOnCopy|LocalizedFileNames)] Windows desktop.ini
|
|
|
840325 |
!:mime application/x-wine-extension-ini
|
|
|
840325 |
#!:mime text/plain
|
|
|
840325 |
# https://support.microsoft.com/kb/84709/
|