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

diff --git a/uip/dp.c b/uip/dp.c
index 7e53a5c9..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
@@ -48,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];
+    char buf[BUFSIZ], **argp;
+    char *dates[NDATES + 1]; /* Includes terminating NULL. */
 
     if (nmh_init(argv[0], 2)) { return 1; }
 
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
-
+    argp = getarguments (invo_name, argc, argv, 1);
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
@@ -92,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;
 
@@ -128,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;
 }