X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fviamail.c;h=5b67ba1527d1b75acda7e260014a7d549b18128d;hp=bb5b12cd431958815bf8835fc0fb01f7840b2946;hb=2f689a1cb907a5de04e6d39ffd217a69af3216c7;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/uip/viamail.c b/uip/viamail.c
index bb5b12c..5b67ba1 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -3,6 +3,10 @@
  * 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.
  */
 
 #include <h/mh.h>
@@ -11,8 +15,8 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/mts.h>
+#include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 
@@ -42,13 +46,12 @@ static struct swit switches[] = {
 #define VERSIONSW               9
     { "version", 0 },
 #define	HELPSW                 10
-    { "help", 4 },
+    { "help", 0 },
 #define DEBUGSW                11
     { "debug", -5 },
     { NULL, 0 }
 };
 
-extern int errno;
 extern int debugsw;
 extern int splitsw;
 extern int verbsw;
@@ -161,7 +164,7 @@ main (int argc, char **argv)
 	adios (NULL, "missing -viamail \"mailpath\" switch");
 
     via_mail (f1, f2, f3, f4, f5, delay, f7);
-    /* NOTREACHED */
+    return 0;  /* dead code to satisfy the compiler */
 }
 
 
@@ -178,13 +181,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);
@@ -233,7 +237,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
     if (verbsw)
 	vec[vecp++] = "-verbose";
 
-    switch (sendsbr (vec, vecp, tmpfil, &st, 0)) {
+    switch (sendsbr (vec, vecp, tmpfil, &st, 0, (char *)0, 0)) {
 	case DONE:
 	case NOTOK:
 	    status++;
@@ -246,4 +250,5 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
     if (unlink (tmpfil) == -1)
 	advise (NULL, "unable to remove temp file %s", tmpfil);
     done (status);
+    return 1;
 }