#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
-
#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "alias.h"
#include "charset.h"
#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
-#include "mx.h"
int mutt_is_mail_list (address_t * addr)
{
struct hdr_format_info *hfi = (struct hdr_format_info *) data;
HEADER *hdr, *htmp;
CONTEXT *ctx;
- char fmt[SHORT_STRING], buf2[SHORT_STRING], ch, *p;
+ char fmt[STRING], buf2[STRING], ch, *p;
int do_locales, i;
int optional = (flags & M_FORMAT_OPTIONAL);
int threads = ((Sort & SORT_MASK) == SORT_THREADS);
case 'f':
buf2[0] = 0;
- rfc822_write_address (buf2, sizeof (buf2), hdr->env->from, 1);
+ rfc822_addrcat(buf2, sizeof (buf2), hdr->env->from, 1);
mutt_format_s (dest, destlen, prefix, buf2);
break;
int j = 0;
for (i = 0; hdr->env->from && hdr->env->from->personal &&
- hdr->env->from->personal[i] && j < SHORT_STRING - 1; i++) {
+ hdr->env->from->personal[i] && j < STRING - 1; i++) {
if (isalpha ((int) hdr->env->from->personal[i])) {
if (!iflag) {
buf2[j++] = hdr->env->from->personal[i];
{
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;
}
if (optional)
- mutt_FormatString (dest, destlen, ifstring, hdr_format_str,
+ m_strformat (dest, destlen, ifstring, hdr_format_str,
(unsigned long) hfi, flags);
else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (dest, destlen, elsestring, hdr_format_str,
+ m_strformat (dest, destlen, elsestring, hdr_format_str,
(unsigned long) hfi, flags);
return (src);
hfi.hdr = hdr;
hfi.ctx = ctx;
- mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi,
+ m_strformat (dest, destlen, s, hdr_format_str, (unsigned long) &hfi,
flags);
}