[BACK]Return to magic.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / file

Diff for /src/usr.bin/file/magic.h between version 1.3 and 1.4

version 1.3, 2008/05/08 01:40:56 version 1.4, 2009/04/24 18:54:34
Line 35 
Line 35 
 #define MAGIC_SYMLINK           0x000002 /* Follow symlinks */  #define MAGIC_SYMLINK           0x000002 /* Follow symlinks */
 #define MAGIC_COMPRESS          0x000004 /* Check inside compressed files */  #define MAGIC_COMPRESS          0x000004 /* Check inside compressed files */
 #define MAGIC_DEVICES           0x000008 /* Look at the contents of devices */  #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_CONTINUE          0x000020 /* Return all matches */
 #define MAGIC_CHECK             0x000040 /* Print warnings to stderr */  #define MAGIC_CHECK             0x000040 /* Print warnings to stderr */
 #define MAGIC_PRESERVE_ATIME    0x000080 /* Restore access time on exit */  #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_ERROR             0x000200 /* Handle ENOENT etc as real errors */
 #define MAGIC_NO_CHECK_COMPRESS 0x001000 /* Don't check for compressed files */  #define MAGIC_MIME_ENCODING     0x000400 /* Return only the MIME encoding */
 #define MAGIC_NO_CHECK_TAR      0x002000 /* Don't check for tar files */  #define MAGIC_MIME              (MAGIC_MIME_TYPE|MAGIC_MIME_ENCODING)
 #define MAGIC_NO_CHECK_SOFT     0x004000 /* Don't check magic entries */  #define MAGIC_NO_CHECK_COMPRESS 0x001000 /* Don't check for compressed files */
 #define MAGIC_NO_CHECK_APPTYPE  0x008000 /* Don't check application type */  #define MAGIC_NO_CHECK_TAR      0x002000 /* Don't check for tar files */
 #define MAGIC_NO_CHECK_ELF      0x010000 /* Don't check for elf details */  #define MAGIC_NO_CHECK_SOFT     0x004000 /* Don't check magic entries */
 #define MAGIC_NO_CHECK_ASCII    0x020000 /* Don't check for ascii files */  #define MAGIC_NO_CHECK_APPTYPE  0x008000 /* Don't check application type */
 #define MAGIC_NO_CHECK_TROFF    0x040000 /* Don't check ascii/troff */  #define MAGIC_NO_CHECK_ELF      0x010000 /* Don't check for elf details */
 #define MAGIC_NO_CHECK_FORTRAN  0x080000 /* Don't check ascii/fortran */  #define MAGIC_NO_CHECK_ASCII    0x020000 /* Don't check for ascii files */
 #define MAGIC_NO_CHECK_TOKENS   0x100000 /* Don't check ascii/tokens */  #define MAGIC_NO_CHECK_TOKENS   0x100000 /* Don't check ascii/tokens */
   
   /* Defined for backwards compatibility; do nothing */
   #define MAGIC_NO_CHECK_FORTRAN  0x000000 /* Don't check ascii/fortran */
   #define MAGIC_NO_CHECK_TROFF    0x000000 /* Don't check ascii/troff */
   
   
 #ifdef __cplusplus  #ifdef __cplusplus
 extern "C" {  extern "C" {
 #endif  #endif
Line 60 
Line 65 
 void magic_close(magic_t);  void magic_close(magic_t);
   
 const char *magic_file(magic_t, const char *);  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_buffer(magic_t, const void *, size_t);
   
 const char *magic_error(magic_t);  const char *magic_error(magic_t);

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4