X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/26cad4056c927e609753103897a60d00611ac9f7..e0c39ed52fa9c99b4591b5170354d8398ffd787b:/uip/mhparse.c?ds=sidebyside

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 3d4d7733..716a22f7 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -11,8 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
@@ -30,12 +28,6 @@ extern int wcachesw;	/* mhcachesbr.c */
 
 int checksw = 0;	/* check Content-MD5 field */
 
-/*
- * Directory to place temp files.  This must
- * be set before these routines are called.
- */
-char *tmp;
-
 /*
  * These are for mhfixmsg to:
  * 1) Instruct parser not to detect invalid Content-Transfer-Encoding
@@ -202,23 +194,23 @@ parse_mime (char *file)
     if ((is_stdin = !(strcmp (file, "-")))) {
         char *tfile = m_mktemp2(NULL, invo_name, NULL, &fp);
         if (tfile == NULL) {
-            advise("mhparse", "unable to create temporary file");
+            advise("mhparse", "unable to create temporary file in %s",
+		   get_temp_dir());
             return NULL;
         }
 	file = add (tfile, NULL);
-	chmod (file, 0600);
 
 	while (fgets (buffer, sizeof(buffer), stdin))
 	    fputs (buffer, fp);
 	fflush (fp);
 
 	if (ferror (stdin)) {
-	    unlink (file);
+	    (void) m_unlink (file);
 	    advise ("stdin", "error reading");
 	    return NULL;
 	}
 	if (ferror (fp)) {
-	    unlink (file);
+	    (void) m_unlink (file);
 	    advise (file, "error writing");
 	    return NULL;
 	}
@@ -230,7 +222,7 @@ parse_mime (char *file)
 
     if (!(ct = get_content (fp, file, 1))) {
 	if (is_stdin)
-	    unlink (file);
+	    (void) m_unlink (file);
 	advise (NULL, "unable to decode %s", file);
 	return NULL;
     }
@@ -1654,7 +1646,12 @@ openBase64 (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -1672,17 +1669,7 @@ openBase64 (CT ct, char **file)
         cp = context_find (buffer);
     }
     if (cp != NULL && *cp != '\0') {
-        if (ce->ce_unlink) {
-            /* Temporary file already exists, so we rename to
-               version with extension. */
-            char *file_org = strdup(ce->ce_file);
-            ce->ce_file = add (cp, ce->ce_file);
-            if (rename(file_org, ce->ce_file)) {
-                adios (ce->ce_file, "unable to rename %s to ", file_org);
-            }
-            free(file_org);
-
-        } else {
+        if (! ce->ce_unlink) {
             ce->ce_file = add (cp, ce->ce_file);
         }
     }
@@ -1888,7 +1875,12 @@ openQuoted (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -1906,17 +1898,7 @@ openQuoted (CT ct, char **file)
         cp = context_find (buffer);
     }
     if (cp != NULL && *cp != '\0') {
-        if (ce->ce_unlink) {
-            /* Temporary file already exists, so we rename to
-               version with extension. */
-            char *file_org = strdup(ce->ce_file);
-            ce->ce_file = add (cp, ce->ce_file);
-            if (rename(file_org, ce->ce_file)) {
-                adios (ce->ce_file, "unable to rename %s to ", file_org);
-            }
-            free(file_org);
-
-        } else {
+        if (! ce->ce_unlink) {
             ce->ce_file = add (cp, ce->ce_file);
         }
     }
@@ -2112,7 +2094,12 @@ open7Bit (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -2130,17 +2117,7 @@ open7Bit (CT ct, char **file)
         cp = context_find (buffer);
     }
     if (cp != NULL && *cp != '\0') {
-        if (ce->ce_unlink) {
-            /* Temporary file already exists, so we rename to
-               version with extension. */
-            char *file_org = strdup(ce->ce_file);
-            ce->ce_file = add (cp, ce->ce_file);
-            if (rename(file_org, ce->ce_file)) {
-                adios (ce->ce_file, "unable to rename %s to ", file_org);
-            }
-            free(file_org);
-
-        } else {
+        if (! ce->ce_unlink) {
             ce->ce_file = add (cp, ce->ce_file);
         }
     }
@@ -2363,12 +2340,12 @@ openFile (CT ct, char **file)
 
 	    if (ferror (gp)) {
 		admonish (ce->ce_file, "error reading");
-		unlink (cachefile);
+		(void) m_unlink (cachefile);
 	    }
 	    else
 		if (ferror (fp)) {
 		    admonish (cachefile, "error writing");
-		    unlink (cachefile);
+		    (void) m_unlink (cachefile);
 		}
 	    fclose (fp);
 	}
@@ -2501,8 +2478,14 @@ openFTP (CT ct, char **file)
 	ce->ce_file = add (*file, NULL);
     else if (caching)
 	ce->ce_file = add (cachefile, NULL);
-    else
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
+    else {
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
+    }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
 	content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
@@ -2573,12 +2556,12 @@ openFTP (CT ct, char **file)
 
 		if (ferror (gp)) {
 		    admonish (ce->ce_file, "error reading");
-		    unlink (cachefile);
+		    (void) m_unlink (cachefile);
 		}
 		else
 		    if (ferror (fp)) {
 			admonish (cachefile, "error writing");
-			unlink (cachefile);
+			(void) m_unlink (cachefile);
 		    }
 		fclose (fp);
 	    }
@@ -2690,7 +2673,12 @@ openMail (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -2783,8 +2771,14 @@ openURL (CT ct, char **file)
     	ce->ce_file = add(*file, NULL);
     else if (caching)
     	ce->ce_file = add(cachefile, NULL);
-    else
-    	ce->ce_file = add(m_mktemp(tmp, NULL, NULL), NULL);
+    else {
+	char *tempfile;
+	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	    adios(NULL, "unable to create temporary file in %s",
+		  get_temp_dir());
+	}
+	ce->ce_file = add (tempfile, NULL);
+    }
 
     if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {
     	content_error(ce->ce_file, ct, "unable to fopen for read/writing");
@@ -2837,7 +2831,7 @@ openURL (CT ct, char **file)
 
 		if (ferror(gp)) {
 		    admonish(ce->ce_file, "error reading");
-		    unlink(cachefile);
+		    (void) m_unlink (cachefile);
 		}
 	    }
 	    umask(mask);