X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Freplsbr.c;h=e2f63c578a8676e116b2b6a955556b3c334bfa45;hb=5ea646bd6534ab3b4d228c1c20998fdfa69ecfcf;hp=3dda47089c543d0ef823e74cc3c153f2f18948fa;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 3dda470..e2f63c5 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -24,7 +24,8 @@ static int dftype=0;
 static char *badaddrs = NULL;
 static char *dfhost = NULL;
 
-static struct mailname mq = { NULL };
+static struct mailname mq;
+static int nodupcheck = 0;		/* If set, no check for duplicates */
 
 /*
  * Buffer size for content part of header fields.
@@ -70,6 +71,8 @@ void
 replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 	int mime, char *form, char *filter, char *fcc)
 {
+    NMH_UNUSED (msg);
+
     register int state, i;
     register struct comp *cptr;
     register char *tmpbuf;
@@ -380,12 +383,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;
 
@@ -437,7 +466,7 @@ replfilter (FILE *in, FILE *out, char *filter)
     rewind (in);
     lseek (fileno(in), (off_t) 0, SEEK_SET);
 
-    switch (pid = vfork ()) {
+    switch (pid = vfork()) {
 	case NOTOK: 
 	    adios ("fork", "unable to");