X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhlsbr.c;h=e961b9b0e0f6058c765c4f72d6334d9b7320e38c;hb=2d3d6cb7011b7fe432ffda2889e1f27860c49f37;hp=1446c2a78d721f2629de65ad94f4b4fbb9658690;hpb=3e151103c954aad7871a197b438b8d79d557e07e;p=mmh

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 1446c2a..e961b9b 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:
@@ -288,16 +290,6 @@ static void mhldone (int);
 static void m_popen (char *);
 static void filterbody (struct mcomp *, char *, int, int, FILE *);
 
-int mhl (int, char **);
-int mhlsbr (int, char **, FILE *(*)());
-void m_pclose (void);
-
-void clear_screen (void);             /* from termsbr.c */
-int SOprintf (char *, ...);           /* from termsbr.c */
-int sc_width (void);                  /* from termsbr.c */
-int sc_length (void);                 /* from termsbr.c */
-int sc_hardcopy (void);               /* from termsbr.c */
-
 
 int
 mhl (int argc, char **argv)
@@ -482,7 +474,7 @@ mhl (int argc, char **argv)
 	    printf ("%s", buf);
 	}
 	else
-	    printf ("\n------- End of Forwarded Message%s\n\n",
+	    printf ("\n------- End of Forwarded Message%s\n",
 		    vecp > 1 ? "s" : "");
     }
 
@@ -1094,7 +1086,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 +1493,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 +1941,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);
     }