X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d6b2ae5fa68b9a82ffc006c233aef64c5cdb3bd2..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/fmtdump.c?ds=inline

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 463c7edf..430a42e4 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -1,6 +1,4 @@
-
-/*
- * fmtdump.c -- compile format file and dump out instructions
+/* fmtdump.c -- compile format file and dump out instructions
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -11,6 +9,7 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 #include <h/scansbr.h>
+#include <h/utils.h>
 
 #define FMTDUMP_SWITCHES \
     X("form formatfile", 0, FORMSW) \
@@ -51,7 +50,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], *nfs, **argp, **arguments;
     struct format *fmt;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -88,8 +87,7 @@ main (int argc, char **argv)
 	}
 	if (form)
 	    adios (NULL, "only one form at a time!");
-	else
-	    form = cp;
+        form = cp;
     }
 
     /*
@@ -110,7 +108,7 @@ 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) {
@@ -142,7 +140,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);
@@ -239,9 +237,6 @@ dumpone(struct format *fmt)
 		break;
 
 	case FT_LIT:
-#ifdef FT_LIT_FORCE
-	case FT_LIT_FORCE:
-#endif
 		putchar(' ');
 		litputs(fmt->f_text);
 		break;
@@ -266,6 +261,7 @@ dumpone(struct format *fmt)
 	case FT_IF_MATCH:
 	case FT_IF_AMATCH:
 		printf(" continue else goto");
+		/* FALLTHRU */
 	case FT_GOTO:
 		i = findlabel(fmt + fmt->f_skip);
 		printf(" L%d", i);
@@ -284,6 +280,7 @@ dumpone(struct format *fmt)
 	case FT_LV_LIT:
 	case FT_LV_PLUS_L:
 	case FT_LV_MINUS_L:
+	case FT_LV_MULTIPLY_L:
 	case FT_LV_DIVIDE_L:
 	case FT_LV_MODULO_L:
 		printf(" value %d", fmt->f_value);
@@ -321,7 +318,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])
@@ -341,105 +338,103 @@ f_typestr(int t)
 	static char buf[32];
 
 	switch (t) {
-	case FT_COMP: return("COMP");
-	case FT_COMPF: return("COMPF");
-	case FT_LIT: return("LIT");
-	case FT_LITF: return("LITF");
-#ifdef	FT_LIT_FORCE
-	case FT_LIT_FORCE: return("LIT_FORCE");
-#endif
-	case FT_CHAR: return("CHAR");
-	case FT_NUM: return("NUM");
-	case FT_NUMF: return("NUMF");
-	case FT_STR: return("STR");
-	case FT_STRF: return("STRF");
-	case FT_STRFW: return("STRFW");
-	case FT_PUTADDR: return("PUTADDR");
-	case FT_STRLIT: return("STRLIT");
-	case FT_STRLITZ: return("STRLITZ");
-	case FT_LS_COMP: return("LS_COMP");
-	case FT_LS_LIT: return("LS_LIT");
-	case FT_LS_GETENV: return("LS_GETENV");
-	case FT_LS_DECODECOMP: return("FT_LS_DECODECOMP");
-	case FT_LS_DECODE: return("FT_LS_DECODE");
-	case FT_LS_TRIM: return("LS_TRIM");
-	case FT_LV_COMP: return("LV_COMP");
-	case FT_LV_COMPFLAG: return("LV_COMPFLAG");
-	case FT_LV_LIT: return("LV_LIT");
-	case FT_LV_DAT: return("LV_DAT");
-	case FT_LV_STRLEN: return("LV_STRLEN");
-	case FT_LV_PLUS_L: return("LV_PLUS_L");
-	case FT_LV_MINUS_L: return("LV_MINUS_L");
-	case FT_LV_DIVIDE_L: return("LV_DIVIDE_L");
-	case FT_LV_MODULO_L: return("LV_MODULO_L");
-	case FT_LV_CHAR_LEFT: return("LV_CHAR_LEFT");
-	case FT_LS_KILO: return("LS_KILO");
-	case FT_LS_KIBI: return("LS_KIBI");
-	case FT_LS_MONTH: return("LS_MONTH");
-	case FT_LS_LMONTH: return("LS_LMONTH");
-	case FT_LS_ZONE: return("LS_ZONE");
-	case FT_LS_DAY: return("LS_DAY");
-	case FT_LS_WEEKDAY: return("LS_WEEKDAY");
-	case FT_LS_822DATE: return("LS_822DATE");
-	case FT_LS_PRETTY: return("LS_PRETTY");
-	case FT_LV_SEC: return("LV_SEC");
-	case FT_LV_MIN: return("LV_MIN");
-	case FT_LV_HOUR: return("LV_HOUR");
-	case FT_LV_MDAY: return("LV_MDAY");
-	case FT_LV_MON: return("LV_MON");
-	case FT_LV_YEAR: return("LV_YEAR");
-	case FT_LV_YDAY: return("LV_YDAY");
-	case FT_LV_WDAY: return("LV_WDAY");
-	case FT_LV_ZONE: return("LV_ZONE");
-	case FT_LV_CLOCK: return("LV_CLOCK");
-	case FT_LV_RCLOCK: return("LV_RCLOCK");
-	case FT_LV_DAYF: return("LV_DAYF");
-	case FT_LV_DST: return("LV_DST");
-	case FT_LV_ZONEF: return("LV_ZONEF");
-	case FT_LS_ADDR: return("LS_ADDR");
-	case FT_LS_PERS: return("LS_PERS");
-	case FT_LS_MBOX: return("LS_MBOX");
-	case FT_LS_HOST: return("LS_HOST");
-	case FT_LS_PATH: return("LS_PATH");
-	case FT_LS_GNAME: return("LS_GNAME");
-	case FT_LS_NOTE: return("LS_NOTE");
-	case FT_LS_822ADDR: return("LS_822ADDR");
-	case FT_LS_FRIENDLY: return("LS_FRIENDLY");
-	case FT_LV_HOSTTYPE: return("LV_HOSTTYPE");
-	case FT_LV_INGRPF: return("LV_INGRPF");
-	case FT_LV_NOHOSTF: return("LV_NOHOSTF");
-	case FT_LOCALDATE: return("LOCALDATE");
-	case FT_GMTDATE: return("GMTDATE");
-	case FT_PARSEDATE: return("PARSEDATE");
-	case FT_PARSEADDR: return("PARSEADDR");
-	case FT_FORMATADDR: return("FORMATADDR");
-	case FT_CONCATADDR: return("CONCATADDR");
-	case FT_MYMBOX: return("MYMBOX");
-	case FT_GETMYMBOX: return("GETMYMBOX");
-	case FT_GETMYADDR: return("GETMYADDR");
-	case FT_SAVESTR: return("SAVESTR");
-#ifdef	FT_PAUSE
-	case FT_PAUSE: return ("PAUSE");
-#endif
-	case FT_DONE: return("DONE");
-	case FT_NOP: return("NOP");
-	case FT_GOTO: return("GOTO");
-	case FT_IF_S_NULL: return("IF_S_NULL");
-	case FT_IF_S: return("IF_S");
-	case FT_IF_V_EQ: return("IF_V_EQ");
-	case FT_IF_V_NE: return("IF_V_NE");
-	case FT_IF_V_GT: return("IF_V_GT");
-	case FT_IF_MATCH: return("IF_MATCH");
-	case FT_IF_AMATCH: return("IF_AMATCH");
-	case FT_S_NULL: return("S_NULL");
-	case FT_S_NONNULL: return("S_NONNULL");
-	case FT_V_EQ: return("V_EQ");
-	case FT_V_NE: return("V_NE");
-	case FT_V_GT: return("V_GT");
-	case FT_V_MATCH: return("V_MATCH");
-	case FT_V_AMATCH: return("V_AMATCH");
+	case FT_COMP: return "COMP";
+	case FT_COMPF: return "COMPF";
+	case FT_LIT: return "LIT";
+	case FT_LITF: return "LITF";
+	case FT_CHAR: return "CHAR";
+	case FT_NUM: return "NUM";
+	case FT_NUMF: return "NUMF";
+	case FT_STR: return "STR";
+	case FT_STRF: return "STRF";
+	case FT_STRFW: return "STRFW";
+	case FT_STRLIT: return "STRLIT";
+	case FT_STRLITZ: return "STRLITZ";
+	case FT_PUTADDR: return "PUTADDR";
+	case FT_LS_COMP: return "LS_COMP";
+	case FT_LS_LIT: return "LS_LIT";
+	case FT_LS_GETENV: return "LS_GETENV";
+	case FT_LS_CFIND: return "LS_CFIND";
+	case FT_LS_DECODECOMP: return "LS_DECODECOMP";
+	case FT_LS_DECODE: return "LS_DECODE";
+	case FT_LS_TRIM: return "LS_TRIM";
+	case FT_LV_COMP: return "LV_COMP";
+	case FT_LV_COMPFLAG: return "LV_COMPFLAG";
+	case FT_LV_LIT: return "LV_LIT";
+	case FT_LV_DAT: return "LV_DAT";
+	case FT_LV_STRLEN: return "LV_STRLEN";
+	case FT_LV_PLUS_L: return "LV_PLUS_L";
+	case FT_LV_MINUS_L: return "LV_MINUS_L";
+	case FT_LV_MULTIPLY_L: return "LV_MULTIPLY_L";
+	case FT_LV_DIVIDE_L: return "LV_DIVIDE_L";
+	case FT_LV_MODULO_L: return "LV_MODULO_L";
+	case FT_LV_CHAR_LEFT: return "LV_CHAR_LEFT";
+	case FT_LS_MONTH: return "LS_MONTH";
+	case FT_LS_LMONTH: return "LS_LMONTH";
+	case FT_LS_ZONE: return "LS_ZONE";
+	case FT_LS_DAY: return "LS_DAY";
+	case FT_LS_WEEKDAY: return "LS_WEEKDAY";
+	case FT_LS_822DATE: return "LS_822DATE";
+	case FT_LS_PRETTY: return "LS_PRETTY";
+	case FT_LS_KILO: return "LS_KILO";
+	case FT_LS_KIBI: return "LS_KIBI";
+	case FT_LV_SEC: return "LV_SEC";
+	case FT_LV_MIN: return "LV_MIN";
+	case FT_LV_HOUR: return "LV_HOUR";
+	case FT_LV_MDAY: return "LV_MDAY";
+	case FT_LV_MON: return "LV_MON";
+	case FT_LV_YEAR: return "LV_YEAR";
+	case FT_LV_YDAY: return "LV_YDAY";
+	case FT_LV_WDAY: return "LV_WDAY";
+	case FT_LV_ZONE: return "LV_ZONE";
+	case FT_LV_CLOCK: return "LV_CLOCK";
+	case FT_LV_RCLOCK: return "LV_RCLOCK";
+	case FT_LV_DAYF: return "LV_DAYF";
+	case FT_LV_DST: return "LV_DST";
+	case FT_LV_ZONEF: return "LV_ZONEF";
+	case FT_LS_PERS: return "LS_PERS";
+	case FT_LS_MBOX: return "LS_MBOX";
+	case FT_LS_HOST: return "LS_HOST";
+	case FT_LS_PATH: return "LS_PATH";
+	case FT_LS_GNAME: return "LS_GNAME";
+	case FT_LS_NOTE: return "LS_NOTE";
+	case FT_LS_ADDR: return "LS_ADDR";
+	case FT_LS_822ADDR: return "LS_822ADDR";
+	case FT_LS_FRIENDLY: return "LS_FRIENDLY";
+	case FT_LV_HOSTTYPE: return "LV_HOSTTYPE";
+	case FT_LV_INGRPF: return "LV_INGRPF";
+	case FT_LS_UNQUOTE: return "LS_UNQUOTE";
+	case FT_LV_NOHOSTF: return "LV_NOHOSTF";
+	case FT_LOCALDATE: return "LOCALDATE";
+	case FT_GMTDATE: return "GMTDATE";
+	case FT_PARSEDATE: return "PARSEDATE";
+	case FT_PARSEADDR: return "PARSEADDR";
+	case FT_FORMATADDR: return "FORMATADDR";
+	case FT_CONCATADDR: return "CONCATADDR";
+	case FT_MYMBOX: return "MYMBOX";
+	case FT_GETMYMBOX: return "GETMYMBOX";
+	case FT_GETMYADDR: return "GETMYADDR";
+	case FT_SAVESTR: return "SAVESTR";
+	case FT_DONE: return "DONE";
+	case FT_PAUSE: return "PAUSE";
+	case FT_NOP: return "NOP";
+	case FT_GOTO: return "GOTO";
+	case FT_IF_S_NULL: return "IF_S_NULL";
+	case FT_IF_S: return "IF_S";
+	case FT_IF_V_EQ: return "IF_V_EQ";
+	case FT_IF_V_NE: return "IF_V_NE";
+	case FT_IF_V_GT: return "IF_V_GT";
+	case FT_IF_MATCH: return "IF_MATCH";
+	case FT_IF_AMATCH: return "IF_AMATCH";
+	case FT_S_NULL: return "S_NULL";
+	case FT_S_NONNULL: return "S_NONNULL";
+	case FT_V_EQ: return "V_EQ";
+	case FT_V_NE: return "V_NE";
+	case FT_V_GT: return "V_GT";
+	case FT_V_MATCH: return "V_MATCH";
+	case FT_V_AMATCH: return "V_AMATCH";
 	default:
-		printf(buf, "/* ??? #%d */", t);
+                snprintf(buf, sizeof buf, "/* ??? #%d */", t);
 		return(buf);
 	}
 }
@@ -452,12 +447,12 @@ f_typestr(int t)
 static char *
 c_typestr(int t)
 {
-	register int i;
+	int i;
 	static char buf[64];
 
 	buf[0] = '\0';
 	if (t & ~(CT_ADDR|CT_DATE))
-		printf(buf, "0x%x ", t);
+                snprintf(buf, sizeof buf, "0x%x ", t);
 	strcat(buf, "<");
 	i = 0;
 	FNORD(CT_ADDR, "ADDR");
@@ -469,12 +464,12 @@ c_typestr(int t)
 static char *
 c_flagsstr(int t)
 {
-	register int i;
+	int i;
 	static char buf[64];
 
 	buf[0] = '\0';
 	if (t & ~(CF_TRUE|CF_PARSED|CF_DATEFAB|CF_TRIMMED))
-		printf(buf, "0x%x ", t);
+                snprintf(buf, sizeof buf, "0x%x ", t);
 	strcat(buf, "<");
 	i = 0;
 	FNORD(CF_TRUE, "TRUE");
@@ -490,10 +485,10 @@ static void
 litputs(char *s)
 {
 	if (s) {
-		putc('"', stdout);
+		putchar('"');
 		while (*s)
 			litputc(*s++);
-		putc('"', stdout);
+		putchar('"');
 	} else
 		fputs("<nil>", stdout);
 }
@@ -502,30 +497,30 @@ static void
 litputc(char c)
 {
 	if (c & ~ 0177) {
-		putc('M', stdout);
-		putc('-', stdout);
+		putchar('M');
+		putchar('-');
 		c &= 0177;
 	}
 	if (c < 0x20 || c == 0177) {
 		if (c == '\b') {
-			putc('\\', stdout);
-			putc('b', stdout);
+			putchar('\\');
+			putchar('b');
 		} else if (c == '\f') {
-			putc('\\', stdout);
-			putc('f', stdout);
+			putchar('\\');
+			putchar('f');
 		} else if (c == '\n') {
-			putc('\\', stdout);
-			putc('n', stdout);
+			putchar('\\');
+			putchar('n');
 		} else if (c == '\r') {
-			putc('\\', stdout);
-			putc('r', stdout);
+			putchar('\\');
+			putchar('r');
 		} else if (c == '\t') {
-			putc('\\', stdout);
-			putc('t', stdout);
+			putchar('\\');
+			putchar('t');
 		} else {
-			putc('^', stdout);
-			putc(c ^ 0x40, stdout);	/* DEL to ?, others to alpha */
+			putchar('^');
+			putchar(c ^ 0x40);	/* DEL to ?, others to alpha */
 		}
 	} else
-		putc(c, stdout);
+		putchar(c);
 }