#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/ascii.h>
+#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
-#include "mime.h"
#include "attach.h"
-#include "mapping.h"
#include "mx.h"
#include "copy.h"
#include "mutt_crypt.h"
}
if (idx[x]->tree) {
- if (str_cmp (idx[x]->tree, buf) != 0)
+ if (m_strcmp(idx[x]->tree, buf) != 0)
str_replace (&idx[x]->tree, buf);
}
else
if (aptr->content->filename && *aptr->content->filename == '/') {
char path[_POSIX_PATH_MAX];
- strfcpy (path, aptr->content->filename, sizeof (path));
+ m_strcpy(path, sizeof(path), aptr->content->filename);
mutt_pretty_mailbox (path);
mutt_format_s (dest, destlen, prefix, path);
}
if (body->filename) {
if (directory && *directory)
- mutt_concat_path (buf, *directory, mutt_basename (body->filename),
- sizeof (buf));
+ mutt_concat_path(buf, sizeof(buf), *directory,
+ mutt_basename(body->filename));
else
- strfcpy (buf, body->filename, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), body->filename);
}
else if (body->hdr &&
body->encoding != ENCBASE64 &&
char tmpbuf[_POSIX_PATH_MAX];
snprintf (tmpbuf, sizeof (tmpbuf), "%s%s", LastSaveFolder, buf);
- strfcpy (buf, tmpbuf, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), tmpbuf);
ret = mutt_get_field (_("Save to file: ")
, buf, sizeof (buf), M_FILE);
if ((ret != 0) || (!buf[0]))
}
else {
mutt_extract_path (buf, path);
- strfcpy (LastSaveFolder, path, sizeof (LastSaveFolder));
+ m_strcpy(LastSaveFolder, sizeof(LastSaveFolder), path);
}
prompt = NULL;
}
else if (rc == -1)
return -1;
- strfcpy (tfile, buf, sizeof (tfile));
+ m_strcpy(tfile, sizeof(tfile), buf);
}
else {
if ((rc =
if (!buf[0]) {
int append = 0;
- strfcpy (buf, NONULL (top->filename), sizeof (buf));
+ m_strcpy(buf, sizeof(buf), NONULL(top->filename));
if (mutt_get_field (_("Save to file: "), buf, sizeof (buf),
M_FILE | M_CLEAR) != 0 || !buf[0])
return;
attach_collapse (cur, 0, 1, 0);
mutt_update_attach_index (cur, &idx, &idxlen, &idxmax, menu);
- FOREVER {
+ for (;;) {
if (op == OP_NULL)
op = mutt_menuLoop (menu);
switch (op) {
CHECK_ATTACH;
if (!idx[menu->current]->content->hdr->env->followup_to ||
- str_casecmp (idx[menu->current]->content->hdr->env->followup_to,
+ m_strcasecmp(idx[menu->current]->content->hdr->env->followup_to,
"poster")
|| query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) !=