summaryrefslogtreecommitdiffstats
path: root/src/file.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-09-23 05:09:36 +0000
committerdelphij <delphij@FreeBSD.org>2015-09-23 05:09:36 +0000
commit7343e0bab7e3abacbbaf76b201c61cd6c76f89b3 (patch)
tree3a5c1894bfdb27e6fed7b206d934a13ed1d8acf1 /src/file.c
parentbe099cce173c1b89675b69d901dab2f8b0872e13 (diff)
downloadFreeBSD-src-7343e0bab7e3abacbbaf76b201c61cd6c76f89b3.zip
FreeBSD-src-7343e0bab7e3abacbbaf76b201c61cd6c76f89b3.tar.gz
Vendor import of file 4.25.
Diffstat (limited to 'src/file.c')
-rw-r--r--src/file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/file.c b/src/file.c
index 44f4cce..fa46b95 100644
--- a/src/file.c
+++ b/src/file.c
@@ -32,7 +32,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: file.c,v 1.165 2015/06/11 12:52:32 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.167 2015/09/11 17:24:09 christos Exp $")
#endif /* lint */
#include "magic.h"
@@ -131,6 +131,7 @@ private struct {
{ "elf_phnum", MAGIC_PARAM_ELF_PHNUM_MAX, 0 },
{ "elf_shnum", MAGIC_PARAM_ELF_SHNUM_MAX, 0 },
{ "elf_notes", MAGIC_PARAM_ELF_NOTES_MAX, 0 },
+ { "regex", MAGIC_PARAM_REGEX_MAX, 0 },
};
private char *progname; /* used throughout */
@@ -237,6 +238,7 @@ main(int argc, char *argv[])
if (magic == NULL)
if ((magic = load(magicfile, flags)) == NULL)
return 1;
+ applyparam(magic);
e |= unwrap(magic, optarg);
++didsomefiles;
break;
OpenPOWER on IntegriCloud