X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=cbce757d8b9f03ce725a8499acefc0ba7c0c181e;hp=22709109f81069709c9582546d4b0d034166adf1;hb=db3bd72d8b48f1f9b49899da081ffbec4ce2c1c6;hpb=ffb2d4f3705ffc083472d04a3c58146b6bc8bfea

diff --git a/init.c b/init.c
index 2270910..cbce757 100644
--- a/init.c
+++ b/init.c
@@ -14,8 +14,7 @@
 
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
-#include <lib-sys/mutt_ssl.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/history.h>
 #include <lib-mx/mx.h>
 
@@ -25,7 +24,6 @@
 #include "charset.h"
 #include "thread.h"
 #include "mutt_idna.h"
-#include "send_smtp.h"
 #include "alias.h"
 #include "init.h"
 
@@ -83,9 +81,6 @@ static struct {
   int (*check) (const char* option, unsigned long val,
                 char* errbuf, ssize_t errlen);
 } SpecialVars[] = {
-#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
-  { "smtp_use_tls",             send_smtp_check_usetls },
-#endif
   { "history",                  check_history },
   { "pager_index_lines",        check_num },
   /* last */
@@ -104,19 +99,19 @@ static int bool_from_string (struct option_t* dst, const char* val,
   int flag = -1;
 
   if (!dst)
-    return (0);
+    return 0;
   if (ascii_strncasecmp (val, "yes", 3) == 0)
     flag = 1;
   else if (ascii_strncasecmp (val, "no", 2) == 0)
     flag = 0;
 
   if (flag < 0)
-    return (0);
+    return 0;
   if (flag)
     set_option (dst->data);
   else
     unset_option (dst->data);
-  return (1);
+  return 1;
 }
 
 static void num_to_string (char* dst, ssize_t dstlen,
@@ -134,7 +129,7 @@ static int num_from_string (struct option_t* dst, const char* val,
   char* t = NULL;
 
   if (!dst)
-    return (0);
+    return 0;
 
   num = strtol (val, &t, 0);
 
@@ -143,7 +138,7 @@ static int num_from_string (struct option_t* dst, const char* val,
       snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
                 val, dst->option);
     }
-    return (0);
+    return 0;
   }
 
   /* just temporarily accept new val so that check_special for
@@ -153,10 +148,10 @@ static int num_from_string (struct option_t* dst, const char* val,
 
   if (!check_special (dst->option, (unsigned long) num, errbuf, errlen)) {
     *((short*) dst->data) = old;
-    return (0);
+    return 0;
   }
 
-  return (1);
+  return 1;
 }
 
 static void str_to_string (char* dst, ssize_t dstlen,
@@ -170,30 +165,30 @@ static int path_from_string (struct option_t* dst, const char* val,
   char path[_POSIX_PATH_MAX];
 
   if (!dst)
-    return (0);
+    return 0;
 
   if (m_strisempty(val)) {
     p_delete((char**) dst->data);
-    return (1);
+    return 1;
   }
 
   path[0] = '\0';
   m_strcpy(path, sizeof(path), val);
   mutt_expand_path (path, sizeof(path));
   m_strreplace((char **) dst->data, path);
-  return (1);
+  return 1;
 }
 
 static int str_from_string (struct option_t* dst, const char* val,
                             char* errbuf, ssize_t errlen) {
   if (!dst)
-    return (0);
+    return 0;
 
   if (!check_special (dst->option, (unsigned long) val, errbuf, errlen))
-    return (0);
+    return 0;
 
   m_strreplace((char**) dst->data, val);
-  return (1);
+  return 1;
 }
 
 static void quad_to_string (char* dst, ssize_t dstlen,
@@ -208,7 +203,7 @@ static int quad_from_string (struct option_t* dst, const char* val,
   int flag = -1;
 
   if (!dst)
-    return (0);
+    return 0;
   if (ascii_strncasecmp (val, "yes", 3) == 0)
     flag = M_YES;
   else if (ascii_strncasecmp (val, "no", 2) == 0)
@@ -219,10 +214,10 @@ static int quad_from_string (struct option_t* dst, const char* val,
     flag = M_ASKNO;
 
   if (flag < 0)
-    return (0);
+    return 0;
 
   set_quadoption (dst->data, flag);
-  return (1);
+  return 1;
 }
 
 static void sort_to_string (char* dst, ssize_t dstlen,
@@ -251,11 +246,11 @@ static int sort_from_string (struct option_t* dst, const char* val,
     if (errbuf)
       snprintf (errbuf, errlen, _("%s: Unknown type."),
                 dst->option);
-    return (0);
+    return 0;
   }
   if (parse_sort (dst, val, map, errbuf, errlen) == -1)
-    return (0);
-  return (1);
+    return 0;
+  return 1;
 }
 
 static void rx_to_string (char* dst, ssize_t dstlen,
@@ -273,13 +268,13 @@ static int rx_from_string (struct option_t* dst, const char* val,
   char* s = NULL;
 
   if (!dst)
-    return (0);
+    return 0;
 
   if (option (OPTATTACHMSG) && !m_strcmp(dst->option, "reply_regexp")) {
     if (errbuf)
       snprintf (errbuf, errlen,
                 "Operation not permitted when in attach-message mode.");
-    return (0);
+    return 0;
   }
 
   if (!((rx_t*) dst->data))
@@ -289,7 +284,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
 
   /* something to do? */
   if (m_strisempty(val) || (p->pattern && m_strcmp(p->pattern, val) == 0))
-    return (1);
+    return 1;
 
   if (m_strcmp(dst->option, "mask") != 0)
     flags |= mutt_which_case (val);
@@ -306,7 +301,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
     regerror (e, rx, errbuf, errlen);
     regfree (rx);
     p_delete(&rx);
-    return (0);
+    return 0;
   }
 
   if (p->rx) {
@@ -321,43 +316,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
   if (m_strcmp(dst->option, "reply_regexp") == 0)
     mutt_adjust_all_subjects ();
 
-  return (1);
-}
-
-static void magic_to_string (char* dst, ssize_t dstlen,
-                             struct option_t* option) {
-  const char* s = NULL;
-  switch (option->data) {
-    case M_MBOX:    s = "mbox"; break;
-    case M_MMDF:    s = "MMDF"; break;
-    case M_MH:      s = "MH"; break;
-    case M_MAILDIR: s = "Maildir"; break;
-    default:        s = "unknown"; break;
-  }
-  snprintf (dst, dstlen, "%s=%s", option->option, s);
-}
-
-static int magic_from_string (struct option_t* dst, const char* val,
-                              char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
-  int flag = -1;
-
-  if (!dst || m_strisempty(val))
-    return (0);
-  if (ascii_strncasecmp (val, "mbox", 4) == 0)
-    flag = M_MBOX;
-  else if (ascii_strncasecmp (val, "mmdf", 4) == 0)
-    flag = M_MMDF;
-  else if (ascii_strncasecmp (val, "mh", 2) == 0)
-    flag = M_MH;
-  else if (ascii_strncasecmp (val, "maildir", 7) == 0)
-    flag = M_MAILDIR;
-
-  if (flag < 0)
-    return (0);
-
-  *((short*) dst->data) = flag;
-  return (1);
-
+  return 1;
 }
 
 static struct {
@@ -374,7 +333,6 @@ static struct {
   { DT_QUAD,    quad_to_string,   quad_from_string },
   { DT_SORT,    sort_to_string,   sort_from_string },
   { DT_RX,      rx_to_string,     rx_from_string },
-  { DT_MAGIC,   magic_to_string,  magic_from_string },
 };
 
 
@@ -385,7 +343,7 @@ int mutt_option_value (const char* val, char* dst, ssize_t dstlen) {
 
   if (!(option = hash_find (ConfigOptions, val))) {
     *dst = '\0';
-    return (0);
+    return 0;
   }
   tmp = p_new(char, dstlen+1);
   FuncTable[DTYPE(option->type)].opt_tostr (tmp, dstlen, option);
@@ -404,7 +362,7 @@ int mutt_option_value (const char* val, char* dst, ssize_t dstlen) {
   memcpy (dst, t, l+1);
   p_delete(&tmp);
 
-  return (1);
+  return 1;
 }
 
 static void toggle_quadoption (int opt)
@@ -437,12 +395,10 @@ int query_quadoption2(int v, const char *prompt)
   switch (v) {
   case M_YES:
   case M_NO:
-    return (v);
+    return v;
 
   default:
-    v = mutt_yesorno(prompt, (v == M_ASKYES));
-    CLEARLINE (LINES - 1);
-    return (v);
+    return mutt_yesorno(prompt, (v == M_ASKYES));
   }
 }
 
@@ -453,15 +409,11 @@ int query_quadoption (int opt, const char *prompt)
   switch (v) {
   case M_YES:
   case M_NO:
-    return (v);
+    return v;
 
   default:
-    v = mutt_yesorno (prompt, (v == M_ASKYES));
-    CLEARLINE (LINES - 1);
-    return (v);
+    return mutt_yesorno(prompt, (v == M_ASKYES));
   }
-
-  /* not reached */
 }
 
 /* always wise to do what someone else did before */
@@ -745,7 +697,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s,
 
     if (!MoreArgs (s)) {
         m_strcpy(err->data, err->dsize, _("alias: no address"));
-        return (-1);
+        return -1;
     }
 
     mutt_extract_token (buf, s, 0);
@@ -825,7 +777,7 @@ static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data __attribut
   mutt_extract_token (buf, s, M_TOKEN_SPACE | M_TOKEN_QUOTE);
   if ((p = strpbrk (buf->data, ": \t")) == NULL || *p != ':') {
     m_strcpy(err->data, err->dsize, _("invalid header field"));
-    return (-1);
+    return -1;
   }
   keylen = p - buf->data + 1;
 
@@ -872,7 +824,7 @@ parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
   if ((i = mutt_getvaluebyname (s, map)) == -1) {
     if (errbuf)
       snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), s, dst->option);
-    return (-1);
+    return -1;
   }
 
   *((short*) dst->data) = i | flags;
@@ -889,7 +841,7 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p,
         return;
 
     mutt_option_value(ptr->option, buf, sizeof(buf));
-    if (m_strlen(ptr->init) == 0 && buf && *buf)
+    if (m_strlen(ptr->init) == 0 && *buf)
         ptr->init = m_strdup(buf);
 }
 
@@ -922,7 +874,7 @@ static int init_expand (char** dst, struct option_t* src) {
   } else
     /* for non-string: take value as is */
     *dst = m_strdup(src->init);
-  return (1);
+  return 1;
 }
 
 /* if additional data more == 1, we want to resolve synonyms */
@@ -948,18 +900,12 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)),
     p_delete(&init);
   }
 
-  if (ptr->flags & R_INDEX)
-    set_option (OPTFORCEREDRAWINDEX);
-  if (ptr->flags & R_PAGER)
-    set_option (OPTFORCEREDRAWPAGER);
-  if (ptr->flags & R_RESORT_SUB)
-    set_option (OPTSORTSUBTHREADS);
-  if (ptr->flags & R_RESORT)
-    set_option (OPTNEEDRESORT);
-  if (ptr->flags & R_RESORT_INIT)
-    set_option (OPTRESORTINIT);
-  if (ptr->flags & R_TREE)
-    set_option (OPTREDRAWTREE);
+  set_option (OPTFORCEREDRAWINDEX);
+  set_option (OPTFORCEREDRAWPAGER);
+  set_option (OPTSORTSUBTHREADS);
+  set_option (OPTNEEDRESORT);
+  set_option (OPTRESORTINIT);
+  set_option (OPTREDRAWTREE);
 }
 
 static int check_num (const char* option, unsigned long p,
@@ -967,17 +913,17 @@ static int check_num (const char* option, unsigned long p,
   if ((int) p < 0) {
     if (errbuf)
       snprintf (errbuf, errlen, _("'%d' is invalid for $%s"), (int) p, option);
-    return (0);
+    return 0;
   }
-  return (1);
+  return 1;
 }
 
 static int check_history (const char* option __attribute__ ((unused)), unsigned long p,
                           char* errbuf, ssize_t errlen) {
   if (!check_num ("history", p, errbuf, errlen))
-    return (0);
+    return 0;
   mutt_init_history ();
-  return (1);
+  return 1;
 }
 
 static int check_special (const char* name, unsigned long val,
@@ -990,7 +936,7 @@ static int check_special (const char* name, unsigned long val,
                                     val, errbuf, errlen));
     }
   }
-  return (1);
+  return 1;
 }
 
 static const struct mapping_t* get_sortmap (struct option_t* option) {
@@ -1013,18 +959,9 @@ static const struct mapping_t* get_sortmap (struct option_t* option) {
     map = SortMethods;
     break;
   }
-  return (map);
+  return map;
 }
 
-#define CHECK_PAGER \
-  if ((CurrentMenu == MENU_PAGER) && \
-      (!option || (option->flags & R_RESORT))) \
-  { \
-    snprintf (err->data, err->dsize, \
-              _("Not available in this menu.")); \
-    return (-1); \
-  }
-
 static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
                       BUFFER * err)
 {
@@ -1060,25 +997,25 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
     option = hash_find(ConfigOptions, tmp->data);
     if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
       snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
-      return (-1);
+      return -1;
     }
     s->dptr = vskipspaces(s->dptr);
 
     if (reset) {
       if (query || unset || inv) {
         snprintf (err->data, err->dsize, _("prefix is illegal with reset"));
-        return (-1);
+        return -1;
       }
 
       if (s && *s->dptr == '=') {
         snprintf (err->data, err->dsize, _("value is illegal with reset"));
-        return (-1);
+        return -1;
       }
 
       if (!m_strcmp("all", tmp->data)) {
         if (CurrentMenu == MENU_PAGER) {
           snprintf (err->data, err->dsize, _("Not available in this menu."));
-          return (-1);
+          return -1;
         }
         hash_map (ConfigOptions, mutt_restore_default, 1);
         set_option (OPTFORCEREDRAWINDEX);
@@ -1087,9 +1024,8 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         set_option (OPTNEEDRESORT);
         set_option (OPTRESORTINIT);
         set_option (OPTREDRAWTREE);
-        return (0);
+        return 0;
       } else {
-        CHECK_PAGER;
         mutt_restore_default (NULL, option, 1);
       }
     }
@@ -1099,7 +1035,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       if (s && *s->dptr == '=') {
         if (unset || inv || query) {
           snprintf (err->data, err->dsize, "Usage: set variable=yes|no");
-          return (-1);
+          return -1;
         }
 
         s->dptr++;
@@ -1110,7 +1046,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
           unset = 1;
         else {
           snprintf (err->data, err->dsize, "Usage: set variable=yes|no");
-          return (-1);
+          return -1;
         }
       }
 
@@ -1119,7 +1055,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         return 0;
       }
 
-      CHECK_PAGER;
       if (unset)
         unset_option (option->data);
       else if (inv)
@@ -1129,7 +1064,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
     }
     else if (DTYPE (option->type) == DT_STR ||
              DTYPE (option->type) == DT_PATH ||
-             DTYPE (option->type) == DT_MAGIC ||
              DTYPE (option->type) == DT_NUM ||
              DTYPE (option->type) == DT_SORT ||
              DTYPE (option->type) == DT_RX)
@@ -1137,7 +1071,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       /* XXX maybe we need to get unset into handlers? */
       if (DTYPE (option->type) == DT_STR || DTYPE (option->type) == DT_PATH) {
         if (unset) {
-          CHECK_PAGER;
           p_delete((void **)(void *)&option->data);
           break;
         }
@@ -1149,7 +1082,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         break;
       }
 
-      CHECK_PAGER;
       s->dptr++;
       mutt_extract_token (tmp, s, 0);
       if (!FuncTable[DTYPE (option->type)].opt_fromstr
@@ -1164,7 +1096,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       }
 
       if (*s->dptr == '=') {
-        CHECK_PAGER;
         s->dptr++;
         mutt_extract_token (tmp, s, 0);
         if (ascii_strcasecmp ("yes", tmp->data) == 0)
@@ -1198,20 +1129,14 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       break;
     }
 
-    if (option->flags & R_INDEX)
-      set_option (OPTFORCEREDRAWINDEX);
-    if (option->flags & R_PAGER)
-      set_option (OPTFORCEREDRAWPAGER);
-    if (option->flags & R_RESORT_SUB)
-      set_option (OPTSORTSUBTHREADS);
-    if (option->flags & R_RESORT)
-      set_option (OPTNEEDRESORT);
-    if (option->flags & R_RESORT_INIT)
-      set_option (OPTRESORTINIT);
-    if (option->flags & R_TREE)
-      set_option (OPTREDRAWTREE);
+    set_option (OPTFORCEREDRAWINDEX);
+    set_option (OPTFORCEREDRAWPAGER);
+    set_option (OPTSORTSUBTHREADS);
+    set_option (OPTNEEDRESORT);
+    set_option (OPTRESORTINIT);
+    set_option (OPTREDRAWTREE);
   }
-  return (r);
+  return r;
 }
 
 #define MAXERRS 128
@@ -1230,17 +1155,17 @@ static int source_rc (const char *rcfile, BUFFER * err)
 
   if ((f = mutt_open_read (rcfile, &pid)) == NULL) {
     snprintf (err->data, err->dsize, "%s: %s", rcfile, strerror (errno));
-    return (-1);
+    return -1;
   }
 
   p_clear(&token, 1);
   while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) {
-    conv = ConfigCharset && (*ConfigCharset) && MCharset.charset;
+    conv = ConfigCharset && (*ConfigCharset) && mod_cset.charset;
     if (conv) {
       currentline = m_strdup(linebuf);
       if (!currentline)
         continue;
-      mutt_convert_string (&currentline, ConfigCharset, MCharset.charset, 0);
+      mutt_convert_string (&currentline, ConfigCharset, mod_cset.charset, 0);
     }
     else
       currentline = linebuf;
@@ -1276,7 +1201,7 @@ static int source_rc (const char *rcfile, BUFFER * err)
               rcfile);
     rc = -1;
   }
-  return (rc);
+  return rc;
 }
 
 #undef MAXERRS
@@ -1291,7 +1216,7 @@ static int parse_source (BUFFER * tmp, BUFFER * s,
   do {
     if (mutt_extract_token (tmp, s, 0) != 0) {
       snprintf (err->data, err->dsize, _("source: error at %s"), s->dptr);
-      return (-1);
+      return -1;
     }
 
     m_strcpy(path, sizeof(path), tmp->data);
@@ -1301,7 +1226,7 @@ static int parse_source (BUFFER * tmp, BUFFER * s,
   }
   while (MoreArgs (s));
 
-  return ((rc < 0) ? -1 : 0);
+  return (rc < 0) ? -1 : 0;
 }
 
 /* line		command to execute
@@ -1351,7 +1276,7 @@ int mutt_parse_rc_line (const char *line, BUFFER * token, BUFFER * err)
 finish:
   if (expn.destroy)
     p_delete(&expn.data);
-  return (r);
+  return r;
 }
 
 
@@ -1598,26 +1523,6 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos)
                  (*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
                  (*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
       }
-      else if (DTYPE (option->type) == DT_MAGIC) {
-        const char *p;
-        switch (DefaultMagic) {
-          case M_MBOX:
-            p = "mbox";
-            break;
-          case M_MMDF:
-            p = "MMDF";
-            break;
-          case M_MH:
-            p = "MH";
-          break;
-          case M_MAILDIR:
-            p = "Maildir";
-            break;
-          default:
-            p = "unknown";
-        }
-        m_strcpy(tmp, sizeof(tmp), p);
-      }
       else if (DTYPE (option->type) == DT_BOOL)
         m_strcpy(tmp, sizeof(tmp), option(option->data) ? "yes" : "no");
       else
@@ -1639,36 +1544,6 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos)
   return 0;
 }
 
-/* Implement the -Q command line flag */
-int mutt_query_variables (string_list_t * queries)
-{
-  string_list_t *p;
-
-  char errbuff[STRING];
-  char command[STRING];
-
-  BUFFER err, token;
-
-  p_clear(&err, 1);
-  p_clear(&token, 1);
-
-  err.data = errbuff;
-  err.dsize = sizeof(errbuff);
-
-  for (p = queries; p; p = p->next) {
-    snprintf (command, sizeof(command), "set ?%s\n", p->data);
-    if (mutt_parse_rc_line (command, &token, &err) == -1) {
-      fprintf (stderr, "%s\n", err.data);
-      p_delete(&token.data);
-      return 1;
-    }
-    printf ("%s\n", err.data);
-  }
-
-  p_delete(&token.data);
-  return 0;
-}
-
 static int mutt_execute_commands (string_list_t * p)
 {
   BUFFER err, token;
@@ -1682,7 +1557,7 @@ static int mutt_execute_commands (string_list_t * p)
     if (mutt_parse_rc_line (p->data, &token, &err) != 0) {
       fprintf (stderr, _("Error in command line: %s\n"), err.data);
       p_delete(&token.data);
-      return (-1);
+      return -1;
     }
   }
   p_delete(&token.data);
@@ -1717,39 +1592,14 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   /* Get some information about the user */
   if ((pw = getpwuid (getuid ()))) {
     char rnbuf[STRING];
-    mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, MCore.gecos_mask);
+    mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, mod_core.gecos_mask);
     Realname = m_strdup(rnbuf);
   }
 
-#ifdef USE_NNTP
-  {
-    FILE *f;
-    char *q;
-
-    if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
-      buffer[0] = '\0';
-      fgets (buffer, sizeof(buffer), f);
-      p = vskipspaces(buffer);
-      q = (char*)p;
-      while (*q && !isspace(*q))
-        q++;
-      *q = '\0';
-      NewsServer = m_strdup(p);
-      m_fclose(&f);
-    }
-  }
-  if ((p = getenv ("NNTPSERVER")))
-    NewsServer = m_strdup(p);
-#endif
-
   if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
     Spoolfile = m_strdup(p);
   } else {
-#ifdef HOMESPOOL
-    mutt_concat_path(buffer, sizeof(buffer), NONULL(MCore.homedir), MAILPATH);
-#else
-    mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(MCore.username));
-#endif
+    mutt_concat_path(buffer, sizeof(buffer), NONULL(mod_core.homedir), MAILPATH);
     Spoolfile = m_strdup(buffer);
   }
 
@@ -1772,20 +1622,13 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   hash_map (ConfigOptions, mutt_restore_default, 0);
 
   CurrentMenu = MENU_MAIN;
-
-#ifdef HAVE_GETSID
-  /* Unset suspend by default if we're the session leader */
-  if (getsid (0) == getpid ())
-    unset_option (OPTSUSPEND);
-#endif
-
   mutt_init_history ();
 
   if (!Muttrc) {
-      snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(MCore.homedir));
+      snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(mod_core.homedir));
     if (access (buffer, F_OK) == -1)
       snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
-                NONULL(MCore.homedir));
+                NONULL(mod_core.homedir));
 
     default_rc = 1;
     Muttrc = m_strdup(buffer);
@@ -1836,9 +1679,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   }
 
   /* LUA {{{ */
-  snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(MCore.homedir));
+  snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(mod_core.homedir));
   if (access(buffer, F_OK) < 0)
-      snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(MCore.homedir));
+      snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(mod_core.homedir));
   if (!access(buffer, F_OK)) {
       need_pause = luaM_wrap(mutt_error, luaM_dofile(buffer));
   }
@@ -1871,36 +1714,3 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   }
 }
 
-int mutt_get_hook_type (const char *name)
-{
-  struct command_t *c;
-
-  for (c = Commands; c->name; c++)
-    if (c->func == mutt_parse_hook && ascii_strcasecmp (c->name, name) == 0)
-      return c->data;
-  return 0;
-}
-
-/* dump out the value of all the variables we have */
-int mutt_dump_variables (int full) {
-    ssize_t i = 0;
-
-    /* get all non-synonyms into list... */
-    for (i = 0; MuttVars[i].option; i++) {
-        struct option_t *option = MuttVars + i;
-        char buf[LONG_STRING];
-
-        if (!full) {
-            mutt_option_value(option->option, buf, sizeof(buf));
-            if (!m_strcmp(buf, option->init))
-                continue;
-        }
-
-        printf("set ");
-        FuncTable[DTYPE(option->type)].opt_tostr(buf, sizeof(buf), option);
-        printf ("%s\n", buf);
-    }
-
-    printf ("\n# vi""m:set ft=muttrc:\n");
-    return 0;
-}