summaryrefslogtreecommitdiffstats
path: root/contrib/file/src/file.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-10-29 17:51:48 +0000
committerdelphij <delphij@FreeBSD.org>2015-10-29 17:51:48 +0000
commite6f47aa69657cac8d80c4361b92a4443b7540770 (patch)
tree676076923b2c91d1a095619e5e8501d3d1d1b13d /contrib/file/src/file.c
parent0528cc36312cf19f8a6e72069d7287150a69b514 (diff)
downloadFreeBSD-src-e6f47aa69657cac8d80c4361b92a4443b7540770.zip
FreeBSD-src-e6f47aa69657cac8d80c4361b92a4443b7540770.tar.gz
MFC r287453,287454,288143:
file 5.25. Relnotes: yes
Diffstat (limited to 'contrib/file/src/file.c')
-rw-r--r--contrib/file/src/file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/file/src/file.c b/contrib/file/src/file.c
index c700f66..fa46b95 100644
--- a/contrib/file/src/file.c
+++ b/contrib/file/src/file.c
@@ -32,7 +32,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: file.c,v 1.164 2015/06/03 18:21:24 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