X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/77bd4fc7347961a3436393f4de70b0acca475ecc..0a01282c77d958d15a135ade3fcd1ef6c57c7273:/uip/send.c diff --git a/uip/send.c b/uip/send.c index 5168dea6..7f665ba4 100644 --- a/uip/send.c +++ b/uip/send.c @@ -1,6 +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 @@ -9,11 +7,13 @@ #include #include +#include "h/done.h" #include - #ifdef OAUTH_SUPPORT # include #endif +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #ifndef CYRUS_SASL # define SASLminc(a) (a) @@ -113,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; @@ -383,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) @@ -398,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);