X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=f15ca1c5e8632b331028766a3703bbf791c90a44;hp=648966c4d3e2c0bf5bc519a986564267490ae1b7;hb=98f62b5fcbd680fd5214ee85e1635b84322cbdd1;hpb=2a2f2f9a5bad73c883b7f9c9b4166d932b6aaf37 diff --git a/commands.c b/commands.c index 648966c..f15ca1c 100644 --- a/commands.c +++ b/commands.c @@ -8,41 +8,26 @@ * 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 #include -#include -#include +#include +#include #include +#include #include "mutt.h" #include "alias.h" #include "recvattach.h" #include "sort.h" #include "copy.h" -#include "mx.h" #include "pager.h" -#include +#include "crypt.h" #include "mutt_idna.h" #include #include @@ -50,17 +35,12 @@ #include -#ifdef BUFFY_SIZE -#include "buffy.h" -#endif - /* The folder the user last saved to. Used by ci_save_message() */ static char LastSaveFolder[_POSIX_PATH_MAX] = ""; int mutt_display_message (HEADER * cur) { char tempfile[_POSIX_PATH_MAX], buf[LONG_STRING]; - int rc = 0, builtin = 0; int cmflags = M_CM_DECODE | M_CM_DISPLAY | M_CM_CHARCONV; FILE *fpout = NULL; FILE *fpfilterout = NULL; @@ -74,35 +54,25 @@ int mutt_display_message (HEADER * cur) mutt_parse_mime_message (Context, cur); mutt_message_hook (Context, cur, M_MESSAGEHOOK); - mutt_mktemp (tempfile); - if ((fpout = safe_fopen (tempfile, "w")) == NULL) { + fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL); + if (!fpout) { mutt_error _("Could not create temporary file!"); - - return (0); + return 0; } if (DisplayFilter && *DisplayFilter) { fpfilterout = fpout; fpout = NULL; - /* mutt_endwin (NULL); */ filterpid = mutt_create_filter_fd (DisplayFilter, &fpout, NULL, NULL, -1, fileno (fpfilterout), -1); if (filterpid < 0) { mutt_error (_("Cannot create display filter")); - safe_fclose (&fpfilterout); + m_fclose(&fpfilterout); unlink (tempfile); return 0; } } - if (!Pager || m_strcmp(Pager, "builtin") == 0) - builtin = 1; - else { - mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur); - fputs (buf, fpout); - fputs ("\n\n", fpout); - } - msg = mx_open_message (Context, cur->msgno); if (msg == NULL) res = -1; @@ -110,34 +80,17 @@ int mutt_display_message (HEADER * cur) /* see if crytpo is needed for this message. if so, we should exit curses */ if (cur->security) { if (cur->security & ENCRYPT) { - if (cur->security & APPLICATION_SMIME) - crypt_smime_getkeys (cur->env); - if (!crypt_valid_passphrase (cur->security)) - return 0; - cmflags |= M_CM_VERIFY; } else if (cur->security & SIGN) { /* find out whether or not the verify signature */ - if (query_quadoption (OPT_VERIFYSIG, _("Verify PGP signature?")) == + if (query_quadoption2(mod_crypt.verify_sig, _("Verify PGP signature?")) == M_YES) { cmflags |= M_CM_VERIFY; } } } - if (cmflags & M_CM_VERIFY || cur->security & ENCRYPT) { - if (cur->security & APPLICATION_PGP) { - if (cur->env->from) - crypt_pgp_invoke_getkeys (cur->env->from); - - crypt_invoke_message (APPLICATION_PGP); - } - - if (cur->security & APPLICATION_SMIME) - crypt_invoke_message (APPLICATION_SMIME); - } - res = _mutt_copy_message (fpout, msg->fp, cur, cur->content, cmflags, (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE | CH_FROM); @@ -148,28 +101,18 @@ int mutt_display_message (HEADER * cur) mx_close_message (&msg); } - if ((safe_fclose (&fpout) != 0 && errno != EPIPE) || res == -1) { + if ((m_fclose(&fpout) != 0 && errno != EPIPE) || res == -1) { mutt_error (_("Could not copy message")); if (fpfilterout != NULL) { mutt_wait_filter (filterpid); - safe_fclose (&fpfilterout); + m_fclose(&fpfilterout); } -#if 0 - /* this is maybe just plain wrong but it makes the pager display - * what we have; i.e. for the crypto stuff we only get - * 'Could not copy message' for invalid passphrases, no PGP output - * not nothing; so just display what we have... - * - pdmef - */ - mutt_unlink (tempfile); - return 0; -#endif } if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0) mutt_any_key_to_continue (NULL); - safe_fclose (&fpfilterout); /* XXX - check result? */ + m_fclose(&fpfilterout); /* XXX - check result? */ /* update crypto information for this message */ @@ -180,67 +123,46 @@ int mutt_display_message (HEADER * cur) are color patterns for both ~g and ~V */ cur->pair = 0; - if (builtin) { - pager_t info; - - if ((cur->security & APPLICATION_SMIME) && (cmflags & M_CM_VERIFY)) { - if (cur->security & GOODSIGN) { - if (!crypt_smime_verify_sender (cur)) - mutt_message (_("S/MIME signature successfully verified.")); - else - mutt_error (_("S/MIME certificate owner does not match sender.")); - } - else if (cur->security & PARTSIGN) - mutt_message (_ - ("Warning: Part of this message has not been signed.")); - else if (cur->security & SIGN || cur->security & BADSIGN) - mutt_error (_("S/MIME signature could NOT be verified.")); + if ((cur->security & APPLICATION_SMIME) && (cmflags & M_CM_VERIFY)) { + if (cur->security & GOODSIGN) { + if (!crypt_smime_verify_sender (cur)) + mutt_message (_("S/MIME signature successfully verified.")); + else + mutt_error (_("S/MIME certificate owner does not match sender.")); } + else if (cur->security & PARTSIGN) + mutt_message (_ + ("Warning: Part of this message has not been signed.")); + else if (cur->security & SIGN || cur->security & BADSIGN) + mutt_error (_("S/MIME signature could NOT be verified.")); + } - if ((cur->security & APPLICATION_PGP) && (cmflags & M_CM_VERIFY)) { - if (cur->security & GOODSIGN) - mutt_message (_("PGP signature successfully verified.")); - else if (cur->security & PARTSIGN) - mutt_message (_ - ("Warning: Part of this message has not been signed.")); - else if (cur->security & SIGN) - mutt_message (_("PGP signature could NOT be verified.")); - } + if ((cur->security & APPLICATION_PGP) && (cmflags & M_CM_VERIFY)) { + if (cur->security & GOODSIGN) + mutt_message (_("PGP signature successfully verified.")); + else if (cur->security & PARTSIGN) + mutt_message (_ + ("Warning: Part of this message has not been signed.")); + else if (cur->security & SIGN) + mutt_message (_("PGP signature could NOT be verified.")); + } + + { + pager_t info; - /* Invoke the builtin pager */ p_clear(&info, 1); info.hdr = cur; info.ctx = Context; - rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info); - } - else { - int r; - - mutt_endwin (NULL); - snprintf (buf, sizeof (buf), "%s %s", NONULL (Pager), tempfile); - if ((r = mutt_system (buf)) == -1) - mutt_error (_("Error running \"%s\"!"), buf); - unlink (tempfile); - keypad (stdscr, TRUE); - if (r != -1) - mutt_set_flag (Context, cur, M_READ, 1); - if (r != -1 && option (OPTPROMPTAFTER)) { - mutt_ungetch (mutt_any_key_to_continue _("Command: "), 0); - rc = km_dokey (MENU_PAGER); - } - else - rc = 0; + return mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info); } - - return rc; } void ci_bounce_message (HEADER * h, int *redraw) { - char prompt[SHORT_STRING]; + char prompt[STRING]; char buf[HUGE_STRING] = { 0 }; address_t *adr = NULL; - const char *err = NULL; + char *err = NULL; int rc; if (h) @@ -274,30 +196,29 @@ void ci_bounce_message (HEADER * h, int *redraw) } buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), adr, 1); + rfc822_addrcat(buf, sizeof (buf), adr, 1); -#define extra_space (15 + 7 + 2) snprintf (prompt, sizeof (prompt), (h ? _("Bounce message to %s") : _("Bounce messages to %s")), buf); - if (mutt_strwidth (prompt) > COLS - extra_space) { - mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0, - prompt, sizeof(prompt), 0); +#define extra_space (15 + 7 + 2) + if (m_strwidth(prompt) > getmaxx(main_w) - extra_space) { + mutt_format_string(prompt, sizeof(prompt), 0, + getmaxx(main_w) - extra_space, 0, 0, prompt, + sizeof(prompt), 0); m_strcat(prompt, sizeof(prompt), "...?"); } else { m_strcat(prompt, sizeof(prompt), "?"); } +#undef extra_space if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) { address_list_wipe(&adr); - CLEARLINE (LINES - 1); mutt_message (h ? _("Message not bounced.") : _("Messages not bounced.")); return; } - CLEARLINE (LINES - 1); - rc = mutt_bounce_message (NULL, h, adr); address_list_wipe(&adr); /* If no error, or background, display message. */ @@ -305,33 +226,25 @@ void ci_bounce_message (HEADER * h, int *redraw) mutt_message (h ? _("Message bounced.") : _("Messages bounced.")); } -static void pipe_set_flags (int decode, int print, int *cmflags, int *chflags) +static void pipe_msg (HEADER * h, FILE * fp, int decode, int print) { + int cmflags = 0; + int chflags = CH_FROM; + if (decode) { - *cmflags |= M_CM_DECODE | M_CM_CHARCONV; - *chflags |= CH_DECODE | CH_REORDER; + cmflags |= M_CM_DECODE | M_CM_CHARCONV; + chflags |= CH_DECODE | CH_REORDER; - if (option (OPTWEED)) { - *chflags |= CH_WEED; - *cmflags |= M_CM_WEED; + if (option(OPTWEED)) { + chflags |= CH_WEED; + cmflags |= M_CM_WEED; } } if (print) - *cmflags |= M_CM_PRINTING; - -} - -static void pipe_msg (HEADER * h, FILE * fp, int decode, int print) -{ - int cmflags = 0; - int chflags = CH_FROM; - - pipe_set_flags (decode, print, &cmflags, &chflags); + cmflags |= M_CM_PRINTING; if (decode && h->security & ENCRYPT) { - if (!crypt_valid_passphrase (h->security)) - return; endwin (); } @@ -341,9 +254,7 @@ static void pipe_msg (HEADER * h, FILE * fp, int decode, int print) mutt_copy_message (fp, Context, h, cmflags, chflags); } - /* the following code is shared between printing and piping */ - static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print, int split, const char *sep) { @@ -352,20 +263,11 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print, pid_t thepid; FILE *fpout; -/* mutt_endwin (NULL); - - is this really needed here ? - it makes the screen flicker on pgp and s/mime messages, - before asking for a passphrase... - Oliver Ehli */ if (h) { - mutt_message_hook (Context, h, M_MESSAGEHOOK); if (decode) { mutt_parse_mime_message (Context, h); - if (h->security & ENCRYPT && !crypt_valid_passphrase (h->security)) - return 1; } mutt_endwin (NULL); @@ -376,21 +278,15 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print, } pipe_msg (h, fpout, decode, print); - fclose (fpout); + m_fclose(&fpout); rc = mutt_wait_filter (thepid); - } - else { /* handle tagged messages */ - + } else { /* handle tagged messages */ if (decode) { for (i = 0; i < Context->vcount; i++) if (Context->hdrs[Context->v2r[i]]->tagged) { mutt_message_hook (Context, Context->hdrs[Context->v2r[i]], M_MESSAGEHOOK); mutt_parse_mime_message (Context, Context->hdrs[Context->v2r[i]]); - if (Context->hdrs[Context->v2r[i]]->security & ENCRYPT && - !crypt_valid_passphrase (Context->hdrs[Context->v2r[i]]-> - security)) - return 1; } } @@ -409,13 +305,12 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print, /* add the message separator */ if (sep) fputs (sep, fpout); - safe_fclose (&fpout); + m_fclose(&fpout); if (mutt_wait_filter (thepid) != 0) rc = 1; } } - } - else { + } else { mutt_endwin (NULL); if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) { mutt_perror (_("Can't create filter process")); @@ -432,7 +327,7 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print, fputs (sep, fpout); } } - safe_fclose (&fpout); + m_fclose(&fpout); if (mutt_wait_filter (thepid) != 0) rc = 1; } @@ -461,7 +356,7 @@ void mutt_pipe_message (HEADER * h) void mutt_print_message (HEADER * h) { - if (quadoption (OPT_PRINT) && (!PrintCmd || !*PrintCmd)) { + if (quadoption (OPT_PRINT) && m_strisempty(PrintCmd)) { mutt_message (_("No printing command has been defined.")); return; } @@ -538,7 +433,7 @@ int mutt_select_sort (int reverse) if (reverse) Sort |= SORT_REVERSE; - return (Sort != method ? 0 : -1); /* no need to resort if it's the same */ + return Sort != method ? 0 : -1; /* no need to resort if it's the same */ } /* invoke a command in a subshell */ @@ -548,10 +443,9 @@ void mutt_shell_escape (void) buf[0] = 0; if (mutt_get_field (_("Shell command: "), buf, sizeof (buf), M_CMD) == 0) { - if (!buf[0] && Shell) - m_strcpy(buf, sizeof(buf), Shell); + if (!buf[0]) + m_strcpy(buf, sizeof(buf), mod_core.shell); if (buf[0]) { - CLEARLINE (LINES - 1); mutt_endwin (NULL); fflush (stdout); if (mutt_system (buf) != 0 || option (OPTWAITKEY)) @@ -564,7 +458,7 @@ void mutt_shell_escape (void) void mutt_enter_command (void) { BUFFER err, token; - char buffer[LONG_STRING], errbuf[SHORT_STRING]; + char buffer[LONG_STRING], errbuf[STRING]; int r; buffer[0] = 0; @@ -590,7 +484,7 @@ void mutt_enter_command (void) void mutt_display_address (ENVELOPE * env) { const char *pfx = NULL; - char buf[SHORT_STRING]; + char buf[STRING]; address_t *adr = NULL; adr = mutt_get_address(env, &pfx); @@ -606,7 +500,7 @@ void mutt_display_address (ENVELOPE * env) */ buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), adr, 0); + rfc822_addrcat(buf, sizeof (buf), adr, 0); mutt_message ("%s: %s", pfx, buf); } @@ -663,7 +557,7 @@ int _mutt_save_message (HEADER * h, CONTEXT * ctx, int delete, int decode, mutt_set_flag (Context, h, M_TAG, 0); mutt_set_flag (Context, h, M_APPENDED, 1); } - return (0); + return 0; } /* returns 0 if the copy/save was successful, or -1 on error/abort */ @@ -671,15 +565,10 @@ int mutt_save_message (HEADER * h, int delete, int decode, int decrypt, int *redraw) { int i, need_buffy_cleanup; int need_passphrase = 0, app = 0; - char prompt[SHORT_STRING], buf[_POSIX_PATH_MAX]; + char prompt[STRING], buf[_POSIX_PATH_MAX]; CONTEXT ctx; struct stat st; - -#ifdef BUFFY_SIZE - BUFFY *tmp = NULL; -#else struct utimbuf ut; -#endif *redraw = 0; @@ -721,7 +610,7 @@ int mutt_save_message (HEADER * h, int delete, mutt_pretty_mailbox (buf); if (mutt_enter_fname (prompt, buf, sizeof (buf), redraw, 0) == -1) - return (-1); + return -1; if (*redraw != REDRAW_FULL) { if (!h) @@ -731,7 +620,7 @@ int mutt_save_message (HEADER * h, int delete, } if (!buf[0]) - return (-1); + return -1; /* This is an undocumented feature of ELM pointed out to me by Felix von * Leitner @@ -747,10 +636,6 @@ int mutt_save_message (HEADER * h, int delete, if (mutt_save_confirm (buf, &st) != 0) return -1; - if (need_passphrase && (decode || decrypt) - && !crypt_valid_passphrase (app)) - return -1; - mutt_message (_("Copying to %s..."), buf); if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) { @@ -772,7 +657,7 @@ int mutt_save_message (HEADER * h, int delete, if (h) { if (_mutt_save_message (h, &ctx, delete, decode, decrypt) != 0) { mx_close_mailbox (&ctx, NULL); - return (-1); + return -1; } } else { for (i = 0; i < Context->vcount; i++) { @@ -782,45 +667,34 @@ int mutt_save_message (HEADER * h, int delete, if (_mutt_save_message (Context->hdrs[Context->v2r[i]], &ctx, delete, decode, decrypt) != 0) { mx_close_mailbox (&ctx, NULL); - return (-1); + return -1; } } } } - need_buffy_cleanup = (ctx.magic == M_MBOX || ctx.magic == M_MMDF); + need_buffy_cleanup = (ctx.magic == M_MBOX); mx_close_mailbox (&ctx, NULL); if (need_buffy_cleanup) { -#ifdef BUFFY_SIZE - tmp = buffy_find_mailbox (buf); - if (tmp && tmp->new <= 0) - buffy_update_mailbox (tmp); -#else /* fix up the times so buffy won't get confused */ if (st.st_mtime > st.st_atime) { ut.actime = st.st_atime; ut.modtime = time (NULL); utime (buf, &ut); - } - else + } else { utime (buf, NULL); -#endif + } } mutt_clear_error (); - return (0); + return 0; } return -1; } -void mutt_version (void) -{ - mutt_message (mutt_make_version (1)); -} - void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) { char buf[LONG_STRING]; @@ -839,7 +713,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype); m_strcpy(obuf, sizeof(obuf), buf); if (b->parameter) { - PARAMETER *p; + parameter_t *p; ssize_t l; for (p = b->parameter; p; p = p->next) { @@ -893,13 +767,13 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) b->force_charset |= charset_changed ? 1 : 0; if (!is_multipart(b) && b->parts) - mutt_free_body (&b->parts); - if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) { + body_list_wipe(&b->parts); + if (!mutt_is_message_type(b) && b->hdr) { b->hdr->content = NULL; header_delete(&b->hdr); } - if (fp && (is_multipart(b) || mutt_is_message_type(b->type, b->subtype))) + if (fp && (is_multipart(b) || mutt_is_message_type(b))) mutt_parse_part (fp, b); if (h) { @@ -911,42 +785,3 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) } -static int _mutt_check_traditional_pgp (HEADER * h, int *redraw) -{ - MESSAGE *msg; - int rv = 0; - - h->security |= PGP_TRADITIONAL_CHECKED; - - mutt_parse_mime_message (Context, h); - if ((msg = mx_open_message (Context, h->msgno)) == NULL) - return 0; - if (crypt_pgp_check_traditional (msg->fp, h->content, 0)) { - h->security = crypt_query (h->content); - *redraw |= REDRAW_FULL; - rv = 1; - } - - h->security |= PGP_TRADITIONAL_CHECKED; - mx_close_message (&msg); - return rv; -} - -int mutt_check_traditional_pgp (HEADER * h, int *redraw) -{ - int i; - int rv = 0; - - if (h && !(h->security & PGP_TRADITIONAL_CHECKED)) - rv = _mutt_check_traditional_pgp (h, redraw); - else { - for (i = 0; i < Context->vcount; i++) - if (Context->hdrs[Context->v2r[i]]->tagged && - !(Context->hdrs[Context->v2r[i]]-> - security & PGP_TRADITIONAL_CHECKED)) - rv = - _mutt_check_traditional_pgp (Context->hdrs[Context->v2r[i]], redraw) - || rv; - } - return rv; -}