X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6fc2909634fb431c65ecfa8b6db4f6519f99b389..3c54bbb247ffc8fa094d754099c0b009e79d484d:/uip/ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 0b57e652..83295af9 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -1,17 +1,24 @@
-
-/*
- * ap.c -- parse addresses 822-style
+/* ap.c -- parse addresses 822-style
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * 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/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/getcpy.h"
+#include "sbr/ambigsw.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
 
@@ -51,14 +58,13 @@ main (int argc, char **argv)
     int width = -1, status = 0;
     char *cp, *form = NULL, *format = NULL, *nfs;
     char buf[BUFSIZ], **argp;
-    char **arguments, *addrs[NADDRS];
+    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 ();
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
 
+    argp = getarguments (invo_name, argc, argv, 1);
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
@@ -67,7 +73,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 ...",
@@ -80,31 +86,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);
-	else
-	    addrs[addrp++] = cp;
+	if (addrp == 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);
@@ -131,7 +136,7 @@ main (int argc, char **argv)
 	status += process (addrs[addrp], width);
 
     fmt_free (fmt, 1);
-    done (status);
+    done(!!status);
     return 1;
 }
 
@@ -146,20 +151,19 @@ static int
 process (char *arg, int length)
 {
     int	status = 0;
-    register char *cp;
+    char *cp;
     char error[BUFSIZ];
-    register struct comp *cptr;
-    register struct pqpair *p, *q;
+    struct comp *cptr;
+    struct pqpair *p, *q;
     struct pqpair pq;
-    register struct mailname *mp;
+    struct mailname *mp;
 
     (q = &pq)->pq_next = NULL;
     while ((cp = getname (arg))) {
-	if ((p = (struct pqpair *) mh_xcalloc ((size_t) 1, sizeof(*p))) == NULL)
-	    adios (NULL, "unable to allocate pqpair memory");
+	NEW0(p);
 	if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
-	    p->pq_text = getcpy (cp);
-	    p->pq_error = getcpy (error);
+	    p->pq_text = mh_xstrdup(cp);
+	    p->pq_error = mh_xstrdup(error);
 	    status++;
 	}
 	else {
@@ -175,15 +179,13 @@ process (char *arg, int length)
 
 	cptr = fmt_findcomp ("text");
 	if (cptr) {
-	    if (cptr->c_text)
-		free(cptr->c_text);
+            free(cptr->c_text);
 	    cptr->c_text = p->pq_text;
 	    p->pq_text = NULL;
 	}
 	cptr = fmt_findcomp ("error");
 	if (cptr) {
-	    if (cptr->c_text)
-		free(cptr->c_text);
+            free(cptr->c_text);
 	    cptr->c_text = p->pq_error;
 	    p->pq_error = NULL;
 	}
@@ -192,12 +194,10 @@ process (char *arg, int length)
 	fputs (charstring_buffer (scanl), stdout);
 	charstring_free (scanl);
 
-	if (p->pq_text)
-	    free (p->pq_text);
-	if (p->pq_error)
-	    free (p->pq_error);
+        free(p->pq_text);
+        free(p->pq_error);
 	q = p->pq_next;
-	free ((char *) p);
+	free(p);
     }
 
     return status;