From 6deb05a98d247385fa8f1b418199fc619cf40a8f Mon Sep 17 00:00:00 2001 From: delphij Date: Sun, 11 Dec 2016 07:33:02 +0000 Subject: MFC r308420: MFV r308392: file 5.29. --- contrib/file/src/funcs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'contrib/file/src/funcs.c') diff --git a/contrib/file/src/funcs.c b/contrib/file/src/funcs.c index df8dbae..c8918a4 100644 --- a/contrib/file/src/funcs.c +++ b/contrib/file/src/funcs.c @@ -27,7 +27,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: funcs.c,v 1.89 2016/03/21 15:56:53 christos Exp $") +FILE_RCSID("@(#)$File: funcs.c,v 1.90 2016/10/19 20:51:17 christos Exp $") #endif /* lint */ #include "magic.h" @@ -250,7 +250,7 @@ file_buffer(struct magic_set *ms, int fd, const char *inname __attribute__ ((__u } /* try soft magic tests */ - if ((ms->flags & MAGIC_NO_CHECK_SOFT) == 0) + if ((ms->flags & MAGIC_NO_CHECK_SOFT) == 0) { m = file_softmagic(ms, ubuf, nb, NULL, NULL, BINTEST, looks_text); if ((ms->flags & MAGIC_DEBUG) != 0) @@ -277,6 +277,7 @@ file_buffer(struct magic_set *ms, int fd, const char *inname __attribute__ ((__u if (checkdone(ms, &rv)) goto done; } + } /* try text properties */ if ((ms->flags & MAGIC_NO_CHECK_TEXT) == 0) { -- cgit v1.1