Simplified m_strn() per Ralph's suggestions.

[nmh] / uip / rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index a8231e911167c424b6aa4b07f490b45addd5372e..1ad585d2035cdab965cb8f8329820f417a801f89 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -1,6 +1,4 @@
-
-/*
- * rcvdist.c -- asynchronously redistribute messages
+/* rcvdist.c -- asynchronously redistribute messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -13,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) \
@@ -129,7 +128,8 @@ main (int argc, char **argv)
        sleep (5);
     switch (child_id) {
        case NOTOK: 
-           admonish (NULL, "unable to fork");/* fall */
+           inform("unable to fork, continuing...");
+           /* FALLTHRU */
        case OK: 
            execvp (program, vec);
            fprintf (stderr, "unable to exec ");
@@ -145,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;
@@ -175,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;
@@ -200,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: 
@@ -208,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;
@@ -216,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;
@@ -250,7 +248,7 @@ finished: ;
 }
 
 
-static void
+static void NORETURN
 unlink_done (int status)
 {
     if (backup[0])