projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move history in lib-ui
[apps/madmutt.git]
/
init.c
diff --git
a/init.c
b/init.c
index
96990c2
..
218e29c
100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-24,10
+24,12
@@
#include <lib-lib/debug.h>
#include <lib-lib/rx.h>
#include <lib-lib/debug.h>
#include <lib-lib/rx.h>
+#include <lib-sys/unix.h>
+
#include <lib-ui/curses.h>
#include <lib-ui/curses.h>
+#include <lib-ui/history.h>
#include "mutt.h"
#include "mutt.h"
-#include "history.h"
#include "keymap.h"
#include "mbyte.h"
#include "charset.h"
#include "keymap.h"
#include "mbyte.h"
#include "charset.h"
@@
-36,7
+38,7
@@
#include "mutt_idna.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
#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))
#endif
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
@@
-2608,7
+2610,8
@@
void mutt_init (int skip_sys_rc, LIST * commands)
if (!Homedir)
Homedir = m_strdup(pw->pw_dir);
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 ();
}
Shell = m_strdup(pw->pw_shell);
endpwent ();
}
@@
-2641,7
+2644,7
@@
void mutt_init (int skip_sys_rc, LIST * commands)
else
Hostname = m_strdup(utsname.nodename);
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 != '@') {
Fqdn = m_strdup("@");
else
if (*buffer != '@') {