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

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 0b0ba6e..e2f63c5 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.
@@ -12,6 +10,7 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
+#include <h/utils.h>
 #include <sys/file.h>		/* L_SET */
 #include <errno.h>
 
@@ -25,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.
@@ -71,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;
@@ -78,7 +80,8 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     register char **ap;
     register struct comp **savecomp;
     int	char_read = 0, format_len, mask;
-    char name[NAMESZ], *scanl, *cp;
+    char name[NAMESZ], *scanl;
+    unsigned char *cp;
     FILE *out;
 
     mask = umask(~m_gmprot());
@@ -104,8 +107,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     *--savecomp = NULL;		/* point at zero'd end minus 1 */
 
     for (i = ncomps; i--; )
-	if (!(*nxtbuf++ = malloc(SBUFSIZ)))
-	    adios (NULL, "unable to allocate component buffer");
+	*nxtbuf++ = mh_xmalloc(SBUFSIZ);
 
     nxtbuf = compbuffers;		/* point at start */
     tmpbuf = *nxtbuf++;
@@ -159,10 +161,12 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 		 */
 		if ((cptr = wantcomp[CHASH(name)]))
 		    do {
-			if (!strcasecmp(name, cptr->c_name)) {
+			if (!mh_strcasecmp(name, cptr->c_name)) {
 			    char_read += msg_count;
 			    if (! cptr->c_text) {
-				cptr->c_text = tmpbuf;
+				i = strlen(cptr->c_text = tmpbuf) - 1;
+				if (tmpbuf[i] == '\n')
+				    tmpbuf[i] = '\0';
 				*--savecomp = cptr;
 				tmpbuf = *nxtbuf++;
 			    } else {
@@ -230,7 +234,7 @@ finished:
 	}
     }
     i = format_len + char_read + 256;
-    scanl = malloc ((size_t) i + 2);
+    scanl = mh_xmalloc ((size_t) i + 2);
     dat[0] = 0;
     dat[1] = 0;
     dat[2] = 0;
@@ -291,11 +295,9 @@ static unsigned int bufsiz=0;	/* current size of buf */
 		int i = dst - buf;\
 		int n = last_dst - buf;\
 		bufsiz += ((dst + len - bufend) / BUFINCR + 1) * BUFINCR;\
-		buf = realloc (buf, bufsiz);\
+		buf = mh_xrealloc (buf, bufsiz);\
 		dst = buf + i;\
 		last_dst = buf + n;\
-		if (! buf)\
-		    adios (NULL, "formataddr: couldn't get buffer space");\
 		bufend = buf + bufsiz;\
 	    }
 
@@ -324,9 +326,7 @@ formataddr (char *orig, char *str)
 
     /* if we don't have a buffer yet, get one */
     if (bufsiz == 0) {
-	buf = malloc (BUFINCR);
-	if (! buf)
-	    adios (NULL, "formataddr: couldn't allocate buffer space");
+	buf = mh_xmalloc (BUFINCR);
 	last_dst = buf;		/* XXX */
 	bufsiz = BUFINCR - 6;  /* leave some slop */
 	bufend = buf + bufsiz;
@@ -383,18 +383,44 @@ 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;
 
     for (mp = &mq; mp->m_next; mp = mp->m_next) {
-	if (!strcasecmp (np->m_host, mp->m_next->m_host)
-		&& !strcasecmp (np->m_mbox, mp->m_next->m_mbox))
+	if (!mh_strcasecmp (np->m_host, mp->m_next->m_host)
+		&& !mh_strcasecmp (np->m_mbox, mp->m_next->m_mbox))
 	    return 0;
     }
     if (!ccme && ismymbox (np))
@@ -440,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");