Stop RTF message looking odd when unknown versions of RTF (!= 1)

found. Cope with missing encoding better too. Fixes Debian bug
#136534.

diff --git a/magic/Magdir/rtf b/magic/Magdir/rtf
index 19465ff7a1b8914d3e8fbfac5a34b7a773b1bc42..8e5bfe0e32ee88bb8b278c97211332a12c905e22 100644 (file)
--- a/magic/Magdir/rtf
+++ b/magic/Magdir/rtf
@@ -6,8 +6,10 @@
 #
 0      string          {\\rtf          Rich Text Format data,
 !:mime text/rtf
->5     byte            x               version %c,
->6     string          \\ansi          ANSI
->6     string          \\mac           Apple Macintosh
->6     string          \\pc            IBM PC, code page 437
->6     string          \\pca           IBM PS/2, code page 850
+>5     string          1               version 1,
+>>6    string          \\ansi          ANSI
+>>6    string          \\mac           Apple Macintosh
+>>6    string          \\pc            IBM PC, code page 437
+>>6    string          \\pca           IBM PS/2, code page 850
+>>6    default         x               unknown character set
+>5     default         x               unknown version