vector.c: Move interface to own file.

[nmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 8265723e8c981581aa1f9e702a5e0b28e81a9dec..cb31fdbdf02021bfe3d8f1e69543e2d8bb2a33eb 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -5,11 +5,15 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/addrsbr.h>
-#include <h/fmt_scan.h>
-#include <h/mts.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "h/utils.h"
 #include "sbr/terminal.h"
 
 #define        NADDRS  100
@@ -52,7 +56,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], **argp;
     char *addrs[NADDRS + 1]; /* Includes terminating NULL. */
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     mts_init ();
 
@@ -65,7 +69,7 @@ main (int argc, char **argv)
                    done (1);
 
                case UNKWNSW: 
-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] addrs ...",
@@ -78,30 +82,30 @@ 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]);
                    format = NULL;
                    continue;
                case FMTSW: 
                    if (!(format = *argp++) || *format == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);
                    form = NULL;
                    continue;
 
                case WIDTHSW: 
                    if (!(cp = *argp++) || *cp == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);
                    width = atoi (cp);
                    continue;
            }
        }
        if (addrp == NADDRS)
-           adios (NULL, "more than %d addresses", NADDRS);
+           die("more than %d addresses", NADDRS);
         addrs[addrp++] = cp;
     }
     addrs[addrp] = NULL;
 
     if (addrp == 0)
-       adios (NULL, "usage: %s [switches] addrs ...", invo_name);
+       die("usage: %s [switches] addrs ...", invo_name);
 
     /* get new format string */
     nfs = new_fs (form, format, FORMAT);