X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Ffmtdump.c;h=fff450224ca104ebcdd66f55b965deb6d215eb0a;hb=f480c03187724e54e5391ee61b810827da319a6c;hp=89e70ef666bc679f404fee0e20d3644013de63ef;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 89e70ef..fff4502 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -2,7 +2,9 @@
 /*
  * fmtdump.c -- compile format file and dump out instructions
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -18,13 +20,13 @@ static struct swit switches[] = {
 #define VERSIONSW           2
     { "version", 0 },
 #define	HELPSW              3
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
 /* for assignlabel */
 static struct format *lvec[128];
-static lused = 0;
+static int lused = 0;
 
 /*
  * static prototypes
@@ -35,6 +37,7 @@ static int findlabel(struct format *);
 static void assignlabel(struct format *);
 static char *f_typestr(int);
 static char *c_typestr(int);
+static char *c_flagsstr(int);
 static void litputs(char *);
 static void litputc(char);
 
@@ -102,6 +105,7 @@ main (int argc, char **argv)
 
     fmt_dump(fmt);
     done(0);
+    return 1;
 }
 
 static void
@@ -159,7 +163,7 @@ dumpone(struct format *fmt)
 		if (fmt->f_comp->c_type)
 			printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
 		if (fmt->f_comp->c_flags)
-			printf(", c_flags %d", fmt->f_comp->c_flags);
+			printf(", c_flags %s", c_flagsstr(fmt->f_comp->c_flags));
 		break;
 
 	case FT_LV_SEC:
@@ -191,7 +195,7 @@ dumpone(struct format *fmt)
 		if (fmt->f_comp->c_type)
 			printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
 		if (fmt->f_comp->c_flags)
-			printf(", c_flags %d", fmt->f_comp->c_flags);
+			printf(", c_flags %s", c_flagsstr(fmt->f_comp->c_flags));
 		break;
 
 	case FT_LS_ADDR:
@@ -213,7 +217,7 @@ dumpone(struct format *fmt)
 		if (fmt->f_comp->c_type)
 			printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
 		if (fmt->f_comp->c_flags)
-			printf(", c_flags %d", fmt->f_comp->c_flags);
+			printf(", c_flags %s", c_flagsstr(fmt->f_comp->c_flags));
 		break;
 
 	case FT_COMPF:
@@ -224,7 +228,7 @@ dumpone(struct format *fmt)
 		if (fmt->f_comp->c_type)
 			printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
 		if (fmt->f_comp->c_flags)
-			printf(", c_flags %d", fmt->f_comp->c_flags);
+			printf(", c_flags %s", c_flagsstr(fmt->f_comp->c_flags));
 		break;
 
 	case FT_STRF:
@@ -448,19 +452,35 @@ c_typestr(int t)
 	static char buf[64];
 
 	buf[0] = '\0';
-	if (t & ~(CT_ADDR|CT_DATE|CT_MYMBOX|CT_ADDRPARSE))
+	if (t & ~(CT_ADDR|CT_DATE))
 		printf(buf, "0x%x ", t);
 	strcat(buf, "<");
 	i = 0;
 	FNORD(CT_ADDR, "ADDR");
 	FNORD(CT_DATE, "DATE");
-	FNORD(CT_MYMBOX, "MYMBOX");
-	FNORD(CT_ADDRPARSE, "ADDRPARSE");
 	strcat(buf, ">");
 	return(buf);
-#undef FNORD
 }
 
+static char *
+c_flagsstr(int t)
+{
+	register int i;
+	static char buf[64];
+
+	buf[0] = '\0';
+	if (t & ~(CF_TRUE|CF_PARSED|CF_DATEFAB))
+		printf(buf, "0x%x ", t);
+	strcat(buf, "<");
+	i = 0;
+	FNORD(CF_TRUE, "TRUE");
+	FNORD(CF_PARSED, "PARSED");
+	FNORD(CF_DATEFAB, "DATEFAB");
+	strcat(buf, ">");
+	return(buf);
+}
+#undef FNORD
+
 static void
 litputs(char *s)
 {