X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fspost.c;h=1f3b014b8fb74a79c02c3af17677e40362eae931;hb=e804a366f5091e90f1c0971e2b7546df69f1315a;hp=58d4ae39259c5df7fd911c3511239ca58a9b59c1;hpb=2b5c5779f2eb63019446a69c3e2c6f871e71c3df;p=mmh

diff --git a/uip/spost.c b/uip/spost.c
index 58d4ae3..1f3b014 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -14,6 +14,7 @@
 #include <h/aliasbr.h>
 #include <h/dropsbr.h>
 #include <zotnet/tws/tws.h>
+#include <zotnet/mts/mts.h>
 
 #define	uptolow(c)	((isalpha(c) && isupper (c)) ? tolower (c) : c)
 
@@ -346,10 +347,15 @@ main (int argc, char **argv)
 	out = stdout;
     }
     else {
+#ifdef HAVE_MKSTEMP
+	    if ((out = fdopen( mkstemp (tmpfil), "w" )) == NULL )
+		adios (tmpfil, "unable to create");
+#else
 	    mktemp (tmpfil);
 	    if ((out = fopen (tmpfil, "w")) == NULL)
 		adios (tmpfil, "unable to create");
 	    chmod (tmpfil, 0600);
+#endif
 	}
 
     hdrtab = (msgstate == normal) ? NHeaders : RHeaders;
@@ -450,6 +456,7 @@ main (int argc, char **argv)
     }
     execv ( sendmail, sargv);
     adios ( sendmail, "can't exec");
+    return 0;  /* dead code to satisfy the compiler */
 }
 
 /* DRAFT GENERATION */
@@ -485,7 +492,7 @@ putfmt (char *name, char *str, FILE *out)
     if (hdr->flags & HFCC) {
 	if ((cp = strrchr(str, '\n')))
 	    *cp = 0;
-	for (cp = pp = str; cp = strchr(pp, ','); pp = cp) {
+	for (cp = pp = str; (cp = strchr(pp, ',')); pp = cp) {
 	    *cp++ = 0;
 	    insert_fcc (hdr, pp);
 	}
@@ -500,7 +507,7 @@ putfmt (char *name, char *str, FILE *out)
     }
 #endif	/* notdef */
 
-    if (*str != '\n' && *str != '\0')
+    if (*str != '\n' && *str != '\0') {
 	if (aliasflg && hdr->flags & HTRY) {
 	    /* this header contains address(es) that we have to do
 	     * alias expansion on.  Because of the saved state in
@@ -527,6 +534,7 @@ putfmt (char *name, char *str, FILE *out)
 	} else {
 	    fprintf (out, "%s: %s", name, str );
 	}
+    }
 }