diff options
| author | dim <dim@FreeBSD.org> | 2014-12-11 19:27:27 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-12-11 19:27:27 +0000 |
| commit | da65ea02a341dd797c46b6987753bc1453982b36 (patch) | |
| tree | d9a72217c1d2c4dcfef27a2fd2078dd4b3f69a64 /contrib/file/src/magic.h | |
| parent | 4cba228708753c1128b75a2c25c0dda582a9913a (diff) | |
| parent | dc1c036751105b0a801375ba642278a13543bf7c (diff) | |
| download | FreeBSD-src-da65ea02a341dd797c46b6987753bc1453982b36.zip FreeBSD-src-da65ea02a341dd797c46b6987753bc1453982b36.tar.gz | |
Merge ^/head r275685 through r275714.
Diffstat (limited to 'contrib/file/src/magic.h')
| -rw-r--r-- | contrib/file/src/magic.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/contrib/file/src/magic.h b/contrib/file/src/magic.h index 38e59d7..94cb397 100644 --- a/contrib/file/src/magic.h +++ b/contrib/file/src/magic.h @@ -75,7 +75,7 @@ #define MAGIC_NO_CHECK_FORTRAN 0x000000 /* Don't check ascii/fortran */ #define MAGIC_NO_CHECK_TROFF 0x000000 /* Don't check ascii/troff */ -#define MAGIC_VERSION 518 /* This implementation */ +#define MAGIC_VERSION 521 /* This implementation */ #ifdef __cplusplus @@ -96,11 +96,21 @@ int magic_setflags(magic_t, int); int magic_version(void); int magic_load(magic_t, const char *); +int magic_load_buffers(magic_t, void **, size_t *, size_t); + int magic_compile(magic_t, const char *); int magic_check(magic_t, const char *); int magic_list(magic_t, const char *); int magic_errno(magic_t); +#define MAGIC_PARAM_INDIR_MAX 0 +#define MAGIC_PARAM_NAME_MAX 1 +#define MAGIC_PARAM_ELF_PHNUM_MAX 2 +#define MAGIC_PARAM_ELF_SHNUM_MAX 3 + +int magic_setparam(magic_t, int, const void *); +int magic_getparam(magic_t, int, void *); + #ifdef __cplusplus }; #endif |
