X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4a78cbcd4fa986d9c1e7bd0a5a4bdb619faeb7cb..e0c39ed52fa9c99b4591b5170354d8398ffd787b:/uip/mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 9489a8e4..716a22f7 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -205,12 +205,12 @@ parse_mime (char *file)
 	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;
 	}
@@ -222,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;
     }
@@ -1669,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);
         }
     }
@@ -1908,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);
         }
     }
@@ -2137,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);
         }
     }
@@ -2370,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);
 	}
@@ -2586,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);
 	    }
@@ -2861,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);