projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix small bug from julien
[apps/madmutt.git]
/
recvattach.c
diff --git
a/recvattach.c
b/recvattach.c
index
885c528
..
91428f1
100644
(file)
--- a/
recvattach.c
+++ b/
recvattach.c
@@
-17,6
+17,9
@@
#include <lib-lib/macros.h>
#include <lib-lib/ascii.h>
#include <lib-lib/file.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.h"
#include "enter.h"
@@
-25,9
+28,7
@@
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
-#include "mime.h"
#include "attach.h"
#include "attach.h"
-#include "mapping.h"
#include "mx.h"
#include "copy.h"
#include "mutt_crypt.h"
#include "mx.h"
#include "copy.h"
#include "mutt_crypt.h"
@@
-104,7
+105,7
@@
void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
if (idx[x]->tree) {
if (m_strcmp(idx[x]->tree, buf) != 0)
if (idx[x]->tree) {
if (m_strcmp(idx[x]->tree, buf) != 0)
-
str_replace
(&idx[x]->tree, buf);
+
m_strreplace
(&idx[x]->tree, buf);
}
else
idx[x]->tree = m_strdup(buf);
}
else
idx[x]->tree = m_strdup(buf);
@@
-262,7
+263,7
@@
const char *mutt_attach_fmt (char *dest,
if (aptr->content->filename && *aptr->content->filename == '/') {
char path[_POSIX_PATH_MAX];
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);
}
mutt_pretty_mailbox (path);
mutt_format_s (dest, destlen, prefix, path);
}
@@
-412,7
+413,7
@@
static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
mutt_concat_path(buf, sizeof(buf), *directory,
mutt_basename(body->filename));
else
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 &&
}
else if (body->hdr &&
body->encoding != ENCBASE64 &&
@@
-434,7
+435,7
@@
static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
char tmpbuf[_POSIX_PATH_MAX];
snprintf (tmpbuf, sizeof (tmpbuf), "%s%s", LastSaveFolder, buf);
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]))
ret = mutt_get_field (_("Save to file: ")
, buf, sizeof (buf), M_FILE);
if ((ret != 0) || (!buf[0]))
@@
-442,7
+443,7
@@
static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
}
else {
mutt_extract_path (buf, path);
}
else {
mutt_extract_path (buf, path);
-
strfcpy (LastSaveFolder, path, sizeof (LastSaveFolder)
);
+
m_strcpy(LastSaveFolder, sizeof(LastSaveFolder), path
);
}
prompt = NULL;
}
prompt = NULL;
@@
-464,7
+465,7
@@
static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
}
else if (rc == -1)
return -1;
}
else if (rc == -1)
return -1;
-
strfcpy (tfile, buf, sizeof (tfile)
);
+
m_strcpy(tfile, sizeof(tfile), buf
);
}
else {
if ((rc =
}
else {
if ((rc =
@@
-511,7
+512,7
@@
void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr,
if (!buf[0]) {
int append = 0;
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;
if (mutt_get_field (_("Save to file: "), buf, sizeof (buf),
M_FILE | M_CLEAR) != 0 || !buf[0])
return;
@@
-1200,7
+1201,7
@@
void mutt_view_attachments (HEADER * hdr)
CHECK_ATTACH;
if (!idx[menu->current]->content->hdr->env->followup_to ||
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?")) !=
"poster")
|| query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) !=