diff options
| author | delphij <delphij@FreeBSD.org> | 2015-10-29 17:51:48 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-10-29 17:51:48 +0000 |
| commit | e6f47aa69657cac8d80c4361b92a4443b7540770 (patch) | |
| tree | 676076923b2c91d1a095619e5e8501d3d1d1b13d /contrib/file/src/file.h | |
| parent | 0528cc36312cf19f8a6e72069d7287150a69b514 (diff) | |
| download | FreeBSD-src-e6f47aa69657cac8d80c4361b92a4443b7540770.zip FreeBSD-src-e6f47aa69657cac8d80c4361b92a4443b7540770.tar.gz | |
MFC r287453,287454,288143:
file 5.25.
Relnotes: yes
Diffstat (limited to 'contrib/file/src/file.h')
| -rw-r--r-- | contrib/file/src/file.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/contrib/file/src/file.h b/contrib/file/src/file.h index 1b4ef6f..b0f0cc1 100644 --- a/contrib/file/src/file.h +++ b/contrib/file/src/file.h @@ -27,7 +27,7 @@ */ /* * file.h - definitions for file(1) program - * @(#)$File: file.h,v 1.168 2015/04/09 20:01:41 christos Exp $ + * @(#)$File: file.h,v 1.172 2015/09/11 17:24:09 christos Exp $ */ #ifndef __file_h__ @@ -44,9 +44,11 @@ #define SIZE_T_FORMAT "" #endif #define INT64_T_FORMAT "I64" + #define INTMAX_T_FORMAT "I64" #else #define SIZE_T_FORMAT "z" #define INT64_T_FORMAT "ll" + #define INTMAX_T_FORMAT "j" #endif #include <stdio.h> /* Include that here, to make sure __P gets defined */ @@ -300,15 +302,15 @@ struct magic { #define num_mask _u._mask #define str_range _u._s._count #define str_flags _u._s._flags - /* Words 9-16 */ + /* Words 9-24 */ union VALUETYPE value; /* either number or string */ - /* Words 17-32 */ + /* Words 25-40 */ char desc[MAXDESC]; /* description */ - /* Words 33-52 */ + /* Words 41-60 */ char mimetype[MAXMIME]; /* MIME type */ - /* Words 53-54 */ + /* Words 61-62 */ char apple[8]; /* APPLE CREATOR/TYPE */ - /* Words 55-63 */ + /* Words 63-78 */ char ext[64]; /* Popular extensions */ }; @@ -413,11 +415,13 @@ struct magic_set { uint16_t elf_shnum_max; uint16_t elf_phnum_max; uint16_t elf_notes_max; + uint16_t regex_max; #define FILE_INDIR_MAX 15 #define FILE_NAME_MAX 30 #define FILE_ELF_SHNUM_MAX 32768 -#define FILE_ELF_PHNUM_MAX 128 +#define FILE_ELF_PHNUM_MAX 2048 #define FILE_ELF_NOTES_MAX 256 +#define FILE_REGEX_MAX 8192 }; /* Type for Unicode characters */ |
