X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=aae6e61635640c7040b7dcae372d3273222b630e;hp=9b00f9edf3b6e50c5df68c9d87adc9dff1516586;hb=d9960a434f5c00a534a0dabe02ae5ab8d4881569;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/commands.c b/commands.c
index 9b00f9e..aae6e61 100644
--- a/commands.c
+++ b/commands.c
@@ -13,11 +13,13 @@
 #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"
@@ -40,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>
@@ -97,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);
@@ -215,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);
@@ -289,13 +288,12 @@ void ci_bounce_message (HEADER * h, int *redraw)
             buf);
 
   if (mutt_strwidth (prompt) > COLS - extra_space) {
-    mutt_format_string (prompt, sizeof (prompt),
-                        0, COLS - extra_space, 0, 0,
-                        prompt, sizeof (prompt), 0);
-    str_cat (prompt, sizeof (prompt), "...?");
+    mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
+                       prompt, sizeof(prompt), 0);
+    m_strcat(prompt, sizeof(prompt), "...?");
+  } else {
+    m_strcat(prompt, sizeof(prompt), "?");
   }
-  else
-    str_cat (prompt, sizeof (prompt), "?");
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     rfc822_free_address (&adr);
@@ -581,7 +579,7 @@ 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);
   p_delete(&token.data);
   if (errbuf[0]) {
@@ -751,7 +749,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));
@@ -860,7 +858,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);