X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fap.c;h=e2d43dabde09ab34989ca18853d214b8d942bcaf;hp=e444cd89566176e3d37795e070e3fb910502397a;hb=6e7d34c614291079de750ceda1d4f5ec537beb81;hpb=33dc8211a72df0c27fa11220f3b27583cd1c7e49

diff --git a/uip/ap.c b/uip/ap.c
index e444cd8..e2d43da 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,28 +9,24 @@
 #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
 
-#define WIDTH 78
-#define WBUFSIZ BUFSIZ
-
-#define FORMAT "%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
+#define FORMAT "=%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
 
 static struct swit switches[] = {
 #define FORMSW 0
 	{ "form formatfile", 0 },
-#define FMTSW 1
-	{ "format string", 5 },
-#define NORMSW 2
+#define NORMSW 1
 	{ "normalize", 0 },
-#define NNORMSW 3
-	{ "nonormalize", 0 },
-#define WIDTHSW 4
-	{ "width columns", 0 },
-#define VERSIONSW 5
-	{ "version", 0 },
-#define HELPSW 6
+#define NNORMSW 2
+	{ "nonormalize", 2 },
+#define VERSIONSW 3
+	{ "Version", 0 },
+#define HELPSW 4
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -40,28 +36,21 @@ static struct format *fmt;
 static int dat[5];
 
 /*
-** prototypes
-*/
-int sc_width(void);  /* from termsbr.c */
-
-/*
 ** static prototypes
 */
-static int process(char *, int, int);
+static int process(char *, int);
 
 
 int
 main(int argc, char **argv)
 {
 	int addrp = 0, normalize = AD_HOST;
-	int width = 0, status = 0;
-	char *cp, *form = NULL, *format = NULL, *nfs;
+	int status = 0;
+	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 */
@@ -75,34 +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]);
-				format = NULL;
-				continue;
-			case FMTSW:
-				if (!(format = *argp++) || *format == '-')
-					adios(NULL, "missing argument to %s", argp[-2]);
-				form = NULL;
-				continue;
-
-			case WIDTHSW:
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s", argp[-2]);
-				width = atoi(cp);
+					adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
 				continue;
 
 			case NORMSW:
@@ -114,39 +91,31 @@ 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, FORMAT);
+	fmtstr = new_fs(form, FORMAT);
 
-	if (width == 0) {
-		if ((width = sc_width()) < WIDTH / 2)
-			width = WIDTH / 2;
-		width -= 2;
-	}
-	if (width > WBUFSIZ)
-		width = WBUFSIZ;
 	fmt_norm = normalize;
-	fmt_compile(nfs, &fmt);
+	fmt_compile(fmtstr, &fmt);
 
 	dat[0] = 0;
 	dat[1] = 0;
 	dat[2] = 0;
-	dat[3] = width;
+	dat[3] = BUFSIZ;
 	dat[4] = 0;
 
 	for (addrp = 0; addrs[addrp]; addrp++)
-		status += process(addrs[addrp], width, normalize);
+		status += process(addrs[addrp], normalize);
 
-	done(status);
-	return 1;
+	return status;
 }
 
 struct pqpair {
@@ -157,21 +126,19 @@ struct pqpair {
 
 
 static int
-process(char *arg, int length, int norm)
+process(char *arg, int norm)
 {
 	int status = 0;
-	register char *cp;
-	char buffer[WBUFSIZ + 1], error[BUFSIZ];
-	register struct comp *cptr;
-	register struct pqpair *p, *q;
+	char *cp;
+	char buffer[BUFSIZ + 1], error[BUFSIZ];
+	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 = (struct pqpair *) mh_xcalloc((size_t) 1, sizeof(*p));
 		if ((mp = getm(cp, NULL, 0, norm, error)) == NULL) {
 			p->pq_text = getcpy(cp);
 			p->pq_error = getcpy(error);
@@ -191,7 +158,7 @@ process(char *arg, int length, int norm)
 		if (cptr)
 			cptr->c_text = p->pq_error;
 
-		fmt_scan(fmt, buffer, length, dat);
+		fmt_scan(fmt, buffer, BUFSIZ, dat);
 		fputs(buffer, stdout);
 
 		free(p->pq_text);