upstream/608706-fix-spelling-errors.patch: to fix some spelling errors (Closes: 608706)

[software/mutt-debian.git] / group.c

diff --git a/group.c b/group.c
index 142acace0da2dd156b80624dcd8a2ca8139332e2..f48329756ac99c5dee25a95a5f2e8b3888922af6 100644 (file)
--- a/group.c
+++ b/group.c
@@ -1,35 +1,31 @@
 /*
  * Copyright (C) 2006 Thomas Roessler <roessler@does-not-exist.org>
- * 
+ * Copyright (C) 2009 Rocco Rutte <pdmef@gmx.net>
+ *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation; either version 2 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */ 
+ */
 
 #if HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include "mutt.h"
-#include "mapping.h"
 #include "mutt_curses.h"
 #include "mutt_regex.h"
-#include "history.h"
-#include "keymap.h"
 #include "mbyte.h"
 #include "charset.h"
-#include "mutt_crypt.h"
-#include "mutt_idna.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -42,10 +38,10 @@
 group_t *mutt_pattern_group (const char *k)
 {
   group_t *p;
-  
+
   if (!k)
     return 0;
-  
+
   if (!(p = hash_find (Groups, k)))
   {
     dprint (2, (debugfile, "mutt_pattern_group: Creating group %s.\n", k));
@@ -53,10 +49,40 @@ group_t *mutt_pattern_group (const char *k)
     p->name = safe_strdup (k);
     hash_insert (Groups, p->name, p, 0);
   }
-  
+
   return p;
 }
 
+static void mutt_group_remove (group_t *g)
+{
+  if (!g)
+    return;
+  hash_delete (Groups, g->name, g, NULL);
+  rfc822_free_address (&g->as);
+  mutt_free_rx_list (&g->rs);
+  FREE(&g->name);
+  FREE(&g);
+}
+
+int mutt_group_context_clear (group_context_t **ctx)
+{
+  group_context_t *t;
+  for ( ; ctx && *ctx; (*ctx) = t)
+  {
+    mutt_group_remove ((*ctx)->g);
+    t = (*ctx)->next;
+    FREE(ctx);                         /* __FREE_CHECKED__ */
+  }
+  return 0;
+}
+
+static int empty_group (group_t *g)
+{
+  if (!g)
+    return -1;
+  return !g->as && !g->rs;
+}
+
 void mutt_group_context_add (group_context_t **ctx, group_t *group)
 {
   for (; *ctx; ctx = &((*ctx)->next))
@@ -64,7 +90,7 @@ void mutt_group_context_add (group_context_t **ctx, group_t *group)
     if ((*ctx)->g == group)
       return;
   }
-  
+
   *ctx = safe_calloc (1, sizeof (group_context_t));
   (*ctx)->g = group;
 }
@@ -87,40 +113,88 @@ void mutt_group_add_adrlist (group_t *g, ADDRESS *a)
     return;
   if (!a)
     return;
-  
+
   for (p = &g->as; *p; p = &((*p)->next))
     ;
-  
-  q = rfc822_cpy_adr (a);
+
+  q = rfc822_cpy_adr (a, 0);
   q = mutt_remove_xrefs (g->as, q);
   *p = q;
 }
 
-int mutt_group_add_rx (group_t *g, const char *s, int flags, BUFFER *err)
+static int mutt_group_remove_adrlist (group_t *g, ADDRESS *a)
+{
+  ADDRESS *p;
+
+  if (!g)
+    return -1;
+  if (!a)
+    return -1;
+
+  for (p = a; p; p = p->next)
+    rfc822_remove_from_adrlist (&g->as, p->mailbox);
+
+  return 0;
+}
+
+static int mutt_group_add_rx (group_t *g, const char *s, int flags, BUFFER *err)
 {
   return mutt_add_to_rx_list (&g->rs, s, flags, err);
 }
 
+static int mutt_group_remove_rx (group_t *g, const char *s)
+{
+  return mutt_remove_from_rx_list (&g->rs, s);
+}
+
 void mutt_group_context_add_adrlist (group_context_t *ctx, ADDRESS *a)
 {
   for (; ctx; ctx = ctx->next)
     mutt_group_add_adrlist (ctx->g, a);
 }
 
+int mutt_group_context_remove_adrlist (group_context_t *ctx, ADDRESS * a)
+{
+  int rv = 0;
+
+  for (; (!rv) && ctx; ctx = ctx->next)
+  {
+    rv = mutt_group_remove_adrlist (ctx->g, a);
+    if (empty_group (ctx->g))
+      mutt_group_remove (ctx->g);
+  }
+
+  return rv;
+}
+
 int mutt_group_context_add_rx (group_context_t *ctx, const char *s, int flags, BUFFER *err)
 {
   int rv = 0;
-  
+
   for (; (!rv) && ctx; ctx = ctx->next)
     rv = mutt_group_add_rx (ctx->g, s, flags, err);
 
   return rv;
 }
 
+int mutt_group_context_remove_rx (group_context_t *ctx, const char *s)
+{
+  int rv = 0;
+
+  for (; (!rv) && ctx; ctx = ctx->next)
+  {
+    rv = mutt_group_remove_rx (ctx->g, s);
+    if (empty_group (ctx->g))
+      mutt_group_remove (ctx->g);
+  }
+
+  return rv;
+}
+
 int mutt_group_match (group_t *g, const char *s)
 {
   ADDRESS *ap;
-  
+
   if (s && g)
   {
     if (mutt_match_rx_list (s, g->rs))