X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffmtdump.c;h=d75849b53dccb0f5339f3664bfcf2009cc224835;hp=adda2944933b402a9bf23d7aeeba8d94b103353b;hb=fc9279e818dfc96c63a5d75a89080cc68cfe1170;hpb=240013872c392fe644bd4f79382d9f5314b4ea60

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index adda294..d75849b 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -10,15 +10,15 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 #include <h/scansbr.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define FORMSW  0
 	{ "form formatfile", 0 },
-#define FMTSW  1
-	{ "format string", 5 },
-#define VERSIONSW  2
-	{ "version", 0 },
-#define HELPSW  3
+#define VERSIONSW  1
+	{ "Version", 0 },
+#define HELPSW  2
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -44,14 +44,11 @@ static void litputc(char);
 int
 main(int argc, char **argv)
 {
-	int ncomps;
-	char *cp, *form = NULL, *format = NULL;
-	char buf[BUFSIZ], *nfs, **argp, **arguments;
+	char *cp, *form = NULL;
+	char buf[BUFSIZ], *fmtstr, **argp, **arguments;
 	struct format *fmt;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -63,55 +60,48 @@ main(int argc, char **argv)
 	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]", 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 AMBIGSW:
+				ambigsw(cp, switches);
+				exit(EX_USAGE);
+			case UNKWNSW:
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf), "%s [switches]",
+						invo_name);
+				print_help(buf, switches, 1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
+			case VERSIONSW:
+				print_version(invo_name);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
+
+			case FORMSW:
+				if (!(form = *argp++) || *form == '-')
+					adios(EX_USAGE, NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
 
 			}
 		}
 		if (form)
-			adios(NULL, "only one form at a time!");
+			adios(EX_USAGE, NULL, "only one form at a time!");
 		else
 			form = cp;
 	}
 
-	/*
-	** Get new format string.  Must be before chdir().
-	*/
-	nfs = new_fs(form, format, FORMAT);
-	ncomps = fmt_compile(nfs, &fmt);
+	/* Set format string.  Must be before chdir(). */
+	fmtstr = new_fs(form, scanformat);
+	fmt_compile(fmtstr, &fmt);
 
 	fmt_dump(fmt);
-	done(0);
-	return 1;
+	return EX_OK;
 }
 
 static void
 fmt_dump(struct format *fmth)
 {
 	int i;
-	register struct format *fmt, *addr;
+	struct format *fmt, *addr;
 
 	/* Assign labels */
 	for (fmt = fmth; fmt; ++fmt) {
@@ -139,7 +129,7 @@ fmt_dump(struct format *fmth)
 static void
 dumpone(struct format *fmt)
 {
-	register int i;
+	int i;
 
 	if ((i = findlabel(fmt)) >= 0)
 		printf("L%d:", i);
@@ -313,6 +303,9 @@ dumpone(struct format *fmt)
 	case FT_LV_DAT:
 		printf(", value dat[%d]", fmt->f_value);
 		break;
+
+	case FT_LS_UNMAILTO:
+		break;
 	}
 	putchar('\n');
 }
@@ -320,7 +313,7 @@ dumpone(struct format *fmt)
 static int
 findlabel(struct format *addr)
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < lused; ++i)
 		if (addr == lvec[i])
@@ -409,9 +402,6 @@ f_typestr(int t)
 	case FT_PARSEADDR: return("PARSEADDR");
 	case FT_FORMATADDR: return("FORMATADDR");
 	case FT_MYMBOX: return("MYMBOX");
-#ifdef FT_ADDTOSEQ
-	case FT_ADDTOSEQ: return("ADDTOSEQ");
-#endif
 	case FT_SAVESTR: return("SAVESTR");
 #ifdef FT_PAUSE
 	case FT_PAUSE: return ("PAUSE");
@@ -433,6 +423,7 @@ f_typestr(int t)
 	case FT_V_GT: return("V_GT");
 	case FT_V_MATCH: return("V_MATCH");
 	case FT_V_AMATCH: return("V_AMATCH");
+	case FT_LS_UNMAILTO: return("LS_UNMAILTO");
 	default:
 		printf(buf, "/* ??? #%d */", t);
 		return(buf);
@@ -447,7 +438,7 @@ f_typestr(int t)
 static char *
 c_typestr(int t)
 {
-	register int i;
+	int i;
 	static char buf[64];
 
 	buf[0] = '\0';
@@ -464,7 +455,7 @@ c_typestr(int t)
 static char *
 c_flagsstr(int t)
 {
-	register int i;
+	int i;
 	static char buf[64];
 
 	buf[0] = '\0';