X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=29fbb9f759633516c64d78191be42b6e2a148260;hp=dc51b4de728521a2226218ae5fbc546c156d85e3;hb=00f34116b32751764d42f81159c292d850c74bac;hpb=6c9a7df6f0a909d987634888cbb7ccd9b17ecc09 diff --git a/recvattach.c b/recvattach.c index dc51b4d..29fbb9f 100644 --- a/recvattach.c +++ b/recvattach.c @@ -13,29 +13,18 @@ #include #include -#include +#include #include #include #include -#include #include "mutt.h" +#include "crypt.h" #include "handler.h" #include "recvattach.h" #include "attach.h" #include "copy.h" -#define SW (option(OPTMBOXPANE)?SidebarWidth:0) - -static struct mapping_t AttachHelp[] = { - {N_("Exit"), OP_EXIT}, - {N_("Save"), OP_SAVE}, - {N_("Pipe"), OP_PIPE}, - {N_("Print"), OP_PRINT}, - {N_("Help"), OP_HELP}, - {NULL, OP_NULL} -}; - void mutt_update_tree (ATTACHPTR ** idx, short idxlen) { char buf[STRING]; @@ -139,19 +128,15 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m, * %s = size * %u = unlink */ -const char *mutt_attach_fmt (char *dest, - ssize_t destlen, - char op, - const char *src, - const char *prefix, - const char *ifstring, - const char *elsestring, - unsigned long data, format_flag flags) +const char * +mutt_attach_fmt(char *dest, ssize_t destlen, char op, const char *src, + const char *prefix, const char *ifstr, const char *elstr, + anytype data, format_flag flags) { char fmt[16]; - char tmp[SHORT_STRING]; - char charset[SHORT_STRING]; - ATTACHPTR *aptr = (ATTACHPTR *) data; + char tmp[STRING]; + char charset[STRING]; + ATTACHPTR *aptr = data.ptr; int optional = (flags & M_FORMAT_OPTIONAL); ssize_t l; @@ -187,11 +172,10 @@ const char *mutt_attach_fmt (char *dest, } if (mutt_is_message_type(aptr->content) && MsgFmt && aptr->content->hdr) { - char s[SHORT_STRING]; + char s[STRING]; _mutt_make_string (s, sizeof (s), MsgFmt, NULL, aptr->content->hdr, - M_FORMAT_FORCESUBJ | M_FORMAT_MAKEPRINT | - M_FORMAT_ARROWCURSOR); + M_FORMAT_FORCESUBJ | M_FORMAT_MAKEPRINT); if (*s) { mutt_format_s (dest, destlen, prefix, s); break; @@ -312,19 +296,16 @@ const char *mutt_attach_fmt (char *dest, *dest = 0; } - if (optional) - mutt_FormatString (dest, destlen, ifstring, mutt_attach_fmt, data, 0); - else if (flags & M_FORMAT_OPTIONAL) - mutt_FormatString (dest, destlen, elsestring, mutt_attach_fmt, data, 0); - return (src); + if (flags & M_FORMAT_OPTIONAL) + m_strformat(dest, destlen, 0, optional ? ifstr : elstr, + mutt_attach_fmt, data, 0); + return src; } -static void attach_entry (char *b, ssize_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, - (unsigned long) (((ATTACHPTR **) menu->data)[num]), - M_FORMAT_ARROWCURSOR); + m_strformat(b, blen, getmaxx(main_w), AttachFormat, mutt_attach_fmt, + ((ATTACHPTR **) menu->data)[num], 0); } int mutt_tag_attach (MUTTMENU * menu, int n, int m) @@ -339,7 +320,7 @@ int mutt_tag_attach (MUTTMENU * menu, int n, int m) static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr, char **directory) { - char *prompt; + const char *prompt; char buf[_POSIX_PATH_MAX], tfile[_POSIX_PATH_MAX]; int is_message; int append = 0; @@ -382,10 +363,9 @@ static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr, 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 && + is_message = (fp && body->hdr && body->encoding != ENCBASE64 && body->encoding != ENCQUOTEDPRINTABLE && mutt_is_message_type(body)); @@ -394,35 +374,27 @@ static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr, struct stat st; /* check to make sure that this file is really the one the user wants */ - if ((rc = mutt_save_confirm (buf, &st)) == 1) { - prompt = _("Save to file: "); - continue; - } - else if (rc == -1) - return -1; + rc = mutt_save_confirm(buf, &st); m_strcpy(tfile, sizeof(tfile), buf); + } else { + rc = mutt_check_overwrite(body->filename, buf, tfile, sizeof(tfile), + &append, directory); } - else { - if ((rc = - mutt_check_overwrite (body->filename, buf, tfile, sizeof (tfile), - &append, directory)) == -1) - return -1; - else if (rc == 1) { - prompt = _("Save to file: "); - continue; - } + if (rc == -1) + return -1; + if (rc == 1) { + prompt = _("Save to file: "); + continue; } mutt_message _("Saving..."); - if (mutt_save_attachment - (fp, body, tfile, append, - (hdr || !is_message) ? hdr : body->hdr) == 0) { + if (mutt_save_attachment(fp, body, tfile, append, + (hdr || !is_message) ? hdr : body->hdr) == 0) + { mutt_message _("Attachment saved."); - return 0; - } - else { + } else { prompt = _("Save to file: "); continue; } @@ -468,8 +440,7 @@ void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr, m_fclose(&fpout); } } - } - else { + } else { if (tag && menu && top->aptr) { menu->oldcurrent = menu->current; menu->current = top->aptr->num; @@ -502,34 +473,30 @@ 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 afilter) +mutt_query_pipe_attachment(char *command, FILE * fp, BODY * body, int afilter) { char tfile[_POSIX_PATH_MAX]; char warning[STRING + _POSIX_PATH_MAX]; + int tempfd = -1; if (afilter) { - snprintf (warning, sizeof (warning), - _("WARNING! You are about to overwrite %s, continue?"), - body->filename); - if (mutt_yesorno (warning, M_NO) != M_YES) { - CLEARLINE (LINES - 1); - return; - } - mutt_mktemp (tfile); + snprintf(warning, sizeof (warning), + _("WARNING! You are about to overwrite %s, continue?"), + body->filename); + if (mutt_yesorno (warning, M_NO) != M_YES) + return + tempfd = m_tempfd(tfile, sizeof(tfile), NONULL(mod_core.tmpdir), NULL); } - else - tfile[0] = 0; - if (mutt_pipe_attachment (fp, body, command, tfile)) { + if (mutt_pipe_attachment(fp, body, command, tempfd)) { if (afilter) { mutt_unlink (body->filename); mutt_rename_file (tfile, body->filename); mutt_update_encoding (body); mutt_message _("Attachment filtered."); } - } - else { - if (afilter && tfile[0]) + } else if (afilter) { + close(tempfd); mutt_unlink (tfile); } } @@ -543,8 +510,7 @@ static void pipe_attachment (FILE * fp, BODY * b, STATE * state) mutt_decode_attachment (b, state); if (AttachSep) state_puts (AttachSep, state); - } - else { + } else { if ((ifp = fopen (b->filename, "r")) == NULL) { mutt_perror ("fopen"); return; @@ -577,13 +543,13 @@ pipe_attachment_list (char *command, FILE * fp, int tag, BODY * top, void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int afilter) { STATE state; - char buf[SHORT_STRING]; + char buf[STRING]; pid_t thepid; if (fp) afilter = 0; /* sanity check: we can't filter in the recv case yet */ - buf[0] = 0; + buf[0] = '\0'; p_clear(&state, 1); if (mutt_get_field ((afilter ? _("Filter through: ") : _("Pipe to: ")), @@ -599,34 +565,35 @@ void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int afilter) m_fclose(&state.fpout); if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY)) mutt_any_key_to_continue (NULL); - } - else + } else { pipe_attachment_list (buf, fp, tag, top, afilter, &state); + } } -static int can_print (BODY * top, int tag) +static int can_print(BODY * top, int tag) { - char type[STRING]; - for (; top; top = top->next) { - snprintf (type, sizeof (type), "%s/%s", TYPE (top), top->subtype); + char type[STRING]; + int tok = mime_which_token(top->subtype, -1); + + snprintf(type, sizeof(type), "%s/%s", TYPE(top), top->subtype); + if (!tag || top->tagged) { - if (!rfc1524_mailcap_lookup (top, type, NULL, M_PRINT)) { - if (ascii_strcasecmp ("text/plain", top->subtype) && - ascii_strcasecmp ("application/postscript", top->subtype)) { - if (!mutt_can_decode (top)) { - mutt_error (_("I dont know how to print %s attachments!"), type); - return (0); - } - } + if (!rfc1524_mailcap_lookup(top, type, NULL, M_PRINT) + && !(top->type == TYPETEXT && tok == MIME_PLAIN) + && !(top->type == TYPEAPPLICATION && tok == MIME_POSTSCRIPT) + && !mutt_can_decode(top)) + { + mutt_error(_("I dont know how to print %s attachments!"), type); + return 0; } } else if (top->parts) - return (can_print (top->parts, tag)); + return (can_print(top->parts, tag)); if (!tag) break; } - return (1); + return 1; } static void print_attachment_list (FILE * fp, int tag, BODY * top, @@ -634,24 +601,26 @@ static void print_attachment_list (FILE * fp, int tag, BODY * top, { char type[STRING]; - for (; top; top = top->next) { if (!tag || top->tagged) { + int tok = mime_which_token(top->subtype, -1); + snprintf (type, sizeof (type), "%s/%s", TYPE (top), top->subtype); if (!option (OPTATTACHSPLIT) && !rfc1524_mailcap_lookup (top, type, NULL, M_PRINT)) { - if (!ascii_strcasecmp ("text/plain", top->subtype) - || !ascii_strcasecmp ("application/postscript", top->subtype)) + if ((top->type == TYPETEXT && tok == MIME_PLAIN) + || (top->type == TYPEAPPLICATION && tok == MIME_POSTSCRIPT)) { pipe_attachment (fp, top, state); - else if (mutt_can_decode (top)) { + } else + if (mutt_can_decode (top)) { /* decode and print */ char newfile[_POSIX_PATH_MAX] = ""; FILE *ifp; + int newfile_fd; - mutt_mktemp (newfile); - if (mutt_decode_save_attachment (fp, top, newfile, M_PRINTING, 0) == - 0) { + newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(mod_core.tmpdir), NULL); + if (mutt_decode_save_attachment (fp, top, newfile_fd, M_PRINTING) == 0) { if ((ifp = fopen (newfile, "r")) != NULL) { mutt_copy_stream (ifp, state->fpout); m_fclose(&ifp); @@ -661,9 +630,9 @@ static void print_attachment_list (FILE * fp, int tag, BODY * top, } mutt_unlink (newfile); } + } else { + mutt_print_attachment(fp, top); } - else - mutt_print_attachment (fp, top); } else if (top->parts) print_attachment_list (fp, tag, top->parts, state); @@ -678,8 +647,7 @@ void mutt_print_attachment_list (FILE * fp, int tag, BODY * top) pid_t thepid; - if (query_quadoption - (OPT_PRINT, + if (query_quadoption(OPT_PRINT, tag ? _("Print tagged attachment(s)?") : _("Print attachment?")) != M_YES) return; @@ -718,10 +686,8 @@ mutt_update_attach_index (BODY * cur, ATTACHPTR *** idxp, menu->current = menu->max - 1; menu_check_recenter (menu); menu->redraw |= REDRAW_INDEX; - } - int mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr, BODY * cur, ATTACHPTR *** idxp, short *idxlen, @@ -820,7 +786,6 @@ void mutt_view_attachments (HEADER * hdr) int secured = 0; int need_secured = 0; - char helpstr[SHORT_STRING]; MUTTMENU *menu; BODY *cur = NULL; MESSAGE *msg; @@ -839,20 +804,12 @@ void mutt_view_attachments (HEADER * hdr) if ((msg = mx_open_message (Context, hdr->msgno)) == NULL) return; - if ((hdr->security & ENCRYPT) || (mutt_is_application_smime (hdr->content) & SMIMEOPAQUE)) { need_secured = 1; - if ((hdr->security & ENCRYPT) && !crypt_valid_passphrase (hdr->security)) { - mx_close_message (&msg); - return; - } if (hdr->security & APPLICATION_SMIME) { - if (hdr->env) - crypt_smime_getkeys (hdr->env); - if (mutt_is_application_smime (hdr->content)) { secured = !crypt_smime_decrypt_mime (msg->fp, &fp, hdr->content, &cur); @@ -883,7 +840,6 @@ void mutt_view_attachments (HEADER * hdr) if (need_secured && !secured) { mx_close_message (&msg); mutt_error _("Can't decrypt encrypted message!"); - return; } } @@ -898,8 +854,6 @@ void mutt_view_attachments (HEADER * hdr) menu->title = _("Attachments"); menu->make_entry = attach_entry; menu->tag = mutt_tag_attach; - menu->help = - mutt_compile_help (helpstr, sizeof (helpstr), MENU_ATTACH, AttachHelp); mutt_attach_init (cur); attach_collapse (cur, 0, 1, 0); @@ -956,10 +910,6 @@ void mutt_view_attachments (HEADER * hdr) mutt_update_attach_index (cur, &idx, &idxlen, &idxmax, menu); break; - case OP_FORGET_PASSPHRASE: - crypt_forget_passphrase (); - break; - case OP_EXTRACT_KEYS: crypt_pgp_extract_keys_from_attachment_list (fp, menu->tagprefix, menu-> @@ -1013,15 +963,6 @@ void mutt_view_attachments (HEADER * hdr) break; } -#ifdef USE_NNTP - if (Context->magic == M_NNTP) { - mutt_flushinp (); - mutt_error _("Can't delete attachment from newsserver."); - - break; - } -#endif - if (hdr->security & (~PGP_TRADITIONAL_CHECKED)) { mutt_message _("Deletion of attachments from encrypted messages is unsupported."); @@ -1106,32 +1047,6 @@ void mutt_view_attachments (HEADER * hdr) menu->redraw = REDRAW_FULL; break; -#ifdef USE_NNTP - case OP_FORWARD_TO_GROUP: - CHECK_ATTACH; - mutt_attach_forward (fp, hdr, idx, idxlen, - menu->tagprefix ? NULL : idx[menu->current]-> - content, SENDNEWS); - menu->redraw = REDRAW_FULL; - break; - - case OP_FOLLOWUP: - CHECK_ATTACH; - - if (!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?")) != - M_YES) { - mutt_attach_reply (fp, hdr, idx, idxlen, - menu->tagprefix ? NULL : idx[menu->current]-> - content, SENDNEWS | SENDREPLY); - menu->redraw = REDRAW_FULL; - break; - } -#endif - case OP_REPLY: case OP_GROUP_REPLY: case OP_LIST_REPLY: @@ -1181,5 +1096,7 @@ void mutt_view_attachments (HEADER * hdr) op = OP_NULL; } +#undef CHECK_READONLY +#undef CHECK_ATTACH /* not reached */ }