X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=545247268f51e2aef16bde402e68c56ae26189ed;hp=688d550af2d7886726d7bd3b5497a7755ebcdfcd;hb=b17296ba049d71986028ac83f0b415a021d0691c;hpb=7e48409c3d6fb969706114b3c0962ffa0e112d37 diff --git a/mutt.h b/mutt.h index 688d550..5452472 100644 --- a/mutt.h +++ b/mutt.h @@ -609,7 +609,7 @@ typedef struct body { * attachment */ long offset; /* offset where the actual data begins */ - long length; /* length (in bytes) of attachment */ + LOFF_T length; /* length (in bytes) of attachment */ char *filename; /* when sending a message, this is the file * to which this structure refers */ @@ -674,7 +674,7 @@ typedef struct header { unsigned int security:11; /* bit 0-6: flags, bit 7,8: application. see: crypt.h pgplib.h, smime.h */ - unsigned int mime:1; /* has a Mime-Version header? */ + unsigned int mime:1; /* has a MIME-Version header? */ unsigned int flagged:1; /* marked important? */ unsigned int tagged:1; unsigned int appended:1; /* has been saved */ @@ -767,7 +767,7 @@ typedef struct thread { /* flag to mutt_pattern_comp() */ -#define M_FULL_MSG 1 /* enable body and header matching */ +#define M_FULL_MSG (1<<0) /* enable body and header matching */ typedef enum { M_MATCH_FULL_ADDRESS = 1 @@ -775,12 +775,14 @@ typedef enum { typedef struct pattern_t { short op; - short not; - short alladdr; + unsigned int not : 1; + unsigned int alladdr : 1; + unsigned int stringmatch : 1; int min; int max; struct pattern_t *next; struct pattern_t *child; /* arguments to logical op */ + char* str; regex_t *rx; } pattern_t;