X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=2cfb5e86e2f9de23721fb62e15be35d46f9051b7;hp=42718495c660f2cff7688b4713ea7b812cfd6718;hb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;hpb=364bf52ada05bf7d7158dba9d2391f63b71258f6

diff --git a/commands.c b/commands.c
index 4271849..2cfb5e8 100644
--- a/commands.c
+++ b/commands.c
@@ -12,10 +12,14 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/file.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
-#include "ascii.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mime.h"
@@ -38,9 +42,6 @@
 #include "buffy.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <errno.h>
@@ -95,7 +96,7 @@ int mutt_display_message (HEADER * cur)
     }
   }
 
-  if (!Pager || str_cmp (Pager, "builtin") == 0)
+  if (!Pager || m_strcmp(Pager, "builtin") == 0)
     builtin = 1;
   else {
     mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur);
@@ -155,8 +156,16 @@ int mutt_display_message (HEADER * cur)
       mutt_wait_filter (filterpid);
       safe_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)
@@ -205,7 +214,7 @@ int mutt_display_message (HEADER * cur)
     }
 
     /* Invoke the builtin pager */
-    memset (&info, 0, sizeof (pager_t));
+    p_clear(&info, 1);
     info.hdr = cur;
     info.ctx = Context;
     rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info);
@@ -265,7 +274,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
 
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
-    mem_free (&err);
+    p_delete(&err);
     rfc822_free_address (&adr);
     return;
   }
@@ -342,8 +351,8 @@ static void pipe_msg (HEADER * h, FILE * fp, int decode, int print)
 
 /* the following code is shared between printing and piping */
 
-static int _mutt_pipe_message (HEADER * h, char *cmd,
-                               int decode, int print, int split, char *sep)
+static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
+                              int split, const char *sep)
 {
 
   int i, rc = 0;
@@ -571,9 +580,9 @@ void mutt_enter_command (void)
     return;
   err.data = errbuf;
   err.dsize = sizeof (errbuf);
-  memset (&token, 0, sizeof (token));
+  p_clear(&token, 1);
   r = mutt_parse_rc_line (buffer, &token, &err);
-  mem_free (&token.data);
+  p_delete(&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()
@@ -587,11 +596,11 @@ void mutt_enter_command (void)
 
 void mutt_display_address (ENVELOPE * env)
 {
-  char *pfx = NULL;
+  const char *pfx = NULL;
   char buf[SHORT_STRING];
   ADDRESS *adr = NULL;
 
-  adr = mutt_get_address (env, &pfx);
+  adr = mutt_get_address(env, &pfx);
 
   if (!adr)
     return;
@@ -741,7 +750,7 @@ int mutt_save_message (HEADER * h, int delete,
   /* This is an undocumented feature of ELM pointed out to me by Felix von
    * Leitner <leitner@prz.fu-berlin.de>
    */
-  if (str_cmp (buf, ".") == 0)
+  if (m_strcmp(buf, ".") == 0)
     strfcpy (buf, LastSaveFolder, sizeof (buf));
   else
     strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder));
@@ -850,7 +859,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     size_t l;
 
     for (p = b->parameter; p; p = p->next) {
-      l = str_len (buf);
+      l = m_strlen(buf);
 
       rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
       snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
@@ -863,7 +872,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
 
   /* clean up previous junk */
   mutt_free_parameter (&b->parameter);
-  mem_free (&b->subtype);
+  p_delete(&b->subtype);
 
   mutt_parse_content_type (buf, b);