move history in lib-ui

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index 49b0cf7..fa83c6f 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -20,16 +20,17 @@
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
+#include <lib-lib/debug.h>
+#include <lib-lib/rx.h>
 
-#include <lib-ui/curses.h>
+#include <lib-sys/unix.h>
 
-#include "lib/rx.h"
-#include "lib/debug.h"
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
 
 #include "mutt.h"
-#include "enter.h"
 #include "mutt_idna.h"
-#include "mutt_menu.h"
 #include "sort.h"
 
 #define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
@@ -101,8 +102,8 @@ static address_t *mutt_expand_aliases_r (address_t * a, LIST ** expn)
         if (pw) {
           char namebuf[STRING];
 
-          mutt_gecos_name (namebuf, sizeof (namebuf), pw);
-          m_strreplace (&a->personal, namebuf);
+          mutt_gecos_name(namebuf, sizeof (namebuf), pw, GecosMask.rx);
+          m_strreplace(&a->personal, namebuf);
         }
       }
     }
@@ -405,7 +406,7 @@ int mutt_alias_complete (char *s, size_t buflen)
 #define min(a,b)        ((a<b)?a:b)
 
   if (s[0] != 0) {              /* avoid empty string as strstr argument */
-    p_clear(bestname, sizeof(bestname));
+    p_clear(bestname, countof(bestname));
 
     while (a) {
       if (a->name && strstr (a->name, s) == a->name) {