projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a compilation error with gdbm
[apps/madmutt.git]
/
recvattach.c
diff --git
a/recvattach.c
b/recvattach.c
index
ec57733
..
d9b6d61
100644
(file)
--- a/
recvattach.c
+++ b/
recvattach.c
@@
-21,12
+21,13
@@
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "enter.h"
#include "handler.h"
#include "recvattach.h"
#include "handler.h"
#include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
#include "rfc1524.h"
#include "attach.h"
#include "mx.h"
#include "rfc1524.h"
#include "attach.h"
#include "mx.h"
@@
-91,7
+92,7
@@
void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
for (x = 0; x < idxlen; x++) {
idx[x]->num = x;
for (x = 0; x < idxlen; x++) {
idx[x]->num = x;
- if (2 * (idx[x]->level + 2) < sizeof (buf)) {
+ if (2 * (idx[x]->level + 2) < s
s
izeof (buf)) {
if (idx[x]->level) {
s = buf + 2 * (idx[x]->level - 1);
*s++ = (idx[x]->content->next) ? M_TREE_LTEE : M_TREE_LLCORNER;
if (idx[x]->level) {
s = buf + 2 * (idx[x]->level - 1);
*s++ = (idx[x]->content->next) ? M_TREE_LTEE : M_TREE_LLCORNER;
@@
-110,7
+111,7
@@
void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
else
idx[x]->tree = m_strdup(buf);
else
idx[x]->tree = m_strdup(buf);
- if (2 * (idx[x]->level + 2) < sizeof (buf) && idx[x]->level) {
+ if (2 * (idx[x]->level + 2) < s
s
izeof (buf) && idx[x]->level) {
s = buf + 2 * (idx[x]->level - 1);
*s++ = (idx[x]->content->next) ? '\005' : '\006';
*s++ = '\006';
s = buf + 2 * (idx[x]->level - 1);
*s++ = (idx[x]->content->next) ? '\005' : '\006';
*s++ = '\006';
@@
-187,7
+188,7
@@
ATTACHPTR **mutt_gen_attach_list (BODY * m,
* %u = unlink
*/
const char *mutt_attach_fmt (char *dest,
* %u = unlink
*/
const char *mutt_attach_fmt (char *dest,
- size_t destlen,
+ s
s
ize_t destlen,
char op,
const char *src,
const char *prefix,
char op,
const char *src,
const char *prefix,
@@
-200,7
+201,7
@@
const char *mutt_attach_fmt (char *dest,
char charset[SHORT_STRING];
ATTACHPTR *aptr = (ATTACHPTR *) data;
int optional = (flags & M_FORMAT_OPTIONAL);
char charset[SHORT_STRING];
ATTACHPTR *aptr = (ATTACHPTR *) data;
int optional = (flags & M_FORMAT_OPTIONAL);
- size_t l;
+ s
s
ize_t l;
switch (op) {
case 'C':
switch (op) {
case 'C':
@@
-367,7
+368,7
@@
const char *mutt_attach_fmt (char *dest,
return (src);
}
return (src);
}
-static void attach_entry (char *b, size_t blen, MUTTMENU * menu, int num)
+static void attach_entry (char *b, s
s
ize_t blen, MUTTMENU * menu, int num)
{
int w=(COLS-SW)>blen?blen:(COLS-SW);
mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt,
{
int w=(COLS-SW)>blen?blen:(COLS-SW);
mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt,
@@
-564,12
+565,12
@@
void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr,
}
static void
}
static void
-mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter)
+mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int
a
filter)
{
char tfile[_POSIX_PATH_MAX];
char warning[STRING + _POSIX_PATH_MAX];
{
char tfile[_POSIX_PATH_MAX];
char warning[STRING + _POSIX_PATH_MAX];
- if (filter) {
+ if (
a
filter) {
snprintf (warning, sizeof (warning),
_("WARNING! You are about to overwrite %s, continue?"),
body->filename);
snprintf (warning, sizeof (warning),
_("WARNING! You are about to overwrite %s, continue?"),
body->filename);
@@
-583,7
+584,7
@@
mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter)
tfile[0] = 0;
if (mutt_pipe_attachment (fp, body, command, tfile)) {
tfile[0] = 0;
if (mutt_pipe_attachment (fp, body, command, tfile)) {
- if (filter) {
+ if (
a
filter) {
mutt_unlink (body->filename);
mutt_rename_file (tfile, body->filename);
mutt_update_encoding (body);
mutt_unlink (body->filename);
mutt_rename_file (tfile, body->filename);
mutt_update_encoding (body);
@@
-591,7
+592,7
@@
mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter)
}
}
else {
}
}
else {
- if (filter && tfile[0])
+ if (
a
filter && tfile[0])
mutt_unlink (tfile);
}
}
mutt_unlink (tfile);
}
}
@@
-620,50
+621,50
@@
static void pipe_attachment (FILE * fp, BODY * b, STATE * state)
static void
pipe_attachment_list (char *command, FILE * fp, int tag, BODY * top,
static void
pipe_attachment_list (char *command, FILE * fp, int tag, BODY * top,
- int filter, STATE * state)
+ int
a
filter, STATE * state)
{
for (; top; top = top->next) {
if (!tag || top->tagged) {
{
for (; top; top = top->next) {
if (!tag || top->tagged) {
- if (!filter && !option (OPTATTACHSPLIT))
+ if (!
a
filter && !option (OPTATTACHSPLIT))
pipe_attachment (fp, top, state);
else
pipe_attachment (fp, top, state);
else
- mutt_query_pipe_attachment (command, fp, top, filter);
+ mutt_query_pipe_attachment (command, fp, top,
a
filter);
}
else if (top->parts)
}
else if (top->parts)
- pipe_attachment_list (command, fp, tag, top->parts, filter, state);
+ pipe_attachment_list (command, fp, tag, top->parts,
a
filter, state);
if (!tag)
break;
}
}
if (!tag)
break;
}
}
-void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int filter)
+void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int
a
filter)
{
STATE state;
char buf[SHORT_STRING];
pid_t thepid;
if (fp)
{
STATE state;
char buf[SHORT_STRING];
pid_t thepid;
if (fp)
- filter = 0; /* sanity check: we can't filter in the recv case yet */
+
a
filter = 0; /* sanity check: we can't filter in the recv case yet */
buf[0] = 0;
p_clear(&state, 1);
buf[0] = 0;
p_clear(&state, 1);
- if (mutt_get_field ((filter ? _("Filter through: ") : _("Pipe to: ")),
+ if (mutt_get_field ((
a
filter ? _("Filter through: ") : _("Pipe to: ")),
buf, sizeof (buf), M_CMD) != 0 || !buf[0])
return;
mutt_expand_path (buf, sizeof (buf));
buf, sizeof (buf), M_CMD) != 0 || !buf[0])
return;
mutt_expand_path (buf, sizeof (buf));
- if (!filter && !option (OPTATTACHSPLIT)) {
+ if (!
a
filter && !option (OPTATTACHSPLIT)) {
mutt_endwin (NULL);
thepid = mutt_create_filter (buf, &state.fpout, NULL, NULL);
mutt_endwin (NULL);
thepid = mutt_create_filter (buf, &state.fpout, NULL, NULL);
- pipe_attachment_list (buf, fp, tag, top, filter, &state);
+ pipe_attachment_list (buf, fp, tag, top,
a
filter, &state);
fclose (state.fpout);
if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
mutt_any_key_to_continue (NULL);
}
else
fclose (state.fpout);
if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
mutt_any_key_to_continue (NULL);
}
else
- pipe_attachment_list (buf, fp, tag, top, filter, &state);
+ pipe_attachment_list (buf, fp, tag, top,
a
filter, &state);
}
static int can_print (BODY * top, int tag)
}
static int can_print (BODY * top, int tag)