Fixed some more charset/encoding stuff.

[mmh] / uip / replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 9ca0bb9..613b3d9 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -24,7 +24,7 @@ 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 */
 
 /*
@@ -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;
@@ -162,9 +164,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
                        if (!mh_strcasecmp(name, cptr->c_name)) {
                            char_read += msg_count;
                            if (! cptr->c_text) {
-                               i = strlen(cptr->c_text = tmpbuf) - 1;
-                               if (tmpbuf[i] == '\n')
-                                   tmpbuf[i] = '\0';
+                               cptr->c_text = tmpbuf;
                                *--savecomp = cptr;
                                tmpbuf = *nxtbuf++;
                            } else {
@@ -464,7 +464,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");