X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/99873064b5f03ef92885f5e5fcadb4374c39a9ef..2fc70e8bf64ead869fce76abb74f04bf1af94923:/uip/dp.c

diff --git a/uip/dp.c b/uip/dp.c
index cf8f9b14..ece04a3f 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -1,6 +1,4 @@
-
-/*
- * 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
@@ -8,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 
@@ -47,14 +46,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];
-
-    if (nmh_init(argv[0], 1)) { return 1; }
+    char buf[BUFSIZ], **argp;
+    char *dates[NDATES + 1]; /* Includes terminating NULL. */
 
-    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,10 +88,9 @@ main (int argc, char **argv)
 		    continue;
 	    }
 	}
-	if (datep > NDATES)
+	if (datep == NDATES)
 	    adios (NULL, "more than %d dates", NDATES);
-	else
-	    dates[datep++] = cp;
+        dates[datep++] = cp;
     }
     dates[datep] = NULL;
 
@@ -127,7 +123,7 @@ main (int argc, char **argv)
 
     context_save ();	/* save the context file */
     fmt_free (fmt, 1);
-    done (status);
+    done(min(status, MAX_EXIT));
     return 1;
 }
 
@@ -138,13 +134,12 @@ process (char *date, int length)
     int status = 0;
     charstring_t scanl =
 	charstring_create (length < NMH_BUFSIZ ? length : NMH_BUFSIZ);
-    register struct comp *cptr;
+    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);