Replace some ints that are only ever 0 or 1 with bool.

[nmh] / uip / rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 35bbfb7cbbcb201487c4d7cf8d9a5f1499a93694..e90674035f2201fa4c78ea484c5bb921d4d008de 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -10,8 +10,9 @@
 #include <h/rcvmail.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include "h/done.h"
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 
 #define RCVDIST_SWITCHES \
     X("form formfile", 4, FORMSW) \
@@ -47,9 +48,9 @@ main (int argc, char **argv)
     FILE *fp;
     char *tfile = NULL;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
-    done=unlink_done;
+    set_done(unlink_done);
 
     /*
      * Configure this now, since any unknown switches to rcvdist get
@@ -84,7 +85,7 @@ main (int argc, char **argv)
 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);
                    continue;
            }
        }
@@ -92,13 +93,13 @@ main (int argc, char **argv)
     }
 
     if (addrs == NULL)
-       adios (NULL, "usage: %s [switches] [switches for postproc] address ...",
+       die("usage: %s [switches] [switches for postproc] address ...",
            invo_name);
 
     umask (~m_gmprot ());
 
     if ((tfile = m_mktemp2(NULL, invo_name, NULL, &fp)) == NULL) {
-       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+       die("unable to create temporary file in %s", get_temp_dir());
     }
     strncpy (tmpfil, tfile, sizeof(tmpfil));
 
@@ -106,7 +107,7 @@ main (int argc, char **argv)
     fseek (fp, 0L, SEEK_SET);
 
     if ((tfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+       die("unable to create temporary file in %s", get_temp_dir());
     }
     strncpy (drft, tfile, sizeof(tmpfil));
 
@@ -127,8 +128,8 @@ main (int argc, char **argv)
     child_id = fork();
     switch (child_id) {
        case NOTOK: 
-           inform("unable to fork, continuing...");
-           /* FALLTHRU */
+            adios("fork", "failed:");
+
        case OK: 
            execvp (program, vec);
            fprintf (stderr, "unable to exec ");
@@ -226,7 +227,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
                goto finished;
 
            default: 
-               adios (NULL, "m_getfld2() returned %d", state);
+               die("m_getfld2() returned %d", state);
        }
     }
 finished: ;