X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fap.c;h=3bb2bf0b606b8897ce22cf021ec18937a71510ca;hp=41e990a1824a475bc8abf7244669bc866c811b61;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/uip/ap.c b/uip/ap.c
index 41e990a..3bb2bf0 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,29 +9,21 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
-#include <h/mts.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
+#define NNORMSW 2
 	{ "nonormalize", 0 },
-#define WIDTHSW 4
-	{ "width columns", 0 },
-#define VERSIONSW 5
-	{ "version", 0 },
-#define HELPSW 6
+#define VERSIONSW 3
+	{ "Version", 0 },
+#define HELPSW 4
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -41,78 +33,60 @@ 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 = r1bindex(argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
 
-	mts_init(invo_name);
 	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, switches)) {
-				case AMBIGSW:
-					ambigsw(cp, switches);
-					done(1);
-
-				case UNKWNSW:
-					adios(NULL, "-%s unknown", cp);
-
-				case HELPSW:
-					snprintf(buf, sizeof(buf), "%s [switches] addrs ...", invo_name);
-					print_help(buf, switches, 1);
-					done(1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done(1);
-
-				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);
-					continue;
-
-				case NORMSW:
-					normalize = AD_HOST;
-					continue;
-				case NNORMSW:
-					normalize = AD_NHST;
-					continue;
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf), "%s [switches] addrs ...", invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case FORMSW:
+				if (!(form = *argp++) || *form == '-')
+					adios(NULL, "missing argument to %s", argp[-2]);
+				continue;
+
+			case NORMSW:
+				normalize = AD_HOST;
+				continue;
+			case NNORMSW:
+				normalize = AD_NHST;
+				continue;
 			}
 		}
 		if (addrp > NADDRS)
@@ -126,26 +100,19 @@ main(int argc, char **argv)
 		adios(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;
@@ -159,11 +126,11 @@ 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];
+	char buffer[BUFSIZ + 1], error[BUFSIZ];
 	register struct comp *cptr;
 	register struct pqpair *p, *q;
 	struct pqpair pq;
@@ -193,7 +160,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);