From 6678cf7c2ac8c768ea5efe9fe0392f07e522c963 Mon Sep 17 00:00:00 2001 From: obrien Date: Sun, 13 Jan 2008 20:35:16 +0000 Subject: Import file version 4.23 onto the vendor branch --- contrib/file/magic.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'contrib/file/magic.h') diff --git a/contrib/file/magic.h b/contrib/file/magic.h index 39fa2e1..6041f54 100644 --- a/contrib/file/magic.h +++ b/contrib/file/magic.h @@ -34,21 +34,25 @@ #define MAGIC_SYMLINK 0x000002 /* Follow symlinks */ #define MAGIC_COMPRESS 0x000004 /* Check inside compressed files */ #define MAGIC_DEVICES 0x000008 /* Look at the contents of devices */ -#define MAGIC_MIME 0x000010 /* Return a mime string */ +#define MAGIC_MIME_TYPE 0x000010 /* Return only the MIME type */ #define MAGIC_CONTINUE 0x000020 /* Return all matches */ #define MAGIC_CHECK 0x000040 /* Print warnings to stderr */ #define MAGIC_PRESERVE_ATIME 0x000080 /* Restore access time on exit */ -#define MAGIC_RAW 0x000100 /* Don't translate unprintable chars */ +#define MAGIC_RAW 0x000100 /* Don't translate unprint chars */ #define MAGIC_ERROR 0x000200 /* Handle ENOENT etc as real errors */ -#define MAGIC_NO_CHECK_COMPRESS 0x001000 /* Don't check for compressed files */ -#define MAGIC_NO_CHECK_TAR 0x002000 /* Don't check for tar files */ -#define MAGIC_NO_CHECK_SOFT 0x004000 /* Don't check magic entries */ -#define MAGIC_NO_CHECK_APPTYPE 0x008000 /* Don't check application type */ -#define MAGIC_NO_CHECK_ELF 0x010000 /* Don't check for elf details */ -#define MAGIC_NO_CHECK_ASCII 0x020000 /* Don't check for ascii files */ -#define MAGIC_NO_CHECK_TROFF 0x040000 /* Don't check ascii/troff */ -#define MAGIC_NO_CHECK_FORTRAN 0x080000 /* Don't check ascii/fortran */ -#define MAGIC_NO_CHECK_TOKENS 0x100000 /* Don't check ascii/tokens */ +#define MAGIC_MIME_ENCODING 0x000400 /* Return only the MIME encoding */ +#define MAGIC_MIME (MAGIC_MIME_TYPE|MAGIC_MIME_ENCODING) +#define MAGIC_NO_CHECK_COMPRESS 0x001000 /* Don't check for compressed files */ +#define MAGIC_NO_CHECK_TAR 0x002000 /* Don't check for tar files */ +#define MAGIC_NO_CHECK_SOFT 0x004000 /* Don't check magic entries */ +#define MAGIC_NO_CHECK_APPTYPE 0x008000 /* Don't check application type */ +#define MAGIC_NO_CHECK_ELF 0x010000 /* Don't check for elf details */ +#define MAGIC_NO_CHECK_ASCII 0x020000 /* Don't check for ascii files */ +#define MAGIC_NO_CHECK_TROFF 0x040000 /* Don't check ascii/troff */ +#define MAGIC_NO_CHECK_TOKENS 0x100000 /* Don't check ascii/tokens */ + +/* Defined for backwards compatibility; does nothing */ +#define MAGIC_NO_CHECK_FORTRAN 0x000000 /* Don't check ascii/fortran */ #ifdef __cplusplus extern "C" { @@ -59,6 +63,7 @@ magic_t magic_open(int); void magic_close(magic_t); const char *magic_file(magic_t, const char *); +const char *magic_descriptor(magic_t, int); const char *magic_buffer(magic_t, const void *, size_t); const char *magic_error(magic_t); -- cgit v1.1