From: Reuben Thomas <rrt@sc3d.org>
Date: Mon, 11 Feb 2008 00:19:29 +0000 (+0000)
Subject: Clarify UTF-8 BOM message (Reuben Thomas)
X-Git-Tag: FILE5_05~520
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2a974c0254107ccbebb4b01dff10e11239bbb94;p=file

Clarify UTF-8 BOM message (Reuben Thomas)

Add HTML comment to token list in names.h
---

diff --git a/ChangeLog b/ChangeLog
index f3421b56..d39aab48 100644
--- 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 d5f66cc1..d7b0108c 100644
--- a/src/ascmagic.c
+++ b/src/ascmagic.c
@@ -49,7 +49,7 @@
 #include "names.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: ascmagic.c,v 1.58 2008/02/08 13:31:19 christos Exp $")
+FILE_RCSID("@(#)$File: ascmagic.c,v 1.59 2008/02/11 00:19:29 rrt 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 4485c081..2682edcc 100644
--- 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.31 2008/02/07 00:58:52 christos Exp $
+ * $File: names.h,v 1.32 2008/02/11 00:19:29 rrt 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))