projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify block_try function.
[apps/madmutt.git]
/
recvattach.c
diff --git
a/recvattach.c
b/recvattach.c
index
30bcb49
..
91428f1
100644
(file)
--- a/
recvattach.c
+++ b/
recvattach.c
@@
-12,24
+12,27
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#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 "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "enter.h"
#include "handler.h"
#include "recvattach.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"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <ctype.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdlib.h>
@@
-57,12
+60,12
@@
static struct mapping_t AttachHelp[] = {
{N_("Pipe"), OP_PIPE},
{N_("Print"), OP_PRINT},
{N_("Help"), OP_HELP},
{N_("Pipe"), OP_PIPE},
{N_("Print"), OP_PRINT},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL
, OP_NULL
}
};
static int mutt_extract_path (char *filename, char *path)
{
};
static int mutt_extract_path (char *filename, char *path)
{
- char *tmp =
mem_malloc (sizeof (char) *
_POSIX_PATH_MAX);
+ char *tmp =
p_new(char,
_POSIX_PATH_MAX);
char *help_ptr;
help_ptr = tmp;
char *help_ptr;
help_ptr = tmp;
@@
-76,7
+79,7
@@
static int mutt_extract_path (char *filename, char *path)
}
*help_ptr++ = *filename++;
}
}
*help_ptr++ = *filename++;
}
-
mem_free
(&tmp);
+
p_delete
(&tmp);
return 0;
}
return 0;
}
@@
-101,11
+104,11
@@
void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
}
if (idx[x]->tree) {
}
if (idx[x]->tree) {
- if (
str_cmp
(idx[x]->tree, buf) != 0)
-
str_replace
(&idx[x]->tree, buf);
+ if (
m_strcmp
(idx[x]->tree, buf) != 0)
+
m_strreplace
(&idx[x]->tree, buf);
}
else
}
else
- idx[x]->tree =
str_dup
(buf);
+ idx[x]->tree =
m_strdup
(buf);
if (2 * (idx[x]->level + 2) < sizeof (buf) && idx[x]->level) {
s = buf + 2 * (idx[x]->level - 1);
if (2 * (idx[x]->level + 2) < sizeof (buf) && idx[x]->level) {
s = buf + 2 * (idx[x]->level - 1);
@@
-126,7
+129,7
@@
ATTACHPTR **mutt_gen_attach_list (BODY * m,
for (; m; m = m->next) {
if (*idxlen == *idxmax) {
for (; m; m = m->next) {
if (*idxlen == *idxmax) {
-
mem_realloc (&idx, sizeof (ATTACHPTR *) * ((*idxmax) += 5)
);
+
p_realloc(&idx, (*idxmax) += 5
);
for (i = *idxlen; i < *idxmax; i++)
idx[i] = NULL;
}
for (i = *idxlen; i < *idxmax; i++)
idx[i] = NULL;
}
@@
-144,7
+147,7
@@
ATTACHPTR **mutt_gen_attach_list (BODY * m,
}
else {
if (!idx[*idxlen])
}
else {
if (!idx[*idxlen])
- idx[*idxlen] =
(ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR)
);
+ idx[*idxlen] =
p_new(ATTACHPTR, 1
);
new = idx[(*idxlen)++];
new->content = m;
new = idx[(*idxlen)++];
new->content = m;
@@
-260,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);
}
@@
-407,10
+410,10
@@
static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
if (body->filename) {
if (directory && *directory)
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
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 &&
@@
-432,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]))
@@
-440,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;
@@
-462,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 =
@@
-509,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;
@@
-550,7
+553,7
@@
void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr,
break;
}
break;
}
-
mem_free
(&directory);
+
p_delete
(&directory);
if (tag && menu) {
menu->oldcurrent = menu->current;
if (tag && menu) {
menu->oldcurrent = menu->current;
@@
-646,7
+649,7
@@
void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int filter)
filter = 0; /* sanity check: we can't filter in the recv case yet */
buf[0] = 0;
filter = 0; /* sanity check: we can't filter in the recv case yet */
buf[0] = 0;
-
memset (&state, 0, sizeof (STATE)
);
+
p_clear(&state, 1
);
if (mutt_get_field ((filter ? _("Filter through: ") : _("Pipe to: ")),
buf, sizeof (buf), M_CMD) != 0 || !buf[0])
if (mutt_get_field ((filter ? _("Filter through: ") : _("Pipe to: ")),
buf, sizeof (buf), M_CMD) != 0 || !buf[0])
@@
-750,7
+753,7
@@
void mutt_print_attachment_list (FILE * fp, int tag, BODY * top)
if (!can_print (top, tag))
return;
mutt_endwin (NULL);
if (!can_print (top, tag))
return;
mutt_endwin (NULL);
-
memset (&state, 0, sizeof (STATE)
);
+
p_clear(&state, 1
);
thepid = mutt_create_filter (NONULL (PrintCmd), &state.fpout, NULL, NULL);
print_attachment_list (fp, tag, top, &state);
fclose (state.fpout);
thepid = mutt_create_filter (NONULL (PrintCmd), &state.fpout, NULL, NULL);
print_attachment_list (fp, tag, top, &state);
fclose (state.fpout);
@@
-993,7
+996,7
@@
void mutt_view_attachments (HEADER * hdr)
attach_collapse (cur, 0, 1, 0);
mutt_update_attach_index (cur, &idx, &idxlen, &idxmax, menu);
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) {
if (op == OP_NULL)
op = mutt_menuLoop (menu);
switch (op) {
@@
-1198,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?")) !=
@@
-1241,12
+1244,12
@@
void mutt_view_attachments (HEADER * hdr)
hdr->attach_del = 1;
if (idx[idxmax]->content)
idx[idxmax]->content->aptr = NULL;
hdr->attach_del = 1;
if (idx[idxmax]->content)
idx[idxmax]->content->aptr = NULL;
-
mem_free
(&idx[idxmax]->tree);
-
mem_free
(&idx[idxmax]);
+
p_delete
(&idx[idxmax]->tree);
+
p_delete
(&idx[idxmax]);
}
if (hdr->attach_del)
hdr->changed = 1;
}
if (hdr->attach_del)
hdr->changed = 1;
-
mem_free
(&idx);
+
p_delete
(&idx);
idxmax = 0;
if (WithCrypto && need_secured && secured) {
idxmax = 0;
if (WithCrypto && need_secured && secured) {