summaryrefslogtreecommitdiffstats
path: root/contrib/file/src/is_tar.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-06-10 19:22:41 +0000
committerdelphij <delphij@FreeBSD.org>2015-06-10 19:22:41 +0000
commit7d7b7b5da36a9fbecf1110d65e3693b9347630d9 (patch)
treebf2d8b473f0726bcdeb36d064078c17b8e7d13cf /contrib/file/src/is_tar.c
parent352275060a62b930cc38ca67aff50948c9441845 (diff)
parentc042ae22175d978baeb8b11c92152e4aa035e36a (diff)
downloadFreeBSD-src-7d7b7b5da36a9fbecf1110d65e3693b9347630d9.zip
FreeBSD-src-7d7b7b5da36a9fbecf1110d65e3693b9347630d9.tar.gz
MFV r284234:
Update file to 5.23. MFC after: 2 weeks
Diffstat (limited to 'contrib/file/src/is_tar.c')
-rw-r--r--contrib/file/src/is_tar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/file/src/is_tar.c b/contrib/file/src/is_tar.c
index 876c631..a3e5dbf 100644
--- a/contrib/file/src/is_tar.c
+++ b/contrib/file/src/is_tar.c
@@ -40,7 +40,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: is_tar.c,v 1.37 2010/11/30 14:58:53 rrt Exp $")
+FILE_RCSID("@(#)$File: is_tar.c,v 1.38 2015/04/09 20:01:41 christos Exp $")
#endif
#include "magic.h"
@@ -69,7 +69,7 @@ file_is_tar(struct magic_set *ms, const unsigned char *buf, size_t nbytes)
int tar;
int mime = ms->flags & MAGIC_MIME;
- if ((ms->flags & MAGIC_APPLE) != 0)
+ if ((ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION)) != 0)
return 0;
tar = is_tar(buf, nbytes);
OpenPOWER on IntegriCloud