X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/910f3846bb30636fe25bdc6e06e72d50c6779bd9..b4f2851d4:/uip/vmhsbr.c?ds=sidebyside

diff --git a/uip/vmhsbr.c b/uip/vmhsbr.c
index 8ef03108..4c0c8c18 100644
--- a/uip/vmhsbr.c
+++ b/uip/vmhsbr.c
@@ -2,7 +2,9 @@
 /*
  * vmhsbr.c -- routines to help vmh along
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 /*
@@ -12,7 +14,7 @@
 
 #include <h/mh.h>
 #include <h/vmhsbr.h>
-#include <errno.h>
+#include <h/utils.h>
 
 static char *types[] = {
     "OK",
@@ -94,8 +96,7 @@ peer2rc (struct record *rc)
     if (read (PEERrfd, (char *) rc_head (rc), RHSIZE (rc)) != RHSIZE (rc))
 	return rclose (rc, "read from peer lost(1)");
     if (rc->rc_len) {
-	if ((rc->rc_data = malloc ((unsigned) rc->rc_len + 1)) == NULL)
-	    return rclose (rc, "malloc of %d lost", rc->rc_len + 1);
+	rc->rc_data = mh_xmalloc ((unsigned) rc->rc_len + 1);
 	if (read (PEERrfd, rc->rc_data, rc->rc_len) != rc->rc_len)
 	    return rclose (rc, "read from peer lost(2)");
 	rc->rc_data[rc->rc_len] = 0;
@@ -106,7 +107,7 @@ peer2rc (struct record *rc)
     if (fp) {
 	fseek (fp, 0L, SEEK_END);
 	fprintf (fp, "%d: <--- %s %d: \"%*.*s\"\n", (int) getpid(),
-		types[rc->rc_type], rc->rc_len,
+		types[(unsigned char)rc->rc_type], rc->rc_len,
 		rc->rc_len, rc->rc_len, rc->rc_data);
 	fflush (fp);
     }
@@ -127,7 +128,7 @@ rc2peer (char code, int len, char *data)
     if (fp) {
 	fseek (fp, 0L, SEEK_END);
 	fprintf (fp, "%d: ---> %s %d: \"%*.*s\"\n", (int) getpid(),
-		types[rc->rc_type], rc->rc_len,
+		types[(unsigned char)rc->rc_type], rc->rc_len,
 		rc->rc_len, rc->rc_len, data);
 	fflush (fp);
     }
@@ -153,22 +154,26 @@ str2peer (char code, char *str)
 int
 fmt2peer (char code, char *fmt, ...)
 {
+    int     return_value;
     va_list ap;
 
     va_start(ap, fmt);
-    return verr2peer (code, NULL, fmt, ap);
+    return_value = verr2peer (code, NULL, fmt, ap);
     va_end(ap);
+    return return_value;
 }
 
 
 int
 err2peer (char code, char *what, char *fmt, ...)
 {
+    int     return_value;
     va_list ap;
 
     va_start(ap, fmt);
-    verr2peer(code, what, fmt, ap);
+    return_value = verr2peer(code, what, fmt, ap);
     va_end(ap);
+    return return_value;  /* This routine returned garbage before 1999-07-15. */
 }