X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=94c82b2e6fb6e4fa5110eaea3e5b33906a549d1f;hp=c3db611ad1165dd681f8fdd5c4489ddbf90667e5;hb=b218f5706bf6bf15bd59a58d9d8d18df17f0b7c9;hpb=8476307969a605bea67f6b702b0c1e7a52038bed

diff --git a/init.c b/init.c
index c3db611..94c82b2 100644
--- a/init.c
+++ b/init.c
@@ -139,8 +139,8 @@ static int user_from_string  (struct option_t* dst, const char* val,
 
 static struct {
   unsigned short type;
-  void (*opt_to_string) (char* dst, ssize_t dstlen, struct option_t* option);
-  int (*opt_from_string) (struct option_t* dst, const char* val,
+  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 */
@@ -206,7 +206,7 @@ static int num_from_string (struct option_t* dst, const char* val,
 
   num = strtol (val, &t, 0);
 
-  if (!*val || *t || (short) num != num) {
+  if (m_strisempty(val) || *t || (short) num != num) {
     if (errbuf) {
       snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
                 val, dst->option);
@@ -289,7 +289,7 @@ static int path_from_string (struct option_t* dst, const char* val,
   if (!dst)
     return (0);
 
-  if (!val || !*val) {
+  if (m_strisempty(val)) {
     p_delete((char**) dst->data);
     return (1);
   }
@@ -423,7 +423,7 @@ static int rx_from_string (struct option_t* dst, const char* val,
   p = (rx_t*) dst->data;
 
   /* something to do? */
-  if (!val || !*val || (p->pattern && m_strcmp(p->pattern, val) == 0))
+  if (m_strisempty(val) || (p->pattern && m_strcmp(p->pattern, val) == 0))
     return (1);
 
   if (m_strcmp(dst->option, "mask") != 0)
@@ -476,7 +476,7 @@ 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 || !val || !*val)
+  if (!dst || m_strisempty(val))
     return (0);
   if (ascii_strncasecmp (val, "mbox", 4) == 0)
     flag = M_MBOX;
@@ -499,7 +499,7 @@ static void addr_to_string (char* dst, ssize_t dstlen,
                             struct option_t* option) {
   char s[HUGE_STRING];
   s[0] = '\0';
-  rfc822_write_address (s, sizeof(s), *((address_t**) option->data), 0);
+  rfc822_addrcat(s, sizeof(s), *((address_t**) option->data), 0);
   snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
 }
 
@@ -523,7 +523,7 @@ int mutt_option_value (const char* val, char* dst, ssize_t dstlen) {
     return (0);
   }
   tmp = p_new(char, dstlen+1);
-  FuncTable[DTYPE (option->type)].opt_to_string (tmp, dstlen, option);
+  FuncTable[DTYPE(option->type)].opt_tostr (tmp, dstlen, option);
 
   /* as we get things of type $var=value and don't want to bloat the
    * above "just" for expansion, we do the stripping here */
@@ -621,7 +621,7 @@ add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err)
 {
     rx_t* rx;
 
-    if (!s || !*s)
+    if (m_strisempty(s))
         return 0;
 
     if (rx_lookup(list, s))
@@ -637,101 +637,46 @@ add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err)
     return 0;
 }
 
-static int add_to_spam_list (SPAM_LIST ** list, const char *pat,
+static int add_to_spam_list(rx_t **list, const char *pat,
                              const char *templ, BUFFER * err)
 {
-  SPAM_LIST *t = NULL, *last = NULL;
-  rx_t* rx;
-  int n;
-  const char *p;
-
-  if (!pat || !*pat || !templ)
-    return 0;
+    rx_t **last, *rx;
 
-  if (!(rx = rx_compile (pat, REG_ICASE))) {
-    snprintf (err->data, err->dsize, _("Bad regexp: %s"), pat);
-    return -1;
-  }
+    if (m_strisempty(pat) || !templ)
+        return 0;
 
-  /* check to make sure the item is not already on this list */
-  for (last = *list; last; last = last->next) {
-    if (ascii_strcasecmp (rx->pattern, last->rx->pattern) == 0) {
-      /* Already on the list. Formerly we just skipped this case, but
-       * now we're supporting removals, which means we're supporting
-       * re-adds conceptually. So we probably want this to imply a
-       * removal, then do an add. We can achieve the removal by freeing
-       * the template, and leaving t pointed at the current item.
-       */
-      t = last;
-      p_delete(&t->template);
-      break;
+    if (!(rx = rx_compile (pat, REG_ICASE))) {
+        snprintf (err->data, err->dsize, _("Bad regexp: %s"), pat);
+        return -1;
     }
-    if (!last->next)
-      break;
-  }
-
-  /* If t is set, it's pointing into an extant SPAM_LIST* that we want to
-   * update. Otherwise we want to make a new one to link at the list's end.
-   */
-  if (!t) {
-    t = mutt_new_spam_list ();
-    t->rx = rx;
-    if (last)
-      last->next = t;
-    else
-      *list = t;
-  }
-
-  /* Now t is the SPAM_LIST* that we want to modify. It is prepared. */
-  t->template = m_strdup(templ);
 
-  /* Find highest match number in template string */
-  t->nmatch = 0;
-  for (p = templ; *p;) {
-    if (*p == '%') {
-      n = atoi (++p);
-      if (n > t->nmatch)
-        t->nmatch = n;
-      while (*p && isdigit ((int) *p))
-        ++p;
+    /* check to make sure the item is not already on this list */
+    for (last = list; *last; last = &(*last)->next) {
+        if (!ascii_strcasecmp(rx->pattern, (*last)->pattern) == 0) {
+            rx_t *tmp = rx_list_pop(last);
+            rx_delete(&tmp);
+            last = rx_list_last(last);
+            break;
+        }
     }
-    else
-      ++p;
-  }
-  t->nmatch++;                  /* match 0 is always the whole expr */
 
-  return 0;
+    *last = rx;
+    rx_set_template(rx, templ);
+    return 0;
 }
 
-static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
+static int remove_from_spam_list (rx_t ** list, const char *pat)
 {
-  SPAM_LIST *spam, *prev;
   int nremoved = 0;
 
-  /* Being first is a special case. */
-  spam = *list;
-  if (!spam)
-    return 0;
-  if (spam->rx && !m_strcmp(spam->rx->pattern, pat)) {
-    *list = spam->next;
-    rx_delete(&spam->rx);
-    p_delete(&spam->template);
-    p_delete(&spam);
-    return 1;
-  }
-
-  prev = spam;
-  for (spam = prev->next; spam;) {
-    if (!m_strcmp(spam->rx->pattern, pat)) {
-      prev->next = spam->next;
-      rx_delete(&spam->rx);
-      p_delete(&spam->template);
-      p_delete(&spam);
-      spam = prev->next;
-      ++nremoved;
-    }
-    else
-      spam = spam->next;
+  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;
@@ -781,70 +726,6 @@ static int remove_from_rx_list(rx_t **l, const char *str)
     return -1;
 }
 
-static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
-                        BUFFER * err)
-{
-  int i, j;
-  unsigned long res = 0;
-  BUFFER token;
-  struct option_t* option = NULL;
-
-  p_clear(&token, 1);
-  mutt_extract_token (tmp, s, 0);
-
-  /* is the item defined as a variable or a function? */
-  if ((option = hash_find (ConfigOptions, tmp->data)) != NULL)
-    res = 1;
-  else {
-    for (i = 0; !res && i < MENU_MAX; i++) {
-      struct binding_t *b = km_get_table (Menus[i].value);
-
-      if (!b)
-        continue;
-
-      for (j = 0; b[j].name; j++)
-        if (!ascii_strncasecmp (tmp->data, b[j].name, m_strlen(tmp->data))
-            && (m_strlen(b[j].name) == m_strlen(tmp->data))) {
-          res = 1;
-          break;
-        }
-    }
-  }
-  /* check for feature_* */
-  if (!res && ascii_strncasecmp (tmp->data, "feature_", 8) == 0 &&
-      (j = m_strlen(tmp->data)) > 8) {
-    i = 0;
-    while (Features[i]) {
-      if (m_strlen(Features[i]) == j-8 &&
-          ascii_strncasecmp (Features[i], tmp->data+8, j-8) == 0) {
-        res = 1;
-        break;
-      }
-      i++;
-    }
-  }
-
-  if (!MoreArgs (s)) {
-    if (data)
-      snprintf (err->data, err->dsize, _("ifdef: too few arguments"));
-    else
-      snprintf (err->data, err->dsize, _("ifndef: too few arguments"));
-    return (-1);
-  }
-
-  mutt_extract_token (tmp, s, M_TOKEN_SPACE);
-
-  if (data == res) {
-    if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
-      mutt_error ("Error: %s", err->data);
-      p_delete(&token.data);
-      return (-1);
-    }
-    p_delete(&token.data);
-  }
-  return 0;
-}
-
 static int parse_unignore (BUFFER * buf, BUFFER * s,
                            unsigned long data __attribute__ ((unused)),
                            BUFFER * err __attribute__ ((unused)))
@@ -853,12 +734,11 @@ static int parse_unignore (BUFFER * buf, BUFFER * s,
     mutt_extract_token (buf, s, 0);
 
     /* don't add "*" to the unignore list */
-    if (strcmp (buf->data, "*"))
+    if (m_strcmp (buf->data, "*"))
       add_to_list (&UnIgnore, buf->data);
 
     remove_from_list (&Ignore, buf->data);
-  }
-  while (MoreArgs (s));
+  } while (MoreArgs (s));
 
   return 0;
 }
@@ -871,9 +751,7 @@ static int parse_ignore (BUFFER * buf, BUFFER * s,
     mutt_extract_token (buf, s, 0);
     remove_from_list (&UnIgnore, buf->data);
     add_to_list (&Ignore, buf->data);
-  }
-  while (MoreArgs (s));
-
+  } while (MoreArgs(s));
   return 0;
 }
 
@@ -884,9 +762,7 @@ static int parse_list (BUFFER * buf, BUFFER * s,
   do {
     mutt_extract_token (buf, s, 0);
     add_to_list ((string_list_t **) data, buf->data);
-  }
-  while (MoreArgs (s));
-
+  } while (MoreArgs(s));
   return 0;
 }
 
@@ -983,7 +859,7 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
 
     /* "*" is a special case. */
     if (!m_strcmp(buf->data, "*")) {
-      mutt_free_spam_list (&SpamList);
+      rx_list_wipe(&SpamList);
       rx_list_wipe(&NoSpamList);
       return 0;
     }
@@ -1089,7 +965,7 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, string_list_t **ldata,
 
     len = m_strlen(a->minor);
     tmpminor = p_new(char, len + 3);
-    strcpy(&tmpminor[1], a->minor); /* __STRCPY_CHECKED__ */
+    m_strcpy(&tmpminor[1], len + 3, a->minor);
     tmpminor[0] = '^';
     tmpminor[len+1] = '$';
     tmpminor[len+2] = '\0';
@@ -1543,7 +1419,7 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p,
             return;
         ptr = hash_find(ConfigOptions, (const char *)ptr->data);
     }
-    if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
+    if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_fromstr)
         return;
 
     mutt_option_value(ptr->option, buf, sizeof(buf));
@@ -1624,9 +1500,9 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)),
   }
   if (!ptr)
     return;
-  if (FuncTable[DTYPE (ptr->type)].opt_from_string) {
+  if (FuncTable[DTYPE (ptr->type)].opt_fromstr) {
     init_expand (&init, ptr);
-    if (!FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, init, errbuf,
+    if (!FuncTable[DTYPE (ptr->type)].opt_fromstr (ptr, init, errbuf,
                                                        sizeof(errbuf))) {
       if (!option (OPTNOCURSES))
         mutt_endwin (NULL);
@@ -1792,12 +1668,12 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         DTYPE (option->type == DT_SYN))
     {
       struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data);
-      syn_t* tmp = syn_new();
-      tmp->f = m_strdup(CurRCFile);
-      tmp->l = CurRCLine;
-      tmp->n = newopt;
-      tmp->o = option;
-      syn_list_push(&Synonyms, tmp);
+      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;
     }
 
@@ -1842,7 +1718,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         set_option (OPTREDRAWTREE);
         return (0);
       }
-      else if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+      else if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
         snprintf (err->data, err->dsize, _("$%s is read-only"), option->option);
         r = -1;
         break;
@@ -1903,7 +1779,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
           DTYPE (option->type) == DT_SYS) {
         if (unset) {
           CHECK_PAGER;
-          if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+          if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
             snprintf (err->data, err->dsize, _("$%s is read-only"),
                       option->option);
             r = -1;
@@ -1921,13 +1797,13 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       }
 
       if (query || *s->dptr != '=') {
-        FuncTable[DTYPE (option->type)].opt_to_string
+        FuncTable[DTYPE (option->type)].opt_tostr
           (err->data, err->dsize, option);
         break;
       }
 
       /* the $madmutt_ variables are read-only */
-      if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+      if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
         snprintf (err->data, err->dsize, _("$%s is read-only"),
                   option->option);
         r = -1;
@@ -1936,7 +1812,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         CHECK_PAGER;
         s->dptr++;
         mutt_extract_token (tmp, s, 0);
-        if (!FuncTable[DTYPE (option->type)].opt_from_string
+        if (!FuncTable[DTYPE (option->type)].opt_fromstr
             (option, tmp->data, err->data, err->dsize))
           r = -1;
       }
@@ -2050,7 +1926,7 @@ static int source_rc (const char *rcfile, BUFFER * err)
   }
   p_delete(&token.data);
   p_delete(&linebuf);
-  fclose (f);
+  m_fclose(&f);
   if (pid != -1)
     mutt_wait_filter (pid);
   if (rc) {
@@ -2357,8 +2233,7 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos)
           mutt_pretty_mailbox (tmp);
       }
       else if (DTYPE (option->type) == DT_ADDR) {
-        rfc822_write_address (tmp, sizeof(tmp),
-                              *((address_t **) option->data), 0);
+        rfc822_addrcat(tmp, sizeof(tmp), *((address_t **) option->data), 0);
       }
       else if (DTYPE (option->type) == DT_QUAD)
         m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);
@@ -2461,7 +2336,7 @@ int mutt_query_variables (string_list_t * queries)
 static int mutt_execute_commands (string_list_t * p)
 {
   BUFFER err, token;
-  char errstr[SHORT_STRING];
+  char errstr[STRING];
 
   p_clear(&err, 1);
   err.data = errstr;
@@ -2560,7 +2435,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   else
   if (*buffer != '@') {
     Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
-    sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer); /* __SPRINTF_CHECKED__ */
+    sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer);
   }
   else
     Fqdn = m_strdup(NONULL (Hostname));
@@ -2579,7 +2454,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
         q++;
       *q = '\0';
       NewsServer = m_strdup(p);
-      fclose (f);
+      m_fclose(&f);
     }
   }
   if ((p = getenv ("NNTPSERVER")))
@@ -2652,18 +2527,8 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   mutt_init_history ();
 
   if (!Muttrc) {
-#if 0
-    snprintf (buffer, sizeof(buffer), "%s/.madmuttrc-%s", NONULL (Homedir),
-              MUTT_VERSION);
-    if (access (buffer, F_OK) == -1)
-#endif
       snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL (Homedir));
     if (access (buffer, F_OK) == -1)
-#if 0
-      snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc-%s",
-                NONULL (Homedir), MUTT_VERSION);
-    if (access (buffer, F_OK) == -1)
-#endif
       snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
                 NONULL (Homedir));
 
@@ -2773,8 +2638,7 @@ int mutt_dump_variables (int full) {
         }
 
         printf("set ");
-        FuncTable[DTYPE(option->type)].opt_to_string
-            (buf, sizeof(buf), option);
+        FuncTable[DTYPE(option->type)].opt_tostr(buf, sizeof(buf), option);
         printf ("%s\n", buf);
     }