X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b40ecb4417e49cbc53459b28ee394a3b2eb93c9c..faf6326828be2108facd64fcca291c4ffb523eea:/uip/replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index fe79c295..2444aa3c 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -63,7 +63,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     char name[NAMESZ], *cp;
     charstring_t scanl;
     static int dat[5];			/* aux. data for format routine */
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
     struct fmt_callbacks cb;
 
     FILE *out;
@@ -110,9 +110,10 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     /*
      * pick any interesting stuff out of msg "inb"
      */
+    gstate = m_getfld_state_init(inb);
     for (;;) {
 	int msg_count = sizeof tmpbuf;
-	state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+	state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
 	switch (state) {
 	    case FLD:
 	    case FLDPLUS:
@@ -128,7 +129,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 		    char_read += msg_count;
 		    while (state == FLDPLUS) {
 			msg_count= sizeof tmpbuf;
-			state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+			state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
 			fmt_appendcomp(i, name, tmpbuf);
 			char_read += msg_count;
 		    }
@@ -136,7 +137,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 
 		while (state == FLDPLUS) {
 		    msg_count= sizeof tmpbuf;
-		    state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+		    state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
 		}
 		break;
 
@@ -147,7 +148,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 		goto finished;
 
 	    default:
-		adios (NULL, "m_getfld() returned %d", state);
+		adios (NULL, "m_getfld2() returned %d", state);
 	}
     }
 
@@ -204,7 +205,7 @@ finished:
     dat[2] = 0;
     dat[3] = outputlinelen;
     dat[4] = 0;
-    memset(&cb, 0, sizeof(cb));
+    ZERO(&cb);
     cb.formataddr = replformataddr;
     cb.concataddr = replconcataddr;
     fmt_scan (fmt, scanl, i, dat, &cb);
@@ -384,10 +385,10 @@ insert (struct mailname *np)
 	return 0;
 
     for (mp = &mq; mp->m_next; mp = mp->m_next) {
-	if (!strcasecmp (np->m_host ? np->m_host : "",
-			 mp->m_next->m_host ? mp->m_next->m_host : "")  &&
-	    !strcasecmp (np->m_mbox ? np->m_mbox : "",
-			 mp->m_next->m_mbox ? mp->m_next->m_mbox : ""))
+	if (!strcasecmp (FENDNULL(np->m_host),
+			 FENDNULL(mp->m_next->m_host))  &&
+	    !strcasecmp (FENDNULL(np->m_mbox),
+			 FENDNULL(mp->m_next->m_mbox)))
 	    return 0;
     }
     if (!ccme && ismymbox (np))
@@ -426,7 +427,7 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
 	adios (filter, "unable to read");
 
     rewind (in);
-    lseek (fileno(in), (off_t) 0, SEEK_SET);
+    lseek(fileno(in), 0, SEEK_SET);
 
     arglist = argsplit(mhlproc, &mhl, &argnum);