X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8a5a1a5303ddc67f06350a57a515853724a16e31..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/rcvpack.c

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 7fc7602f..7a2c9152 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -5,12 +5,17 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/dropsbr.h>
-#include <h/rcvmail.h>
-#include <h/tws.h>
-#include <h/mts.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/dropsbr.h"
+#include "h/rcvmail.h"
+#include "h/tws.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "h/utils.h"
 
 #define RCVPACK_SWITCHES \
     X("mbox", 0, MBOXSW) \
@@ -39,7 +44,7 @@ main (int argc, char **argv)
     char *cp, *file = NULL, buf[BUFSIZ];
     char **argp, **arguments;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
@@ -53,7 +58,7 @@ main (int argc, char **argv)
 		    ambigsw (cp, switches);
 		    done (1);
 		case UNKWNSW: 
-		    adios (NULL, "-%s unknown", cp);
+		    die("-%s unknown", cp);
 
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
@@ -72,12 +77,12 @@ main (int argc, char **argv)
 	    }
 	}
 	if (file)
-	    adios (NULL, "only one file at a time!");
+	    die("only one file at a time!");
         file = cp;
     }
 
     if (!file)
-	adios (NULL, "%s [switches] file", invo_name);
+	die("%s [switches] file", invo_name);
 
     rewind (stdin);