X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/96a2a03a1473522669e8848959c3aa380cf3d4eb..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/fmtdump.c

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 90e87e15..b7c48120 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -5,11 +5,16 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/fmt_scan.h>
-#include <h/fmt_compile.h>
-#include <h/scansbr.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/fmt_scan.h"
+#include "h/fmt_compile.h"
+#include "h/scansbr.h"
+#include "h/done.h"
+#include "h/utils.h"
 
 #define FMTDUMP_SWITCHES \
     X("form formatfile", 0, FORMSW) \
@@ -50,7 +55,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], *nfs, **argp, **arguments;
     struct format *fmt;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -62,7 +67,7 @@ main (int argc, char **argv)
 		    ambigsw (cp, switches);
 		    done (1);
 		case UNKWNSW: 
-		    adios (NULL, "-%s unknown", cp);
+		    die("-%s unknown", cp);
 
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
@@ -74,19 +79,19 @@ main (int argc, char **argv)
 
 		case FORMSW: 
 		    if (!(form = *argp++) || *form == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			die("missing argument to %s", argp[-2]);
 		    format = NULL;
 		    continue;
 		case FMTSW: 
 		    if (!(format = *argp++) || *format == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			die("missing argument to %s", argp[-2]);
 		    form = NULL;
 		    continue;
 
 	    }
 	}
 	if (form)
-	    adios (NULL, "only one form at a time!");
+	    die("only one form at a time!");
         form = cp;
     }
 
@@ -154,7 +159,7 @@ dumpone(struct format *fmt)
 	case FT_LS_COMP:
 	case FT_LV_COMPFLAG:
 	case FT_LV_COMP:
-		printf(", comp ");
+		fputs(", comp ", stdout);
 		litputs(fmt->f_comp->c_name);
 		if (fmt->f_comp->c_type)
 			printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
@@ -186,7 +191,7 @@ dumpone(struct format *fmt)
 	case FT_LOCALDATE:
 	case FT_GMTDATE:
 	case FT_PARSEDATE:
-		printf(", c_name ");
+		fputs(", c_name ", stdout);
 		litputs(fmt->f_comp->c_name);
 		if (fmt->f_comp->c_type)
 			printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
@@ -210,7 +215,7 @@ dumpone(struct format *fmt)
 	case FT_MYMBOX:
 	case FT_GETMYMBOX:
 	case FT_GETMYADDR:
-		printf(", c_name ");
+		fputs(", c_name ", stdout);
 		litputs(fmt->f_comp->c_name);
 		if (fmt->f_comp->c_type)
 			printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
@@ -221,7 +226,7 @@ dumpone(struct format *fmt)
 	case FT_COMPF:
 		printf(", width %d, fill '", fmt->f_width);
 		litputc(fmt->f_fill);
-		printf("' name ");
+		fputs("' name ", stdout);
 		litputs(fmt->f_comp->c_name);
 		if (fmt->f_comp->c_type)
 			printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
@@ -244,7 +249,7 @@ dumpone(struct format *fmt)
 	case FT_LITF:
 		printf(", width %d, fill '", fmt->f_width);
 		litputc(fmt->f_fill);
-		printf("' ");
+		fputs("' ", stdout);
 		litputs(fmt->f_text);
 		break;
 
@@ -260,7 +265,7 @@ dumpone(struct format *fmt)
 	case FT_IF_S_NULL:
 	case FT_IF_MATCH:
 	case FT_IF_AMATCH:
-		printf(" continue else goto");
+		fputs(" continue else goto", stdout);
 		/* FALLTHRU */
 	case FT_GOTO:
 		i = findlabel(fmt + fmt->f_skip);
@@ -287,17 +292,17 @@ dumpone(struct format *fmt)
 		break;
 
 	case FT_LS_LIT:
-		printf(" str ");
+		fputs(" str ", stdout);
 		litputs(fmt->f_text);
 		break;
 
 	case FT_LS_GETENV:
-		printf(" getenv ");
+		fputs(" getenv ", stdout);
 		litputs(fmt->f_text);
 		break;
 
 	case FT_LS_DECODECOMP:
-		printf(", comp ");
+		fputs(", comp ", stdout);
 		litputs(fmt->f_comp->c_name);
 		break;