#include <lib-lib/debug.h>
#include <lib-lib/rx.h>
+#include <lib-sys/unix.h>
+
#include <lib-ui/curses.h>
+#include <lib-ui/history.h>
#include "mutt.h"
-#include "history.h"
#include "keymap.h"
#include "mbyte.h"
#include "charset.h"
#include "mutt_idna.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
-#include <lib-network/mutt_ssl.h>
+#include <lib-sys/mutt_ssl.h>
#endif
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
unsigned long data __attribute__ ((unused)),
BUFFER * err __attribute__ ((unused)))
{
- ALIAS *tmp, *last = NULL;
+ alias_t *tmp, *last = NULL;
do {
mutt_extract_token (buf, s, 0);
set_option (OPTFORCEREDRAWINDEX);
}
else
- mutt_free_alias (&Aliases);
+ alias_delete(&Aliases);
break;
}
else
else
Aliases = tmp->next;
tmp->next = NULL;
- mutt_free_alias (&tmp);
+ alias_delete(&tmp);
break;
}
last = tmp;
unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
- ALIAS *tmp = Aliases;
- ALIAS *last = NULL;
+ alias_t *tmp = Aliases;
+ alias_t *last = NULL;
char *estr = NULL;
if (!MoreArgs (s)) {
if (!tmp) {
/* create a new alias */
- tmp = p_new(ALIAS, 1);
- tmp->self = tmp;
+ tmp = alias_new();
tmp->name = m_strdup(buf->data);
/* give the main addressbook code a chance */
if (CurrentMenu == MENU_ALIAS)
if (!Homedir)
Homedir = m_strdup(pw->pw_dir);
- Realname = m_strdup(mutt_gecos_name (rnbuf, sizeof(rnbuf), pw));
+ mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx);
+ Realname = m_strdup(rnbuf);
Shell = m_strdup(pw->pw_shell);
endpwent ();
}
else
Hostname = m_strdup(utsname.nodename);
- if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
+ if (!p && getdnsdomainname(buffer, sizeof(buffer)) == -1)
Fqdn = m_strdup("@");
else
if (*buffer != '@') {