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

diff --git a/uip/ap.c b/uip/ap.c
index 41e990a..b49cdc2 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,29 +9,26 @@
 #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
+#define WIDTHSW 3
 	{ "width columns", 0 },
-#define VERSIONSW 5
+#define VERSIONSW 4
 	{ "version", 0 },
-#define HELPSW 6
+#define HELPSW 5
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -56,63 +53,56 @@ main(int argc, char **argv)
 {
 	int addrp = 0, normalize = AD_HOST;
 	int width = 0, status = 0;
-	char *cp, *form = NULL, *format = NULL, *nfs;
+	char *cp, *form = NULL, *nfs;
 	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 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;
 			}
 		}
 		if (addrp > NADDRS)
@@ -126,7 +116,7 @@ main(int argc, char **argv)
 		adios(NULL, "usage: %s [switches] addrs ...", invo_name);
 
 	/* get new format string */
-	nfs = new_fs(form, format, FORMAT);
+	nfs = new_fs(form, FORMAT);
 
 	if (width == 0) {
 		if ((width = sc_width()) < WIDTH / 2)