Fix mutt_pipe_message() and mutt_print_message()

A discrepancy in the prototype and the function lead to these functions
crashing.

Fixes: #1579

diff --git a/commands.h b/commands.h
index e51a53b948d314d6e2d3ad18838d4d615a60289e..9013ff72c516421aac11ee172fe2f1990d82275e 100644 (file)
--- a/commands.h
+++ b/commands.h
@@ -49,8 +49,8 @@ void mutt_display_address(struct Envelope *env);
 int  mutt_display_message(struct Email *cur);
 int  mutt_edit_content_type(struct Email *e, struct Body *b, FILE *fp);
 void mutt_enter_command(void);
-void mutt_pipe_message(struct Email *e);
-void mutt_print_message(struct Email *e);
+void mutt_pipe_message(struct Mailbox *m, struct Email *e);
+void mutt_print_message(struct Mailbox *m, struct Email *e);
 int  mutt_save_message_ctx(struct Email *e, bool delete, bool decode, bool decrypt, struct Mailbox *m);
 int  mutt_save_message(struct Mailbox *m, struct EmailList *el, bool delete, bool decode, bool decrypt);
 int  mutt_select_sort(int reverse);

diff --git a/index.c b/index.c
index ef700f77af9275e8164da1e272a3a9997efca9c5..8cff83246e34f39ac30f328c60aa95c2e1ff9b9b 100644 (file)
--- a/index.c
+++ b/index.c
@@ -3256,7 +3256,7 @@ int mutt_index_menu(void)
       case OP_PIPE:
         if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
           break;
-        mutt_pipe_message(tag ? NULL : CUR_EMAIL);
+        mutt_pipe_message(Context->mailbox, tag ? NULL : CUR_EMAIL);
 
 #ifdef USE_IMAP
         /* in an IMAP folder index with imap_peek=no, piping could change
@@ -3273,7 +3273,7 @@ int mutt_index_menu(void)
       case OP_PRINT:
         if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
           break;
-        mutt_print_message(tag ? NULL : CUR_EMAIL);
+        mutt_print_message(Context->mailbox, tag ? NULL : CUR_EMAIL);
 
 #ifdef USE_IMAP
         /* in an IMAP folder index with imap_peek=no, printing could change

diff --git a/pager.c b/pager.c
index d32298a661e14041fc207bc8143c40c0923b4186..a5ba3038a19bba5cf8dbce0df22c44c62c77b376 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -3128,7 +3128,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
         if (IsAttach(extra))
           mutt_pipe_attachment_list(extra->actx, extra->fp, false, extra->body, false);
         else
-          mutt_pipe_message(extra->email);
+          mutt_pipe_message(Context->mailbox, extra->email);
         break;
 
       case OP_PRINT:
@@ -3136,7 +3136,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
         if (IsAttach(extra))
           mutt_print_attachment_list(extra->actx, extra->fp, false, extra->body);
         else
-          mutt_print_message(extra->email);
+          mutt_print_message(Context->mailbox, extra->email);
         break;
 
       case OP_MAIL: