#include "mutt.h"
#include "mutt_curses.h"
#include "sort.h"
+#include "thread.h"
#include "charset.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
+#include <lib-lib/str.h>
+
+#include <lib-mime/mime.h>
+
+#include "lib/rx.h"
+
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
int mutt_is_mail_list (ADDRESS * addr)
{
- if (!mutt_match_rx_list (addr->mailbox, UnMailLists))
- return mutt_match_rx_list (addr->mailbox, MailLists);
+ if (!rx_list_match (UnMailLists, addr->mailbox))
+ return rx_list_match (MailLists, addr->mailbox);
return 0;
}
int mutt_is_subscribed_list (ADDRESS * addr)
{
- if (!mutt_match_rx_list (addr->mailbox, UnMailLists)
- && !mutt_match_rx_list (addr->mailbox, UnSubscribedLists))
- return mutt_match_rx_list (addr->mailbox, SubscribedLists);
+ if (!rx_list_match (UnMailLists, addr->mailbox)
+ && !rx_list_match (UnSubscribedLists, addr->mailbox))
+ return rx_list_match (SubscribedLists, addr->mailbox);
return 0;
}
* return 1. Otherwise, simply return 0.
*/
static int
-check_for_mailing_list (ADDRESS * adr, char *pfx, char *buf, int buflen)
+check_for_mailing_list (ADDRESS * adr, const char *pfx, char *buf, int buflen)
{
for (; adr; adr = adr->next) {
if (mutt_is_subscribed_list (adr)) {
else if (me && hdr->cc)
snprintf (buf, len, "Cc %s", mutt_get_name (hdr->cc));
else if (hdr->from)
- strfcpy (buf, mutt_get_name (hdr->from), len);
+ m_strcpy(buf, len, mutt_get_name(hdr->from));
else
*buf = 0;
}
else if (me && hdr->cc)
snprintf (buf, len, "%s", hdr->cc->mailbox);
else if (hdr->from)
- strfcpy (buf, hdr->from->mailbox, len);
+ m_strcpy(buf, len, hdr->from->mailbox);
else
*buf = 0;
}
* %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 */
!first_mailing_list (dest, destlen, hdr->env->cc))
dest[0] = 0;
if (dest[0]) {
- strfcpy (buf2, dest, sizeof (buf2));
+ m_strcpy(buf2, sizeof(buf2), dest);
mutt_format_s (dest, destlen, prefix, buf2);
break;
}
case 'b':
if (ctx) {
if ((p = strrchr (ctx->path, '/')))
- strfcpy (dest, p + 1, destlen);
+ m_strcpy(dest, destlen, p + 1);
else
- strfcpy (dest, ctx->path, destlen);
+ m_strcpy(dest, destlen, ctx->path);
}
else
- strfcpy (dest, "(null)", destlen);
- strfcpy (buf2, dest, sizeof (buf2));
+ m_strcpy(dest, destlen, "(null)");
+ m_strcpy(buf2, sizeof(buf2), dest);
mutt_format_s (dest, destlen, prefix, buf2);
break;
snprintf (dest, destlen, fmt, ctx->msgcount);
}
else
- strfcpy (dest, "(null)", destlen);
+ m_strcpy(dest, destlen, "(null)");
break;
case 'n':
snprintf (dest, destlen, fmt,
(Tochars
&& ((i = mutt_user_is_recipient (hdr))) <
- mutt_strlen (Tochars)) ? Tochars[i] : ' ');
+ m_strlen(Tochars)) ? Tochars[i] : ' ');
break;
case 'u':
if (hdr->env->from && hdr->env->from->mailbox) {
- strfcpy (buf2, mutt_addr_for_display (hdr->env->from), sizeof (buf2));
+ m_strcpy(buf2, sizeof(buf2), mutt_addr_for_display(hdr->env->from));
if ((p = strpbrk (buf2, "%@")))
*p = 0;
}
optional = 0;
break;
+ case 'X':
+ {
+ int count = 0;
+
+ if (option (OPTCOUNTATTACH)) {
+ if (!hdr->content->parts)
+ mutt_parse_mime_message(ctx, hdr);
+ count = mutt_count_body_parts(hdr, 0);
+ }
+
+ /* The recursion allows messages without depth to return 0. */
+ if (optional)
+ optional = count != 0;
+
+ snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+ snprintf (dest, destlen, fmt, count);
+ }
+ break;
+
case 'Z':
ch = ' ';
((i =
mutt_user_is_recipient
(hdr)) <
- mutt_strlen (Tochars)) ?
+ m_strlen(Tochars)) ?
Tochars[i] : ' ')));
mutt_format_s (dest, destlen, prefix, buf2);
break;
&& (hdr->thread->parent && hdr->thread->parent->message
&& hdr->thread->parent->message->env->x_label))
htmp = hdr->thread->parent->message;
- if (htmp && mutt_strcasecmp (hdr->env->x_label,
+ if (htmp && m_strcasecmp(hdr->env->x_label,
htmp->env->x_label) == 0)
i = 0;
}