X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=0660e9588a376d52f640b0be4a4a81785ec06c03;hp=5e1f0a10cef5fb35cce34703dfcca68b18b828d0;hb=ca0b3e830b86700d9e5e31b1784de2bdcaf58fc5;hpb=12824674d1fad93674dbe77419326301f62f14bd

diff --git a/uip/send.c b/uip/send.c
index 5e1f0a1..0660e95 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -232,7 +232,6 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 	int status;
 	char buffer[BUFSIZ];
 	char *original_draft;
-	char *p;  /* string pointer for building file name */
 
 	/*
 	** Save the original name of the draft file.  The name of the
@@ -266,12 +265,13 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 	switch (setjmp(env)) {
 	case OK:
 		status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
-		/* rename the original draft */
 		if (status == OK) {
-			strncpy(buffer, m_backup(original_draft),
-					sizeof(buffer));
-			if (rename(original_draft, buffer) == NOTOK) {
-				advise(buffer, "unable to rename %s to", drft);
+			/* move original draft to +trash folder */
+			snprintf(buffer, sizeof buffer,
+					"</dev/null refile -file %s +trash",
+					original_draft);
+			if (system(buffer) != 0) {
+				advise(NULL, "unable to trash the draft");
 			}
 		}
 		break;
@@ -286,31 +286,9 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 		unlink(distfile);
 	}
 
-	/*
-	** Get rid of any temporary files that we created for attachments.
-	** Also get rid of the renamed composition file that mhbuild
-	** leaves as a turd.  It looks confusing, but we use the body
-	** file name to help build the renamed composition file name.
-	*/
+	/* Get rid of temporary files that we created for attachments. */
 	if (drft == composition_file_name) {
 		clean_up_temporary_files();
-
-		if (strlen(composition_file_name) >=
-				sizeof (composition_file_name) - 6) {
-			advise(NULL, "unable to remove original composition file.");
-		} else {
-			if (!(p = strrchr(composition_file_name, '/'))) {
-				p = composition_file_name;
-			} else {
-				p++;
-			}
-			strcpy(body_file_name, p);
-			*p++ = ',';
-			strcpy(p, body_file_name);
-			strcat(p, ".orig");
-
-			unlink(composition_file_name);
-		}
 	}
 
 	return status;
@@ -447,6 +425,11 @@ attach(char *draft_file_name)
 		clean_up_temporary_files();
 		return (NOTOK);
 	}
+	/* Remove the automatically created backup of mhbuild. */
+	snprintf(buf, sizeof buf, "%s.orig", composition_file_name);
+	if (unlink(buf) == -1) {
+		advise(NULL, "unable to remove original composition file.");
+	}
 
 	return (OK);
 }