X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=cde830db53ae209d8e32d810cc154f0749edf1f1;hp=da633cb968680c5182b48108cc5947d066d8e96a;hb=cc8910fb496d58eb30e116d06a0a01dde4dc944c;hpb=ace94418088f9165d23763bd39752cc31b406f03

diff --git a/commands.c b/commands.c
index da633cb..cde830d 100644
--- a/commands.c
+++ b/commands.c
@@ -55,7 +55,7 @@ int mutt_display_message (HEADER * cur)
   mutt_parse_mime_message (Context, cur);
   mutt_message_hook (Context, cur, M_MESSAGEHOOK);
 
-  fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+  fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
   if (!fpout) {
     mutt_error _("Could not create temporary file!");
     return 0;
@@ -86,7 +86,7 @@ int mutt_display_message (HEADER * cur)
       }
       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;
         }
@@ -204,11 +204,11 @@ void ci_bounce_message (HEADER * h, int *redraw)
   buf[0] = 0;
   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);
 
+#define extra_space (15 + 7 + 2)
   if (m_strwidth(prompt) > COLS - extra_space) {
     mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
                        prompt, sizeof(prompt), 0);
@@ -216,6 +216,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   } else {
     m_strcat(prompt, sizeof(prompt), "?");
   }
+#undef extra_space
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     address_list_wipe(&adr);
@@ -233,29 +234,23 @@ 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) {
     endwin ();
@@ -267,9 +262,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)
 {
@@ -469,7 +462,7 @@ void mutt_shell_escape (void)
   buf[0] = 0;
   if (mutt_get_field (_("Shell command: "), buf, sizeof (buf), M_CMD) == 0) {
     if (!buf[0])
-      m_strcpy(buf, sizeof(buf), MCore.shell);
+      m_strcpy(buf, sizeof(buf), mod_core.shell);
     if (buf[0]) {
       CLEARLINE (LINES - 1);
       mutt_endwin (NULL);
@@ -699,7 +692,7 @@ int mutt_save_message (HEADER * h, int delete,
       }
     }
 
-    need_buffy_cleanup = (ctx.magic == M_MBOX || ctx.magic == M_MMDF);
+    need_buffy_cleanup = (ctx.magic == M_MBOX);
 
     mx_close_mailbox (&ctx, NULL);
 
@@ -816,42 +809,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;
-}