X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2adafe760a9c45b417727a3f5d9481de26471a8b..2a00dc2ba830dbc6bab73fbca824b5d46fe7347e:/uip/dp.c

diff --git a/uip/dp.c b/uip/dp.c
index 2e071973..cbb48bb6 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 
@@ -47,14 +48,12 @@ main (int argc, char **argv)
 {
     int datep = 0, width = -1, status = 0;
     char *cp, *form = NULL, *format = NULL, *nfs;
-    char buf[BUFSIZ], **argp, **arguments;
-    char *dates[NDATES];
+    char buf[BUFSIZ], **argp;
+    char *dates[NDATES + 1]; /* Includes terminating NULL. */
 
-    if (nmh_init(argv[0], 1)) { return 1; }
-
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
+    if (nmh_init(argv[0], 2)) { return 1; }
 
+    argp = getarguments (invo_name, argc, argv, 1);
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
@@ -91,7 +90,7 @@ main (int argc, char **argv)
 		    continue;
 	    }
 	}
-	if (datep > NDATES)
+	if (datep == NDATES)
 	    adios (NULL, "more than %d dates", NDATES);
 	else
 	    dates[datep++] = cp;
@@ -108,11 +107,11 @@ main (int argc, char **argv)
 	if ((width = sc_width ()) < WIDTH / 2) {
 	    /* Default:  width of the terminal, but at least WIDTH/2. */
 	    width = WIDTH / 2;
-	} else if (width == 0) {
-	    /* Unlimited width. */
-	    width = INT_MAX;
 	}
 	width -= 2;
+    } else if (width == 0) {
+	/* Unlimited width.  */
+	width = INT_MAX;
     }
     fmt_compile (nfs, &fmt, 1);
 
@@ -136,14 +135,14 @@ static int
 process (char *date, int length)
 {
     int status = 0;
-    charstring_t scanl = charstring_create (length);
-    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);
+        mh_xfree(cptr->c_text);
+	cptr->c_text = mh_xstrdup(date);
     }
     fmt_scan (fmt, scanl, length, dat, NULL);
     fputs (charstring_buffer (scanl), stdout);