X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fap.c;h=af97e9ecfedcdd6d79159f893c18091220d79552;hp=aaa87629d947309ce8fe7a1154973cda1017fa77;hb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c;hpb=0073224c28bf81dad1812d406bb9915b24b23eb6

diff --git a/uip/ap.c b/uip/ap.c
index aaa8762..af97e9e 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,6 +9,8 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
+#include <locale.h>
+#include <sysexits.h>
 
 #define NADDRS 100
 
@@ -20,9 +22,9 @@ static struct swit switches[] = {
 #define NORMSW 1
 	{ "normalize", 0 },
 #define NNORMSW 2
-	{ "nonormalize", 0 },
+	{ "nonormalize", 2 },
 #define VERSIONSW 3
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW 4
 	{ "help", 0 },
 	{ NULL, 0 }
@@ -43,13 +45,11 @@ main(int argc, char **argv)
 {
 	int addrp = 0, normalize = AD_HOST;
 	int status = 0;
-	char *cp, *form = NULL, *nfs;
+	char *cp, *form = NULL, *fmtstr;
 	char buf[BUFSIZ], **argp;
 	char **arguments, *addrs[NADDRS];
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -63,22 +63,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:
@@ -90,20 +90,20 @@ 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 */
-	nfs = new_fs(form, FORMAT);
+	fmtstr = new_fs(form, FORMAT);
 
 	fmt_norm = normalize;
-	fmt_compile(nfs, &fmt);
+	fmt_compile(fmtstr, &fmt);
 
 	dat[0] = 0;
 	dat[1] = 0;
@@ -114,8 +114,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 {
@@ -140,7 +139,7 @@ process(char *arg, int norm)
 	while ((cp = getname(arg))) {
 		if ((p = (struct pqpair *)
 				calloc((size_t) 1, sizeof(*p))) == NULL)
-			adios(NULL, "unable to allocate pqpair memory");
+			adios(EX_OSERR, NULL, "unable to allocate pqpair memory");
 		if ((mp = getm(cp, NULL, 0, norm, error)) == NULL) {
 			p->pq_text = getcpy(cp);
 			p->pq_error = getcpy(error);