lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 7a96658edd5e3c1d2063ae082173adb6c0e1c949..a75e21aca73c89cdf6c88c1c99863dc5b5598f4a 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) \
@@ -42,7 +41,7 @@ int
 main (int argc, char **argv)
 {
     pid_t child_id;
-    int i, vecp;
+    int vecp;
     char *addrs = NULL, *cp, *form = NULL, buf[BUFSIZ], *program;
     char **argp, **arguments, **vec;
     FILE *fp;
@@ -125,11 +124,10 @@ main (int argc, char **argv)
     vec[vecp++] = drft;
     vec[vecp] = NULL;
 
-    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-       sleep (5);
+    child_id = fork();
     switch (child_id) {
        case NOTOK: 
-           admonish (NULL, "unable to fork");
+           inform("unable to fork, continuing...");
            /* FALLTHRU */
        case OK: 
            execvp (program, vec);
@@ -146,8 +144,6 @@ main (int argc, char **argv)
 
 /* very similar to routine in replsbr.c */
 
-#define        SBUFSIZ 256
-
 static int outputlinelen = OUTPUTLINELEN;
 
 static struct format *fmt;
@@ -176,11 +172,11 @@ 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;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     if (!(out = fopen (drft, "w")))
        adios (drft, "unable to create");
@@ -200,25 +196,26 @@ rcvdistout (FILE *inb, char *form, char *addrs)
     if (cptr)
        cptr->c_text = addrs;
 
+    gstate = m_getfld_state_init(inb);
     for (;;) {
-       int msg_count = SBUFSIZ;
-       switch (state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb)) {
+       int msg_count = sizeof tmpbuf;
+       switch (state = m_getfld2(&gstate, name, tmpbuf, &msg_count)) {
            case FLD: 
            case FLDPLUS: 
                i = fmt_addcomptext(name, tmpbuf);
                if (i != -1) {
                    char_read += msg_count;
                    while (state == FLDPLUS) {
-                       msg_count = SBUFSIZ;
-                       state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+                       msg_count = sizeof tmpbuf;
+                       state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
                        fmt_appendcomp(i, name, tmpbuf);
                        char_read += msg_count;
                    }
                }
 
                while (state == FLDPLUS) {
-                   msg_count = SBUFSIZ;
-                   state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+                   msg_count = sizeof tmpbuf;
+                   state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
                }
                break;
 
@@ -229,7 +226,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
                goto finished;
 
            default: 
-               adios (NULL, "m_getfld() returned %d", state);
+               adios (NULL, "m_getfld2() returned %d", state);
        }
     }
 finished: ;
@@ -251,7 +248,7 @@ finished: ;
 }
 
 
-static void
+static void NORETURN
 unlink_done (int status)
 {
     if (backup[0])