X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhmail.c;h=e906b1d3c928d0e9031e37692d222f18df0b1f04;hb=03bf20a885b3953a0385e814ba4e0196b46f6159;hp=5171f4e8007a304af536f79ebc68c97655c8646c;hpb=017a82124bf2ea39ced5aa4c8f969c18b3c2fb90;p=mmh

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 5171f4e..e906b1d 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -3,10 +3,15 @@
  * mhmail.c -- simple mail program
  *
  * $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.
  */
 
 #include <h/mh.h>
 #include <h/signals.h>
+#include <h/utils.h>
 #include <signal.h>
 
 static struct swit switches[] = {
@@ -47,6 +52,7 @@ main (int argc, char **argv)
     char *from = NULL, *body = NULL, **argp, **arguments;
     char *vec[5], buf[BUFSIZ];
     FILE *out;
+    char *tfile = NULL;
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -120,10 +126,11 @@ main (int argc, char **argv)
 
     if (tolist == NULL)
 	adios (NULL, "usage: %s addrs ... [switches]", invo_name);
-    strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
-    if ((out = fopen (tmpfil, "w")) == NULL)
-	adios (tmpfil, "unable to write");
-    chmod (tmpfil, 0600);
+
+    tfile = m_mktemp2(NULL, invo_name, NULL, &out);
+    if (tfile == NULL) adios("mhmail", "unable to create temporary file");
+    chmod(tfile, 0600);
+    strncpy (tmpfil, tfile, sizeof(tmpfil));
 
     SIGNAL2 (SIGINT, intrser);
 
@@ -168,7 +175,7 @@ main (int argc, char **argv)
 
     if (child_id == NOTOK) {
 	/* report failure and then send it */
-	admonish (NULL, "unable to fork");
+	adios (NULL, "unable to fork");
     } else if (child_id) {
 	/* parent process */
 	if ((status = pidXwait(child_id, postproc))) {