projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revamp lib.[hc] functions into lib-lib/file.[hc].
[apps/madmutt.git]
/
attach.c
diff --git
a/attach.c
b/attach.c
index
0b97d5a
..
8b9cb82
100644
(file)
--- a/
attach.c
+++ b/
attach.c
@@
-12,8
+12,13
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_menu.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_menu.h"
@@
-26,9
+31,6
@@
#include "mx.h"
#include "mutt_crypt.h"
#include "mx.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
#include "lib/debug.h"
#include <ctype.h>
@@
-144,19
+146,19
@@
int mutt_compose_attachment (BODY * a)
b->parameter = NULL;
}
if (b->description) {
b->parameter = NULL;
}
if (b->description) {
-
mem_free
(&a->description);
+
p_delete
(&a->description);
a->description = b->description;
b->description = NULL;
}
if (b->form_name) {
a->description = b->description;
b->description = NULL;
}
if (b->form_name) {
-
mem_free
(&a->form_name);
+
p_delete
(&a->form_name);
a->form_name = b->form_name;
b->form_name = NULL;
}
/* Remove headers by copying out data to another file, then
* copying the file back */
a->form_name = b->form_name;
b->form_name = NULL;
}
/* Remove headers by copying out data to another file, then
* copying the file back */
- fseek (fp, b->offset, 0);
+ fseek
o
(fp, b->offset, 0);
mutt_mktemp (tempfile);
if ((tfp = safe_fopen (tempfile, "w")) == NULL) {
mutt_perror (_("Failure to open file to strip headers."));
mutt_mktemp (tempfile);
if ((tfp = safe_fopen (tempfile, "w")) == NULL) {
mutt_perror (_("Failure to open file to strip headers."));
@@
-238,11
+240,14
@@
int mutt_edit_attachment (BODY * a)
command, sizeof (command))) {
/* For now, editing requires a file, no piping */
mutt_error _("Mailcap Edit entry requires %%s");
command, sizeof (command))) {
/* For now, editing requires a file, no piping */
mutt_error _("Mailcap Edit entry requires %%s");
+ goto bailout;
}
else {
mutt_endwin (NULL);
}
else {
mutt_endwin (NULL);
- if (mutt_system (command) == -1)
+ if (mutt_system (command) == -1)
{
mutt_error (_("Error running \"%s\"!"), command);
mutt_error (_("Error running \"%s\"!"), command);
+ goto bailout;
+ }
}
}
}
}
}
}
@@
-275,7
+280,7
@@
static int is_mmnoask (const char *buf)
int lng;
if ((p = getenv ("MM_NOASK")) != NULL && *p) {
int lng;
if ((p = getenv ("MM_NOASK")) != NULL && *p) {
- if (
str_cmp
(p, "1") == 0)
+ if (
m_strcmp
(p, "1") == 0)
return (1);
strfcpy (tmp, p, sizeof (tmp));
return (1);
strfcpy (tmp, p, sizeof (tmp));
@@
-293,7
+298,7
@@
static int is_mmnoask (const char *buf)
}
}
else {
}
}
else {
- lng =
str_len
(p);
+ lng =
m_strlen
(p);
if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)
return (1);
}
if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)
return (1);
}
@@
-311,7
+316,7
@@
void mutt_check_lookup_list (BODY * b, char *type, int len)
int i;
for (; t; t = t->next) {
int i;
for (; t; t = t->next) {
- i =
str_len
(t->data) - 1;
+ i =
m_strlen
(t->data) - 1;
if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
ascii_strncasecmp (type, t->data, i) == 0) ||
ascii_strcasecmp (type, t->data) == 0) {
if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
ascii_strncasecmp (type, t->data, i) == 0) ||
ascii_strcasecmp (type, t->data) == 0) {
@@
-332,9
+337,9
@@
void mutt_check_lookup_list (BODY * b, char *type, int len)
debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
}
if (tmp.subtype)
debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
}
if (tmp.subtype)
-
mem_free
(&tmp.subtype);
+
p_delete
(&tmp.subtype);
if (tmp.xtype)
if (tmp.xtype)
-
mem_free
(&tmp.xtype);
+
p_delete
(&tmp.xtype);
}
}
}
}
}
}
@@
-362,7
+367,7
@@
int mutt_is_autoview (BODY * b, const char *type)
}
for (; t; t = t->next) {
}
for (; t; t = t->next) {
- i =
str_len
(t->data) - 1;
+ i =
m_strlen
(t->data) - 1;
if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
ascii_strncasecmp (type, t->data, i) == 0) ||
ascii_strcasecmp (type, t->data) == 0)
if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
ascii_strncasecmp (type, t->data, i) == 0) ||
ascii_strcasecmp (type, t->data) == 0)
@@
-423,7
+428,7
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
strfcpy (command, entry->command, sizeof (command));
if (fp) {
strfcpy (command, entry->command, sizeof (command));
if (fp) {
- fname =
str_dup
(a->filename);
+ fname =
m_strdup
(a->filename);
mutt_sanitize_filename (fname, 1);
}
else
mutt_sanitize_filename (fname, 1);
}
else
@@
-431,7
+436,7
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
if (rfc1524_expand_filename (entry->nametemplate, fname,
tempfile, sizeof (tempfile))) {
if (rfc1524_expand_filename (entry->nametemplate, fname,
tempfile, sizeof (tempfile))) {
- if (fp == NULL &&
str_cmp
(tempfile, a->filename)) {
+ if (fp == NULL &&
m_strcmp
(tempfile, a->filename)) {
/* send case: the file is already there */
if (safe_symlink (a->filename, tempfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
/* send case: the file is already there */
if (safe_symlink (a->filename, tempfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
@@
-449,7
+454,7
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
if (fp) {
/* recv case: we need to save the attachment to a file */
if (fp) {
/* recv case: we need to save the attachment to a file */
-
mem_free
(&fname);
+
p_delete
(&fname);
if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
goto return_error;
}
if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
goto return_error;
}
@@
-562,18
+567,18
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
if (use_pager) {
pager_t info;
if (use_pager) {
pager_t info;
+ p_clear(&info, 1);
- memset (&info, 0, sizeof (info));
- info.fp = fp;
+ info.fp = fp;
info.bdy = a;
info.ctx = Context;
info.idx = idx;
info.idxlen = idxlen;
info.hdr = hdr;
info.bdy = a;
info.ctx = Context;
info.idx = idx;
info.idxlen = idxlen;
info.hdr = hdr;
- rc = mutt_do_pager
(descrip, pagerfile,
- M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE :
-
0),
&info);
+ rc = mutt_do_pager(descrip, pagerfile,
+ M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0),
+ &info);
*pagerfile = '\0';
}
else
*pagerfile = '\0';
}
else
@@
-612,16
+617,13
@@
int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
if (fp) {
/* recv case */
if (fp) {
/* recv case */
-
STATE s;
STATE s;
-
- memset (&s, 0, sizeof (STATE));
+ p_clear(&s, 1);
if (outfile && *outfile)
if (outfile && *outfile)
- thepid =
- mutt_create_filter_fd (path, &s.fpout, NULL, NULL, -1, out, -1);
+ thepid = mutt_create_filter_fd(path, &s.fpout, NULL, NULL, -1, out, -1);
else
else
- thepid = mutt_create_filter
(path, &s.fpout, NULL, NULL);
+ thepid = mutt_create_filter(path, &s.fpout, NULL, NULL);
if (thepid < 0) {
mutt_perror (_("Can't create filter"));
if (thepid < 0) {
mutt_perror (_("Can't create filter"));
@@
-721,7
+723,7
@@
int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
hn->msgno = hdr->msgno; /* required for MH/maildir */
hn->read = 1;
hn->msgno = hdr->msgno; /* required for MH/maildir */
hn->read = 1;
- fseek (fp, m->offset, 0);
+ fseek
o
(fp, m->offset, 0);
if (fgets (buf, sizeof (buf), fp) == NULL)
return -1;
if (mx_open_mailbox (path, M_APPEND | M_QUIET, &ctx) == NULL)
if (fgets (buf, sizeof (buf), fp) == NULL)
return -1;
if (mx_open_mailbox (path, M_APPEND | M_QUIET, &ctx) == NULL)
@@
-750,13
+752,13
@@
int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
/* In recv mode, extract from folder and decode */
STATE s;
/* In recv mode, extract from folder and decode */
STATE s;
+ p_clear(&s, 1);
- memset (&s, 0, sizeof (s));
if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
return (-1);
}
if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
return (-1);
}
- fseek ((s.fpin = fp), m->offset, 0);
+ fseek
o
((s.fpin = fp), m->offset, 0);
mutt_decode_attachment (m, &s);
if (fclose (s.fpout) != 0) {
mutt_decode_attachment (m, &s);
if (fclose (s.fpout) != 0) {
@@
-804,7
+806,7
@@
int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
BODY *saved_parts = NULL;
HEADER *saved_hdr = NULL;
BODY *saved_parts = NULL;
HEADER *saved_hdr = NULL;
-
memset (&s, 0, sizeof (s)
);
+
p_clear(&s, 1
);
s.flags = displaying;
if (flags == M_SAVE_APPEND)
s.flags = displaying;
if (flags == M_SAVE_APPEND)