X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=9a781dd73204b829f6989548667c4fb2cd7b77b8;hp=0b0530a9b88da7a8340be0968d2baa60c4490c8d;hb=e83ad1be25aefea3ed21ec08edbaf2d5a72c4a9d;hpb=babaee2b3c92746ec5bd6914222dd9a9eda67285 diff --git a/muttlib.c b/muttlib.c index 0b0530a..9a781dd 100644 --- a/muttlib.c +++ b/muttlib.c @@ -86,7 +86,7 @@ void mutt_adv_mktemp (char *s, size_t l) mktemp (s); if (period != NULL) { *period = '.'; - sl = safe_strlen (s); + sl = mutt_strlen (s); strfcpy (s + sl, period, l - sl); } } @@ -276,7 +276,7 @@ void mutt_free_header (HEADER ** h) int mutt_matches_ignore (const char *s, LIST * t) { for (; t; t = t->next) { - if (!ascii_strncasecmp (s, t->data, safe_strlen (t->data)) + if (!ascii_strncasecmp (s, t->data, mutt_strlen (t->data)) || *t->data == '*') return 1; } @@ -364,7 +364,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[safe_strlen (Maildir) - 1] == '/') + Maildir[mutt_strlen (Maildir) - 1] == '/') strfcpy (p, NONULL (Maildir), sizeof (p)); else #endif @@ -489,7 +489,7 @@ char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw) else strfcpy (dest, pw->pw_gecos, destlen); - pwnl = safe_strlen (pw->pw_name); + pwnl = mutt_strlen (pw->pw_name); for (idx = 0; dest[idx]; idx++) { if (dest[idx] == '&') { @@ -637,6 +637,46 @@ void mutt_free_envelope (ENVELOPE ** p) FREE (p); } +/* move all the headers from extra not present in base into base */ +void mutt_merge_envelopes(ENVELOPE* base, ENVELOPE** extra) +{ + /* copies each existing element if necessary, and sets the element + * to NULL in the source so that mutt_free_envelope doesn't leave us + * with dangling pointers. */ +#define MOVE_ELEM(h) if (!base->h) { base->h = (*extra)->h; (*extra)->h = NULL; } + MOVE_ELEM(return_path); + MOVE_ELEM(from); + MOVE_ELEM(to); + MOVE_ELEM(cc); + MOVE_ELEM(bcc); + MOVE_ELEM(sender); + MOVE_ELEM(reply_to); + MOVE_ELEM(mail_followup_to); + MOVE_ELEM(list_post); + MOVE_ELEM(message_id); + MOVE_ELEM(supersedes); + MOVE_ELEM(date); + MOVE_ELEM(x_label); + MOVE_ELEM(references); + MOVE_ELEM(in_reply_to); + /* real_subj is subordinate to subject */ + if (!base->subject) { + base->subject = (*extra)->subject; + base->real_subj = (*extra)->real_subj; + (*extra)->subject = NULL; + (*extra)->real_subj = NULL; + } + /* spam and user headers should never be hashed, and the new envelope may + * have better values. Use new versions regardless. */ + mutt_buffer_free (&base->spam); + mutt_free_list (&base->userhdrs); + MOVE_ELEM(spam); + MOVE_ELEM(userhdrs); +#undef MOVE_ELEM + + mutt_free_envelope(extra); +} + void _mutt_mktemp (char *s, const char *src, int line) { @@ -701,15 +741,15 @@ void mutt_pretty_mailbox (char *s) } *q = 0; - if (safe_strncmp (s, Maildir, (len = safe_strlen (Maildir))) == 0 && + if (safe_strncmp (s, Maildir, (len = mutt_strlen (Maildir))) == 0 && s[len] == '/') { *s++ = '='; - memmove (s, s + len, safe_strlen (s + len) + 1); + memmove (s, s + len, mutt_strlen (s + len) + 1); } - else if (safe_strncmp (s, Homedir, (len = safe_strlen (Homedir))) == 0 && + else if (safe_strncmp (s, Homedir, (len = mutt_strlen (Homedir))) == 0 && s[len] == '/') { *s++ = '~'; - memmove (s, s + len - 1, safe_strlen (s + len - 1) + 1); + memmove (s, s + len - 1, mutt_strlen (s + len - 1) + 1); } } @@ -749,7 +789,7 @@ void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt, size_t slen; int found = 0; - slen = safe_strlen (src); + slen = mutt_strlen (src); destlen--; for (p = fmt, d = dest; destlen && *p; p++) { @@ -901,7 +941,7 @@ int mutt_skipchars (const char *s, const char *c) ret++; s++; } - return (safe_strlen (p)); + return (mutt_strlen (p)); } void mutt_FormatString (char *dest, /* output buffer */ @@ -1001,7 +1041,7 @@ void mutt_FormatString (char *dest, /* output buffer */ if (count > col) { count -= col; /* how many columns left on this line */ mutt_FormatString (buf, sizeof (buf), src, callback, data, flags); - wid = safe_strlen (buf); + wid = mutt_strlen (buf); if (count > wid) { count -= wid; /* how many chars to pad */ memset (wptr, ch, count); @@ -1059,7 +1099,7 @@ void mutt_FormatString (char *dest, /* output buffer */ *p = '_'; } - if ((len = safe_strlen (buf)) + wlen > destlen) + if ((len = mutt_strlen (buf)) + wlen > destlen) len = (destlen - wlen > 0) ? (destlen - wlen) : 0; memcpy (wptr, buf, len); @@ -1130,7 +1170,7 @@ FILE *mutt_open_read (const char *path, pid_t * thepid) FILE *f; struct stat s; - int len = safe_strlen (path); + int len = mutt_strlen (path); if (path[len - 1] == '|') { /* read from a pipe */ @@ -1188,7 +1228,7 @@ int mutt_save_confirm (const char *s, struct stat *st) } if (option (OPTCONFIRMAPPEND) && - (!TrashPath || (safe_strcmp (s, TrashPath) != 0))) + (!TrashPath || (mutt_strcmp (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); @@ -1231,7 +1271,7 @@ void state_prefix_putc (char c, STATE * s) if (s->flags & M_PENDINGPREFIX) { int i; - i = safe_strlen (Quotebuf); + i = mutt_strlen (Quotebuf); Quotebuf[i++] = c; Quotebuf[i] = '\0'; if (i == sizeof (Quotebuf) - 1 || c == '\n') { @@ -1285,7 +1325,7 @@ int state_printf (STATE * s, const char *fmt, ...) void state_mark_attach (STATE * s) { - if ((s->flags & M_DISPLAY) && !safe_strcmp (Pager, "builtin")) + if ((s->flags & M_DISPLAY) && !mutt_strcmp (Pager, "builtin")) state_puts (AttachmentMarker, s); } @@ -1353,14 +1393,14 @@ BUFFER *mutt_buffer_from (BUFFER * b, char *seed) b = mutt_buffer_init (b); b->data = safe_strdup (seed); - b->dsize = safe_strlen (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, safe_strlen (s)); + mutt_buffer_add (buf, s, mutt_strlen (s)); } void mutt_buffer_addch (BUFFER * buf, char c)