more rationalization.

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index dc5084b..e0711c3 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -55,6 +55,27 @@ const address_t *alias_lookup(const alias_t *list, const char *s)
     return NULL;
 }
 
     return NULL;
 }
 

+/* This routine looks to see if the user has an alias defined for the given
+   address.                                                                 */
+const address_t *alias_reverse_lookup(const alias_t *list, const address_t *a)
+{
+    if (!a || !a->mailbox)
+        return NULL;
+
+    for (; list; list = list->next) {
+        address_t *ap;
+
+        /* cycle through all addresses if this is a group alias */
+        for (ap = list->addr; ap; ap = ap->next) {
+            if (!ap->group && ap->mailbox
+            &&  !ascii_strcasecmp(ap->mailbox, a->mailbox))
+                return ap;
+        }
+    }
+
+    return NULL;
+}
+

 static int string_is_address(const char *str, const char *u, const char *d)
 {
     char buf[LONG_STRING];
 static int string_is_address(const char *str, const char *u, const char *d)
 {
     char buf[LONG_STRING];


@@ -349,30 +370,6 @@ void mutt_expand_aliases_env(ENVELOPE *env)
 
 /************* READ MARK *********************/
 
 
 /************* READ MARK *********************/
 

-
-/*
- * This routine looks to see if the user has an alias defined for the given
- * address.
- */
-address_t *alias_reverse_lookup (address_t * a)
-{
-  alias_t *t = Aliases;
-  address_t *ap;
-
-  if (!a || !a->mailbox)
-    return NULL;
-
-  for (; t; t = t->next) {
-    /* cycle through all addresses if this is a group alias */
-    for (ap = t->addr; ap; ap = ap->next) {
-      if (!ap->group && ap->mailbox &&
-          ascii_strcasecmp (ap->mailbox, a->mailbox) == 0)
-        return ap;
-    }
-  }
-  return 0;
-}
-

 /* alias_complete() -- alias completion routine
  *
  * given a partial alias, this routine attempts to fill in the alias
 /* alias_complete() -- alias completion routine
  *
  * given a partial alias, this routine attempts to fill in the alias