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

Diff for /src/usr.bin/file/file.h between version 1.9 and 1.10

version 1.9, 2002/02/17 19:42:30 version 1.10, 2002/06/05 13:46:44
Line 30 
Line 30 
 #ifndef __file_h__  #ifndef __file_h__
 #define __file_h__  #define __file_h__
   
 typedef int8_t int8;  
 typedef int32_t int32;  
 typedef u_int32_t uint32;  
   
 #ifndef HOWMANY  #ifndef HOWMANY
 # define HOWMANY 8192           /* how much of the file to look at */  # define HOWMANY 8192           /* how much of the file to look at */
 #endif  #endif
Line 48 
Line 44 
 #define ADD     4               /* if '>&' appears,  */  #define ADD     4               /* if '>&' appears,  */
         short cont_level;       /* level of ">" */          short cont_level;       /* level of ">" */
         struct {          struct {
                 int8 type;      /* byte short long */                  int8_t type;    /* byte short long */
                 int32 offset;   /* offset from indirection */                  int32_t offset; /* offset from indirection */
         } in;          } in;
         int32 offset;           /* offset to magic number */          int32_t offset;         /* offset to magic number */
         unsigned char reln;     /* relation (0=eq, '>'=gt, etc) */          unsigned char reln;     /* relation (0=eq, '>'=gt, etc) */
         int8 type;              /* int, short, long or string. */          int8_t type;            /* int, short, long or string. */
         char vallen;            /* length of string value, if any */          char vallen;            /* length of string value, if any */
 #define                         BYTE    1  #define                         BYTE    1
 #define                         SHORT   2  #define                         SHORT   2
Line 69 
Line 65 
         union VALUETYPE {          union VALUETYPE {
                 unsigned char b;                  unsigned char b;
                 unsigned short h;                  unsigned short h;
                 uint32 l;                  uint32_t l;
                 char s[MAXstring];                  char s[MAXstring];
                 unsigned char hs[2];    /* 2 bytes of a fixed-endian "short" */                  unsigned char hs[2];    /* 2 bytes of a fixed-endian "short" */
                 unsigned char hl[4];    /* 2 bytes of a fixed-endian "long" */                  unsigned char hl[4];    /* 2 bytes of a fixed-endian "long" */
         } value;                /* either number or string */          } value;                /* either number or string */
         uint32 mask;    /* mask before comparison with value */          uint32_t mask;  /* mask before comparison with value */
         char nospflag;          /* supress space character */          char nospflag;          /* supress space character */
         char desc[MAXDESC];     /* description */          char desc[MAXDESC];     /* description */
 };  };
Line 93 
Line 89 
 extern int   tryit(unsigned char *, int, int);  extern int   tryit(unsigned char *, int, int);
 extern int   zmagic(unsigned char *, int);  extern int   zmagic(unsigned char *, int);
 extern void  ckfprintf(FILE *, const char *, ...);  extern void  ckfprintf(FILE *, const char *, ...);
 extern uint32 signextend(struct magic *, unsigned int32);  extern uint32_t signextend(struct magic *, uint32_t);
 extern int internatmagic(unsigned char *, int);  extern int internatmagic(unsigned char *, int);
 extern void tryelf(int, char *, int);  extern void tryelf(int, char *, int);
   
Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10