inc/test-eom-align: rm(1) unwanted +inbox emails, not rmm(1).

[nmh] / uip / send.c

diff --git a/uip/send.c b/uip/send.c
index e05cd5dc275e4ddeafbed80032191eb1212be543..7f665ba4848a23d1b3e0eda918b31f02eecba58f 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -1,5 +1,4 @@
-/*
- * send.c -- send a composed message
+/* send.c -- send a composed 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
@@ -8,11 +7,13 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
+#include "h/done.h"
 #include <h/utils.h>
-
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
@@ -112,7 +113,7 @@ extern char *distfile;
 int
 main (int argc, char **argv)
 {
-    int msgp = 0, distsw = 0, vecp;
+    int msgp = 0, vecp;
     int isdf = 0, mime = 0;
     int msgnum, status;
     char *cp, *dfolder = NULL, *maildir = NULL;
@@ -382,7 +383,7 @@ go_to_it:
 
     if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
        if ((cp = context_find ("signature")) && *cp)
-           m_putenv ("SIGNATURE", cp);
+           setenv("SIGNATURE", cp, 1);
 
     for (msgnum = 0; msgnum < msgp; msgnum++)
        if (stat (msgs[msgnum], &st) == NOTOK)
@@ -397,12 +398,11 @@ go_to_it:
 
     if ((cp = getenv ("mhdist"))
            && *cp
-           && (distsw = atoi (cp))
+           && atoi(cp)
            && altmsg) {
        vec[vecp++] = "-dist";
        if ((cp = m_mktemp2(altmsg, invo_name, NULL, NULL)) == NULL) {
-           adios(NULL, "unable to create temporary file in %s",
-                 get_temp_dir());
+           adios(NULL, "unable to create temporary file");
        }
        distfile = mh_xstrdup(cp);
        (void) m_unlink(distfile);