diff options
| author | delphij <delphij@FreeBSD.org> | 2016-12-11 07:37:20 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-12-11 07:37:20 +0000 |
| commit | 884efc61f7391700d81bb717ea62d897524b2184 (patch) | |
| tree | 4a428617338dba61584b97a48fed633f5f610466 /contrib/file/src/funcs.c | |
| parent | 90c02dc90566ee82971be44f1fe9fcf2016abc22 (diff) | |
| download | FreeBSD-src-884efc61f7391700d81bb717ea62d897524b2184.zip FreeBSD-src-884efc61f7391700d81bb717ea62d897524b2184.tar.gz | |
MFC r308420: MFV r308392: file 5.29.
Diffstat (limited to 'contrib/file/src/funcs.c')
| -rw-r--r-- | contrib/file/src/funcs.c | 5 |
1 files changed, 3 insertions, 2 deletions
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) { |
