X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fviamail.c;h=aea746d3f113c0913915c6e8aa20ae77e78c4494;hb=56a34bc502bde807ab722ee5f20d4db2901a5b23;hp=859dfafa645fd8296093a556be7f4cfc1749e659;hpb=5ff96d61ee5af34956ae958a0bc72ee78734a4d7;p=mmh

diff --git a/uip/viamail.c b/uip/viamail.c
index 859dfaf..aea746d 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -2,8 +2,6 @@
 /*
  * viamail.c -- send multiple files in a MIME message
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -181,13 +179,14 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
     char *vec[MAXARGS];
     struct stat st;
     FILE *fp;
+    char *tfile = NULL;
 
     umask (~m_gmprot ());
 
-    strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
-    if ((fp = fopen (tmpfil, "w+")) == NULL)
-	adios (tmpfil, "unable to open for writing");
-    chmod (tmpfil, 0600);
+    tfile = m_mktemp2(NULL, invo_name, NULL, &fp);
+    if (tfile == NULL) adios("viamail", "unable to create temporary file");
+    chmod(tfile, 0600);
+    strncpy (tmpfil, tfile, sizeof(tmpfil));
 
     if (!strchr(mailsw, '@'))
 	mailsw = concat (mailsw, "@", LocalName (), NULL);
@@ -248,5 +247,6 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
     fclose (fp);
     if (unlink (tmpfil) == -1)
 	advise (NULL, "unable to remove temp file %s", tmpfil);
-    return done (status);
+    done (status);
+    return 1;
 }