Clarify UTF-8 BOM message (Reuben Thomas)

Add HTML comment to token list in names.h

diff --git a/ChangeLog b/ChangeLog
index f3421b563c7403c8aa37cdd035382af9b0a84617..d39aab4862d291b55d401a82ad9fd5b527ab013c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 
+2007-02-11 00:17 Reuben Thomas <rrt@sc3d.org>
+
+       * Clarify UTF-8 BOM message (Reuben Thomas)
+
+       * Add HTML comment to token list in names.h
+       
 2007-02-04 15:50 Christos Zoulas <christos@astron.com>
 
        * Debian fixes (Reuben Thomas)

diff --git a/src/ascmagic.c b/src/ascmagic.c
index 88093c688a1cc976a350f1014e15fd038c4a01ac..f62be2058f4ba0302eca62c22b66447ea8153f62 100644 (file)
--- a/src/ascmagic.c
+++ b/src/ascmagic.c
@@ -49,7 +49,7 @@
 #include "names.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: ascmagic.c,v 1.57 2008/02/07 03:10:20 christos Exp $")
+FILE_RCSID("@(#)$File: ascmagic.c,v 1.58 2008/02/08 13:31:19 christos Exp $")
 #endif /* lint */
 
 typedef unsigned long unichar;
@@ -121,7 +121,7 @@ file_ascmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes)
                code_mime = "us-ascii";
                type = "text";
        } else if (looks_utf8_with_BOM(buf, nbytes, ubuf, &ulen) > 0) {
-               code = "UTF-8 Unicode with BOM";
+               code = "UTF-8 Unicode (with BOM)";
                code_mime = "utf-8";
                type = "text";
        } else if (looks_utf8(buf, nbytes, ubuf, &ulen) > 1) {

diff --git a/src/names.h b/src/names.h
index 07dd770c9bf4fb695de7d07e200273f2fbaf3da4..daf116818c912703de017ab1ff40912c8e88c7ab 100644 (file)
--- a/src/names.h
+++ b/src/names.h
@@ -32,7 +32,7 @@
  * appear at fixed offsets into the file. Don't make HOWMANY
  * too high unless you have a very fast CPU.
  *
- * $File: names.h,v 1.30 2008/01/26 18:45:16 christos Exp $
+ * $File: names.h,v 1.31 2008/02/07 00:58:52 christos Exp $
  */
 
 /*
@@ -167,6 +167,7 @@ static const struct names {
        {"<body",       L_HTML},
        {"<BODY",       L_HTML},
        {"<html",       L_HTML},
-       {"<HTML",       L_HTML}
+       {"<HTML",       L_HTML},
+       {"<!--",        L_HTML},
 };
 #define NNAMES (sizeof(names)/sizeof(struct names))