diff options
| author | dim <dim@FreeBSD.org> | 2015-06-20 19:34:50 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-06-20 19:34:50 +0000 |
| commit | e109f99dcb6c95c84bbec22229de29a25491f7c2 (patch) | |
| tree | d142d742b698973a366ae768a3f4033924e314c8 /contrib/file/src/fsmagic.c | |
| parent | 238df27d058d0d8912acf0a186d3f43289a0a2b6 (diff) | |
| parent | cb167b45a82327b0d6d88e85e3d6e2e326291ee4 (diff) | |
| download | FreeBSD-src-e109f99dcb6c95c84bbec22229de29a25491f7c2.zip FreeBSD-src-e109f99dcb6c95c84bbec22229de29a25491f7c2.tar.gz | |
Merge ^/head r284188 through r284643.
Diffstat (limited to 'contrib/file/src/fsmagic.c')
| -rw-r--r-- | contrib/file/src/fsmagic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/file/src/fsmagic.c b/contrib/file/src/fsmagic.c index 1e8fd74..27f982a 100644 --- a/contrib/file/src/fsmagic.c +++ b/contrib/file/src/fsmagic.c @@ -32,7 +32,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: fsmagic.c,v 1.75 2014/12/04 15:56:46 christos Exp $") +FILE_RCSID("@(#)$File: fsmagic.c,v 1.76 2015/04/09 20:01:41 christos Exp $") #endif /* lint */ #include "magic.h" @@ -110,7 +110,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) struct stat tstatbuf; #endif - if (ms->flags & MAGIC_APPLE) + if (ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION)) return 0; if (fn == NULL) return 0; |
