#include "mutt.h"
#include "mutt_curses.h"
#include "mime.h"
-#include "mailbox.h"
#include "mx.h"
#include "url.h"
#ifdef USE_IMAP
#include "imap.h"
+#include "imap/mx_imap.h"
#endif
#include "mutt_crypt.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <string.h>
#include <ctype.h>
if (b->parameter)
mutt_free_parameter (&b->parameter);
if (b->unlink && b->filename) {
- dprint (1, (debugfile, "mutt_free_body: Unlinking %s.\n", b->filename));
+ debug_print (1, ("unlinking %s.\n", b->filename));
unlink (b->filename);
}
else if (b->filename)
- dprint (1,
- (debugfile, "mutt_free_body: Not unlinking %s.\n",
- b->filename));
+ debug_print (1, ("not unlinking %s.\n", b->filename));
FREE (&b->filename);
FREE (&b->content);
{
#ifdef USE_IMAP
/* if folder = {host} or imap[s]://host/: don't append slash */
- if (mx_is_imap (NONULL (Maildir)) &&
+ if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
(Maildir[safe_strlen (Maildir) - 1] == '}' ||
Maildir[safe_strlen (Maildir) - 1] == '/'))
strfcpy (p, NONULL (Maildir), sizeof (p));
#ifdef USE_IMAP
/* Rewrite IMAP path in canonical form - aids in string comparisons of
* folders. May possibly fail, in which case s should be the same. */
- if (mx_is_imap (s))
+ if (imap_is_magic (s, NULL) == M_IMAP)
imap_expand_path (s, slen);
#endif
void _mutt_mktemp (char *s, const char *src, int line)
{
- snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d-%d", NONULL (Tempdir),
- NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++);
- dprint (1,
- (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
+
+ snprintf (s, _POSIX_PATH_MAX, "%s/muttng-%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);
}
{
static char vstring[STRING];
- snprintf (vstring, sizeof (vstring), "Mutt-ng %s (%s)",
+ snprintf (vstring, sizeof (vstring), "Mutt-ng %s (%s) based on Mutt 1.5.9",
MUTT_VERSION, ReleaseDate);
return vstring;
}
if (regexec
(l->rx->rx, s, (size_t) l->nmatch, (regmatch_t *) pmatch,
(int) 0) == 0) {
- dprint (5,
- (debugfile, "mutt_match_spam_list: %s matches %s\n", s,
- l->rx->pattern));
- dprint (5,
- (debugfile, "mutt_match_spam_list: %d subs\n",
- l->rx->rx->re_nsub));
+ debug_print (5, ("%s matches %s\n%d subst", s, l->rx->pattern, l->rx->rx->re_nsub));
/* Copy template into text, with substitutions. */
for (p = l->template; *p;) {
}
}
text[tlen] = '\0';
- dprint (5, (debugfile, "mutt_match_spam_list: \"%s\"\n", text));
+ debug_print (5, ("\"%s\"\n", text));
return 1;
}
}