X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=2a4c7be3463c46145d407a9bdd213c3d5ccbe1fb;hp=33051bb7786a5c3ae18f907ff208498937222fe4;hb=f5b0e714a215eddd4d9f8084b434b713f0a580b4;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281 diff --git a/commands.c b/commands.c index 33051bb..2a4c7be 100644 --- a/commands.c +++ b/commands.c @@ -1,20 +1,11 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1996-2000 Michael R. Elkins * Copyright (C) 2000 Thomas Roessler - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. */ #if HAVE_CONFIG_H @@ -22,11 +13,13 @@ #endif #include "mutt.h" +#include "enter.h" +#include "recvattach.h" +#include "ascii.h" #include "mutt_curses.h" #include "mutt_menu.h" #include "mime.h" #include "sort.h" -#include "mailbox.h" #include "copy.h" #include "mx.h" #include "pager.h" @@ -45,6 +38,11 @@ #include "buffy.h" #endif +#include "lib/mem.h" +#include "lib/intl.h" +#include "lib/str.h" +#include "lib/debug.h" + #include #include #include @@ -66,8 +64,9 @@ int mutt_display_message (HEADER * cur) int cmflags = M_CM_DECODE | M_CM_DISPLAY | M_CM_CHARCONV; FILE *fpout = NULL; FILE *fpfilterout = NULL; + MESSAGE *msg = NULL; pid_t filterpid = -1; - int res; + int res = 0; snprintf (buf, sizeof (buf), "%s/%s", TYPE (cur->content), cur->content->subtype); @@ -75,38 +74,6 @@ int mutt_display_message (HEADER * cur) mutt_parse_mime_message (Context, cur); mutt_message_hook (Context, cur, M_MESSAGEHOOK); - /* see if crytpo is needed for this message. if so, we should exit curses */ - if (WithCrypto && 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?")) == - 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); - } - - mutt_mktemp (tempfile); if ((fpout = safe_fopen (tempfile, "w")) == NULL) { mutt_error _("Could not create temporary file!"); @@ -128,7 +95,7 @@ int mutt_display_message (HEADER * cur) } } - if (!Pager || mutt_strcmp (Pager, "builtin") == 0) + if (!Pager || str_cmp (Pager, "builtin") == 0) builtin = 1; else { mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur); @@ -136,9 +103,52 @@ int mutt_display_message (HEADER * cur) fputs ("\n\n", fpout); } - res = mutt_copy_message (fpout, Context, cur, cmflags, - (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | - CH_DECODE | CH_FROM); + msg = mx_open_message (Context, cur->msgno); + if (msg == NULL) res = -1; + + if (res != -1) { + /* see if crytpo is needed for this message. if so, we should exit curses */ + if (WithCrypto && 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?")) == + 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); + if (res == 0 && (ferror(fpout) || feof(fpout))) { + debug_print (1, ("_mutt_copy_message failed to detect EOF!\n")); + res = -1; + } + + mx_close_message (&msg); + } + if ((safe_fclose (&fpout) != 0 && errno != EPIPE) || res == -1) { mutt_error (_("Could not copy message")); if (fpfilterout != NULL) { @@ -157,6 +167,7 @@ int mutt_display_message (HEADER * cur) if (WithCrypto) { /* update crypto information for this message */ + cur->security &= ~(GOODSIGN|BADSIGN); cur->security |= crypt_query (cur->content); /* Remove color cache for this message, in case there @@ -189,7 +200,7 @@ int mutt_display_message (HEADER * cur) else if (cur->security & PARTSIGN) mutt_message (_ ("Warning: Part of this message has not been signed.")); - else + else if (cur->security & SIGN) mutt_message (_("PGP signature could NOT be verified.")); } @@ -254,7 +265,7 @@ void ci_bounce_message (HEADER * h, int *redraw) if (mutt_addrlist_to_idna (adr, &err) < 0) { mutt_error (_("Bad IDN: '%s'"), err); - FREE (&err); + mem_free (&err); rfc822_free_address (&adr); return; } @@ -271,10 +282,10 @@ void ci_bounce_message (HEADER * h, int *redraw) mutt_format_string (prompt, sizeof (prompt), 0, COLS - extra_space, 0, 0, prompt, sizeof (prompt), 0); - safe_strcat (prompt, sizeof (prompt), "...?"); + str_cat (prompt, sizeof (prompt), "...?"); } else - safe_strcat (prompt, sizeof (prompt), "?"); + str_cat (prompt, sizeof (prompt), "?"); if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) { rfc822_free_address (&adr); @@ -357,7 +368,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd, mutt_endwin (NULL); if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) { - mutt_perror _("Can't create filter process"); + mutt_perror (_("Can't create filter process")); return 1; } @@ -388,7 +399,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd, M_MESSAGEHOOK); mutt_endwin (NULL); if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) { - mutt_perror _("Can't create filter process"); + mutt_perror (_("Can't create filter process")); return 1; } @@ -405,7 +416,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd, else { mutt_endwin (NULL); if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) { - mutt_perror _("Can't create filter process"); + mutt_perror (_("Can't create filter process")); return 1; } @@ -562,7 +573,7 @@ void mutt_enter_command (void) err.dsize = sizeof (errbuf); memset (&token, 0, sizeof (token)); r = mutt_parse_rc_line (buffer, &token, &err); - FREE (&token.data); + mem_free (&token.data); if (errbuf[0]) { /* since errbuf could potentially contain printf() sequences in it, we must call mutt_error() in this fashion so that vsprintf() @@ -634,30 +645,31 @@ static void set_copy_flags (HEADER * hdr, int decode, int decrypt, } } -void _mutt_save_message (HEADER * h, CONTEXT * ctx, int delete, int decode, - int decrypt) -{ +int _mutt_save_message (HEADER * h, CONTEXT * ctx, int delete, int decode, + int decrypt) { int cmflags, chflags; + int rc; set_copy_flags (h, decode, decrypt, &cmflags, &chflags); if (decode || decrypt) mutt_parse_mime_message (Context, h); - if (mutt_append_message (ctx, Context, h, cmflags, chflags) == 0) { - if (delete) { - mutt_set_flag (Context, h, M_DELETE, 1); - if (option (OPTDELETEUNTAG)) - mutt_set_flag (Context, h, M_TAG, 0); - } + if ((rc = mutt_append_message (ctx, Context, h, cmflags, chflags)) != 0) + return rc; + + if (delete) { + mutt_set_flag (Context, h, M_DELETE, 1); + if (option (OPTDELETEUNTAG)) + mutt_set_flag (Context, h, M_TAG, 0); mutt_set_flag (Context, h, M_APPENDED, 1); } + return (0); } /* returns 0 if the copy/save was successful, or -1 on error/abort */ int mutt_save_message (HEADER * h, int delete, - int decode, int decrypt, int *redraw) -{ + 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]; @@ -729,7 +741,7 @@ int mutt_save_message (HEADER * h, int delete, /* This is an undocumented feature of ELM pointed out to me by Felix von * Leitner */ - if (mutt_strcmp (buf, ".") == 0) + if (str_cmp (buf, ".") == 0) strfcpy (buf, LastSaveFolder, sizeof (buf)); else strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder)); @@ -747,7 +759,7 @@ int mutt_save_message (HEADER * h, int delete, mutt_message (_("Copying to %s..."), buf); #ifdef USE_IMAP - if (Context->magic == M_IMAP && !(decode || decrypt) && mx_is_imap (buf)) { + if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) { switch (imap_copy_messages (Context, h, buf, delete)) { /* success */ case 0: @@ -764,15 +776,21 @@ int mutt_save_message (HEADER * h, int delete, #endif if (mx_open_mailbox (buf, M_APPEND, &ctx) != NULL) { - if (h) - _mutt_save_message (h, &ctx, delete, decode, decrypt); - else { + if (h) { + if (_mutt_save_message (h, &ctx, delete, decode, decrypt) != 0) { + mx_close_mailbox (&ctx, NULL); + return (-1); + } + } else { 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_save_message (Context->hdrs[Context->v2r[i]], &ctx, delete, - decode, decrypt); + if (_mutt_save_message (Context->hdrs[Context->v2r[i]], &ctx, delete, + decode, decrypt) != 0) { + mx_close_mailbox (&ctx, NULL); + return (-1); + } } } } @@ -783,9 +801,9 @@ int mutt_save_message (HEADER * h, int delete, if (need_buffy_cleanup) { #ifdef BUFFY_SIZE - tmp = mutt_find_mailbox (buf); + tmp = buffy_find_mailbox (buf); if (tmp && tmp->new <= 0) - mutt_update_mailbox (tmp); + buffy_update_mailbox (tmp); #else /* fix up the times so buffy won't get confused */ if (st.st_mtime > st.st_atime) { @@ -816,26 +834,26 @@ int mutt_update_list_file (char *filename, char *section, char *key, int ext = 0, done = 0, r = 0; snprintf (oldfile, sizeof (oldfile), "%s.bak", filename); - dprint (1, (debugfile, "Renaming %s to %s\n", filename, oldfile)); + debug_print (1, ("Renaming %s to %s\n", filename, oldfile)); /* if file not exist, create it */ if ((ifp = safe_fopen (filename, "a"))) fclose (ifp); if (_mutt_rename_file (filename, oldfile, 1)) { - mutt_perror _("Unable to create backup file"); + mutt_perror (_("Unable to create backup file")); return (-1); } - dprint (1, (debugfile, "Opening %s\n", oldfile)); + debug_print (1, ("Opening %s\n", oldfile)); if (!(ifp = safe_fopen (oldfile, "r"))) { - mutt_perror _("Unable to open backup file for reading"); + mutt_perror (_("Unable to open backup file for reading")); return (-1); } - dprint (1, (debugfile, "Opening %s\n", filename)); + debug_print (1, ("Opening %s\n", filename)); if (!(ofp = safe_fopen (filename, "w"))) { fclose (ifp); - mutt_perror _("Unable to open new file for writing"); + mutt_perror (_("Unable to open new file for writing")); return (-1); } @@ -854,7 +872,7 @@ int mutt_update_list_file (char *filename, char *section, char *key, while (*c && *c != '\n') c++; c[0] = 0; /* strip EOL */ - if (!strncmp (buf, "#: ", 3) && !mutt_strcasecmp (buf + 3, section)) + if (!strncmp (buf, "#: ", 3) && !str_casecmp (buf + 3, section)) done++; } if (r != EOF && !done) { @@ -882,8 +900,8 @@ int mutt_update_list_file (char *filename, char *section, char *key, done++; break; } - else if (key && !strncmp (buf, key, strlen (key)) && - (!*key || buf[strlen (key)] == ' ')) { + else if (key && !strncmp (buf, key, str_len (key)) && + (!*key || buf[str_len (key)] == ' ')) { c = buf; ext = 0; while (*c && (*c != '\r') && (*c != '\n')) @@ -927,7 +945,7 @@ int mutt_update_list_file (char *filename, char *section, char *key, void mutt_version (void) { - mutt_message ("Mutt-ng %s (%s)", MUTT_VERSION, ReleaseDate); + mutt_message (mutt_make_version ()); } void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) @@ -952,7 +970,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) size_t l; for (p = b->parameter; p; p = p->next) { - l = strlen (buf); + l = str_len (buf); rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials); snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp); @@ -965,7 +983,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) /* clean up previous junk */ mutt_free_parameter (&b->parameter); - FREE (&b->subtype); + mem_free (&b->subtype); mutt_parse_content_type (buf, b);