X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..cfb444d37fc236a9fdac369cbcf2a5bfc37a33f5:/uip/rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 7fd59ec2..1ad585d2 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -11,6 +11,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 
 #define RCVDIST_SWITCHES \
     X("form formfile", 4, FORMSW) \
@@ -144,8 +145,6 @@ main (int argc, char **argv)
 
 /* very similar to routine in replsbr.c */
 
-#define	SBUFSIZ	256
-
 static int outputlinelen = OUTPUTLINELEN;
 
 static struct format *fmt;
@@ -174,7 +173,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 {
     int char_read = 0, format_len, i, state;
     char **ap;
-    char *cp, name[NAMESZ], tmpbuf[SBUFSIZ];
+    char *cp, name[NAMESZ], tmpbuf[NMH_BUFSIZ];
     charstring_t scanl;
     struct comp *cptr;
     FILE *out;
@@ -199,7 +198,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 	cptr->c_text = addrs;
 
     for (;;) {
-	int msg_count = SBUFSIZ;
+	int msg_count = sizeof tmpbuf;
 	switch (state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb)) {
 	    case FLD: 
 	    case FLDPLUS: 
@@ -207,7 +206,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 		if (i != -1) {
 		    char_read += msg_count;
 		    while (state == FLDPLUS) {
-			msg_count = SBUFSIZ;
+			msg_count = sizeof tmpbuf;
 			state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
 			fmt_appendcomp(i, name, tmpbuf);
 			char_read += msg_count;
@@ -215,7 +214,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 		}
 
 		while (state == FLDPLUS) {
-		    msg_count = SBUFSIZ;
+		    msg_count = sizeof tmpbuf;
 		    state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
 		}
 		break;
@@ -249,7 +248,7 @@ finished: ;
 }
 
 
-static void
+static void NORETURN
 unlink_done (int status)
 {
     if (backup[0])