From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 18 Oct 2016 22:25:42 +0000 (+0000)
Subject: fix mime messages (Guy Helmer)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63826f9fd9709ce8619be0ed2e06593cfaf3a091;p=file

fix mime messages (Guy Helmer)
---

diff --git a/src/readcdf.c b/src/readcdf.c
index 483e1d80..20e631d6 100644
--- a/src/readcdf.c
+++ b/src/readcdf.c
@@ -26,7 +26,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: readcdf.c,v 1.62 2016/10/18 16:10:07 christos Exp $")
+FILE_RCSID("@(#)$File: readcdf.c,v 1.63 2016/10/18 22:25:42 christos Exp $")
 #endif
 
 #include <assert.h>
@@ -463,7 +463,7 @@ private struct sinfo {
 			0, 0, 0, 0
 		},
 	},
-	{ "Microsoft Excel", "application/vnd.ms-excel",
+	{ "Microsoft Excel", "vnd.ms-excel",
 		{
 			"Book", "Workbook", NULL, NULL, NULL,
 		},
@@ -473,7 +473,7 @@ private struct sinfo {
 			0, 0, 0,
 		},
 	},
-	{ "Microsoft Word", "application/msword",
+	{ "Microsoft Word", "msword",
 		{
 			"WordDocument", NULL, NULL, NULL, NULL,
 		},
@@ -482,7 +482,7 @@ private struct sinfo {
 			0, 0, 0, 0,
 		},
 	},
-	{ "Microsoft PowerPoint", "application/vnd.ms-powerpoint",
+	{ "Microsoft PowerPoint", "vnd.ms-powerpoint",
 		{
 			"PowerPoint", NULL, NULL, NULL, NULL,
 		},
@@ -491,7 +491,7 @@ private struct sinfo {
 			0, 0, 0, 0,
 		},
 	},
-	{ "Microsoft Outlook Message", "application/vnd.ms-outlook",
+	{ "Microsoft Outlook Message", "vnd.ms-outlook",
 		{
 			"__properties_version1.0",
 			"__recip_version1.0_#00000000",
@@ -526,8 +526,7 @@ cdf_file_dir_info(struct magic_set *ms, const cdf_dir_t *dir)
 			if (file_printf(ms, "CDFV2 %s", si->name) == -1)
 				return -1;
 		} else {
-			if (file_printf(ms, "application/CDFV2-%s",
-			    si->mime) == -1)
+			if (file_printf(ms, "application/%s", si->mime) == -1)
 				return -1;
 		}
 		return 1;
@@ -667,7 +666,7 @@ out0:
 		    if (file_printf(ms, ", %s", expn) == -1)
 			return -1;
 	    } else {
-		if (file_printf(ms, "application/CDFV2-unknown") == -1)
+		if (file_printf(ms, "application/CDFV2") == -1)
 		    return -1;
 	    }
 	    i = 1;