X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=2e15ea043e7ecb8332012bbcc045f559fc2cb9cc;hp=c52c58b81e69aa64489c2de41a6d91031aa1a520;hb=3e611c4b53a33408955152e1c9336f8643ea096e;hpb=bad8211c28d4b229878e0264012009493db48da5 diff --git a/muttlib.c b/muttlib.c index c52c58b..2e15ea0 100644 --- a/muttlib.c +++ b/muttlib.c @@ -12,13 +12,22 @@ # include "config.h" #endif +#include +#include +#include +#include +#include + #include "mutt.h" +#include "enter.h" #include "mutt_curses.h" #include "mime.h" #include "mx.h" #include "url.h" +#include "attach.h" #include "reldate.h" +#include "version.h" #ifdef USE_IMAP #include "imap.h" @@ -27,9 +36,6 @@ #include "mutt_crypt.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include "lib/debug.h" #include @@ -44,9 +50,11 @@ #include #include +#define SW (option(OPTMBOXPANE)?SidebarWidth:0) + BODY *mutt_new_body (void) { - BODY *p = (BODY *) safe_calloc (1, sizeof (BODY)); + BODY *p = p_new(BODY, 1); p->disposition = DISPATTACH; p->use_disp = 1; @@ -60,7 +68,7 @@ BODY *mutt_new_body (void) * Renamed to mutt_adv_mktemp so I only have to change where it's * called, and not all possible cases. */ -void mutt_adv_mktemp (char *s, size_t l) +void mutt_adv_mktemp (const char* dir, char *s, size_t l) { char buf[_POSIX_PATH_MAX]; char tmp[_POSIX_PATH_MAX]; @@ -68,7 +76,7 @@ void mutt_adv_mktemp (char *s, size_t l) size_t sl; struct stat sb; - strfcpy (buf, NONULL (Tempdir), sizeof (buf)); + strfcpy (buf, dir && *dir ? dir : NONULL (Tempdir), sizeof (buf)); mutt_expand_path (buf, sizeof (buf)); if (s[0] == '\0') { snprintf (s, l, "%s/muttXXXXXX", buf); @@ -86,7 +94,7 @@ void mutt_adv_mktemp (char *s, size_t l) mktemp (s); if (period != NULL) { *period = '.'; - sl = mutt_strlen (s); + sl = m_strlen(s); strfcpy (s + sl, period, l - sl); } } @@ -112,7 +120,7 @@ int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src) tmp[0] = '\0'; } - mutt_adv_mktemp (tmp, sizeof (tmp)); + mutt_adv_mktemp (NULL, tmp, sizeof (tmp)); if (mutt_save_attachment (fp, src, tmp, 0, NULL) == -1) return -1; @@ -123,19 +131,19 @@ int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src) b->parts = NULL; b->next = NULL; - b->filename = safe_strdup (tmp); + b->filename = m_strdup(tmp); b->use_disp = use_disp; b->unlink = 1; if (mutt_is_text_part (b)) b->noconv = 1; - b->xtype = safe_strdup (b->xtype); - b->subtype = safe_strdup (b->subtype); - b->form_name = safe_strdup (b->form_name); - b->filename = safe_strdup (b->filename); - b->d_filename = safe_strdup (b->d_filename); - b->description = safe_strdup (b->description); + b->xtype = m_strdup(b->xtype); + b->subtype = m_strdup(b->subtype); + b->form_name = m_strdup(b->form_name); + b->filename = m_strdup(b->filename); + b->d_filename = m_strdup(b->d_filename); + b->description = m_strdup(b->description); /* * we don't seem to need the HEADER structure currently. @@ -149,8 +157,8 @@ int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src) for (par = b->parameter, ppar = &b->parameter; par; ppar = &(*ppar)->next, par = par->next) { *ppar = mutt_new_parameter (); - (*ppar)->attribute = safe_strdup (par->attribute); - (*ppar)->value = safe_strdup (par->value); + (*ppar)->attribute = m_strdup(par->attribute); + (*ppar)->value = m_strdup(par->value); } mutt_stamp_attachment (b); @@ -177,12 +185,12 @@ void mutt_free_body (BODY ** p) else if (b->filename) debug_print (1, ("not unlinking %s.\n", b->filename)); - FREE (&b->filename); - FREE (&b->content); - FREE (&b->xtype); - FREE (&b->subtype); - FREE (&b->description); - FREE (&b->form_name); + p_delete(&b->filename); + p_delete(&b->content); + p_delete(&b->xtype); + p_delete(&b->subtype); + p_delete(&b->description); + p_delete(&b->form_name); if (b->hdr) { /* Don't free twice (b->hdr->content = b->parts) */ @@ -193,7 +201,7 @@ void mutt_free_body (BODY ** p) if (b->parts) mutt_free_body (&b->parts); - FREE (&b); + p_delete(&b); } *p = 0; @@ -205,52 +213,15 @@ void mutt_free_parameter (PARAMETER ** p) PARAMETER *o; while (t) { - FREE (&t->attribute); - FREE (&t->value); + p_delete(&t->attribute); + p_delete(&t->value); o = t; t = t->next; - FREE (&o); + p_delete(&o); } *p = 0; } -LIST *mutt_add_list (LIST * head, const char *data) { - size_t len = mutt_strlen (data); - return (mutt_add_list_n (head, data, len ? len + 1 : 0)); -} - -LIST *mutt_add_list_n (LIST *head, const void *data, size_t len) { - LIST *tmp; - - for (tmp = head; tmp && tmp->next; tmp = tmp->next); - - if (tmp) { - tmp->next = safe_malloc (sizeof (LIST)); - tmp = tmp->next; - } else - head = tmp = safe_malloc (sizeof (LIST)); - - tmp->data = safe_malloc (len); - if (len) - memcpy (tmp->data, data, len); - tmp->next = NULL; - return head; -} - -void mutt_free_list (LIST ** list) -{ - LIST *p; - - if (!list) - return; - while (*list) { - p = *list; - *list = (*list)->next; - FREE (&p->data); - FREE (&p); - } -} - HEADER *mutt_dup_header (HEADER * h) { HEADER *hnew; @@ -266,50 +237,50 @@ void mutt_free_header (HEADER ** h) return; mutt_free_envelope (&(*h)->env); mutt_free_body (&(*h)->content); - FREE (&(*h)->maildir_flags); - FREE (&(*h)->tree); - FREE (&(*h)->path); + p_delete(&(*h)->maildir_flags); + p_delete(&(*h)->tree); + p_delete(&(*h)->path); #ifdef MIXMASTER mutt_free_list (&(*h)->chain); #endif #if defined USE_POP || defined USE_IMAP || defined USE_NNTP - FREE (&(*h)->data); + p_delete(&(*h)->data); #endif - FREE (h); + p_delete(h); } /* returns true if the header contained in "s" is in list "t" */ int mutt_matches_ignore (const char *s, LIST * t) { for (; t; t = t->next) { - if (!ascii_strncasecmp (s, t->data, mutt_strlen (t->data)) + if (!ascii_strncasecmp (s, t->data, m_strlen(t->data)) || *t->data == '*') return 1; } return 0; } -/* prepend the path part of *path to *link */ -void mutt_expand_link (char *newpath, const char *path, const char *link) +/* prepend the path part of *path to *lnk */ +void mutt_expand_link (char *newpath, const char *path, const char *lnk) { const char *lb = NULL; size_t len; - /* link is full path */ - if (*link == '/') { - strfcpy (newpath, link, _POSIX_PATH_MAX); + /* lnk is full path */ + if (*lnk == '/') { + strfcpy (newpath, lnk, _POSIX_PATH_MAX); return; } if ((lb = strrchr (path, '/')) == NULL) { - /* no path in link */ - strfcpy (newpath, link, _POSIX_PATH_MAX); + /* no path in lnk */ + strfcpy (newpath, lnk, _POSIX_PATH_MAX); return; } len = lb - path + 1; memcpy (newpath, path, len); - strfcpy (newpath + len, link, _POSIX_PATH_MAX - len); + strfcpy (newpath + len, lnk, _POSIX_PATH_MAX - len); } char *mutt_expand_path (char *s, size_t slen) @@ -324,7 +295,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx) char tmp[_POSIX_PATH_MAX]; char *t; - char *tail = ""; + const char *tail = ""; int recurse = 0; @@ -370,7 +341,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx) #ifdef USE_IMAP /* if folder = imap[s]://host/: don't append slash */ if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP && - Maildir[mutt_strlen (Maildir) - 1] == '/') + Maildir[m_strlen(Maildir) - 1] == '/') strfcpy (p, NONULL (Maildir), sizeof (p)); else #endif @@ -483,7 +454,7 @@ char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw) if (!pw || !pw->pw_gecos) return NULL; - memset (dest, 0, destlen); + p_clear(dest, destlen); if (GecosMask.rx) { if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0) @@ -495,7 +466,7 @@ char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw) else strfcpy (dest, pw->pw_gecos, destlen); - pwnl = mutt_strlen (pw->pw_name); + pwnl = m_strlen(pw->pw_name); for (idx = 0; dest[idx]; idx++) { if (dest[idx] == '&') { @@ -537,8 +508,8 @@ void mutt_set_parameter (const char *attribute, const char *value, } q = mutt_new_parameter (); - q->attribute = safe_strdup (attribute); - q->value = safe_strdup (value); + q->attribute = m_strdup(attribute); + q->value = m_strdup(value); q->next = *p; *p = q; } @@ -621,26 +592,26 @@ void mutt_free_envelope (ENVELOPE ** p) rfc822_free_address (&(*p)->reply_to); rfc822_free_address (&(*p)->mail_followup_to); - FREE (&(*p)->list_post); - FREE (&(*p)->subject); + p_delete(&(*p)->list_post); + p_delete(&(*p)->subject); /* real_subj is just an offset to subject and shouldn't be freed */ - FREE (&(*p)->message_id); - FREE (&(*p)->supersedes); - FREE (&(*p)->date); - FREE (&(*p)->x_label); - FREE (&(*p)->organization); + p_delete(&(*p)->message_id); + p_delete(&(*p)->supersedes); + p_delete(&(*p)->date); + p_delete(&(*p)->x_label); + p_delete(&(*p)->organization); #ifdef USE_NNTP - FREE (&(*p)->newsgroups); - FREE (&(*p)->xref); - FREE (&(*p)->followup_to); - FREE (&(*p)->x_comment_to); + p_delete(&(*p)->newsgroups); + p_delete(&(*p)->xref); + p_delete(&(*p)->followup_to); + p_delete(&(*p)->x_comment_to); #endif mutt_buffer_free (&(*p)->spam); mutt_free_list (&(*p)->references); mutt_free_list (&(*p)->in_reply_to); mutt_free_list (&(*p)->userhdrs); - FREE (p); + p_delete(p); } /* move all the headers from extra not present in base into base */ @@ -704,9 +675,9 @@ void mutt_free_alias (ALIAS ** p) while (*p) { t = *p; *p = (*p)->next; - FREE (&t->name); + p_delete(&t->name); rfc822_free_address (&t->addr); - FREE (&t); + p_delete(&t); } } @@ -751,15 +722,15 @@ void mutt_pretty_mailbox (char *s) } *q = 0; - if (safe_strncmp (s, Maildir, (len = mutt_strlen (Maildir))) == 0 && + if (str_ncmp (s, Maildir, (len = m_strlen(Maildir))) == 0 && s[len] == '/') { *s++ = '='; - memmove (s, s + len, mutt_strlen (s + len) + 1); + memmove (s, s + len, m_strlen(s + len) + 1); } - else if (safe_strncmp (s, Homedir, (len = mutt_strlen (Homedir))) == 0 && + else if (str_ncmp (s, Homedir, (len = m_strlen(Homedir))) == 0 && s[len] == '/') { *s++ = '~'; - memmove (s, s + len - 1, mutt_strlen (s + len - 1) + 1); + memmove (s, s + len - 1, m_strlen(s + len - 1) + 1); } } @@ -799,7 +770,7 @@ void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt, size_t slen; int found = 0; - slen = mutt_strlen (src); + slen = m_strlen(src); destlen--; for (p = fmt, d = dest; destlen && *p; p++) { @@ -831,8 +802,8 @@ void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt, *d = '\0'; if (!found && destlen > 0) { - safe_strcat (dest, destlen, " "); - safe_strcat (dest, destlen, src); + str_cat (dest, destlen, " "); + str_cat (dest, destlen, src); } } @@ -860,13 +831,13 @@ int mutt_check_overwrite (const char *attname, const char *path, str_replace (directory, fname); break; case 1: /* yes */ - FREE (directory); + p_delete(directory); break; case -1: /* abort */ - FREE (directory); + p_delete(directory); return -1; case 2: /* no */ - FREE (directory); + p_delete(directory); return 1; } } @@ -951,7 +922,7 @@ int mutt_skipchars (const char *s, const char *c) ret++; s++; } - return (mutt_strlen (p)); + return (m_strlen(p)); } void mutt_FormatString (char *dest, /* output buffer */ @@ -1045,13 +1016,11 @@ void mutt_FormatString (char *dest, /* output buffer */ if (DrawFullLine || option (OPTSTATUSONTOP)) count = (COLS < destlen ? COLS : destlen); else - count = - ((COLS - SidebarWidth) < - destlen ? (COLS - SidebarWidth) : destlen); + count = ((COLS - SW) < destlen ? (COLS - SW) : destlen); if (count > col) { count -= col; /* how many columns left on this line */ mutt_FormatString (buf, sizeof (buf), src, callback, data, flags); - wid = mutt_strlen (buf); + wid = m_strlen(buf); if (count > wid) { count -= wid; /* how many chars to pad */ memset (wptr, ch, count); @@ -1082,12 +1051,12 @@ void mutt_FormatString (char *dest, /* output buffer */ break; /* skip rest of input */ } else { - short tolower = 0; + short lower = 0; short nodots = 0; while (ch == '_' || ch == ':') { if (ch == '_') - tolower = 1; + lower = 1; else if (ch == ':') nodots = 1; @@ -1099,7 +1068,7 @@ void mutt_FormatString (char *dest, /* output buffer */ callback (buf, sizeof (buf), ch, src, prefix, ifstring, elsestring, data, flags); - if (tolower) + if (lower) str_tolower (buf); if (nodots) { char *p = buf; @@ -1109,7 +1078,7 @@ void mutt_FormatString (char *dest, /* output buffer */ *p = '_'; } - if ((len = mutt_strlen (buf)) + wlen > destlen) + if ((len = m_strlen(buf)) + wlen > destlen) len = (destlen - wlen > 0) ? (destlen - wlen) : 0; memcpy (wptr, buf, len); @@ -1148,15 +1117,14 @@ void mutt_FormatString (char *dest, /* output buffer */ } else { unsigned int bar = mutt_skipchars (src, "%\\"); - char *bar2 = safe_malloc (bar + 1); + char *bar2 = p_dupstr(src, bar); - strfcpy (bar2, src, bar + 1); while (bar--) { *wptr++ = *src++; wlen++; } col += mutt_strwidth (bar2); - FREE (&bar2); + p_delete(&bar2); } } *wptr = 0; @@ -1177,32 +1145,26 @@ void mutt_FormatString (char *dest, /* output buffer */ then we assume it is a commmand to run instead of a normal file. */ FILE *mutt_open_read (const char *path, pid_t * thepid) { - FILE *f; - struct stat s; - - int len = mutt_strlen (path); - - if (path[len - 1] == '|') { - /* read from a pipe */ - - char *s = safe_strdup (path); - - s[len - 1] = 0; - mutt_endwin (NULL); - *thepid = mutt_create_filter (s, NULL, &f, NULL); - FREE (&s); - } - else { - if (stat (path, &s) < 0) - return (NULL); - if (S_ISDIR (s.st_mode)) { - errno = EINVAL; - return (NULL); + int len = m_strlen(path); + FILE *f; + + if (path[len - 1] == '|') { + char *s = m_strdup(path); + + /* read from a pipe */ + + s[len - 1] = 0; + mutt_endwin (NULL); + *thepid = mutt_create_filter (s, NULL, &f, NULL); + p_delete(&s); + } else { + f = fopen (path, "r"); + if (!f) + return NULL; + *thepid = -1; } - f = fopen (path, "r"); - *thepid = -1; - } - return (f); + + return (f); } /* returns 0 if OK to proceed, -1 to abort, 1 to retry */ @@ -1233,7 +1195,7 @@ int mutt_save_confirm (const char *s, struct stat *st) if (magic > 0 && !mx_access (s, W_OK)) { if (option (OPTCONFIRMAPPEND) && - (!TrashPath || (mutt_strcmp (s, TrashPath) != 0))) { + (!TrashPath || (str_cmp (s, TrashPath) != 0))) { /* if we're appending to the trash, there's no point in asking */ snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s); if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO) @@ -1277,81 +1239,6 @@ int mutt_save_confirm (const char *s, struct stat *st) return (ret); } -void state_prefix_putc (char c, STATE * s) -{ - if (s->flags & M_PENDINGPREFIX) { - int i; - - i = mutt_strlen (Quotebuf); - Quotebuf[i++] = c; - Quotebuf[i] = '\0'; - if (i == sizeof (Quotebuf) - 1 || c == '\n') { - char buf[2 * SHORT_STRING]; - int j = 0, offset = 0; - regmatch_t pmatch[1]; - - state_reset_prefix (s); - while (regexec - ((regex_t *) QuoteRegexp.rx, &Quotebuf[offset], 1, pmatch, - 0) == 0) - offset += pmatch->rm_eo; - - if (!option (OPTQUOTEEMPTY) && Quotebuf[offset] == '\n') { - buf[0] = '\n'; - buf[1] = '\0'; - } - else if (option (OPTQUOTEQUOTED) && offset) { - for (i = 0; i < offset; i++) - if (Quotebuf[i] != ' ') - j = i; - strncpy (buf, Quotebuf, j + 1); - strcpy (buf + j + 1, Quotebuf + j); - } - else - snprintf (buf, sizeof (buf), "%s%s", NONULL (s->prefix), Quotebuf); - - state_puts (buf, s); - } - } - else - state_putc (c, s); - - if (c == '\n') { - state_set_prefix (s); - Quotebuf[0] = '\0'; - } -} - -int state_printf (STATE * s, const char *fmt, ...) -{ - int rv; - va_list ap; - - va_start (ap, fmt); - rv = vfprintf (s->fpout, fmt, ap); - va_end (ap); - - return rv; -} - -void state_mark_attach (STATE * s) -{ - if ((s->flags & M_DISPLAY) && !mutt_strcmp (Pager, "builtin")) - state_puts (AttachmentMarker, s); -} - -void state_attach_puts (const char *t, STATE * s) -{ - if (*t != '\n') - state_mark_attach (s); - while (*t) { - state_putc (*t, s); - if (*t++ == '\n' && *t) - if (*t != '\n') - state_mark_attach (s); - } -} - void mutt_display_sanitize (char *s) { for (; *s; s++) { @@ -1368,87 +1255,7 @@ void mutt_sleep (short s) sleep (s); } -/* - * Creates and initializes a BUFFER*. If passed an existing BUFFER*, - * just initializes. Frees anything already in the buffer. - * - * Disregards the 'destroy' flag, which seems reserved for caller. - * This is bad, but there's no apparent protocol for it. - */ -BUFFER *mutt_buffer_init (BUFFER * b) -{ - if (!b) { - b = safe_malloc (sizeof (BUFFER)); - if (!b) - return NULL; - } - else { - FREE(&b->data); - } - memset (b, 0, sizeof (BUFFER)); - return b; -} - -/* - * Creates and initializes a BUFFER*. If passed an existing BUFFER*, - * just initializes. Frees anything already in the buffer. Copies in - * the seed string. - * - * Disregards the 'destroy' flag, which seems reserved for caller. - * This is bad, but there's no apparent protocol for it. - */ -BUFFER *mutt_buffer_from (BUFFER * b, char *seed) -{ - if (!seed) - return NULL; - - b = mutt_buffer_init (b); - b->data = safe_strdup (seed); - b->dsize = mutt_strlen (seed); - b->dptr = (char *) b->data + b->dsize; - return b; -} - -void mutt_buffer_addstr (BUFFER * buf, const char *s) -{ - mutt_buffer_add (buf, s, mutt_strlen (s)); -} - -void mutt_buffer_addch (BUFFER * buf, char c) -{ - mutt_buffer_add (buf, &c, 1); -} - -void mutt_buffer_free (BUFFER ** p) -{ - if (!p || !*p) - return; - - FREE (&(*p)->data); - /* dptr is just an offset to data and shouldn't be freed */ - FREE (p); -} - -/* dynamically grows a BUFFER to accomodate s, in increments of 128 bytes. - * Always one byte bigger than necessary for the null terminator, and - * the buffer is always null-terminated */ -void mutt_buffer_add (BUFFER * buf, const char *s, size_t len) -{ - size_t offset; - - if (buf->dptr + len + 1 > buf->data + buf->dsize) { - offset = buf->dptr - buf->data; - buf->dsize += len < 128 ? 128 : len + 1; - safe_realloc ((void **) &buf->data, buf->dsize); - buf->dptr = buf->data + offset; - } - memcpy (buf->dptr, s, len); - buf->dptr += len; - *(buf->dptr) = '\0'; -} - /* Decrease a file's modification time by 1 second */ - time_t mutt_decrease_mtime (const char *f, struct stat *st) { struct utimbuf utim; @@ -1471,12 +1278,29 @@ time_t mutt_decrease_mtime (const char *f, struct stat *st) return mtime; } -const char *mutt_make_version (void) +/* sets mtime of 'to' to mtime of 'from' */ +void mutt_set_mtime (const char* from, const char* to) { + struct utimbuf utim; + struct stat st; + + if (stat (from, &st) != -1) { + utim.actime = st.st_mtime; + utim.modtime = st.st_mtime; + utime (to, &utim); + } +} + +const char *mutt_make_version (int full) { static char vstring[STRING]; - snprintf (vstring, sizeof (vstring), "Mutt-ng %s (%s) based on Mutt 1.5.9", - MUTT_VERSION, ReleaseDate); + if (full) + snprintf (vstring, sizeof (vstring), "Mutt-ng %s-r%s (based " + "on Mutt 1.5.11/%s)", MUTT_VERSION, MUTT_REVISION, + ReleaseDate); + else + snprintf (vstring, sizeof (vstring), "mutt-ng/%s-r%s", + MUTT_VERSION, MUTT_REVISION); return vstring; } @@ -1490,8 +1314,8 @@ void mutt_free_spam_list (SPAM_LIST ** list) p = *list; *list = (*list)->next; rx_free (&p->rx); - FREE(&p->template); - FREE(&p); + p_delete(&p->template); + p_delete(&p); } } @@ -1510,7 +1334,7 @@ int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x) for (; l; l = l->next) { /* If this pattern needs more matches, expand pmatch. */ if (l->nmatch > nmatch) { - safe_realloc (&pmatch, l->nmatch * sizeof (regmatch_t)); + p_realloc(&pmatch, l->nmatch); nmatch = l->nmatch; } @@ -1524,7 +1348,7 @@ int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x) for (p = l->template; *p;) { if (*p == '%') { n = atoi (++p); /* find pmatch index */ - while (isdigit (*p)) + while (isdigit ((unsigned char) *p)) ++p; /* skip subst token */ for (i = pmatch[n].rm_so; (i < pmatch[n].rm_eo) && (tlen < x); i++) text[tlen++] = s[i]; @@ -1570,8 +1394,8 @@ int mutt_cmp_header (const HEADER * h1, const HEADER * h2) { int mutt_cmp_addr (const ADDRESS * a, const ADDRESS * b) { while (a && b) { - if (mutt_strcmp (a->mailbox, b->mailbox) || - mutt_strcmp (a->personal, b->personal)) + if (str_cmp (a->mailbox, b->mailbox) || + str_cmp (a->personal, b->personal)) return (0); a = a->next; @@ -1586,7 +1410,7 @@ int mutt_cmp_addr (const ADDRESS * a, const ADDRESS * b) int mutt_cmp_list (const LIST * a, const LIST * b) { while (a && b) { - if (mutt_strcmp (a->data, b->data)) + if (str_cmp (a->data, b->data)) return (0); a = a->next; @@ -1601,8 +1425,8 @@ int mutt_cmp_list (const LIST * a, const LIST * b) int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2) { if (e1 && e2) { - if (mutt_strcmp (e1->message_id, e2->message_id) || - mutt_strcmp (e1->subject, e2->subject) || + if (str_cmp (e1->message_id, e2->message_id) || + str_cmp (e1->subject, e2->subject) || !mutt_cmp_list (e1->references, e2->references) || !mutt_cmp_addr (e1->from, e2->from) || !mutt_cmp_addr (e1->sender, e2->sender) || @@ -1625,8 +1449,8 @@ int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2) int mutt_cmp_param (const PARAMETER * p1, const PARAMETER * p2) { while (p1 && p2) { - if (mutt_strcmp (p1->attribute, p2->attribute) || - mutt_strcmp (p1->value, p2->value)) + if (str_cmp (p1->attribute, p2->attribute) || + str_cmp (p1->value, p2->value)) return (0); p1 = p1->next; @@ -1642,8 +1466,8 @@ int mutt_cmp_body (const BODY * b1, const BODY * b2) { if (b1->type != b2->type || b1->encoding != b2->encoding || - mutt_strcmp (b1->subtype, b2->subtype) || - mutt_strcmp (b1->description, b2->description) || + str_cmp (b1->subtype, b2->subtype) || + str_cmp (b1->description, b2->description) || !mutt_cmp_param (b1->parameter, b2->parameter) || b1->length != b2->length) return (0);