lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / dp.c

diff --git a/uip/dp.c b/uip/dp.c
index 097b961d2cab83fc09493f718a2b2870660b18e7..9ed5199cf35d46b5d22e7b0172aaf365d49415d5 100644 (file)
--- 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,8 +6,10 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
+#include "sbr/terminal.h"
 
 #define        NDATES 100
 
@@ -47,14 +47,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)) {
@@ -91,10 +89,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 +124,7 @@ main (int argc, char **argv)
 
     context_save ();   /* save the context file */
     fmt_free (fmt, 1);
-    done (status);
+    done(!!status);
     return 1;
 }
 
@@ -138,13 +135,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);
+        free(cptr->c_text);
+       cptr->c_text = mh_xstrdup(date);
     }
     fmt_scan (fmt, scanl, length, dat, NULL);
     fputs (charstring_buffer (scanl), stdout);