X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=061f35e55feac644e9c9520a1483b671911de3fa;hp=f99452a5a6886ac07b2fdc78a17964bfde408184;hb=5f299ed8b67fa06f3c96777d437c0285ff71d9ac;hpb=0dd5b492f18e549ef95b0ac6765329473e426633

diff --git a/init.c b/init.c
index f99452a..061f35e 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>
@@ -42,7 +41,7 @@ static int parse_sort (struct option_t* dst, const char *s,
                        const struct mapping_t *map,
                        char* errbuf, ssize_t errlen);
 
-static HASH *ConfigOptions = NULL;
+static hash_t *ConfigOptions = NULL;
 
 /* for synonym warning reports: synonym found during parsing */
 typedef struct syn_t {
@@ -69,10 +68,6 @@ static const char* CurRCFile = NULL;
 static int CurRCLine = 0;
 
 /* prototypes for checking for special vars */
-static int check_dsn_return (const char* option, unsigned long val,
-                             char* errbuf, ssize_t errlen);
-static int check_dsn_notify (const char* option, unsigned long val,
-                             char* errbuf, ssize_t errlen);
 static int check_history    (const char* option, unsigned long val,
                              char* errbuf, ssize_t errlen);
 /* this checks that numbers are >= 0 */
@@ -92,8 +87,6 @@ static struct {
   int (*check) (const char* option, unsigned long val,
                 char* errbuf, ssize_t errlen);
 } SpecialVars[] = {
-  { "dsn_notify",               check_dsn_notify },
-  { "dsn_return",               check_dsn_return },
 #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
   { "smtp_use_tls",             mutt_libesmtp_check_usetls },
 #endif
@@ -331,7 +324,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)
@@ -358,7 +351,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++;
   }
 
@@ -378,7 +371,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 ();
@@ -494,10 +487,8 @@ int quadoption (int opt)
   return (QuadOptions[n] >> b) & 0x3;
 }
 
-int query_quadoption2(int opt, const char *prompt)
+int query_quadoption2(int v, const char *prompt)
 {
-  int v = mlua_reggetq(opt);
-
   switch (v) {
   case M_YES:
   case M_NO:
@@ -528,312 +519,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;
@@ -936,7 +621,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; ) {
@@ -1068,59 +753,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)))
@@ -1396,45 +1028,6 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)),
     set_option (OPTREDRAWTREE);
 }
 
-/* check whether value for $dsn_return would be valid */
-static int check_dsn_return (const char* option __attribute__ ((unused)), unsigned long p,
-                             char* errbuf, ssize_t errlen) {
-  char* val = (char*) p;
-  if (val && *val && m_strncmp(val, "hdrs", 4) != 0 &&
-      m_strncmp(val, "full", 4) != 0) {
-    if (errbuf)
-      snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), val, "dsn_return");
-    return (0);
-  }
-  return (1);
-}
-
-/* check whether value for $dsn_notify would be valid */
-static int
-check_dsn_notify (const char* option __attribute__ ((unused)),
-                  unsigned long val, char* errbuf, ssize_t errlen)
-{
-    const char *p = (const char*)val;
-
-    while (p && *p) {
-        const char *q = m_strchrnul(p, ',');
-        int len = q - p;
-
-        if (!m_strncmp(p, "never", len)   && !m_strncmp(p, "delay", len)
-        &&  !m_strncmp(p, "failure", len) && !m_strncmp(p, "success", len))
-        {
-            if (errbuf)
-                snprintf(errbuf, errlen, _("'%.*s' is invalid for $%s"),
-                         len, p, "dsn_notify");
-            return 0;
-        }
-
-        p = q + 1;
-    }
-
-    return 1;
-}
-
 static int check_num (const char* option, unsigned long p,
                       char* errbuf, ssize_t errlen) {
   if ((int) p < 0) {
@@ -1729,12 +1322,12 @@ static int source_rc (const char *rcfile, BUFFER * err)
 
   p_clear(&token, 1);
   while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) {
-    conv = ConfigCharset && (*ConfigCharset) && Charset;
+    conv = ConfigCharset && (*ConfigCharset) && MCharset.charset;
     if (conv) {
       currentline = m_strdup(linebuf);
       if (!currentline)
         continue;
-      mutt_convert_string (&currentline, ConfigCharset, Charset, 0);
+      mutt_convert_string (&currentline, ConfigCharset, MCharset.charset, 0);
     }
     else
       currentline = linebuf;
@@ -2189,7 +1782,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;
@@ -2200,9 +1792,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   err.data = error;
   err.dsize = sizeof(error);
 
-  ConfigOptions = hash_create (sizeof(MuttVars) * 2);
+  ConfigOptions = hash_new (sizeof(MuttVars) * 2, 0);
   for (i = 0; MuttVars[i].option; i++) {
-    hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
+    hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i]);
   }
 
   /*
@@ -2211,59 +1803,14 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   snprintf (AttachmentMarker, sizeof(AttachmentMarker),
             "\033]9;%ld\a", (long) time (NULL));
 
-  /* on one of the systems I use, getcwd() does not return the same prefix
-     as is listed in the passwd file */
-  if ((p = getenv ("HOME")))
-    Homedir = m_strdup(p);
-
+  luaM_initialize();
   /* Get some information about the user */
   if ((pw = getpwuid (getuid ()))) {
     char rnbuf[STRING];
-
-    Username = m_strdup(pw->pw_name);
-    if (!Homedir)
-      Homedir = m_strdup(pw->pw_dir);
-
-    mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx);
+    mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, MCore.gecos_mask);
     Realname = m_strdup(rnbuf);
-    endpwent ();
-  }
-  else {
-    if (!Homedir) {
-      mutt_endwin (NULL);
-      fputs (_("unable to determine home directory"), stderr);
-      exit (1);
-    }
-    if ((p = getenv ("USER")))
-      Username = m_strdup(p);
-    else {
-      mutt_endwin (NULL);
-      fputs (_("unable to determine username"), stderr);
-      exit (1);
-    }
   }
 
-  /* 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;
@@ -2285,30 +1832,17 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
     NewsServer = m_strdup(p);
 #endif
 
-  if ((p = getenv ("MAIL")))
-    Spoolfile = m_strdup(p);
-  else if ((p = getenv ("MAILDIR")))
+  if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
     Spoolfile = m_strdup(p);
-  else {
+  } else {
 #ifdef HOMESPOOL
-    mutt_concat_path(buffer, sizeof(buffer), NONULL(Homedir), MAILPATH);
+    mutt_concat_path(buffer, sizeof(buffer), NONULL(MCore.homedir), MAILPATH);
 #else
-    mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(Username));
+    mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(MCore.username));
 #endif
     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");
-  }
-
-  Tempdir = m_strdup((p = getenv ("TMPDIR")) ? p : "/tmp");
-
   if ((p = getenv ("REPLYTO")) != NULL) {
     BUFFER buf, token;
 
@@ -2326,9 +1860,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();
-  mlua_initialize();
-
   /* Set standard defaults */
   hash_map (ConfigOptions, mutt_set_default, 0);
   hash_map (ConfigOptions, mutt_restore_default, 0);
@@ -2344,10 +1875,10 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   mutt_init_history ();
 
   if (!Muttrc) {
-      snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL (Homedir));
+      snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(MCore.homedir));
     if (access (buffer, F_OK) == -1)
       snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
-                NONULL (Homedir));
+                NONULL(MCore.homedir));
 
     default_rc = 1;
     Muttrc = m_strdup(buffer);
@@ -2358,8 +1889,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
     mutt_expand_path (buffer, sizeof(buffer));
     Muttrc = m_strdup(buffer);
   }
-  p_delete(&AliasFile);
-  AliasFile = m_strdup(NONULL (Muttrc));
 
   /* Process the global rc file if it exists and the user hasn't explicity
      requested not to via "-n".  */
@@ -2400,11 +1929,11 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   }
 
   /* LUA {{{ */
-  snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(Homedir));
+  snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(MCore.homedir));
   if (access(buffer, F_OK) < 0)
-      snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(Homedir));
+      snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(MCore.homedir));
   if (!access(buffer, F_OK)) {
-      need_pause = mlua_wrap(mutt_error, mlua_dofile(buffer));
+      need_pause = luaM_wrap(mutt_error, luaM_dofile(buffer));
   }
   /* }}} */