summaryrefslogtreecommitdiffstats
path: root/contrib/file/src/magic.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-01-23 18:48:59 +0000
committerdelphij <delphij@FreeBSD.org>2015-01-23 18:48:59 +0000
commit606dfe10754ec3dbe1055a9ab1e26f94dd25282b (patch)
treead6b6f423e47801e60bdd11239c19553a525dad3 /contrib/file/src/magic.c
parentb62501e2c26308009af2e269236ed99f01f67d98 (diff)
downloadFreeBSD-src-606dfe10754ec3dbe1055a9ab1e26f94dd25282b.zip
FreeBSD-src-606dfe10754ec3dbe1055a9ab1e26f94dd25282b.tar.gz
MFC r276577: MFV r276568:
Update file to 5.22.
Diffstat (limited to 'contrib/file/src/magic.c')
-rw-r--r--contrib/file/src/magic.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/file/src/magic.c b/contrib/file/src/magic.c
index b0cf11c..d16f8c6 100644
--- a/contrib/file/src/magic.c
+++ b/contrib/file/src/magic.c
@@ -33,7 +33,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: magic.c,v 1.90 2014/12/04 15:56:46 christos Exp $")
+FILE_RCSID("@(#)$File: magic.c,v 1.91 2014/12/16 23:18:40 christos Exp $")
#endif /* lint */
#include "magic.h"
@@ -554,6 +554,9 @@ magic_setparam(struct magic_set *ms, int param, const void *val)
case MAGIC_PARAM_ELF_SHNUM_MAX:
ms->elf_shnum_max = *(const size_t *)val;
return 0;
+ case MAGIC_PARAM_ELF_NOTES_MAX:
+ ms->elf_notes_max = *(const size_t *)val;
+ return 0;
default:
errno = EINVAL;
return -1;
@@ -576,6 +579,9 @@ magic_getparam(struct magic_set *ms, int param, void *val)
case MAGIC_PARAM_ELF_SHNUM_MAX:
*(size_t *)val = ms->elf_shnum_max;
return 0;
+ case MAGIC_PARAM_ELF_NOTES_MAX:
+ *(size_t *)val = ms->elf_notes_max;
+ return 0;
default:
errno = EINVAL;
return -1;
OpenPOWER on IntegriCloud