X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Freplsbr.c;h=a415346e0116bc5c7000cccade5b250ef5031dcf;hp=244fdc93246620c086c9561e3426857d03e5f3f6;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=008837e090c008e3afe7a9c8667070bafa091e62

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 244fdc9..a415346 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -79,7 +79,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());
@@ -159,10 +160,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 {
@@ -389,8 +392,8 @@ insert (struct mailname *np)
 	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))