X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=76280aa6bd3e81fdae6d9b079c073abf11bc44ae;hb=c7b5e1df086bcc37ff40163ee67571f076cf6683;hp=5e1f0a10cef5fb35cce34703dfcca68b18b828d0;hpb=9fca5fd33b87291cdcb326c7aab6ab9574244289;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 5e1f0a1..76280aa 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -46,6 +46,7 @@ static void armed_done(int) NORETURN;
 static void anno(struct stat *);
 static int sendaux(char **, int, char *, struct stat *);
 static int attach(char *);
+static int signandenc(char *);
 static void clean_up_temporary_files(void);
 static int get_line(void);
 static void make_mime_composition_file_entry(char *);
@@ -232,7 +233,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
@@ -262,16 +262,37 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 		break;
 	}
 
+	/*
+	** Sign and encrypt the message as needed.
+	** Use the mhbuild composition file for the draft if there was
+	** a successful conversion because that now contains the MIME
+	** message.  A nice side effect of this is that it leaves the
+	** original draft file untouched so that it can be retrieved
+	** and modified if desired.
+	*/
+	switch (signandenc(drft)) {
+	case OK:
+		drft = composition_file_name;
+		break;
+
+	case NOTOK:
+		return (NOTOK);
+
+	case DONE:
+		break;
+	}
+
 	done=armed_done;
 	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 +307,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 +446,58 @@ 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);
+}
+
+static int
+signandenc(char *draft_file_name)
+{
+	char buf[BUFSIZ];
+	int dosign = 0;
+	int doenc = 0;
+
+	if (!(draft_file = fopen(draft_file_name, "r"))) {
+		adios(NULL, "can't open draft file `%s'.", draft_file_name);
+	}
+
+	/* We'll grow the buffer as needed. */
+	field = (char *)mh_xmalloc(field_size = 256);
+
+	/* Scan the draft file for an attachment header field name. */
+	while (get_line() != EOF && *field != '\0' && *field != '-') {
+		if (strncasecmp(field, sign_hdr, strlen(sign_hdr))==0 &&
+				field[strlen(sign_hdr)] == ':') {
+			dosign = 1;
+		}
+		if (strncasecmp(field, enc_hdr, strlen(enc_hdr))==0 &&
+				field[strlen(enc_hdr)] == ':') {
+			doenc = 1;
+		}
+	}
+	if (!dosign && !doenc) {
+		return DONE;
+	}
+
+	strcpy(composition_file_name, draft_file_name);
+
+	/* We're ready to roll! */
+	sprintf(buf, "mhsign -m%s '%s'", doenc ? " -e" : "",
+			draft_file_name);
+	if (system(buf) != 0) {
+		/* some problem */
+		return (NOTOK);
+	}
+	/* Remove the automatically created backup of mhsign. */
+	snprintf(buf, sizeof buf, "%s.orig", draft_file_name);
+	if (unlink(buf) == -1) {
+		advise(NULL, "unable to remove original draft file.");
+	}
 
 	return (OK);
 }