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

diff --git a/uip/dp.c b/uip/dp.c
index 67eef061..ac6fb97b 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -1,20 +1,23 @@
-
-/*
- * dp.c -- parse dates 822-style
+/* dp.c -- parse dates 822-style
  *
  * 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>
-#include <h/fmt_scan.h>
-#include <h/tws.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
 
 #define	WIDTH 78
-#define	WBUFSIZ BUFSIZ
 
 #define	FORMAT "%<(nodate{text})error: %{text}%|%(putstr(pretty{text}))%>"
 
@@ -46,22 +49,14 @@ static int process (char *, int);
 int
 main (int argc, char **argv)
 {
-    int datep = 0, width = 0, status = 0;
+    int datep = 0, width = -1, status = 0;
     char *cp, *form = NULL, *format = NULL, *nfs;
-    char buf[BUFSIZ], **argp, **arguments;
-    char *dates[NDATES];
-
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    char buf[BUFSIZ], **argp;
+    char *dates[NDATES + 1]; /* Includes terminating NULL. */
 
-    /* read user profile/context */
-    context_read();
-
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
+    argp = getarguments (invo_name, argc, argv, 1);
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
@@ -69,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 ...",
@@ -82,42 +77,44 @@ 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);
-	else
-	    dates[datep++] = cp;
+	if (datep == 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);
 
-    if (width == 0) {
-	if ((width = sc_width ()) < WIDTH / 2)
+    if (width == -1) {
+	if ((width = sc_width ()) < WIDTH / 2) {
+	    /* Default:  width of the terminal, but at least WIDTH/2. */
 	    width = WIDTH / 2;
+	}
 	width -= 2;
+    } else if (width == 0) {
+	/* Unlimited width.  */
+	width = INT_MAX;
     }
-    if (width > WBUFSIZ)
-	width = WBUFSIZ;
     fmt_compile (nfs, &fmt, 1);
 
     dat[0] = 0;
@@ -131,7 +128,7 @@ main (int argc, char **argv)
 
     context_save ();	/* save the context file */
     fmt_free (fmt, 1);
-    done (status);
+    done(!!status);
     return 1;
 }
 
@@ -140,17 +137,18 @@ static int
 process (char *date, int length)
 {
     int status = 0;
-    char buffer[WBUFSIZ + 1];
-    register struct comp *cptr;
+    charstring_t scanl =
+	charstring_create (length < NMH_BUFSIZ ? length : NMH_BUFSIZ);
+    struct comp *cptr;
 
     cptr = fmt_findcomp ("text");
     if (cptr) {
-    	if (cptr->c_text)
-	    free(cptr->c_text);
-	cptr->c_text = getcpy(date);
+        free(cptr->c_text);
+	cptr->c_text = mh_xstrdup(date);
     }
-    fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat, NULL);
-    fputs (buffer, stdout);
+    fmt_scan (fmt, scanl, length, dat, NULL);
+    fputs (charstring_buffer (scanl), stdout);
+    charstring_free (scanl);
 
     return status;
 }