user (login) name of the author
first name of the author, or the recipient if the message is from you
name of organization of author (`organization:' field) +
number of attachments (%-X: number of top-level attachments)
`x-label:' field, if present
`x-label' field, if present, and (1) not at part of a thread tree, (2) at the top of a thread, or (3) `x-label' is different from diff -Pur mutt-1.4-nntp/doc/manual.sgml.head mutt-1.4/doc/manual.sgml.head --- mutt-1.4-nntp/doc/manual.sgml.head Tue Sep 3 12:39:46 2002 +++ mutt-1.4/doc/manual.sgml.head Tue Sep 3 12:45:39 2002 @@ -1727,6 +1727,7 @@ ~U unread messages ~v message is part of a collapsed thread. ~x EXPR messages which contain EXPR in the `References' field +~X [MIN]-[MAX] messages with MIN to MAX attachments *) ~y EXPR messages which contain EXPR in the `X-Label' field ~z [MIN]-[MAX] messages with a size in the range MIN to MAX *) ~= duplicated messages (see $duplicate_threads) diff -Pur mutt-1.4-nntp/doc/manual.txt mutt-1.4/doc/manual.txt --- mutt-1.4-nntp/doc/manual.txt Tue Sep 3 12:39:46 2002 +++ mutt-1.4/doc/manual.txt Tue Sep 3 12:45:39 2002 @@ -2048,6 +2048,7 @@ ~t USER messages addressed to USER ~U unread messages ~v message is part of a collapsed thread. + ~X [MIN]-[MAX] messages with MIN - MAX attachments *) ~x EXPR messages which contain EXPR in the `References' field ~y EXPR messages which contain EXPR in the `X-Label' field ~z [MIN]-[MAX] messages with a size in the range MIN to MAX *) @@ -4248,6 +4249,8 @@ %%vv first name of the author, or the recipient if the message is from you + + %%XV number of attachments (%-X: number of top-level attachments) %%WW name of organization of author (`organization:' field) diff -Pur mutt-1.4-nntp/doc/muttrc.man.head mutt-1.4/doc/muttrc.man.head --- mutt-1.4-nntp/doc/muttrc.man.head Thu May 9 04:51:28 2002 +++ mutt-1.4/doc/muttrc.man.head Tue Sep 3 12:45:39 2002 @@ -367,13 +367,14 @@ ~U unread messages ~v message is part of a collapsed thread. ~x \fIEXPR\fP messages which contain \fIEXPR\fP in the \(lqReferences\(rq field +~X \fIMIN\fP-\fIMAX\fP messages with MIN - MAX attachments ~z \fIMIN\fP-\fIMAX\fP messages with a size in the range \fIMIN\fP to \fIMAX\fP ~= duplicated messages (see $duplicate_threads) .TE .PP In the above, \fIEXPR\fP is a regular expression. .PP -With the \fB~m\fP, \fB~n\fP, and \fB~z\fP operators, you can also +With the \fB~m\fP, \fB~n\fP, \fB~X\fP, and \fB~z\fP operators, you can also specify ranges in the forms \fB<\fP\fIMAX\fP, \fB>\fP\fIMIN\fP, \fIMIN\fP\fB-\fP, and \fB-\fP\fIMAX\fP. .SS Matching dates diff -Pur mutt-1.4-nntp/globals.h mutt-1.4/globals.h --- mutt-1.4-nntp/globals.h Tue Sep 3 12:39:46 2002 +++ mutt-1.4/globals.h Tue Sep 3 12:45:39 2002 @@ -125,6 +125,10 @@ WHERE LIST *AutoViewList INITVAL(0); WHERE LIST *AlternativeOrderList INITVAL(0); +WHERE LIST *AttachAllow INITVAL(0); +WHERE LIST *AttachExclude INITVAL(0); +WHERE LIST *InlineAllow INITVAL(0); +WHERE LIST *InlineExclude INITVAL(0); WHERE LIST *HeaderOrderList INITVAL(0); WHERE LIST *Ignore INITVAL(0); WHERE LIST *UnIgnore INITVAL(0); diff -Pur mutt-1.4-nntp/hdrline.c mutt-1.4/hdrline.c --- mutt-1.4-nntp/hdrline.c Tue Sep 3 12:39:46 2002 +++ mutt-1.4/hdrline.c Tue Sep 3 12:54:11 2002 @@ -226,6 +226,7 @@ * %u = user (login) name of author * %v = first name of author, unless from self * %W = where user is (organization) + * %X = number of MIME attachments * %y = `x-label:' field (if present) * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label) * %Z = status flags */ @@ -658,6 +659,43 @@ (hdr->flagged ? '!' : (Tochars && ((i = mutt_user_is_recipient (hdr)) < mutt_strlen (Tochars)) ? Tochars[i] : ' '))); mutt_format_s (dest, destlen, prefix, buf2); + break; + + case 'X': + { + int i, flags; + struct body *parts; + + flags = 0; + + if (option(OPTATRECURSE)) + flags |= M_PARTS_MSGTRANS; + + /* Find whether MIME structure is parsed. */ + parts = hdr->content->parts; + + /* If not then parse it. */ + if (parts == NULL) + { + mutt_parse_mime_message(ctx, hdr); + } + + /* Count parts. */ + i = mutt_count_body_parts(hdr->content, flags); + + /* If not pre-parsed, throw out our work. */ + if (parts == NULL) + { + mutt_free_body(&hdr->content->parts); + } + + /* The recursion allows messages without depth to return 0. */ + if (optional) + optional = i ? 1 : 0; + + snprintf (fmt, sizeof (fmt), "%%%sd", prefix); + snprintf (dest, destlen, fmt, i); + } break; case 'y': diff -Pur mutt-1.4-nntp/init.c mutt-1.4/init.c --- mutt-1.4-nntp/init.c Tue Sep 3 12:39:46 2002 +++ mutt-1.4/init.c Tue Sep 3 12:45:39 2002 @@ -407,6 +407,152 @@ } +static int parse_attach_list (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) +{ + ATTACH_MATCH *a; + LIST **ldata, *listp, *lastp; + char *p; + char *tmpminor; + int len; + + /* Find the last item in the list that data points to. */ + lastp = NULL; + ldata = (LIST **)data; + dprint(30, (debugfile, "parse_attach_list: ldata = %08x, *ldata = %08x\n", + ldata, *ldata)); + for (listp = *ldata; listp; listp = listp->next) + { + a = (ATTACH_MATCH *)listp->data; + dprint(30, (debugfile, "parse_attach_list: skipping %s/%s\n", + a->major, a->minor)); + lastp = listp; + } + + do + { + mutt_extract_token (buf, s, 0); + + if (!buf->data || *buf->data == '\0') + continue; + + a = safe_malloc(sizeof(ATTACH_MATCH)); + + /* some cheap hacks that I expect to remove */ + if (!mutt_strcasecmp(buf->data, "any")) + a->major = safe_strdup("*/.*"); + else if (!mutt_strcasecmp(buf->data, "none")) + a->major = safe_strdup("cheap_hack/this_should_never_match"); + else + a->major = safe_strdup(buf->data); + + if ((p = strchr(a->major, '/'))) + { + *p = '\0'; + ++p; + a->minor = p; + } + else + { + a->minor = "unknown"; + } + + len = strlen(a->minor); + tmpminor = safe_malloc(len+3); + strcpy(&tmpminor[1], a->minor); + tmpminor[0] = '^'; + tmpminor[len+1] = '$'; + tmpminor[len+2] = '\0'; + + a->major_int = mutt_check_mime_type(a->major); + regcomp(&a->minor_rx, tmpminor, REG_ICASE|REG_EXTENDED); + + safe_free((void **)&tmpminor); + + dprint(30, (debugfile, "parse_attach_list: added %s/%s [%d]\n", + a->major, a->minor, a->major_int)); + + listp = safe_malloc(sizeof(LIST)); + listp->data = (char *)a; + listp->next = NULL; + if (lastp) + { + lastp->next = listp; + } + else + { + *ldata = listp; + } + lastp = listp; + } + while (MoreArgs (s)); + + return 0; +} + +static int parse_unattach_list (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) +{ + ATTACH_MATCH *a; + LIST **ldata, *lp, *lastp; + char *tmp; + int major; + char *minor; + + ldata = (LIST **)data; + do + { + mutt_extract_token (buf, s, 0); + + if (!mutt_strcasecmp(buf->data, "any")) + tmp = safe_strdup("*/.*"); + else if (!mutt_strcasecmp(buf->data, "none")) + tmp = safe_strdup("cheap_hack/this_should_never_match"); + else + tmp = safe_strdup(buf->data); + + if ((minor = strchr(tmp, '/'))) + { + *minor = '\0'; + ++minor; + } + else + { + minor = "unknown"; + } + major = mutt_check_mime_type(tmp); + + lastp = NULL; + for(lp = *ldata; lp; lp = lastp->next) + { + a = (ATTACH_MATCH *)lp->data; + dprint(30, (debugfile, "parse_unattach_list: check %s/%s [%d] : %s/%s [%d]\n", + a->major, a->minor, a->major_int, tmp, minor, major)); + if (a->major_int == major && !mutt_strcasecmp(minor, a->minor)) + { + dprint(30, (debugfile, "parse_unattach_list: removed %s/%s [%d]\n", + a->major, a->minor, a->major_int)); + regfree(&a->minor_rx); + free(a->major); + if (lastp) + { + lastp->next = lp->next; + } + lastp = lp; + free (lp->data); /* same as a */ + free (lp); + } + + lastp = lp; + lp = lp->next; + } + + remove_from_list ((LIST **) data, buf->data); + } + while (MoreArgs (s)); + + return 0; +} + + static int parse_unlists (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) { do diff -Pur mutt-1.4-nntp/init.h mutt-1.4/init.h --- mutt-1.4-nntp/init.h Tue Sep 3 12:39:46 2002 +++ mutt-1.4/init.h Tue Sep 3 12:53:46 2002 @@ -244,6 +244,18 @@ ** ``$$attach_sep'' separator is added after each attachment. When set, ** Mutt will operate on the attachments one by one. */ + { "attach_ignore_fundamental", DT_BOOL, R_INDEX, OPTATIGNORE, 1 }, + /* + ** .pp + ** If set, Mutt's attachment counter discounts the fundamental MIME + ** part if its disposition is inline. + */ + { "attach_recurse", DT_BOOL, R_INDEX, OPTATRECURSE, 1 }, + /* + ** .pp + ** If set, Mutt's attachment counter (%X/~X) will examine message/* + ** components for attachments. + */ { "attribution", DT_STR, R_NONE, UL &Attribution, UL "On %d, %n wrote:" }, /* ** .pp @@ -940,6 +952,7 @@ ** .dt %u .dd user (login) name of the author ** .dt %v .dd first name of the author, or the recipient if the message is from you ** .dt %W .dd name of organization of author (`organization:' field) + ** .dt %X .dd number of attachments ** .dt %y .dd `x-label:' field, if present ** .dt %Y .dd `x-label' field, if present, and (1) not at part of a thread tree, ** (2) at the top of a thread, or (3) `x-label' is different from @@ -2624,6 +2637,8 @@ static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *); +static int parse_attach_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); +static int parse_unattach_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); @@ -2647,6 +2662,8 @@ { "account-hook", mutt_parse_hook, M_ACCOUNTHOOK }, #endif { "alias", parse_alias, 0 }, + { "attach-allow", parse_attach_list, UL &AttachAllow }, + { "attach-exclude", parse_attach_list, UL &AttachExclude }, { "auto_view", parse_list, UL &AutoViewList }, { "alternative_order", parse_list, UL &AlternativeOrderList}, { "bind", mutt_parse_bind, 0 }, @@ -2664,6 +2681,8 @@ { "iconv-hook", mutt_parse_hook, M_ICONVHOOK }, #endif { "ignore", parse_ignore, 0 }, + { "inline-allow", parse_attach_list, UL &InlineAllow }, + { "inline-exclude", parse_attach_list, UL &InlineExclude }, { "lists", parse_list, UL &MailLists }, { "macro", mutt_parse_macro, 0 }, { "mailboxes", mutt_parse_mailboxes, 0 }, @@ -2684,9 +2703,13 @@ { "subscribe", parse_subscribe, 0 }, { "toggle", parse_set, M_SET_INV }, { "unalias", parse_unalias, 0 }, + { "unattach-allow", parse_unattach_list, UL &AttachAllow }, + { "unattach-exclude", parse_unattach_list, UL &AttachExclude }, { "unhdr_order", parse_unlist, UL &HeaderOrderList }, { "unhook", mutt_parse_unhook, 0 }, { "unignore", parse_unignore, 0 }, + { "uninline-allow", parse_unattach_list, UL &InlineAllow }, + { "uninline-exclude", parse_unattach_list, UL &InlineExclude }, { "unlists", parse_unlists, 0 }, { "unmono", mutt_parse_unmono, 0 }, { "unmy_hdr", parse_unmy_hdr, 0 }, diff -Pur mutt-1.4-nntp/mime.h mutt-1.4/mime.h --- mutt-1.4-nntp/mime.h Fri Mar 3 04:10:10 2000 +++ mutt-1.4/mime.h Tue Sep 3 12:45:39 2002 @@ -27,7 +27,8 @@ TYPEMODEL, TYPEMULTIPART, TYPETEXT, - TYPEVIDEO + TYPEVIDEO, + TYPEANY }; /* Content-Transfer-Encoding */ diff -Pur mutt-1.4-nntp/mutt.h mutt-1.4/mutt.h --- mutt-1.4-nntp/mutt.h Tue Sep 3 12:39:46 2002 +++ mutt-1.4/mutt.h Tue Sep 3 12:48:42 2002 @@ -222,6 +222,7 @@ M_PGP_KEY, #endif M_XLABEL, + M_MIMEATTACH, #ifdef USE_NNTP M_NEWSGROUPS, #endif @@ -427,6 +428,9 @@ OPTWRITEBCC, /* write out a bcc header? */ OPTXMAILER, + OPTATIGNORE, /* Ignore fundamental inline parts? */ + OPTATRECURSE, /* Recurse message/\* types? */ + /* PGP options */ #ifdef HAVE_PGP @@ -838,6 +842,16 @@ /* flags for the STATE struct */ #define M_DISPLAY (1<<0) /* output is displayed to the user */ +/* for attachment counter */ +typedef struct +{ + char *major; + int major_int; + char *minor; + regex_t minor_rx; +} ATTACH_MATCH; + + #ifdef HAVE_PGP @@ -860,6 +874,10 @@ void state_attach_puts (const char *, STATE *); void state_prefix_putc (char, STATE *); int state_printf(STATE *, const char *, ...); + +/* Flags for mutt_count_body_parts() */ +#define M_PARTS_MSGTRANS (1<<0) /* message/rfc822 is transparent */ +#define M_PARTS_TOPLEVEL (1<<1) /* is the top-level part */ #include "ascii.h" #include "protos.h" diff -Pur mutt-1.4-nntp/parse.c mutt-1.4/parse.c --- mutt-1.4-nntp/parse.c Tue Sep 3 12:39:46 2002 +++ mutt-1.4/parse.c Tue Sep 3 12:45:39 2002 @@ -301,6 +301,10 @@ return TYPEVIDEO; else if (ascii_strcasecmp ("model", s) == 0) return TYPEMODEL; + else if (ascii_strcasecmp ("*", s) == 0) + return TYPEANY; + else if (ascii_strcasecmp (".*", s) == 0) + return TYPEANY; else return TYPEOTHER; } @@ -1427,4 +1431,153 @@ p = rfc822_parse_adrlist (p, s); return p; +} + +/* Compares mime types to the ok and except lists */ +int count_body_parts_check(LIST **checklist, BODY *b, int dflt) +{ + LIST *type; + ATTACH_MATCH *a; + + /* If list is null, use default behavior. */ + if (! *checklist) + { + /*return dflt;*/ + return 0; + } + + for (type = *checklist; type; type = type->next) + { + a = (ATTACH_MATCH *)type->data; + dprint(30, (debugfile, "cbpc: %s %d/%s ?? %s/%s [%d]... ", + dflt ? "[OK] " : "[EXCL] ", + b->type, b->subtype, a->major, a->minor, a->major_int)); + if ((a->major_int == TYPEANY || a->major_int == b->type) && + !regexec(&a->minor_rx, b->subtype, 0, NULL, 0)) + { + dprint(30, (debugfile, "yes\n")); + return 1; + } + else + { + dprint(30, (debugfile, "no\n")); + } + } + + return 0; +} + +/* + * Define CBP_DEBUG to rewrite content-descs indicating why a body part + * counts or does not count. This is bad code, but it's only for debugging. + */ +#undef CBP_DEBUG +#ifdef CBP_DEBUG +# define AT_COUNT(why) { shallcount = 1; \ + bp->description = strdup("yes: " ## why); } +# define AT_NOCOUNT(why) { shallcount = 0; \ + bp->description = strdup(" no: " ## why); } +#else +# define AT_COUNT(why) { shallcount = 1; } +# define AT_NOCOUNT(why) { shallcount = 0; } +#endif + +int count_body_parts (BODY *body, int flags) +{ + int count = 0; + int shallcount, shallrecurse; + BODY *bp; + + if (body == NULL) + return 0; + + for (bp = body; bp != NULL; bp = bp->next) + { + /* Initial disposition is to count and not to recurse this part. */ + AT_COUNT("default"); + shallrecurse = 0; + + dprint(30, (debugfile, "bp: desc=\"%s\"; fn=\"%s\", type=\"%d/%s\"\n", + bp->description ? bp->description : ("none"), + bp->filename ? bp->filename : + bp->d_filename ? bp->d_filename : "(none)", + bp->type, bp->subtype ? bp->subtype : "*")); + + if (bp->type == TYPEMESSAGE) + { + /* If messages are "transparent", recursively examine their parts. */ + if (flags & M_PARTS_MSGTRANS) + shallrecurse = 1; + + /* If it's an external body pointer, don't recurse it. */ + if (!ascii_strcasecmp (bp->subtype, "external-body")) + shallrecurse = 0; + + /* Don't count containers if they're top-level. */ + if (flags & M_PARTS_TOPLEVEL) + AT_NOCOUNT("top-level message/*"); + } + else if (bp->type == TYPEMULTIPART) + { + /* Always recurse multiparts. */ + shallrecurse = 1; + + /* Don't count containers if they're top-level. */ + if (flags & M_PARTS_TOPLEVEL) + AT_NOCOUNT("top-level multipart"); + } + + /* Do not count the fundamental part if it is inlined and + * attach_ignore_fundamental is set. + */ + if (option(OPTATIGNORE) && (bp->disposition == DISPINLINE) && + bp->type != TYPEMULTIPART && bp->type != TYPEMESSAGE && bp == body) + AT_NOCOUNT("ignore fundamental inlines"); + + /* If this body isn't scheduled for enumeration already, don't bother + * profiling it further. + */ + if (shallcount) + { + /* Turn off shallcount if message type is not in ok list, + * or if it is in except list. Check is done separately for + * inlines vs. attachments. + */ + + if (bp->disposition == DISPATTACH) + { + if (!count_body_parts_check(&AttachAllow, bp, 1)) + AT_NOCOUNT("attach not allowed"); + if (count_body_parts_check(&AttachExclude, bp, 0)) + AT_NOCOUNT("attach excluded"); + } + else + { + if (!count_body_parts_check(&InlineAllow, bp, 1)) + AT_NOCOUNT("inline not allowed"); + if (count_body_parts_check(&InlineExclude, bp, 0)) + AT_NOCOUNT("excluded"); + } + } + + if (shallcount) + count++; + + dprint(30, (debugfile, "cbp: %08x shallcount = %d\n", bp, shallcount)); + + if (shallrecurse) + { + dprint(30, (debugfile, "cbp: %08x pre count = %d\n", bp, count)); + count += count_body_parts(bp->parts, flags & ~M_PARTS_TOPLEVEL); + dprint(30, (debugfile, "cbp: %08x post count = %d\n", bp, count)); + } + } + + dprint(30, (debugfile, "bp: return %d\n", count < 0 ? 0 : count)); + return count < 0 ? 0 : count; +} + +int mutt_count_body_parts (BODY *body, int flags) +{ + return count_body_parts(body, flags | M_PARTS_TOPLEVEL); } diff -Pur mutt-1.4-nntp/pattern.c mutt-1.4/pattern.c --- mutt-1.4-nntp/pattern.c Tue Sep 3 12:39:46 2002 +++ mutt-1.4/pattern.c Tue Sep 3 12:52:22 2002 @@ -90,6 +90,7 @@ #ifdef USE_NNTP { 'w', M_NEWSGROUPS, 0, eat_regexp }, #endif + { 'X', M_MIMEATTACH, 0, eat_range }, { 'x', M_REFERENCE, 0, eat_regexp }, { 'y', M_XLABEL, 0, eat_regexp }, { 'z', M_SIZE, 0, eat_range }, @@ -1054,6 +1055,19 @@ #endif case M_XLABEL: return (pat->not ^ (h->env->x_label && regexec (pat->rx, h->env->x_label, 0, NULL, 0) == 0)); + case M_MIMEATTACH: + { + int i, flags = 0; + + if (option(OPTATRECURSE)) + flags |= M_PARTS_MSGTRANS; + + mutt_parse_mime_message(ctx, h); + i = mutt_count_body_parts(h->content->parts, flags); + mutt_free_body(&h->content->parts); + return (pat->not ^ (i >= pat->min && (pat->max == M_MAXRANGE || + i <= pat->max))); + } case M_DUPLICATED: return (pat->not ^ (h->thread && h->thread->duplicate_thread)); #ifdef USE_NNTP diff -Pur mutt-1.4-nntp/protos.h mutt-1.4/protos.h --- mutt-1.4-nntp/protos.h Tue Sep 3 12:39:46 2002 +++ mutt-1.4/protos.h Tue Sep 3 12:45:39 2002 @@ -151,6 +151,7 @@ void mutt_bounce_message (FILE *fp, HEADER *, ADDRESS *); void mutt_buffy (char *, size_t); void mutt_canonical_charset (char *, size_t, const char *); +int mutt_count_body_parts (BODY *body, int flags); void mutt_check_rescore (CONTEXT *); void mutt_clear_error (void); void mutt_create_alias (ENVELOPE *, ADDRESS *);