X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3b6170b27ba8fedbb4d67d2842bfaa38d4417962..9f1e781a5c2beb9df943c832300a3f5bee1e4ed3:/uip/rcvdist.c?ds=sidebyside

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index a75e21ac..9f52a4b2 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -5,12 +5,15 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/fmt_scan.h>
-#include <h/rcvmail.h>
-#include <h/tws.h>
-#include <h/mts.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/fmt_scan.h"
+#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"
 
 #define RCVDIST_SWITCHES \
@@ -47,9 +50,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 +87,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 +95,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 +109,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 +130,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 +229,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: ;