X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=dc51b4de728521a2226218ae5fbc546c156d85e3;hp=fcad4919d7e6b0d30df6b0d94b9e691488305a77;hb=6c9a7df6f0a909d987634888cbb7ccd9b17ecc09;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1 diff --git a/recvattach.c b/recvattach.c index fcad491..dc51b4d 100644 --- a/recvattach.c +++ b/recvattach.c @@ -8,51 +8,24 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include -#include +#include #include +#include + +#include +#include +#include +#include +#include #include "mutt.h" -#include "enter.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 "copy.h" -#include "mutt_crypt.h" - - -#include -#include -#include -#include -#include -#include -#include -static const char *Mailbox_is_read_only = N_("Mailbox is read-only."); -static char LastSaveFolder[_POSIX_PATH_MAX] = ""; - -#define CHECK_READONLY if (Context->readonly) \ -{\ - mutt_flushinp (); \ - mutt_error _(Mailbox_is_read_only); \ - break; \ -} - -#define SW (option(OPTMBOXPANE)?SidebarWidth:0) +#define SW (option(OPTMBOXPANE)?SidebarWidth:0) static struct mapping_t AttachHelp[] = { {N_("Exit"), OP_EXIT}, @@ -63,26 +36,6 @@ static struct mapping_t AttachHelp[] = { {NULL, OP_NULL} }; -static int mutt_extract_path (char *filename, char *path) -{ - char *tmp = p_new(char, _POSIX_PATH_MAX); - char *help_ptr; - - help_ptr = tmp; - - while (*filename != '\0') { - if (*filename == '/') { - *help_ptr++ = *filename++; - *help_ptr++ = '\0'; - strcat (path, tmp); - help_ptr = tmp; - } - *help_ptr++ = *filename++; - } - p_delete(&tmp); - return 0; -} - void mutt_update_tree (ATTACHPTR ** idx, short idxlen) { char buf[STRING]; @@ -91,7 +44,7 @@ void mutt_update_tree (ATTACHPTR ** idx, short idxlen) for (x = 0; x < idxlen; x++) { idx[x]->num = x; - if (2 * (idx[x]->level + 2) < sizeof (buf)) { + if (2 * (idx[x]->level + 2) < ssizeof (buf)) { if (idx[x]->level) { s = buf + 2 * (idx[x]->level - 1); *s++ = (idx[x]->content->next) ? M_TREE_LTEE : M_TREE_LLCORNER; @@ -110,7 +63,7 @@ void mutt_update_tree (ATTACHPTR ** idx, short idxlen) else idx[x]->tree = m_strdup(buf); - if (2 * (idx[x]->level + 2) < sizeof (buf) && idx[x]->level) { + if (2 * (idx[x]->level + 2) < ssizeof (buf) && idx[x]->level) { s = buf + 2 * (idx[x]->level - 1); *s++ = (idx[x]->content->next) ? '\005' : '\006'; *s++ = '\006'; @@ -157,7 +110,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m, /* We don't support multipart messages in the compose menu yet */ if (!compose && !m->collapsed && ((m->type == TYPEMULTIPART && !mutt_is_multipart_encrypted(m)) - || mutt_is_message_type (m->type, m->subtype))) + || mutt_is_message_type(m))) { idx = mutt_gen_attach_list (m->parts, m->type, idx, idxlen, idxmax, level + 1, compose); @@ -187,7 +140,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m, * %u = unlink */ const char *mutt_attach_fmt (char *dest, - size_t destlen, + ssize_t destlen, char op, const char *src, const char *prefix, @@ -200,7 +153,7 @@ const char *mutt_attach_fmt (char *dest, char charset[SHORT_STRING]; ATTACHPTR *aptr = (ATTACHPTR *) data; int optional = (flags & M_FORMAT_OPTIONAL); - size_t l; + ssize_t l; switch (op) { case 'C': @@ -232,8 +185,8 @@ const char *mutt_attach_fmt (char *dest, mutt_format_s (dest, destlen, prefix, aptr->content->description); break; } - if (mutt_is_message_type (aptr->content->type, aptr->content->subtype) - && MsgFmt && aptr->content->hdr) { + if (mutt_is_message_type(aptr->content) && MsgFmt && aptr->content->hdr) + { char s[SHORT_STRING]; _mutt_make_string (s, sizeof (s), MsgFmt, NULL, aptr->content->hdr, @@ -250,8 +203,7 @@ const char *mutt_attach_fmt (char *dest, } } else if (aptr->content->description || - (mutt_is_message_type - (aptr->content->type, aptr->content->subtype) + (mutt_is_message_type(aptr->content) && MsgFmt && aptr->content->hdr)) break; /* FALLS THROUGH TO 'f' */ @@ -367,7 +319,7 @@ const char *mutt_attach_fmt (char *dest, return (src); } -static void attach_entry (char *b, size_t blen, MUTTMENU * menu, int num) +static void attach_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) { int w=(COLS-SW)>blen?blen:(COLS-SW); mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt, @@ -384,22 +336,11 @@ int mutt_tag_attach (MUTTMENU * menu, int n, int m) return cur->tagged - ot; } -int mutt_is_message_type (int type, const char *subtype) -{ - if (type != TYPEMESSAGE) - return 0; - - subtype = NONULL (subtype); - return (ascii_strcasecmp (subtype, "rfc822") == 0 - || ascii_strcasecmp (subtype, "news") == 0); -} - static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr, char **directory) { char *prompt; char buf[_POSIX_PATH_MAX], tfile[_POSIX_PATH_MAX]; - char path[_POSIX_PATH_MAX] = ""; int is_message; int append = 0; int rc; @@ -415,42 +356,39 @@ static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr, else if (body->hdr && body->encoding != ENCBASE64 && body->encoding != ENCQUOTEDPRINTABLE && - mutt_is_message_type (body->type, body->subtype)) + mutt_is_message_type(body)) mutt_default_save (buf, sizeof (buf), body->hdr); else buf[0] = 0; prompt = _("Save to file ('#' for last used folder): "); while (prompt) { - ret = - mutt_get_field (prompt, buf, sizeof (buf), - M_FILE | M_CLEAR | M_LASTFOLDER); + static char LastSaveFolder[_POSIX_PATH_MAX] = "."; + + ret = mutt_get_field(prompt, buf, sizeof (buf), + M_FILE | M_CLEAR | M_LASTFOLDER); if (((ret != 0) && (ret != 2)) || (!buf[0] && ret != 2)) return -1; if (ret == 2) { char tmpbuf[_POSIX_PATH_MAX]; - snprintf (tmpbuf, sizeof (tmpbuf), "%s%s", LastSaveFolder, buf); + snprintf (tmpbuf, sizeof (tmpbuf), "%s/%s", LastSaveFolder, buf); m_strcpy(buf, sizeof(buf), tmpbuf); - ret = mutt_get_field (_("Save to file: ") - , buf, sizeof (buf), M_FILE); + ret = mutt_get_field(_("Save to file: "), buf, sizeof (buf), M_FILE); if ((ret != 0) || (!buf[0])) return -1; } - else { - mutt_extract_path (buf, path); - m_strcpy(LastSaveFolder, sizeof(LastSaveFolder), path); - } + m_dirname(LastSaveFolder, sizeof(LastSaveFolder), buf); prompt = NULL; - mutt_expand_path (buf, sizeof (buf)); + mutt_expand_path(buf, sizeof (buf)); is_message = (fp && body->hdr && body->encoding != ENCBASE64 && body->encoding != ENCQUOTEDPRINTABLE && - mutt_is_message_type (body->type, body->subtype)); + mutt_is_message_type(body)); if (is_message) { struct stat st; @@ -520,14 +458,14 @@ void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr, rc = mutt_save_attachment (fp, top, tfile, append, hdr); if (rc == 0 && AttachSep && (fpout = fopen (tfile, "a")) != NULL) { fprintf (fpout, "%s", AttachSep); - fclose (fpout); + m_fclose(&fpout); } } else { rc = mutt_save_attachment (fp, top, tfile, M_SAVE_APPEND, hdr); if (rc == 0 && AttachSep && (fpout = fopen (tfile, "a")) != NULL) { fprintf (fpout, "%s", AttachSep); - fclose (fpout); + m_fclose(&fpout); } } } @@ -564,12 +502,12 @@ void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr, } 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 afilter) { char tfile[_POSIX_PATH_MAX]; char warning[STRING + _POSIX_PATH_MAX]; - if (filter) { + if (afilter) { snprintf (warning, sizeof (warning), _("WARNING! You are about to overwrite %s, continue?"), body->filename); @@ -583,7 +521,7 @@ mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter) tfile[0] = 0; if (mutt_pipe_attachment (fp, body, command, tfile)) { - if (filter) { + if (afilter) { mutt_unlink (body->filename); mutt_rename_file (tfile, body->filename); mutt_update_encoding (body); @@ -591,7 +529,7 @@ mutt_query_pipe_attachment (char *command, FILE * fp, BODY * body, int filter) } } else { - if (filter && tfile[0]) + if (afilter && tfile[0]) mutt_unlink (tfile); } } @@ -612,7 +550,7 @@ static void pipe_attachment (FILE * fp, BODY * b, STATE * state) return; } mutt_copy_stream (ifp, state->fpout); - fclose (ifp); + m_fclose(&ifp); if (AttachSep) state_puts (AttachSep, state); } @@ -620,50 +558,50 @@ static void pipe_attachment (FILE * fp, BODY * b, STATE * state) static void pipe_attachment_list (char *command, FILE * fp, int tag, BODY * top, - int filter, STATE * state) + int afilter, STATE * state) { for (; top; top = top->next) { if (!tag || top->tagged) { - if (!filter && !option (OPTATTACHSPLIT)) + if (!afilter && !option (OPTATTACHSPLIT)) pipe_attachment (fp, top, state); else - mutt_query_pipe_attachment (command, fp, top, filter); + mutt_query_pipe_attachment (command, fp, top, afilter); } else if (top->parts) - pipe_attachment_list (command, fp, tag, top->parts, filter, state); + pipe_attachment_list (command, fp, tag, top->parts, afilter, state); 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 afilter) { STATE state; char buf[SHORT_STRING]; pid_t thepid; if (fp) - filter = 0; /* sanity check: we can't filter in the recv case yet */ + afilter = 0; /* sanity check: we can't filter in the recv case yet */ buf[0] = 0; p_clear(&state, 1); - if (mutt_get_field ((filter ? _("Filter through: ") : _("Pipe to: ")), + if (mutt_get_field ((afilter ? _("Filter through: ") : _("Pipe to: ")), buf, sizeof (buf), M_CMD) != 0 || !buf[0]) return; mutt_expand_path (buf, sizeof (buf)); - if (!filter && !option (OPTATTACHSPLIT)) { + if (!afilter && !option (OPTATTACHSPLIT)) { mutt_endwin (NULL); thepid = mutt_create_filter (buf, &state.fpout, NULL, NULL); - pipe_attachment_list (buf, fp, tag, top, filter, &state); - fclose (state.fpout); + pipe_attachment_list (buf, fp, tag, top, afilter, &state); + m_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, afilter, &state); } static int can_print (BODY * top, int tag) @@ -716,7 +654,7 @@ static void print_attachment_list (FILE * fp, int tag, BODY * top, 0) { if ((ifp = fopen (newfile, "r")) != NULL) { mutt_copy_stream (ifp, state->fpout); - fclose (ifp); + m_fclose(&ifp); if (AttachSep) state_puts (AttachSep, state); } @@ -753,7 +691,7 @@ void mutt_print_attachment_list (FILE * fp, int tag, BODY * top) p_clear(&state, 1); thepid = mutt_create_filter (NONULL (PrintCmd), &state.fpout, NULL, NULL); print_attachment_list (fp, tag, top, &state); - fclose (state.fpout); + m_fclose(&state.fpout); if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY)) mutt_any_key_to_continue (NULL); } @@ -791,12 +729,6 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr, { ATTACHPTR **idx = *idxp; -#if 0 - int old_optweed = option (OPTWEED); - - set_option (OPTWEED); -#endif - do { switch (op) { case OP_DISPLAY_HEADERS: @@ -852,10 +784,6 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr, } while (op != OP_NULL); -#if 0 - if (option (OPTWEED) != old_optweed) - toggle_option (OPTWEED); -#endif return op; } @@ -867,10 +795,9 @@ static void attach_collapse (BODY * b, short collapse, short init, for (; b; b = b->next) { i = init || b->collapsed; if (i && option (OPTDIGESTCOLLAPSE) && b->type == TYPEMULTIPART - && !ascii_strcasecmp (b->subtype, "digest")) + && mime_which_token(b->subtype, -1) == MIME_DIGEST) attach_collapse (b->parts, 1, 1, 0); - else if (b->type == TYPEMULTIPART - || mutt_is_message_type (b->type, b->subtype)) + else if (b->type == TYPEMULTIPART || mutt_is_message_type(b)) attach_collapse (b->parts, collapse, i, 0); b->collapsed = collapse; if (just_one) @@ -888,19 +815,6 @@ void mutt_attach_init (BODY * b) } } -static const char *Function_not_permitted = -N_("Function not permitted in attach-message mode."); - -#define CHECK_ATTACH if(option(OPTATTACHMSG)) \ - {\ - mutt_flushinp (); \ - mutt_error _(Function_not_permitted); \ - break; \ - } - - - - void mutt_view_attachments (HEADER * hdr) { int secured = 0; @@ -952,8 +866,8 @@ void mutt_view_attachments (HEADER * hdr) cur = NULL; secured = !crypt_smime_decrypt_mime (_fp, &fp, _cur, &cur); - mutt_free_body (&_cur); - safe_fclose (&_fp); + body_list_wipe(&_cur); + m_fclose(&_fp); } } else @@ -991,9 +905,23 @@ void mutt_view_attachments (HEADER * hdr) attach_collapse (cur, 0, 1, 0); mutt_update_attach_index (cur, &idx, &idxlen, &idxmax, menu); +#define CHECK_READONLY \ + if (Context->readonly) { \ + mutt_flushinp (); \ + mutt_error _("Mailbox is read-only."); \ + break; \ + } + +#define CHECK_ATTACH \ + if (option(OPTATTACHMSG)) { \ + mutt_flushinp (); \ + mutt_error _("Function not permitted in attach-message mode."); \ + break; \ + } + for (;;) { if (op == OP_NULL) - op = mutt_menuLoop (menu); + op = mutt_menuLoop(menu); switch (op) { case OP_ATTACH_VIEW_MAILCAP: mutt_view_attachment (fp, idx[menu->current]->content, M_MAILCAP, @@ -1078,14 +1006,12 @@ void mutt_view_attachments (HEADER * hdr) case OP_DELETE: CHECK_READONLY; -#ifdef USE_POP if (Context->magic == M_POP) { mutt_flushinp (); mutt_error _("Can't delete attachment from POP server."); break; } -#endif #ifdef USE_NNTP if (Context->magic == M_NNTP) { @@ -1245,8 +1171,8 @@ void mutt_view_attachments (HEADER * hdr) idxmax = 0; if (need_secured && secured) { - fclose (fp); - mutt_free_body (&cur); + m_fclose(&fp); + body_list_wipe(&cur); } mutt_menuDestroy (&menu); @@ -1255,6 +1181,5 @@ void mutt_view_attachments (HEADER * hdr) op = OP_NULL; } - /* not reached */ }