# include "config.h"
#endif
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
+#include <utime.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/buffer.h>
+#include <lib-lib/file.h>
+#include <lib-lib/url.h>
+
+#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+
+#include "alias.h"
#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"
-#include "imap/mx_imap.h"
-#endif
+#include <imap/imap.h>
+#include <imap/mx_imap.h>
-#include "mutt_crypt.h"
-
-#include "lib/debug.h"
-
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <time.h>
-#include <sys/types.h>
-#include <utime.h>
+#include <lib-crypt/crypt.h>
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
-BODY *mutt_new_body (void)
-{
- BODY *p = p_new(BODY, 1);
-
- p->disposition = DISPATTACH;
- p->use_disp = 1;
- return (p);
-}
-
-
/* Modified by blong to accept a "suggestion" for file name. If
* that file exists, then construct one with unique name but
* keep any extension. This might fail, I guess.
* Renamed to mutt_adv_mktemp so I only have to change where it's
* called, and not all possible cases.
*/
-void mutt_adv_mktemp (const char* dir, char *s, size_t l)
+void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
{
char buf[_POSIX_PATH_MAX];
char tmp[_POSIX_PATH_MAX];
char *period;
- size_t sl;
+ ssize_t sl;
struct stat sb;
- strfcpy (buf, dir && *dir ? dir : NONULL (Tempdir), sizeof (buf));
+ m_strcpy(buf, sizeof(buf), m_strisempty(dir) ? NONULL(Tempdir) : dir);
mutt_expand_path (buf, sizeof (buf));
if (s[0] == '\0') {
snprintf (s, l, "%s/muttXXXXXX", buf);
mktemp (s);
}
else {
- strfcpy (tmp, s, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), s);
mutt_sanitize_filename (tmp, 1);
snprintf (s, l, "%s/%s", buf, tmp);
if (lstat (s, &sb) == -1 && errno == ENOENT)
if (period != NULL) {
*period = '.';
sl = m_strlen(s);
- strfcpy (s + sl, period, l - sl);
+ m_strcpy(s + sl, l - sl, period);
}
}
}
char tmp[_POSIX_PATH_MAX];
BODY *b;
- PARAMETER *par, **ppar;
+ parameter_t *par, **ppar;
short use_disp;
if (src->filename) {
use_disp = 1;
- strfcpy (tmp, src->filename, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), src->filename);
}
else {
use_disp = 0;
if (mutt_save_attachment (fp, src, tmp, 0, NULL) == -1)
return -1;
- *tgt = mutt_new_body ();
+ *tgt = body_new();
b = *tgt;
memcpy (b, src, sizeof (BODY));
/* copy parameters */
for (par = b->parameter, ppar = &b->parameter; par;
ppar = &(*ppar)->next, par = par->next) {
- *ppar = mutt_new_parameter ();
+ *ppar = parameter_new();
(*ppar)->attribute = m_strdup(par->attribute);
(*ppar)->value = m_strdup(par->value);
}
return 0;
}
-
-
-void mutt_free_body (BODY ** p)
-{
- BODY *a = *p, *b;
-
- while (a) {
- b = a;
- a = a->next;
-
- if (b->parameter)
- mutt_free_parameter (&b->parameter);
- if (b->unlink && b->filename) {
- debug_print (1, ("unlinking %s.\n", b->filename));
- unlink (b->filename);
- }
- else if (b->filename)
- debug_print (1, ("not unlinking %s.\n", b->filename));
-
- 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) */
- b->hdr->content = NULL;
- mutt_free_header (&b->hdr);
- }
-
- if (b->parts)
- mutt_free_body (&b->parts);
-
- p_delete(&b);
- }
-
- *p = 0;
-}
-
-void mutt_free_parameter (PARAMETER ** p)
-{
- PARAMETER *t = *p;
- PARAMETER *o;
-
- while (t) {
- p_delete(&t->attribute);
- p_delete(&t->value);
- o = t;
- t = t->next;
- p_delete(&o);
- }
- *p = 0;
-}
-
-HEADER *mutt_dup_header (HEADER * h)
-{
- HEADER *hnew;
-
- hnew = mutt_new_header ();
- memcpy (hnew, h, sizeof (HEADER));
- return hnew;
-}
-
-void mutt_free_header (HEADER ** h)
-{
- if (!h || !*h)
- return;
- mutt_free_envelope (&(*h)->env);
- mutt_free_body (&(*h)->content);
- 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
- p_delete(&(*h)->data);
-#endif
- p_delete(h);
-}
-
/* returns true if the header contained in "s" is in list "t" */
-int mutt_matches_ignore (const char *s, LIST * t)
+int mutt_matches_ignore (const char *s, string_list_t * t)
{
for (; t; t = t->next) {
if (!ascii_strncasecmp (s, t->data, m_strlen(t->data))
void mutt_expand_link (char *newpath, const char *path, const char *lnk)
{
const char *lb = NULL;
- size_t len;
+ ssize_t len;
/* lnk is full path */
if (*lnk == '/') {
- strfcpy (newpath, lnk, _POSIX_PATH_MAX);
+ m_strcpy(newpath, _POSIX_PATH_MAX, lnk);
return;
}
if ((lb = strrchr (path, '/')) == NULL) {
/* no path in lnk */
- strfcpy (newpath, lnk, _POSIX_PATH_MAX);
+ m_strcpy(newpath, _POSIX_PATH_MAX, lnk);
return;
}
len = lb - path + 1;
memcpy (newpath, path, len);
- strfcpy (newpath + len, lnk, _POSIX_PATH_MAX - len);
+ m_strcpy(newpath + len, _POSIX_PATH_MAX - len, lnk);
}
-char *mutt_expand_path (char *s, size_t slen)
+char *mutt_expand_path (char *s, ssize_t slen)
{
return _mutt_expand_path (s, slen, 0);
}
-char *_mutt_expand_path (char *s, size_t slen, int rx)
+char *_mutt_expand_path (char *s, ssize_t slen, int rx)
{
char p[_POSIX_PATH_MAX] = "";
char q[_POSIX_PATH_MAX] = "";
case '~':
{
if (*(s + 1) == '/' || *(s + 1) == 0) {
- strfcpy (p, NONULL (Homedir), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Homedir));
tail = s + 1;
}
else {
*t = 0;
if ((pw = getpwnam (s + 1))) {
- strfcpy (p, pw->pw_dir, sizeof (p));
+ m_strcpy(p, sizeof(p), pw->pw_dir);
if (t) {
*t = '/';
tail = t;
case '=':
case '+':
{
-#ifdef USE_IMAP
/* if folder = imap[s]://host/: don't append slash */
if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
Maildir[m_strlen(Maildir) - 1] == '/')
- strfcpy (p, NONULL (Maildir), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Maildir));
else
-#endif
snprintf (p, sizeof (p), "%s/", NONULL (Maildir));
tail = s + 1;
case '@':
{
HEADER *h;
- ADDRESS *alias;
+ /* FIXME: BUG ? */
+ address_t *alias;
- if ((alias = mutt_lookup_alias (s + 1))) {
- h = mutt_new_header ();
- h->env = mutt_new_envelope ();
+ if ((alias = alias_lookup(s + 1))) {
+ h = header_new();
+ h->env = envelope_new();
h->env->from = h->env->to = alias;
mutt_default_save (p, sizeof (p), h);
h->env->from = h->env->to = NULL;
- mutt_free_header (&h);
+ header_delete(&h);
/* Avoid infinite recursion if the resulting folder starts with '@' */
if (*p != '@')
recurse = 1;
case '>':
{
- strfcpy (p, NONULL (Inbox), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Inbox));
tail = s + 1;
}
break;
case '<':
{
- strfcpy (p, NONULL (Outbox), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Outbox));
tail = s + 1;
}
break;
case '!':
{
if (*(s + 1) == '!') {
- strfcpy (p, NONULL (LastFolder), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(LastFolder));
tail = s + 2;
}
else {
- strfcpy (p, NONULL (Spoolfile), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Spoolfile));
tail = s + 1;
}
}
case '-':
{
- strfcpy (p, NONULL (LastFolder), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(LastFolder));
tail = s + 1;
}
break;
case '^':
{
- strfcpy (p, NONULL (CurrentFolder), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(CurrentFolder));
tail = s + 1;
}
break;
}
if (rx && *p && !recurse) {
- mutt_rx_sanitize_string (q, sizeof (q), p);
+ rx_sanitize_string (q, sizeof (q), p);
snprintf (tmp, sizeof (tmp), "%s%s", q, tail);
}
else
snprintf (tmp, sizeof (tmp), "%s%s", p, tail);
- strfcpy (s, tmp, slen);
+ m_strcpy(s, slen, tmp);
}
while (recurse);
return (s);
}
-/* Extract the real name from /etc/passwd's GECOS field.
- * When set, honor the regular expression in GecosMask,
- * otherwise assume that the GECOS field is a
- * comma-separated list.
- * Replace "&" by a capitalized version of the user's login
- * name.
- */
-
-char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw)
-{
- regmatch_t pat_match[1];
- size_t pwnl;
- int idx;
- char *p;
-
- if (!pw || !pw->pw_gecos)
- return NULL;
-
- p_clear(dest, destlen);
-
- if (GecosMask.rx) {
- if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0)
- strfcpy (dest, pw->pw_gecos + pat_match[0].rm_so,
- MIN (pat_match[0].rm_eo - pat_match[0].rm_so + 1, destlen));
- }
- else if ((p = strchr (pw->pw_gecos, ',')))
- strfcpy (dest, pw->pw_gecos, MIN (destlen, p - pw->pw_gecos + 1));
- else
- strfcpy (dest, pw->pw_gecos, destlen);
-
- pwnl = m_strlen(pw->pw_name);
-
- for (idx = 0; dest[idx]; idx++) {
- if (dest[idx] == '&') {
- memmove (&dest[idx + pwnl], &dest[idx + 1],
- MAX (destlen - idx - pwnl - 1, 0));
- memcpy (&dest[idx], pw->pw_name, MIN (destlen - idx - 1, pwnl));
- dest[idx] = toupper ((unsigned char) dest[idx]);
- }
- }
-
- return dest;
-}
-
-
-char *mutt_get_parameter (const char *s, PARAMETER * p)
-{
- for (; p; p = p->next)
- if (ascii_strcasecmp (s, p->attribute) == 0)
- return (p->value);
-
- return NULL;
-}
-
-void mutt_set_parameter (const char *attribute, const char *value,
- PARAMETER ** p)
-{
- PARAMETER *q;
-
- if (!value) {
- mutt_delete_parameter (attribute, p);
- return;
- }
-
- for (q = *p; q; q = q->next) {
- if (ascii_strcasecmp (attribute, q->attribute) == 0) {
- str_replace (&q->value, value);
- return;
- }
- }
-
- q = mutt_new_parameter ();
- q->attribute = m_strdup(attribute);
- q->value = m_strdup(value);
- q->next = *p;
- *p = q;
-}
-
-void mutt_delete_parameter (const char *attribute, PARAMETER ** p)
-{
- PARAMETER *q;
-
- for (q = *p; q; p = &q->next, q = q->next) {
- if (ascii_strcasecmp (attribute, q->attribute) == 0) {
- *p = q->next;
- q->next = NULL;
- mutt_free_parameter (&q);
- return;
- }
- }
-}
-
-/* returns 1 if Mutt can't display this type of data, 0 otherwise */
-int mutt_needs_mailcap (BODY * m)
-{
- switch (m->type) {
- case TYPETEXT:
-
- if (!ascii_strcasecmp ("plain", m->subtype) ||
- !ascii_strcasecmp ("rfc822-headers", m->subtype) ||
- !ascii_strcasecmp ("enriched", m->subtype))
- return 0;
- break;
-
- case TYPEAPPLICATION:
- if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (m))
- return 0;
- if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (m))
- return 0;
- break;
-
- case TYPEMULTIPART:
- case TYPEMESSAGE:
- return 0;
- }
-
- return 1;
-}
-
-int mutt_is_text_part (BODY * b)
-{
- int t = b->type;
- char *s = b->subtype;
-
- if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
- return 0;
-
- if (t == TYPETEXT)
- return 1;
-
- if (t == TYPEMESSAGE) {
- if (!ascii_strcasecmp ("delivery-status", s))
- return 1;
- }
-
- if ((WithCrypto & APPLICATION_PGP) && t == TYPEAPPLICATION) {
- if (!ascii_strcasecmp ("pgp-keys", s))
- return 1;
- }
-
- return 0;
-}
-
-void mutt_free_envelope (ENVELOPE ** p)
-{
- if (!*p)
- return;
- rfc822_free_address (&(*p)->return_path);
- rfc822_free_address (&(*p)->from);
- rfc822_free_address (&(*p)->to);
- rfc822_free_address (&(*p)->cc);
- rfc822_free_address (&(*p)->bcc);
- rfc822_free_address (&(*p)->sender);
- rfc822_free_address (&(*p)->reply_to);
- rfc822_free_address (&(*p)->mail_followup_to);
-
- p_delete(&(*p)->list_post);
- p_delete(&(*p)->subject);
- /* real_subj is just an offset to subject and shouldn't be freed */
- 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
- 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);
- p_delete(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
+ * to NULL in the source so that envelope_delete 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);
/* 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);
+ string_list_wipe(&base->userhdrs);
MOVE_ELEM(spam);
MOVE_ELEM(userhdrs);
#undef MOVE_ELEM
- mutt_free_envelope(extra);
+ envelope_delete(extra);
}
void _mutt_mktemp (char *s, const char *src, int line)
{
- snprintf (s, _POSIX_PATH_MAX, "%s/muttng-%s-%d-%d-%d-%x%x", NONULL (Tempdir),
+ snprintf (s, _POSIX_PATH_MAX, "%s/madmutt-%s-%d-%d-%d-%x%x", NONULL (Tempdir),
NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++,
(unsigned int) rand(), (unsigned int) rand());
- debug_print (1, ("%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
unlink (s);
}
-void mutt_free_alias (ALIAS ** p)
-{
- ALIAS *t;
-
- while (*p) {
- t = *p;
- *p = (*p)->next;
- p_delete(&t->name);
- rfc822_free_address (&t->addr);
- p_delete(&t);
- }
-}
-
/* collapse the pathname using ~ or = when possible */
void mutt_pretty_mailbox (char *s)
{
char *p = s, *q = s;
- size_t len;
+ ssize_t len;
url_scheme_t scheme;
scheme = url_check_scheme (s);
-#ifdef USE_IMAP
if (scheme == U_IMAP || scheme == U_IMAPS) {
imap_pretty_mailbox (s);
return;
}
-#endif
/* if s is an url, only collapse path component */
if (scheme != U_UNKNOWN) {
}
*q = 0;
- if (str_ncmp (s, Maildir, (len = m_strlen(Maildir))) == 0 &&
+ if (m_strncmp(s, Maildir, (len = m_strlen(Maildir))) == 0 &&
s[len] == '/') {
*s++ = '=';
memmove (s, s + len, m_strlen(s + len) + 1);
}
- else if (str_ncmp (s, Homedir, (len = m_strlen(Homedir))) == 0 &&
+ else if (m_strncmp(s, Homedir, (len = m_strlen(Homedir))) == 0 &&
s[len] == '/') {
*s++ = '~';
memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);
}
}
-void mutt_pretty_size (char *s, size_t len, long n)
+void mutt_pretty_size (char *s, ssize_t len, long n)
{
if (n == 0)
- strfcpy (s, "0K", len);
+ m_strcpy(s, len, "0K");
else if (n < 10189) /* 0.1K - 9.9K */
snprintf (s, len, "%3.1fK", (n < 103) ? 0.1 : n / 1024.0);
else if (n < 1023949) { /* 10K - 999K */
}
}
-void mutt_expand_file_fmt (char *dest, size_t destlen, const char *fmt,
+void mutt_expand_file_fmt (char *dest, ssize_t destlen, const char *fmt,
const char *src)
{
char tmp[LONG_STRING];
mutt_expand_fmt (dest, destlen, fmt, tmp);
}
-void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt,
+void mutt_expand_fmt (char *dest, ssize_t destlen, const char *fmt,
const char *src)
{
const char *p;
char *d;
- size_t slen;
+ ssize_t slen;
int found = 0;
slen = m_strlen(src);
break;
case 's':
found = 1;
- strfcpy (d, src, destlen + 1);
+ m_strcpy(d, destlen + 1, src);
d += destlen > slen ? slen : destlen;
destlen -= destlen > slen ? slen : destlen;
p++;
*d = '\0';
if (!found && destlen > 0) {
- str_cat (dest, destlen, " ");
- str_cat (dest, destlen, src);
+ m_strcat(dest, destlen, " ");
+ m_strcat(dest, destlen, src);
}
}
/* return 0 on success, -1 on abort, 1 on error */
int mutt_check_overwrite (const char *attname, const char *path,
- char *fname, size_t flen, int *append,
+ char *fname, ssize_t flen, int *append,
char **directory)
{
int rc = 0;
char tmp[_POSIX_PATH_MAX];
struct stat st;
- strfcpy (fname, path, flen);
+ m_strcpy(fname, flen, path);
if (access (fname, F_OK) != 0)
return 0;
if (stat (fname, &st) != 0)
(_("File is a directory, save under it? [(y)es, (n)o, (a)ll]"),
_("yna"))) {
case 3: /* all */
- str_replace (directory, fname);
+ m_strreplace(directory, fname);
break;
case 1: /* yes */
p_delete(directory);
if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp),
M_FILE | M_CLEAR) != 0 || !tmp[0])
return (-1);
- mutt_concat_path (fname, path, tmp, flen);
+ mutt_concat_path(fname, flen, path, tmp);
}
else
- mutt_concat_path (fname, path, mutt_basename (attname), flen);
+ mutt_concat_path(fname, flen, path, mutt_basename(attname));
}
if (*append == 0 && access (fname, F_OK) == 0) {
return 0;
}
-void mutt_save_path (char *d, size_t dsize, ADDRESS * a)
+void mutt_save_path (char *d, ssize_t dsize, address_t * a)
{
if (a && a->mailbox) {
- strfcpy (d, a->mailbox, dsize);
+ m_strcpy(d, dsize, a->mailbox);
if (!option (OPTSAVEADDRESS)) {
char *p;
if ((p = strpbrk (d, "%@")))
*p = 0;
}
- str_tolower (d);
+ m_strtolower(d);
}
else
*d = 0;
}
-void mutt_safe_path (char *s, size_t l, ADDRESS * a)
+void mutt_safe_path (char *s, ssize_t l, address_t * a)
{
char *p;
}
void mutt_FormatString (char *dest, /* output buffer */
- size_t destlen, /* output buffer len */
+ ssize_t destlen, /* output buffer len */
const char *src, /* template string */
format_t * callback, /* callback for processing */
unsigned long data, /* callback data */
{ /* callback flags */
char prefix[SHORT_STRING], buf[LONG_STRING], *cp, *wptr = dest, ch;
char ifstring[SHORT_STRING], elsestring[SHORT_STRING];
- size_t wlen, count, len, col, wid;
+ ssize_t wlen, wid, count, col, len;
prefix[0] = '\0';
destlen--; /* save room for the terminal \0 */
/* eat the format string */
cp = prefix;
count = 0;
- while (count < sizeof (prefix) &&
+ while (count < ssizeof (prefix) &&
(isdigit ((unsigned char) *src) || *src == '.' || *src == '-'))
{
*cp++ = *src++;
/* eat the `if' part of the string */
cp = ifstring;
count = 0;
- while (count < sizeof (ifstring) && *src && *src != '?'
+ while (count < ssizeof (ifstring) && *src && *src != '?'
&& *src != '&') {
*cp++ = *src++;
count++;
src++; /* skip the & */
cp = elsestring;
count = 0;
- while (count < sizeof (elsestring) && *src && *src != '?') {
+ while (count < ssizeof (elsestring) && *src && *src != '?') {
*cp++ = *src++;
count++;
}
data, flags);
if (lower)
- str_tolower (buf);
+ m_strtolower(buf);
if (nodots) {
char *p = buf;
magic = mx_get_magic (s);
-#ifdef USE_POP
if (magic == M_POP) {
mutt_error _("Can't save message to POP mailbox.");
return 1;
}
-#endif
#ifdef USE_NNTP
if (magic == M_NNTP) {
if (magic > 0 && !mx_access (s, W_OK)) {
if (option (OPTCONFIRMAPPEND) &&
- (!TrashPath || (str_cmp (s, TrashPath) != 0))) {
+ (!TrashPath || (m_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);
if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
}
}
else {
-#ifdef USE_IMAP
if (magic != M_IMAP)
-#endif /* execute the block unconditionally if we don't use imap */
{
st->st_mtime = 0;
st->st_atime = 0;
static char vstring[STRING];
if (full)
- snprintf (vstring, sizeof (vstring), "Mutt-ng %s-r%s (based "
- "on Mutt 1.5.11/%s)", MUTT_VERSION, MUTT_REVISION,
- ReleaseDate);
+ snprintf (vstring, sizeof (vstring),
+ "Madmutt/%s-r%s (based on Mutt 1.5.11)",
+ MUTT_VERSION, MUTT_REVISION);
else
- snprintf (vstring, sizeof (vstring), "mutt-ng/%s-r%s",
+ snprintf (vstring, sizeof (vstring), "Madmutt/%s-%s",
MUTT_VERSION, MUTT_REVISION);
return vstring;
}
while (*list) {
p = *list;
*list = (*list)->next;
- rx_free (&p->rx);
+ rx_delete(&p->rx);
p_delete(&p->template);
p_delete(&p);
}
}
/* Does this pattern match? */
- if (regexec
- (l->rx->rx, s, (size_t) l->nmatch, (regmatch_t *) pmatch,
- (int) 0) == 0) {
- debug_print (5, ("%s matches %s\n%d subst", s, l->rx->pattern, l->rx->rx->re_nsub));
-
+ if (regexec(l->rx->rx, s, l->nmatch, (regmatch_t *)pmatch, (int) 0) == 0)
+ {
/* Copy template into text, with substitutions. */
for (p = l->template; *p;) {
if (*p == '%') {
}
}
text[tlen] = '\0';
- debug_print (5, ("\"%s\"\n", text));
return 1;
}
}
}
/* return 1 if address lists are strictly identical */
-int mutt_cmp_addr (const ADDRESS * a, const ADDRESS * b)
+int mutt_cmp_addr (const address_t * a, const address_t * b)
{
while (a && b) {
- if (str_cmp (a->mailbox, b->mailbox) ||
- str_cmp (a->personal, b->personal))
+ if (m_strcmp(a->mailbox, b->mailbox) ||
+ m_strcmp(a->personal, b->personal))
return (0);
a = a->next;
return (1);
}
-int mutt_cmp_list (const LIST * a, const LIST * b)
+int mutt_cmp_list (const string_list_t * a, const string_list_t * b)
{
while (a && b) {
- if (str_cmp (a->data, b->data))
+ if (m_strcmp(a->data, b->data))
return (0);
a = a->next;
int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
{
if (e1 && e2) {
- if (str_cmp (e1->message_id, e2->message_id) ||
- str_cmp (e1->subject, e2->subject) ||
+ if (m_strcmp(e1->message_id, e2->message_id) ||
+ m_strcmp(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) ||
}
}
-int mutt_cmp_param (const PARAMETER * p1, const PARAMETER * p2)
-{
- while (p1 && p2) {
- if (str_cmp (p1->attribute, p2->attribute) ||
- str_cmp (p1->value, p2->value))
- return (0);
-
- p1 = p1->next;
- p2 = p2->next;
- }
- if (p1 || p2)
- return (0);
-
- return (1);
-}
-
int mutt_cmp_body (const BODY * b1, const BODY * b2)
{
if (b1->type != b2->type ||
b1->encoding != b2->encoding ||
- str_cmp (b1->subtype, b2->subtype) ||
- str_cmp (b1->description, b2->description) ||
- !mutt_cmp_param (b1->parameter, b2->parameter) ||
+ m_strcmp(b1->subtype, b2->subtype) ||
+ m_strcmp(b1->description, b2->description) ||
+ !parameter_equal(b1->parameter, b2->parameter) ||
b1->length != b2->length)
return (0);
return (1);
projects / apps / madmutt.git / blobdiff