]> granicus.if.org Git - file/commitdiff
when -i don't print application/x-directorybinary.
authorChristos Zoulas <christos@zoulas.com>
Fri, 7 Nov 2008 17:25:59 +0000 (17:25 +0000)
committerChristos Zoulas <christos@zoulas.com>
Fri, 7 Nov 2008 17:25:59 +0000 (17:25 +0000)
src/fsmagic.c

index 0ea615495edf1aeaf2a193f17c0765de04b0dd4b..6166142eade5a7157dd17e80554944b98aa081cf 100644 (file)
@@ -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;