X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fap.c;h=9d3560184e50fdc7570766fa5050a4478613fdc0;hp=c293a5325b794048a0941888e6807b87977ce1d6;hb=88b2142594d5ea1e8385dae5eca81eed1018c555;hpb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9

diff --git a/uip/ap.c b/uip/ap.c
index c293a53..9d35601 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,6 +9,9 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
+#include <h/utils.h>
+#include <locale.h>
+#include <sysexits.h>
 
 #define NADDRS 100
 
@@ -61,22 +64,22 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(EX_USAGE);
 
 			case UNKWNSW:
-				adios(NULL, "-%s unknown", cp);
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [switches] addrs ...", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case FORMSW:
 				if (!(form = *argp++) || *form == '-')
-					adios(NULL, "missing argument to %s", argp[-2]);
+					adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
 				continue;
 
 			case NORMSW:
@@ -88,14 +91,14 @@ main(int argc, char **argv)
 			}
 		}
 		if (addrp > NADDRS)
-			adios(NULL, "more than %d addresses", NADDRS);
+			adios(EX_USAGE, NULL, "more than %d addresses", NADDRS);
 		else
 			addrs[addrp++] = cp;
 	}
 	addrs[addrp] = NULL;
 
 	if (addrp == 0)
-		adios(NULL, "usage: %s [switches] addrs ...", invo_name);
+		adios(EX_USAGE, NULL, "usage: %s [switches] addrs ...", invo_name);
 
 	/* get new format string */
 	fmtstr = new_fs(form, FORMAT);
@@ -112,8 +115,7 @@ main(int argc, char **argv)
 	for (addrp = 0; addrs[addrp]; addrp++)
 		status += process(addrs[addrp], normalize);
 
-	done(status);
-	return 1;
+	return status;
 }
 
 struct pqpair {
@@ -127,24 +129,22 @@ static int
 process(char *arg, int norm)
 {
 	int status = 0;
-	register char *cp;
+	char *cp;
 	char buffer[BUFSIZ + 1], 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 *)
-				calloc((size_t) 1, sizeof(*p))) == NULL)
-			adios(NULL, "unable to allocate pqpair memory");
+		p = mh_xcalloc(1, sizeof(*p));
 		if ((mp = getm(cp, NULL, 0, norm, 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 {
-			p->pq_text = getcpy(mp->m_text);
+			p->pq_text = mh_xstrdup(mp->m_text);
 			mnfree(mp);
 		}
 		q = (q->pq_next = p);
@@ -161,11 +161,11 @@ process(char *arg, int norm)
 		fmt_scan(fmt, buffer, BUFSIZ, dat);
 		fputs(buffer, stdout);
 
-		free(p->pq_text);
+		mh_free0(&(p->pq_text));
 		if (p->pq_error)
-			free(p->pq_error);
+			mh_free0(&(p->pq_error));
 		q = p->pq_next;
-		free((char *) p);
+		mh_free0(&p);
 	}
 
 	return status;