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

[nmh] / uip / viamail.c

diff --git a/uip/viamail.c b/uip/viamail.c
index 050ca0f658e546a6e74bc1f69da6c6b9806ca0d7..db93066fc95849dc6340691cac730a7d55bccd2e 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -1,6 +1,4 @@
-
-/*
- * viamail.c -- send multiple files in a MIME message
+/* viamail.c -- send multiple files in a MIME message

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -14,6 +12,9 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

+#include <h/utils.h>
+#include "sbr/m_mktemp.h"
+#include "sbr/base64.h"

 
 #define VIAMAIL_SWITCHES \
     X("to mailpath", 0, TOSW) \
 
 #define VIAMAIL_SWITCHES \
     X("to mailpath", 0, TOSW) \


@@ -56,7 +57,7 @@ main (int argc, char **argv)
     char *cp, buf[BUFSIZ];
     char **argp, **arguments;
 
     char *cp, buf[BUFSIZ];
     char **argp, **arguments;
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;


@@ -213,7 +214,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
        vec[vecp++] = cp;
     }
 
        vec[vecp++] = cp;
     }
 

-    switch (sendsbr (vec, vecp, program, tmpfil, &st, 0)) {
+    switch (sendsbr (vec, vecp, program, tmpfil, &st, 0, NULL)) {

        case DONE:
        case NOTOK:
            status++;
        case DONE:
        case NOTOK:
            status++;