X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Freplsbr.c;h=9ca0bb94f72dbaf7a5f296813f1b84e2751e195f;hb=c3ed95b3c5530b84a73dbdd531cb9aca9ba8dea0;hp=a415346e0116bc5c7000cccade5b250ef5031dcf;hpb=13f84dd50ca5754391dbd3296a5c7425f9363600;p=mmh

diff --git a/uip/replsbr.c b/uip/replsbr.c
index a415346..9ca0bb9 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -2,8 +2,6 @@
 /*
  * replsbr.c -- routines to help repl along...
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -27,6 +25,7 @@ static char *badaddrs = NULL;
 static char *dfhost = NULL;
 
 static struct mailname mq = { NULL };
+static int nodupcheck = 0;		/* If set, no check for duplicates */
 
 /*
  * Buffer size for content part of header fields.
@@ -382,12 +381,38 @@ formataddr (char *orig, char *str)
 }
 
 
+/*
+ * fmt_scan will call this routine if the user includes the function
+ * "(concataddr {component})" in a format string.  This behaves exactly
+ * like formataddr, except that it does NOT suppress duplicate addresses
+ * between calls.
+ *
+ * As an implementation detail: I thought about splitting out formataddr()
+ * into the generic part and duplicate-suppressing part, but the call to
+ * insert() was buried deep within a couple of loops and I didn't see a
+ * way to do it easily.  So instead we simply set a special flag to stop
+ * the duplicate check and call formataddr().
+ */
+char *
+concataddr(char *orig, char *str)
+{
+    char *cp;
+
+    nodupcheck = 1;
+    cp = formataddr(orig, str);
+    nodupcheck = 0;
+    return cp;
+}
+
 static int
 insert (struct mailname *np)
 {
     char buffer[BUFSIZ];
     register struct mailname *mp;
 
+    if (nodupcheck)
+	return 1;
+
     if (np->m_mbox == NULL)
 	return 0;