begin to move ui code into the lib-ui

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index 9be40dc..49b0cf7 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -21,12 +21,13 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "lib/rx.h"
 #include "lib/debug.h"
 
 #include "mutt.h"
 #include "enter.h"
-#include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "sort.h"
@@ -101,7 +102,7 @@ static address_t *mutt_expand_aliases_r (address_t * a, LIST ** expn)
           char namebuf[STRING];
 
           mutt_gecos_name (namebuf, sizeof (namebuf), pw);
-          str_replace (&a->personal, namebuf);
+          m_strreplace (&a->personal, namebuf);
         }
       }
     }
@@ -409,7 +410,7 @@ int mutt_alias_complete (char *s, size_t buflen)
     while (a) {
       if (a->name && strstr (a->name, s) == a->name) {
         if (!bestname[0])       /* init */
-          m_strcpy(bestname, MIN(m_strlen(a->name) + 1, sizeof(bestname)),
+          m_strcpy(bestname, MIN(m_strlen(a->name) + 1, ssizeof(bestname)),
                    a->name);
         else {
           for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
@@ -541,19 +542,21 @@ int mutt_addr_is_user (address_t * addr)
   return 0;
 }
 
-static const char *alias_format_str (char *dest, size_t destlen, char op,
-                                     const char *src, const char *fmt,
-                                     const char *ifstring,
-                                     const char *elsestring,
-                                     unsigned long data, format_flag flags)
+static const format_t *alias_format_str (char *dest, size_t destlen, char op,
+                                     const format_t *src, const char *fmt,
+                                     const char *ifstring __attribute__ ((unused)),
+                                     const char *elsestring __attribute__ ((unused)),
+                                     unsigned long data, format_flag flags __attribute__ ((unused)))
 {
   char tmp[SHORT_STRING], adr[SHORT_STRING];
   ALIAS *alias = (ALIAS *) data;
 
   switch (op) {
   case 'f':
-    snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-    snprintf (dest, destlen, tmp, alias->del ? "D" : " ");
+    if(alias->del)
+      m_strcpy (dest, sizeof(dest), "D");
+    else
+      m_strcpy (dest, sizeof(dest), " ");
     break;
   case 'a':
     mutt_format_s (dest, destlen, fmt, alias->name);
@@ -579,7 +582,7 @@ static const char *alias_format_str (char *dest, size_t destlen, char op,
 
 static void alias_entry (char *s, size_t slen, MUTTMENU * m, int num)
 {
-  mutt_FormatString (s, slen, NONULL (AliasFmt), alias_format_str,
+  mutt_FormatString (s, slen, NONULL (AliasFmt), (format_t *) alias_format_str,
                      (unsigned long) ((ALIAS **) m->data)[num],
                      M_FORMAT_ARROWCURSOR);
 }