X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=a04efbd4025d4e474dcb828d02afa2ec1421b104;hp=3d17e76124348a70fd84a4be4dcadf1634a158fe;hb=e1f82ec5b248a12c5bfef139f1f27bf4292ee3a0;hpb=16534e98723674fa391e3fc29d2a07ce419c13dd

diff --git a/init.c b/init.c
index 3d17e76..a04efbd 100644
--- a/init.c
+++ b/init.c
@@ -11,7 +11,6 @@
  */
 
 #include <lib-lib/lib-lib.h>
-#include <sys/utsname.h>
 
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
@@ -26,11 +25,7 @@
 #include "charset.h"
 #include "thread.h"
 #include "mutt_idna.h"
-
-#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
 #include "mutt_libesmtp.h"
-#endif
-
 #include "alias.h"
 #include "init.h"
 
@@ -97,57 +92,6 @@ static struct {
   { NULL,         NULL }
 };
 
-/* protos for config type handles: convert value to string */
-static void bool_to_string  (char* dst, ssize_t dstlen, struct option_t* option);
-static void num_to_string   (char* dst, ssize_t dstlen, struct option_t* option);
-static void str_to_string   (char* dst, ssize_t dstlen, struct option_t* option);
-static void quad_to_string  (char* dst, ssize_t dstlen, struct option_t* option);
-static void sort_to_string  (char* dst, ssize_t dstlen, struct option_t* option);
-static void rx_to_string    (char* dst, ssize_t dstlen, struct option_t* option);
-static void magic_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void addr_to_string  (char* dst, ssize_t dstlen, struct option_t* option);
-
-/* protos for config type handles: convert to value from string */
-static int bool_from_string  (struct option_t* dst, const char* val,
-                              char* errbuf, ssize_t errlen);
-static int num_from_string   (struct option_t* dst, const char* val,
-                              char* errbuf, ssize_t errlen);
-static int str_from_string   (struct option_t* dst, const char* val,
-                              char* errbuf, ssize_t errlen);
-static int path_from_string  (struct option_t* dst, const char* val,
-                              char* errbuf, ssize_t errlen);
-static int quad_from_string  (struct option_t* dst, const char* val,
-                              char* errbuf, ssize_t errlen);
-static int sort_from_string  (struct option_t* dst, const char* val,
-                              char* errbuf, ssize_t errlen);
-static int rx_from_string    (struct option_t* dst, const char* val,
-                              char* errbuf, ssize_t errlen);
-static int magic_from_string (struct option_t* dst, const char* val,
-                              char* errbuf, ssize_t errlen);
-static int addr_from_string  (struct option_t* dst, const char* val,
-                              char* errbuf, ssize_t errlen);
-
-static struct {
-  unsigned short type;
-  void (*opt_tostr) (char* dst, ssize_t dstlen, struct option_t* option);
-  int (*opt_fromstr) (struct option_t* dst, const char* val,
-                          char* errbuf, ssize_t errlen);
-} FuncTable[] = {
-  { 0,          NULL,             NULL }, /* there's no DT_ type with 0 */
-  { DT_BOOL,    bool_to_string,   bool_from_string },
-  { DT_NUM,     num_to_string,    num_from_string },
-  { DT_STR,     str_to_string,    str_from_string },
-  { DT_PATH,    str_to_string,    path_from_string },
-  { 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 },
-  /* synonyms should be resolved already so we don't need this
-   * but must define it as DT_ is used for indexing */
-  { DT_SYN,     NULL,             NULL },
-  { DT_ADDR,    addr_to_string,   addr_from_string },
-};
-
 static void bool_to_string (char* dst, ssize_t dstlen,
                             struct option_t* option) {
   snprintf (dst, dstlen, "%s=%s", option->option,
@@ -325,7 +269,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
                            char* errbuf, ssize_t errlen) {
   rx_t* p = NULL;
   regex_t* rx = NULL;
-  int flags = 0, e = 0, not = 0;
+  int flags = 0, e = 0, neg = 0;
   char* s = NULL;
 
   if (!dst)
@@ -352,7 +296,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
 
   s = (char*) val;
   if (m_strcmp(dst->option, "mask") == 0 && *s == '!') {
-    not = 1;
+    neg = 1;
     s++;
   }
 
@@ -372,7 +316,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
 
   m_strreplace(&p->pattern, val);
   p->rx = rx;
-  p->not = not;
+  p->neg = neg;
 
   if (m_strcmp(dst->option, "reply_regexp") == 0)
     mutt_adjust_all_subjects ();
@@ -434,6 +378,25 @@ static int addr_from_string (struct option_t* dst, const char* val,
   return (1);
 }
 
+static struct {
+  unsigned short type;
+  void (*opt_tostr) (char* dst, ssize_t dstlen, struct option_t* option);
+  int (*opt_fromstr) (struct option_t* dst, const char* val,
+                          char* errbuf, ssize_t errlen);
+} FuncTable[] = {
+  { 0,          NULL,             NULL }, /* there's no DT_ type with 0 */
+  { DT_BOOL,    bool_to_string,   bool_from_string },
+  { DT_NUM,     num_to_string,    num_from_string },
+  { DT_STR,     str_to_string,    str_from_string },
+  { DT_PATH,    str_to_string,    path_from_string },
+  { 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 },
+  { DT_ADDR,    addr_to_string,   addr_from_string },
+};
+
+
 int mutt_option_value (const char* val, char* dst, ssize_t dstlen) {
   struct option_t* option = NULL;
   char* tmp = NULL, *t = NULL;
@@ -520,312 +483,6 @@ int query_quadoption (int opt, const char *prompt)
   /* not reached */
 }
 
-static void add_to_list(string_list_t **list, const char *str)
-{
-    /* don't add a NULL or empty string to the list */
-    if (m_strisempty(str))
-        return;
-
-    /* check to make sure the item is not already on this list */
-    while (*list) {
-        if (!ascii_strcasecmp(str, (*list)->data))
-            return;
-        list = &(*list)->next;
-    }
-
-    *list = p_new(string_list_t, 1);
-    (*list)->data = m_strdup(str);
-}
-
-static int
-add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err)
-{
-    rx_t *rx;
-
-    if (m_strisempty(s))
-        return 0;
-
-    if (rx_lookup(list, s))
-        return 0;
-
-    rx = rx_compile(s, flags);
-    if (!rx) {
-        snprintf(err->data, err->dsize, "Bad regexp: %s\n", s);
-        return -1;
-    }
-
-    rx_list_append(list, rx);
-    return 0;
-}
-
-static int add_to_spam_list(rx_t **list, const char *pat,
-                             const char *templ, BUFFER * err)
-{
-    rx_t *rx;
-
-    if (m_strisempty(pat) || !templ)
-        return 0;
-
-    if (!(rx = rx_compile (pat, REG_ICASE))) {
-        snprintf (err->data, err->dsize, _("Bad regexp: %s"), pat);
-        return -1;
-    }
-
-    /* check to make sure the item is not already on this list */
-    while (*list) {
-        if (!ascii_strcasecmp(rx->pattern, (*list)->pattern)) {
-            rx_t *tmp = rx_list_pop(list);
-            rx_delete(&tmp);
-        } else {
-            list = &(*list)->next;
-        }
-    }
-
-    *list = rx;
-    rx_set_template(rx, templ);
-    return 0;
-}
-
-static int remove_from_spam_list (rx_t ** list, const char *pat)
-{
-    int nremoved = 0;
-
-    while (*list) {
-        if (!m_strcmp((*list)->pattern, pat)) {
-            rx_t *spam = rx_list_pop(list);
-            rx_delete(&spam);
-            nremoved++;
-        } else {
-            list = &(*list)->next;
-        }
-    }
-
-    return nremoved;
-}
-
-
-static void remove_from_list(string_list_t **l, const char *str)
-{
-    if (!m_strcmp("*", str)) {
-        string_list_wipe(l);  /* ``unCMD *'' means delete all current entries */
-        return;
-    }
-
-    while (*l) {
-        if (!ascii_strcasecmp(str, (*l)->data)) {
-            string_list_t *it = string_list_pop(l);
-            string_item_delete(&it);
-        } else {
-            l = &(*l)->next;
-        }
-    }
-}
-
-static int remove_from_rx_list(rx_t **l, const char *str)
-{
-    if (m_strcmp("*", str) == 0) {
-        rx_list_wipe(l);
-        return 0;
-    }
-
-    l = rx_lookup(l, str);
-    if (l) {
-        rx_t *r = rx_list_pop(l);
-        rx_delete(&r);
-        return 0;
-    }
-
-    return -1;
-}
-
-static int parse_unignore (BUFFER * buf, BUFFER * s,
-                           unsigned long data __attribute__ ((unused)),
-                           BUFFER * err __attribute__ ((unused)))
-{
-  do {
-    mutt_extract_token (buf, s, 0);
-
-    /* don't add "*" to the unignore list */
-    if (m_strcmp (buf->data, "*"))
-      add_to_list (&UnIgnore, buf->data);
-
-    remove_from_list (&Ignore, buf->data);
-  } while (MoreArgs (s));
-
-  return 0;
-}
-
-static int parse_ignore (BUFFER * buf, BUFFER * s,
-                         unsigned long data __attribute__ ((unused)),
-                         BUFFER * err __attribute__ ((unused)))
-{
-  do {
-    mutt_extract_token (buf, s, 0);
-    remove_from_list (&UnIgnore, buf->data);
-    add_to_list (&Ignore, buf->data);
-  } while (MoreArgs(s));
-  return 0;
-}
-
-static int parse_list(BUFFER * buf, BUFFER * s, unsigned long data,
-                      BUFFER * err __attribute__ ((unused)))
-{
-  do {
-    mutt_extract_token (buf, s, 0);
-    add_to_list ((string_list_t **) data, buf->data);
-  } while (MoreArgs(s));
-  return 0;
-}
-
-static void _alternates_clean (void)
-{
-  int i;
-
-  if (Context && Context->msgcount) {
-    for (i = 0; i < Context->msgcount; i++)
-      Context->hdrs[i]->recip_valid = 0;
-  }
-}
-
-static int parse_alternates (BUFFER * buf, BUFFER * s,
-                             unsigned long data __attribute__ ((unused)),
-                             BUFFER * err __attribute__ ((unused)))
-{
-  _alternates_clean ();
-  do {
-    mutt_extract_token (buf, s, 0);
-    remove_from_rx_list (&UnAlternates, buf->data);
-
-    if (add_to_rx_list (&Alternates, buf->data, REG_ICASE, err) != 0)
-      return -1;
-  }
-  while (MoreArgs (s));
-
-  return 0;
-}
-
-static int parse_unalternates (BUFFER * buf, BUFFER * s,
-                               unsigned long data __attribute__ ((unused)),
-                               BUFFER * err __attribute__ ((unused)))
-{
-  _alternates_clean ();
-  do {
-    mutt_extract_token (buf, s, 0);
-    remove_from_rx_list (&Alternates, buf->data);
-
-    if (m_strcmp(buf->data, "*") &&
-        add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0)
-      return -1;
-
-  }
-  while (MoreArgs (s));
-
-  return 0;
-}
-
-static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
-                            BUFFER * err)
-{
-  BUFFER templ;
-
-  p_clear(&templ, 1);
-
-  /* Insist on at least one parameter */
-  if (!MoreArgs (s)) {
-    if (data == M_SPAM)
-      m_strcpy(err->data, err->dsize, _("spam: no matching pattern"));
-    else
-      m_strcpy(err->data, err->dsize, _("nospam: no matching pattern"));
-    return -1;
-  }
-
-  /* Extract the first token, a regexp */
-  mutt_extract_token (buf, s, 0);
-
-  /* data should be either M_SPAM or M_NOSPAM. M_SPAM is for spam commands. */
-  if (data == M_SPAM) {
-    /* If there's a second parameter, it's a template for the spam tag. */
-    if (MoreArgs (s)) {
-      mutt_extract_token (&templ, s, 0);
-
-      /* Add to the spam list. */
-      if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) {
-        p_delete(&templ.data);
-        return -1;
-      }
-      p_delete(&templ.data);
-    }
-
-    /* If not, try to remove from the nospam list. */
-    else {
-      remove_from_rx_list (&NoSpamList, buf->data);
-    }
-
-    return 0;
-  }
-
-  /* M_NOSPAM is for nospam commands. */
-  else if (data == M_NOSPAM) {
-    /* nospam only ever has one parameter. */
-
-    /* "*" is a special case. */
-    if (!m_strcmp(buf->data, "*")) {
-      rx_list_wipe(&SpamList);
-      rx_list_wipe(&NoSpamList);
-      return 0;
-    }
-
-    /* If it's on the spam list, just remove it. */
-    if (remove_from_spam_list (&SpamList, buf->data) != 0)
-      return 0;
-
-    /* Otherwise, add it to the nospam list. */
-    if (add_to_rx_list (&NoSpamList, buf->data, REG_ICASE, err) != 0)
-      return -1;
-
-    return 0;
-  }
-
-  /* This should not happen. */
-  m_strcpy(err->data, err->dsize, "This is no good at all.");
-  return -1;
-}
-
-static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
-                         BUFFER * err __attribute__ ((unused)))
-{
-  do {
-    mutt_extract_token (buf, s, 0);
-    /*
-     * Check for deletion of entire list
-     */
-    if (m_strcmp(buf->data, "*") == 0) {
-      string_list_wipe((string_list_t **) data);
-      break;
-    }
-    remove_from_list ((string_list_t **) data, buf->data);
-  }
-  while (MoreArgs (s));
-
-  return 0;
-}
-
-static int parse_lists (BUFFER * buf, BUFFER * s,
-                        unsigned long data __attribute__ ((unused)),
-                        BUFFER * err)
-{
-  do {
-    mutt_extract_token (buf, s, 0);
-    remove_from_rx_list (&UnMailLists, buf->data);
-
-    if (add_to_rx_list (&MailLists, buf->data, REG_ICASE, err) != 0)
-      return -1;
-  }
-  while (MoreArgs (s));
-
-  return 0;
-}
-
 /* always wise to do what someone else did before */
 static void _attachments_clean (void) {
   int i;
@@ -928,7 +585,7 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, string_list_t **ldata,
     }
     major = mutt_check_mime_type(tmp);
 
-    /* We must do our own walk here because remove_from_list() will only
+    /* We must do our own walk here because string_list_remove() will only
      * remove the string_list_t->data, not anything pointed to by the string_list_t->data. */
     lastp = NULL;
     for(lp = *ldata; lp; ) {
@@ -1060,59 +717,6 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data __att
   return parse_unattach_list(buf, s, listp, err);
 }
 
-static int parse_unlists (BUFFER * buf, BUFFER * s,
-                          unsigned long data __attribute__ ((unused)),
-                          BUFFER * err __attribute__ ((unused)))
-{
-  do {
-    mutt_extract_token (buf, s, 0);
-    remove_from_rx_list (&SubscribedLists, buf->data);
-    remove_from_rx_list (&MailLists, buf->data);
-
-    if (m_strcmp(buf->data, "*") &&
-        add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0)
-      return -1;
-  }
-  while (MoreArgs (s));
-
-  return 0;
-}
-
-static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
-                            BUFFER * err)
-{
-  do {
-    mutt_extract_token (buf, s, 0);
-    remove_from_rx_list (&UnMailLists, buf->data);
-    remove_from_rx_list (&UnSubscribedLists, buf->data);
-
-    if (add_to_rx_list (&MailLists, buf->data, REG_ICASE, err) != 0)
-      return -1;
-    if (add_to_rx_list (&SubscribedLists, buf->data, REG_ICASE, err) != 0)
-      return -1;
-  }
-  while (MoreArgs (s));
-
-  return 0;
-}
-
-static int parse_unsubscribe (BUFFER * buf, BUFFER * s,
-                              unsigned long data __attribute__ ((unused)),
-                              BUFFER * err __attribute__ ((unused)))
-{
-  do {
-    mutt_extract_token (buf, s, 0);
-    remove_from_rx_list (&SubscribedLists, buf->data);
-
-    if (m_strcmp(buf->data, "*") &&
-        add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0)
-      return -1;
-  }
-  while (MoreArgs (s));
-
-  return 0;
-}
-
 static int parse_unalias (BUFFER * buf, BUFFER * s,
                           unsigned long data __attribute__ ((unused)),
                           BUFFER * err __attribute__ ((unused)))
@@ -1300,11 +904,6 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p,
     char buf[LONG_STRING];
     struct option_t *ptr = p;
 
-    if (DTYPE(ptr->type) == DT_SYN) {
-        if (!more)
-            return;
-        ptr = hash_find(ConfigOptions, (const char *)ptr->data);
-    }
     if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_fromstr)
         return;
 
@@ -1319,8 +918,7 @@ static int init_expand (char** dst, struct option_t* src) {
 
   p_delete(dst);
 
-  if (DTYPE(src->type) == DT_STR ||
-      DTYPE(src->type) == DT_PATH) {
+  if (DTYPE(src->type) == DT_STR || DTYPE(src->type) == DT_PATH) {
     /* only expand for string as it's the only place where
      * we want to expand vars right now */
     if (src->init && *src->init) {
@@ -1353,11 +951,6 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)),
   struct option_t* ptr = (struct option_t*) p;
   char* init = NULL;
 
-  if (DTYPE (ptr->type) == DT_SYN) {
-    if (!more)
-      return;
-    ptr = hash_find (ConfigOptions, (char*) ptr->data);
-  }
   if (!ptr)
     return;
   if (FuncTable[DTYPE (ptr->type)].opt_fromstr) {
@@ -1483,21 +1076,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
 
     /* get the variable name */
     mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
-
-    /* resolve synonyms */
-    if ((option = hash_find (ConfigOptions, tmp->data)) != NULL &&
-        DTYPE (option->type == DT_SYN))
-    {
-      struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data);
-      syn_t* syn = syn_new();
-      syn->f = m_strdup(CurRCFile);
-      syn->l = CurRCLine;
-      syn->n = newopt;
-      syn->o = option;
-      syn_list_push(&Synonyms, syn);
-      option = newopt;
-    }
-
+    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);
@@ -2142,7 +1721,6 @@ static int mutt_execute_commands (string_list_t * p)
 void mutt_init (int skip_sys_rc, string_list_t * commands)
 {
   struct passwd *pw;
-  struct utsname utsname;
   const char *p;
   char buffer[STRING], error[STRING];
   int default_rc = 0, need_pause = 0;
@@ -2172,27 +1750,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
     Realname = m_strdup(rnbuf);
   }
 
-  /* And about the host... */
-  uname (&utsname);
-  /* some systems report the FQDN instead of just the hostname */
-  if ((p = strchr (utsname.nodename, '.'))) {
-    Hostname = p_dupstr(utsname.nodename, p - utsname.nodename);
-    p++;
-    m_strcpy(buffer, sizeof(buffer), p);       /* save the domain for below */
-  }
-  else
-    Hostname = m_strdup(utsname.nodename);
-
-  if (!p && getdnsdomainname(buffer, sizeof(buffer)) == -1)
-    Fqdn = m_strdup("@");
-  else
-  if (*buffer != '@') {
-    Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
-    sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer);
-  }
-  else
-    Fqdn = m_strdup(NONULL (Hostname));
-
 #ifdef USE_NNTP
   {
     FILE *f;
@@ -2214,11 +1771,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
     NewsServer = m_strdup(p);
 #endif
 
-  if ((p = getenv ("MAIL")))
+  if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
     Spoolfile = m_strdup(p);
-  else if ((p = getenv ("MAILDIR")))
-    Spoolfile = m_strdup(p);
-  else {
+  } else {
 #ifdef HOMESPOOL
     mutt_concat_path(buffer, sizeof(buffer), NONULL(MCore.homedir), MAILPATH);
 #else
@@ -2227,15 +1782,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
     Spoolfile = m_strdup(buffer);
   }
 
-  if ((p = getenv ("MAILCAPS")))
-    MailcapPath = m_strdup(p);
-  else {
-    /* Default search path from RFC1524 */
-    MailcapPath =
-      m_strdup("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
-                   "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
-  }
-
   if ((p = getenv ("REPLYTO")) != NULL) {
     BUFFER buf, token;
 
@@ -2253,8 +1799,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   if ((p = getenv ("EMAIL")) != NULL)
     From = rfc822_parse_adrlist (NULL, p);
 
-  charset_initialize();
-
   /* Set standard defaults */
   hash_map (ConfigOptions, mutt_set_default, 0);
   hash_map (ConfigOptions, mutt_restore_default, 0);
@@ -2378,9 +1922,6 @@ int mutt_dump_variables (int full) {
         struct option_t *option = MuttVars + i;
         char buf[LONG_STRING];
 
-        if (DTYPE(option->type) == DT_SYN)
-            continue;
-
         if (!full) {
             mutt_option_value(option->option, buf, sizeof(buf));
             if (!m_strcmp(buf, option->init))