X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsendsbr.c;h=57ef00737c60eb84b27020247cc25308f3fdde72;hp=aeba011e1377352e48db87e90cd7ea3d862b7ba0;hb=5dd6771b28c257af405d7248639ed0e3bcdce38b;hpb=30fd2ad6d3eff3749b2ae99ec90d2215bf1b1aca

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index aeba011..57ef007 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -2,8 +2,6 @@
 /*
  * sendsbr.c -- routines to help WhatNow/Send along
  *
- * $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.
@@ -41,7 +39,6 @@ char *altmsg   = NULL;		/*  .. */
 char *annotext = NULL;
 char *distfile = NULL;
 
-static int armed = 0;
 static jmp_buf env;
 
 static	char	body_file_name[MAXPATHLEN + 1];		/* name of temporary file for body content */
@@ -56,12 +53,12 @@ static	FILE	*composition_file;			/* composition file pointer */
  * external prototypes
  */
 int sendsbr (char **, int, char *, struct stat *, int, char *, int);
-int done (int);
 char *getusername (void);
 
 /*
  * static prototypes
  */
+static void armed_done (int) NORETURN;
 static void alert (char *, int);
 static int tmp_fd (void);
 static void anno (int, struct stat *);
@@ -118,7 +115,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
 	}
     }
 
-    armed++;
+    done=armed_done;
     switch (setjmp (env)) {
     case OK: 
 	/*
@@ -126,8 +123,11 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
 	 * rename the draft file.  I'm not quite sure why.
 	 */
 	if (pushsw && unique) {
-	    if (rename (drft, strncpy (file, m_scratch (drft, invo_name), sizeof(file)))
-		    == NOTOK)
+            char *cp = m_mktemp2(drft, invo_name, NULL, NULL);
+            if (cp == NULL) {
+                adios ("sendsbr", "unable to create temporary file");
+            }
+	    if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK)
 		adios (file, "unable to rename %s to", drft);
 	    drft = file;
 	}
@@ -154,7 +154,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
 	break;
     }
 
-    armed = 0;
+    done=exit;
     if (distfile)
 	unlink (distfile);
 
@@ -254,8 +254,12 @@ attach(char *attachment_header_field_name, char *draft_file_name,
      *	Make names for the temporary files.
      */
 
-    (void)strncpy(body_file_name, m_scratch("", m_maildir(invo_name)), sizeof (body_file_name));
-    (void)strncpy(composition_file_name, m_scratch("", m_maildir(invo_name)), sizeof (composition_file_name));
+    (void)strncpy(body_file_name,
+                  m_mktemp(m_maildir(invo_name), NULL, NULL),
+                  sizeof (body_file_name));
+    (void)strncpy(composition_file_name,
+                  m_mktemp(m_maildir(invo_name), NULL, NULL),
+                  sizeof (composition_file_name));
 
     if (has_body)
 	body_file = fopen(body_file_name, "w");
@@ -677,9 +681,11 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 	char tmpdrf[BUFSIZ];
 	FILE *out;
 
-	strncpy (tmpdrf, m_scratch (drft, invo_name), sizeof(tmpdrf));
-	if ((out = fopen (tmpdrf, "w")) == NULL)
-	    adios (tmpdrf, "unable to open for writing");
+	char *cp = m_mktemp2(drft, invo_name, NULL, &out);
+        if (cp == NULL) {
+	    adios (drft, "unable to create temporary file for");
+        }
+	strncpy(tmpdrf, cp, sizeof(tmpdrf));
 	chmod (tmpdrf, 0600);
 
 	/*
@@ -920,16 +926,17 @@ static int
 tmp_fd (void)
 {
     int fd;
-    char tmpfil[BUFSIZ];
+    char *tfile = NULL;
+
+    tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
+    if (tfile == NULL) return NOTOK;
+    fchmod(fd, 0600);
 
-    strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
-    if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-	return NOTOK;
     if (debugsw)
-	advise (NULL, "temporary file %s selected", tmpfil);
+	advise (NULL, "temporary file %s selected", tfile);
     else
-	if (unlink (tmpfil) == NOTOK)
-	    advise (tmpfil, "unable to remove");
+	if (unlink (tfile) == NOTOK)
+	    advise (tfile, "unable to remove");
 
     return fd;
 }
@@ -1075,12 +1082,10 @@ oops:
 }
 
 
-int
-done (int status)
+static void
+armed_done (int status)
 {
-    if (armed)
-	longjmp (env, status ? status : NOTOK);
+    longjmp (env, status ? status : NOTOK);
 
     exit (status);
-    return 1;  /* dead code to satisfy the compiler */
 }