X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/94eba9d3c32077aa8548f2132cc43d6a0679272a..04ee0c3f6ad7e4177cc43a0c57f046013a4fbac9:/uip/dp.c

diff --git a/uip/dp.c b/uip/dp.c
index 3575c979..ac6fb97b 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -5,11 +5,15 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
-#include <h/fmt_scan.h>
-#include <h/tws.h>
-#include "../sbr/terminal.h"
+#include "h/mh.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "sbr/terminal.h"
 
 #define	NDATES 100
 
@@ -50,7 +54,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], **argp;
     char *dates[NDATES + 1]; /* Includes terminating NULL. */
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     argp = getarguments (invo_name, argc, argv, 1);
     while ((cp = *argp++)) {
@@ -60,7 +64,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] dates ...",
@@ -73,30 +77,30 @@ 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;
 
 		case WIDTHSW: 
 		    if (!(cp = *argp++) || *cp == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			die("missing argument to %s", argp[-2]);
 		    width = atoi (cp);
 		    continue;
 	    }
 	}
 	if (datep == NDATES)
-	    adios (NULL, "more than %d dates", NDATES);
+	    die("more than %d dates", NDATES);
         dates[datep++] = cp;
     }
     dates[datep] = NULL;
 
     if (datep == 0)
-	adios (NULL, "usage: %s [switches] dates ...", invo_name);
+	die("usage: %s [switches] dates ...", invo_name);
 
     /* get new format string */
     nfs = new_fs (form, format, FORMAT);
@@ -139,7 +143,7 @@ process (char *date, int length)
 
     cptr = fmt_findcomp ("text");
     if (cptr) {
-        mh_xfree(cptr->c_text);
+        free(cptr->c_text);
 	cptr->c_text = mh_xstrdup(date);
     }
     fmt_scan (fmt, scanl, length, dat, NULL);