From: Christos Zoulas Date: Fri, 7 Nov 2008 17:25:59 +0000 (+0000) Subject: when -i don't print application/x-directorybinary. X-Git-Tag: FILE5_05~281 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65a5a5ec9f502aa8ea823a83b41effc98ba1fb6e;p=file when -i don't print application/x-directorybinary. --- diff --git a/src/fsmagic.c b/src/fsmagic.c index 0ea61549..6166142e 100644 --- a/src/fsmagic.c +++ b/src/fsmagic.c @@ -32,7 +32,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: fsmagic.c,v 1.55 2008/11/04 16:38:28 christos Exp $") +FILE_RCSID("@(#)$File: fsmagic.c,v 1.56 2008/11/07 17:25:59 christos Exp $") #endif /* lint */ #include "magic.h" @@ -88,9 +88,13 @@ bad_link(struct magic_set *ms, int err, char *buf) private int handle_mime(struct magic_set *ms, int mime, const char *str) { - if ((mime & MAGIC_MIME_TYPE) && file_printf(ms, "application/%s", str) - == -1) - return -1; + if ((mime & MAGIC_MIME_TYPE)) { + if (file_printf(ms, "application/%s", str) == -1) + return -1; + if ((mime & MAGIC_MIME_ENCODING) && file_printf(ms, + "; encoding=") == -1) + return -1; + } if ((mime & MAGIC_MIME_ENCODING) && file_printf(ms, "binary") == -1) return -1; return 0;