diff options
Diffstat (limited to 'contrib/file/file.h')
| -rw-r--r-- | contrib/file/file.h | 236 |
1 files changed, 123 insertions, 113 deletions
diff --git a/contrib/file/file.h b/contrib/file/file.h index bb2fc16..cc8b4d2 100644 --- a/contrib/file/file.h +++ b/contrib/file/file.h @@ -27,7 +27,7 @@ */ /* * file.h - definitions for file(1) program - * @(#)$Id: file.h,v 1.83 2006/12/11 21:48:49 christos Exp $ + * @(#)$File: file.h,v 1.91 2007/03/25 03:13:47 christos Exp $ */ #ifndef __file_h__ @@ -46,10 +46,13 @@ #ifdef HAVE_INTTYPES_H #include <inttypes.h> #endif +#include <regex.h> #include <sys/types.h> /* Do this here and now, because struct stat gets re-defined on solaris */ #include <sys/stat.h> +#define ENABLE_CONDITIONALS + #ifndef MAGIC #define MAGIC "/etc/magic" #endif @@ -66,6 +69,20 @@ #endif #define public +#ifndef __GNUC_PREREQ__ +#ifdef __GNUC__ +#define __GNUC_PREREQ__(x, y) \ + ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ + (__GNUC__ > (x))) +#else +#define __GNUC_PREREQ__(x, y) 0 +#endif +#endif + +#ifndef MIN +#define MIN(a,b) (((a) < (b)) ? (a) : (b)) +#endif + #ifndef HOWMANY # define HOWMANY (256 * 1024) /* how much of the file to look at */ #endif @@ -74,7 +91,7 @@ #define MAXstring 32 /* max leng of "string" types */ #define MAGICNO 0xF11E041C -#define VERSIONNO 3 +#define VERSIONNO 4 #define FILE_MAGICSIZE (32 * 4) #define FILE_LOAD 0 @@ -86,17 +103,20 @@ struct magic { uint16_t cont_level; /* level of ">" */ uint8_t nospflag; /* supress space character */ uint8_t flag; -#define INDIR 1 /* if '>(...)' appears, */ -#define UNSIGNED 2 /* comparison is unsigned */ -#define OFFADD 4 /* if '>&' appears, */ -#define INDIROFFADD 8 /* if '>&(' appears, */ +#define INDIR 1 /* if '(...)' appears */ +#define OFFADD 2 /* if '>&' or '>...(&' appears */ +#define INDIROFFADD 4 /* if '>&(' appears */ +#define UNSIGNED 8 /* comparison is unsigned */ + /* Word 2 */ uint8_t reln; /* relation (0=eq, '>'=gt, etc) */ uint8_t vallen; /* length of string value, if any */ uint8_t type; /* int, short, long or string. */ uint8_t in_type; /* type of indirrection */ +#define FILE_INVALID 0 #define FILE_BYTE 1 #define FILE_SHORT 2 +#define FILE_DEFAULT 3 #define FILE_LONG 4 #define FILE_STRING 5 #define FILE_DATE 6 @@ -126,89 +146,33 @@ struct magic { #define FILE_QLDATE 30 #define FILE_LEQLDATE 31 #define FILE_BEQLDATE 32 +#define FILE_NAMES_SIZE 33/* size of array to contain all names */ -#define FILE_FORMAT_NAME \ -/* 0 */ "invalid 0", \ -/* 1 */ "byte", \ -/* 2 */ "short", \ -/* 3 */ "invalid 3", \ -/* 4 */ "long", \ -/* 5 */ "string", \ -/* 6 */ "date", \ -/* 7 */ "beshort", \ -/* 8 */ "belong", \ -/* 9 */ "bedate", \ -/* 10 */ "leshort", \ -/* 11 */ "lelong", \ -/* 12 */ "ledate", \ -/* 13 */ "pstring", \ -/* 14 */ "ldate", \ -/* 15 */ "beldate", \ -/* 16 */ "leldate", \ -/* 17 */ "regex", \ -/* 18 */ "bestring16", \ -/* 19 */ "lestring16", \ -/* 20 */ "search", \ -/* 21 */ "medate", \ -/* 22 */ "meldate", \ -/* 23 */ "melong", \ -/* 24 */ "quad", \ -/* 25 */ "lequad", \ -/* 26 */ "bequad", \ -/* 27 */ "qdate", \ -/* 28 */ "leqdate", \ -/* 29 */ "beqdate", \ -/* 30 */ "qldate", \ -/* 31 */ "leqldate", \ -/* 32 */ "beqldate", - +#define IS_STRING(t) \ + ((t) == FILE_STRING || \ + (t) == FILE_PSTRING || \ + (t) == FILE_BESTRING16 || \ + (t) == FILE_LESTRING16 || \ + (t) == FILE_REGEX || \ + (t) == FILE_SEARCH || \ + (t) == FILE_DEFAULT) #define FILE_FMT_NONE 0 #define FILE_FMT_NUM 1 /* "cduxXi" */ #define FILE_FMT_STR 2 /* "s" */ #define FILE_FMT_QUAD 3 /* "ll" */ -#define FILE_FORMAT_STRING \ -/* 0 */ FILE_FMT_NONE, \ -/* 1 */ FILE_FMT_NUM, \ -/* 2 */ FILE_FMT_NUM, \ -/* 3 */ FILE_FMT_NONE, \ -/* 4 */ FILE_FMT_NUM, \ -/* 5 */ FILE_FMT_STR, \ -/* 6 */ FILE_FMT_STR, \ -/* 7 */ FILE_FMT_NUM, \ -/* 8 */ FILE_FMT_NUM, \ -/* 9 */ FILE_FMT_STR, \ -/* 10 */ FILE_FMT_NUM, \ -/* 11 */ FILE_FMT_NUM, \ -/* 12 */ FILE_FMT_STR, \ -/* 13 */ FILE_FMT_STR, \ -/* 14 */ FILE_FMT_STR, \ -/* 15 */ FILE_FMT_STR, \ -/* 16 */ FILE_FMT_STR, \ -/* 17 */ FILE_FMT_STR, \ -/* 18 */ FILE_FMT_STR, \ -/* 19 */ FILE_FMT_STR, \ -/* 20 */ FILE_FMT_STR, \ -/* 21 */ FILE_FMT_STR, \ -/* 22 */ FILE_FMT_STR, \ -/* 23 */ FILE_FMT_NUM, \ -/* 24 */ FILE_FMT_QUAD, \ -/* 25 */ FILE_FMT_QUAD, \ -/* 26 */ FILE_FMT_QUAD, \ -/* 27 */ FILE_FMT_STR, \ -/* 28 */ FILE_FMT_STR, \ -/* 29 */ FILE_FMT_STR, \ -/* 30 */ FILE_FMT_STR, \ -/* 31 */ FILE_FMT_STR, \ -/* 32 */ FILE_FMT_STR, - - /* Word 3 */ uint8_t in_op; /* operator for indirection */ uint8_t mask_op; /* operator for mask */ +#ifdef ENABLE_CONDITIONALS + uint8_t cond; /* conditional type */ + uint8_t dummy1; +#else uint8_t dummy1; uint8_t dummy2; +#endif + #define FILE_OPS "&|^+-*/%" #define FILE_OPAND 0 #define FILE_OPOR 1 @@ -218,8 +182,20 @@ struct magic { #define FILE_OPMULTIPLY 5 #define FILE_OPDIVIDE 6 #define FILE_OPMODULO 7 +#define FILE_OPS_MASK 0x07 /* mask for above ops */ +#define FILE_UNUSED_1 0x08 +#define FILE_UNUSED_2 0x10 +#define FILE_UNUSED_3 0x20 #define FILE_OPINVERSE 0x40 #define FILE_OPINDIRECT 0x80 + +#ifdef ENABLE_CONDITIONALS +#define COND_NONE 0 +#define COND_IF 1 +#define COND_ELIF 2 +#define COND_ELSE 3 +#endif /* ENABLE_CONDITIONALS */ + /* Word 4 */ uint32_t offset; /* offset to magic number */ /* Word 5 */ @@ -227,33 +203,44 @@ struct magic { /* Word 6 */ uint32_t lineno; /* line number in magic file */ /* Word 7,8 */ - uint64_t mask; /* mask before comparison with value */ + union { + uint64_t _mask; /* for use with numeric and date types */ + struct { + uint32_t _count; /* repeat/line count */ + uint32_t _flags; /* modifier flags */ + } _s; /* for use with string types */ + } _u; +#define num_mask _u._mask +#define str_count _u._s._count +#define str_flags _u._s._flags + /* Words 9-16 */ union VALUETYPE { uint8_t b; uint16_t h; uint32_t l; uint64_t q; - char s[MAXstring]; - struct { - char *buf; - size_t buflen; - } search; uint8_t hs[2]; /* 2 bytes of a fixed-endian "short" */ uint8_t hl[4]; /* 4 bytes of a fixed-endian "long" */ uint8_t hq[8]; /* 8 bytes of a fixed-endian "quad" */ + char s[MAXstring]; /* the search string or regex pattern */ } value; /* either number or string */ /* Words 17..31 */ char desc[MAXDESC]; /* description */ }; #define BIT(A) (1 << (A)) -#define STRING_IGNORE_LOWERCASE BIT(0) -#define STRING_COMPACT_BLANK BIT(1) -#define STRING_COMPACT_OPTIONAL_BLANK BIT(2) -#define CHAR_IGNORE_LOWERCASE 'c' +#define STRING_COMPACT_BLANK BIT(0) +#define STRING_COMPACT_OPTIONAL_BLANK BIT(1) +#define STRING_IGNORE_LOWERCASE BIT(2) +#define STRING_IGNORE_UPPERCASE BIT(3) +#define REGEX_OFFSET_START BIT(4) #define CHAR_COMPACT_BLANK 'B' #define CHAR_COMPACT_OPTIONAL_BLANK 'b' +#define CHAR_IGNORE_LOWERCASE 'c' +#define CHAR_IGNORE_UPPERCASE 'C' +#define CHAR_REGEX_OFFSET_START 's' +#define STRING_IGNORE_CASE (STRING_IGNORE_LOWERCASE|STRING_IGNORE_UPPERCASE) /* list of magic entries */ @@ -267,54 +254,77 @@ struct mlist { }; struct magic_set { - struct mlist *mlist; - struct cont { - size_t len; - int32_t *off; - } c; - struct out { - /* Accumulation buffer */ - char *buf; - char *ptr; - size_t len; - size_t size; - /* Printable buffer */ - char *pbuf; - size_t psize; - } o; - uint32_t offset; - int error; - int flags; - int haderr; - const char *file; - size_t line; + struct mlist *mlist; + struct cont { + size_t len; + struct level_info { + int32_t off; + int got_match; +#ifdef ENABLE_CONDITIONALS + int last_match; + int last_cond; /* used for error checking by parse() */ +#endif + } *li; + } c; + struct out { + /* Accumulation buffer */ + char *buf; + char *ptr; + size_t left; + size_t size; + /* Printable buffer */ + char *pbuf; + size_t psize; + } o; + uint32_t offset; + int error; + int flags; + int haderr; + const char *file; + size_t line; /* current magic line number */ + + /* data for searches */ + struct { + const char *s; /* start of search in original source */ + size_t s_len; /* length of search region */ + size_t offset; /* starting offset in source: XXX - should this be off_t? */ + size_t rm_len; /* match length */ + } search; + + union VALUETYPE ms_value; /* either number or string */ }; struct stat; protected const char *file_fmttime(uint32_t, int); -protected int file_buffer(struct magic_set *, int, const void *, size_t); +protected int file_buffer(struct magic_set *, int, const char *, const void *, + size_t); protected int file_fsmagic(struct magic_set *, const char *, struct stat *); protected int file_pipe2file(struct magic_set *, int, const void *, size_t); protected int file_printf(struct magic_set *, const char *, ...); protected int file_reset(struct magic_set *); -protected int file_tryelf(struct magic_set *, int, const unsigned char *, size_t); -protected int file_zmagic(struct magic_set *, int, const unsigned char *, size_t); +protected int file_tryelf(struct magic_set *, int, const unsigned char *, + size_t); +protected int file_zmagic(struct magic_set *, int, const char *, + const unsigned char *, size_t); protected int file_ascmagic(struct magic_set *, const unsigned char *, size_t); protected int file_is_tar(struct magic_set *, const unsigned char *, size_t); protected int file_softmagic(struct magic_set *, const unsigned char *, size_t); protected struct mlist *file_apprentice(struct magic_set *, const char *, int); -protected uint64_t file_signextend(struct magic_set *, struct magic *, uint64_t); +protected uint64_t file_signextend(struct magic_set *, struct magic *, + uint64_t); protected void file_delmagic(struct magic *, int type, size_t entries); protected void file_badread(struct magic_set *); protected void file_badseek(struct magic_set *); protected void file_oomem(struct magic_set *, size_t); protected void file_error(struct magic_set *, int, const char *, ...); +protected void file_magerror(struct magic_set *, const char *, ...); protected void file_magwarn(struct magic_set *, const char *, ...); protected void file_mdump(struct magic *); protected void file_showstr(FILE *, const char *, size_t); protected size_t file_mbswidth(const char *); protected const char *file_getbuffer(struct magic_set *); -protected ssize_t sread(int, void *, size_t); +protected ssize_t sread(int, void *, size_t, int); +protected int file_check_mem(struct magic_set *, unsigned int); #ifndef COMPILE_ONLY extern const char *file_names[]; |
