X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3e151103c954aad7871a197b438b8d79d557e07e..6cd749f4e818af7d10dfd6b1de1bb37cb7915acd:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 1446c2a7..6bfbade7 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -16,6 +16,8 @@
 #include <h/m_setjmp.h>
 #include <signal.h>
 #include <errno.h>
+#include <sys/wait.h>
+#include <sys/types.h>
 
 /*
  * MAJOR BUG:
@@ -1094,7 +1096,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 	    if ((c1->c_flags & FACEDFLT) && c2->c_face == NULL) {
 		char   *h, *o;
 		if ((h = mp->m_host) == NULL)
-		    h = LocalName ();
+		    h = LocalName (0);
 		if ((o = OfficialName (h)))
 		    h = o;
 		c2->c_face = concat ("address ", h, " ", mp->m_mbox,
@@ -1501,7 +1503,7 @@ face_format (struct mcomp *c1)
 	if ((mp = getm (cp, NULL, 0, AD_NAME, NULL))) {
 	    char *h, *o;
 	    if ((h = mp->m_host) == NULL)
-		h = LocalName ();
+		h = LocalName (0);
 	    if ((o = OfficialName (h)))
 		h = o;
 	    c1->c_face = concat ("address ", h, " ", mp->m_mbox, NULL);
@@ -1949,7 +1951,8 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
 
     holder.c_text = buf;
 
-    while ((cc = read(fdoutput[0], buf, bufsz)) > 0) {
+    while ((cc = read(fdoutput[0], buf, bufsz - 1)) > 0) {
+    	buf[cc] = '\0';
     	putcomp(c1, &holder, BODYCOMP);
     }