X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhparse.c;h=bca794228593a63f5660b9cd6c54eb0f73d2f831;hb=e056446589e2fee53f823e0da1fb34076018c3dd;hp=f5ff85c24437cf1a4b86240cc343eab37866f82c;hpb=636b3bab53e3fc2154bb86fb02aeecf433cc977a;p=mmh

diff --git a/uip/mhparse.c b/uip/mhparse.c
index f5ff85c..bca7942 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -204,12 +204,14 @@ parse_mime (char *file)
      * Check if file is actually standard input
      */
     if ((is_stdin = !(strcmp (file, "-")))) {
-	file = add (m_tmpfil (invo_name), NULL);
-	if ((fp = fopen (file, "w+")) == NULL) {
-	    advise (file, "unable to fopen for writing and reading");
-	    return NULL;
-	}
+        char *tfile = m_mktemp2(NULL, invo_name, NULL, &fp);
+        if (tfile == NULL) {
+            advise("mhparse", "unable to create temporary file");
+            return NULL;
+        }
+	file = add (tfile, NULL);
 	chmod (file, 0600);
+
 	while (fgets (buffer, sizeof(buffer), stdin))
 	    fputs (buffer, fp);
 	fflush (fp);
@@ -1058,7 +1060,7 @@ static int
 InitText (CT ct)
 {
     char buffer[BUFSIZ];
-    char *chset;
+    char *chset = NULL;
     char **ap, **ep, *cp;
     struct k2v *kv;
     struct text *t;
@@ -1087,9 +1089,12 @@ InitText (CT ct)
     /* check if content specified a character set */
     if (*ap) {
 	/* match character set or set to CHARSET_UNKNOWN */
-	for (kv = Charset; kv->kv_key; kv++)
-	    if (!mh_strcasecmp (*ep, kv->kv_key))
+	for (kv = Charset; kv->kv_key; kv++) {
+	    if (!mh_strcasecmp (*ep, kv->kv_key)) {
+		chset = *ep;
 		break;
+	    }
+	}
 	t->tx_charset = kv->kv_value;
     } else {
 	t->tx_charset = CHARSET_UNSPECIFIED;
@@ -1761,7 +1766,7 @@ openBase64 (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_scratch ("", tmp), NULL);
+	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -1778,8 +1783,21 @@ openBase64 (CT ct, char **file)
                   ci->ci_type);
         cp = context_find (buffer);
     }
-    if (cp != NULL && *cp != '\0')
-        ce->ce_file = add (cp, ce->ce_file);
+    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 {
+            ce->ce_file = add (cp, ce->ce_file);
+        }
+    }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
 	content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
@@ -1969,7 +1987,7 @@ openQuoted (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_scratch ("", tmp), NULL);
+	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -1986,8 +2004,21 @@ openQuoted (CT ct, char **file)
                   ci->ci_type);
         cp = context_find (buffer);
     }
-    if (cp != NULL && *cp != '\0')
-        ce->ce_file = add (cp, ce->ce_file);
+    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 {
+            ce->ce_file = add (cp, ce->ce_file);
+        }
+    }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
 	content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
@@ -2174,7 +2205,7 @@ open7Bit (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_scratch ("", tmp), NULL);
+	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);
@@ -2191,8 +2222,21 @@ open7Bit (CT ct, char **file)
                   ci->ci_type);
         cp = context_find (buffer);
     }
-    if (cp != NULL && *cp != '\0')
-        ce->ce_file = add (cp, ce->ce_file);
+    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 {
+            ce->ce_file = add (cp, ce->ce_file);
+        }
+    }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
 	content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
@@ -2542,7 +2586,7 @@ openFTP (CT ct, char **file)
     else if (caching)
 	ce->ce_file = add (cachefile, NULL);
     else
-	ce->ce_file = add (m_scratch ("", tmp), NULL);
+	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
 	content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
@@ -2744,7 +2788,7 @@ openMail (CT ct, char **file)
     }
 
     if (*file == NULL) {
-	ce->ce_file = add (m_scratch ("", tmp), NULL);
+	ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
 	ce->ce_unlink = 1;
     } else {
 	ce->ce_file = add (*file, NULL);