X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsendsbr.c;h=150c175c55db0a2f8508dbdbe0e3ab92d28ac636;hb=8ff284ff9167eff8f5349481529332d59ed913b1;hp=0cae87803885767532290ce7e4e925b9057e1ab6;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4;p=mmh

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 0cae878..150c175 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -52,23 +52,23 @@ static FILE *composition_file;  /* composition file pointer */
 /*
 ** external prototypes
 */
-int sendsbr (char **, int, char *, struct stat *, int, char *, int);
-char *getusername (void);
+int sendsbr(char **, int, char *, struct stat *, int);
+char *getusername(void);
 
 /*
 ** static prototypes
 */
-static void armed_done (int) NORETURN;
-static void alert (char *, int);
-static int tmp_fd (void);
-static void anno (int, struct stat *);
-static void annoaux (int);
-static int sendaux (char **, int, char *, struct stat *);
-
-static int attach(char *, char *, int);
+static void armed_done(int) NORETURN;
+static void alert(char *, int);
+static int tmp_fd(void);
+static void anno(int, struct stat *);
+static void annoaux(int);
+static int sendaux(char **, int, char *, struct stat *);
+
+static int attach(char *);
 static void clean_up_temporary_files(void);
 static int get_line(void);
-static void make_mime_composition_file_entry(char *, int);
+static void make_mime_composition_file_entry(char *);
 
 
 /*
@@ -76,8 +76,7 @@ static void make_mime_composition_file_entry(char *, int);
 */
 
 int
-sendsbr (char **vec, int vecp, char *drft, struct stat *st,
-	int rename_drft, char *attachment_header_field_name, int attachformat)
+sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
 {
 	int status;
 	char buffer[BUFSIZ], file[BUFSIZ];
@@ -94,32 +93,27 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st,
 	original_draft = drft;
 
 	/*
-	** There might be attachments if a header field name for
-	** attachments is supplied.  Convert the draft to a MIME message.
+	** Convert the draft to a MIME message.
 	** 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 (attach(drft)) {
+	case OK:
+		drft = composition_file_name;
+		break;
 
-	if (attachment_header_field_name != (char *)0) {
-		switch (attach(attachment_header_field_name, drft,
-				attachformat)) {
-		case OK:
-			drft = composition_file_name;
-			break;
-
-		case NOTOK:
-			return (NOTOK);
+	case NOTOK:
+		return (NOTOK);
 
-		case DONE:
-			break;
-		}
+	case DONE:
+		break;
 	}
 
 	done=armed_done;
-	switch (setjmp (env)) {
+	switch (setjmp(env)) {
 	case OK:
 		/*
 		** If given -push and -unique (which is undocumented), then
@@ -128,20 +122,22 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st,
 		if (pushsw && unique) {
 			char *cp = m_mktemp2(drft, invo_name, NULL, NULL);
 			if (cp == NULL) {
-				adios ("sendsbr", "unable to create temporary file");
+				adios("sendsbr", "unable to create temporary file");
 			}
-			if (rename (drft, strncpy(file, cp, sizeof(file)))
+			if (rename(drft, strncpy(file, cp, sizeof(file)))
 					== NOTOK)
-				adios (file, "unable to rename %s to", drft);
+				adios(file, "unable to rename %s to", drft);
 			drft = file;
 		}
 
-		status = sendaux (vec, vecp, drft, st) ? NOTOK : OK;
+		status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
 
 		/* rename the original draft */
 		if (rename_drft && status == OK &&
-				rename (original_draft, strncpy (buffer, m_backup (original_draft), sizeof(buffer))) == NOTOK)
-			advise (buffer, "unable to rename %s to", drft);
+				rename(original_draft, strncpy(buffer,
+				m_backup(original_draft), sizeof(buffer)))
+				== NOTOK)
+			advise(buffer, "unable to rename %s to", drft);
 		break;
 
 	default:
@@ -151,7 +147,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st,
 
 	done=exit;
 	if (distfile)
-		unlink (distfile);
+		unlink(distfile);
 
 	/*
 	** Get rid of any temporary files that we created for attachments.
@@ -165,7 +161,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st,
 
 		if (strlen(composition_file_name) >=
 				sizeof (composition_file_name) - 6)
-			advise((char *)0, "unable to remove original composition file.");
+			advise(NULL, "unable to remove original composition file.");
 
 		else {
 			if ((p = strrchr(composition_file_name, '/')) == NULL)
@@ -173,12 +169,12 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st,
 			else
 				p++;
 
-			(void)strcpy(body_file_name, p);
+			strcpy(body_file_name, p);
 			*p++ = ',';
-			(void)strcpy(p, body_file_name);
-			(void)strcat(p, ".orig");
+			strcpy(p, body_file_name);
+			strcat(p, ".orig");
 
-			(void)unlink(composition_file_name);
+			unlink(composition_file_name);
 		}
 	}
 
@@ -186,13 +182,13 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st,
 }
 
 static int
-attach(char *attachment_header_field_name, char *draft_file_name,
-	int attachformat)
+attach(char *draft_file_name)
 {
 	char buf[MAXPATHLEN + 6];  /* miscellaneous buffer */
 	int c;  /* current character for body copy */
 	int has_attachment;  /* draft has at least one attachment */
 	int has_body;  /* draft has a message body */
+	int non_ascii; /* msg body contains non-ASCII chars */
 	int length;  /* length of attachment header field name */
 	char *p;  /* miscellaneous string pointer */
 
@@ -201,7 +197,7 @@ attach(char *attachment_header_field_name, char *draft_file_name,
 	*/
 
 	if ((draft_file = fopen(draft_file_name, "r")) == (FILE *)0)
-		adios((char *)0, "can't open draft file `%s'.",
+		adios(NULL, "can't open draft file `%s'.",
 				draft_file_name);
 
 	/*
@@ -212,54 +208,64 @@ attach(char *attachment_header_field_name, char *draft_file_name,
 	field = (char *)mh_xmalloc(field_size = 256);
 
 	/*
-	** Scan the draft file for a header field name that matches the
-	** -attach argument.  The existence of one indicates that the
+	** Scan the draft file for an attachment header field name.
+	** The existence of one indicates that the
 	** draft has attachments.  Bail out if there are no attachments
 	** because we're done.  Read to the end of the headers even if
 	** we have no attachments.
 	*/
 
-	length = strlen(attachment_header_field_name);
+	length = strlen(attach_hdr);
 
 	has_attachment = 0;
 
 	while (get_line() != EOF && *field != '\0' && *field != '-')
-		if (strncasecmp(field, attachment_header_field_name, length)
-				== 0 && field[length] == ':')
+		if (strncasecmp(field, attach_hdr, length) == 0 &&
+				field[length] == ':')
 			has_attachment = 1;
 
-	if (has_attachment == 0)
-		return (DONE);
-
 	/*
 	** We have at least one attachment.  Look for at least one
 	** non-blank line in the body of the message which indicates
 	** content in the body.
+	** Check if body contains at least one non-blank (= not empty)
+	** and if it contains any non-ASCII chars (= need MIME).
 	*/
 
 	has_body = 0;
+	non_ascii = 0;
 
 	while (get_line() != EOF) {
 		for (p = field; *p != '\0'; p++) {
 			if (*p != ' ' && *p != '\t') {
 				has_body = 1;
-				break;
+			}
+			if (*p > 127 || *p < 0) {
+				non_ascii = 1;
 			}
 		}
-
-		if (has_body)
+		if (has_body && non_ascii)
 			break;
 	}
 
 	/*
-	** Make names for the temporary files.
+	** Bail out if there are no attachments and only ASCII text.
+	** This means we don't need to convert it to MIME.
+	*/
+	if (!has_attachment && non_ascii==0) {
+		return DONE;
+	}
+
+	/*
+	** Else: mimify
 	*/
 
-	(void)strncpy(body_file_name,
-			m_mktemp(m_maildir(invo_name), NULL, NULL),
+	/* Make names for the temporary files.  */
+	strncpy(body_file_name,
+			m_mktemp(toabsdir(invo_name), NULL, NULL),
 			sizeof (body_file_name));
-	(void)strncpy(composition_file_name,
-			m_mktemp(m_maildir(invo_name), NULL, NULL),
+	strncpy(composition_file_name,
+			m_mktemp(toabsdir(invo_name), NULL, NULL),
 			sizeof (composition_file_name));
 
 	if (has_body)
@@ -270,7 +276,7 @@ attach(char *attachment_header_field_name, char *draft_file_name,
 	if ((has_body && body_file == (FILE *)0) ||
 			composition_file == (FILE *)0) {
 		clean_up_temporary_files();
-		adios((char *)0, "unable to open all of the temporary files.");
+		adios(NULL, "unable to open all of the temporary files.");
 	}
 
 	/*
@@ -278,62 +284,55 @@ attach(char *attachment_header_field_name, char *draft_file_name,
 	** non-attachment header fields to the temporary composition file.
 	** Then add the dashed line separator.
 	*/
-
 	rewind(draft_file);
-
 	while (get_line() != EOF && *field != '\0' && *field != '-')
-		if (strncasecmp(field, attachment_header_field_name, length)
-				!= 0 || field[length] != ':')
-			(void)fprintf(composition_file, "%s\n", field);
-
-	(void)fputs("--------\n", composition_file);
+		if (strncasecmp(field, attach_hdr, length) != 0 ||
+				field[length] != ':')
+			fprintf(composition_file, "%s\n", field);
+	fputs("--------\n", composition_file);
 
 	/*
 	** Copy the message body to a temporary file.
 	*/
-
 	if (has_body) {
 		while ((c = getc(draft_file)) != EOF)
 				putc(c, body_file);
-
-		(void)fclose(body_file);
+		fclose(body_file);
 	}
 
 	/*
 	** Add a mhbuild MIME composition file line for the body if
 	** there was one.
 	*/
-
-	if (has_body)
-		make_mime_composition_file_entry(body_file_name, attachformat);
+	if (has_body) {
+		/* old: make_mime_composition_file_entry(body_file_name); */
+		/* charset will be discovered/guessed by buildmimeproc */
+		fprintf(composition_file, "#text/plain %s\n", body_file_name);
+	}
 
 	/*
 	** Now, go back to the beginning of the draft file and look for
 	** header fields that specify attachments.  Add a mhbuild MIME
 	** composition file for each.
 	*/
-
 	rewind(draft_file);
-
 	while (get_line() != EOF && *field != '\0' && *field != '-') {
-		if (strncasecmp(field, attachment_header_field_name, length)
-				== 0 && field[length] == ':') {
+		if (strncasecmp(field, attach_hdr, length) == 0 &&
+				field[length] == ':') {
 			for (p = field + length + 1; *p == ' ' || *p == '\t';
 					p++)
 				;
-
-			make_mime_composition_file_entry(p, attachformat);
+			make_mime_composition_file_entry(p);
 		}
 	}
 
-	(void)fclose(composition_file);
+	fclose(composition_file);
 
 	/*
 	** We're ready to roll!  Run mhbuild on the composition file.
 	** Note that mhbuild is in the context as buildmimeproc.
 	*/
-
-	(void)sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
+	sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
 
 	if (system(buf) != 0) {
 		clean_up_temporary_files();
@@ -346,8 +345,8 @@ attach(char *attachment_header_field_name, char *draft_file_name,
 static void
 clean_up_temporary_files(void)
 {
-	(void)unlink(body_file_name);
-	(void)unlink(composition_file_name);
+	unlink(body_file_name);
+	unlink(composition_file_name);
 
 	return;
 }
@@ -368,7 +367,7 @@ get_line(void)
 
 	for (n = 0, p = field; (c = getc(draft_file)) != EOF; *p++ = c) {
 		if (c == '\n' && (c = getc(draft_file)) != ' ' && c != '\t') {
-			(void)ungetc(c, draft_file);
+			ungetc(c, draft_file);
 			c = '\n';
 			break;
 		}
@@ -387,18 +386,16 @@ get_line(void)
 }
 
 static void
-make_mime_composition_file_entry(char *file_name, int attachformat)
+make_mime_composition_file_entry(char *file_name)
 {
 	int binary;  /* binary character found flag */
 	int c;  /* current character */
-	char cmd[MAXPATHLEN + 6];  /* file command buffer */
 	char *content_type;  /* mime content type */
 	FILE *fp;  /* content and pipe file pointer */
 	struct node *np;  /* context scan node pointer */
 	char *p;  /* miscellaneous string pointer */
-	struct stat st;  /* file status buffer */
 
-	content_type = (char *)0;
+	content_type = NULL;
 
 	/*
 	** Check the file name for a suffix.  Scan the context for that
@@ -409,7 +406,7 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 	** the field, including the dot.
 	*/
 
-	if ((p = strrchr(file_name, '.')) != (char *)0) {
+	if ((p = strrchr(file_name, '.')) != NULL) {
 		for (np = m_defs; np; np = np->n_next) {
 			if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0
 					&& mh_strcasecmp(p, np->n_field) == 0)
@@ -427,10 +424,10 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 	** content type based on this check.
 	*/
 
-	if (content_type == (char *)0) {
+	if (content_type == NULL) {
 		if ((fp = fopen(file_name, "r")) == (FILE *)0) {
 			clean_up_temporary_files();
-			adios((char *)0, "unable to access file \"%s\"",
+			adios(NULL, "unable to access file \"%s\"",
 					file_name);
 		}
 
@@ -443,7 +440,7 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 			}
 		}
 
-		(void)fclose(fp);
+		fclose(fp);
 
 		content_type = binary ?
 				"application/octet-stream" : "text/plain";
@@ -457,112 +454,34 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 	** (if possible) by running the "file" command on the file.
 	*/
 
-	if (stat(file_name, &st) == -1 || access(file_name, R_OK) != 0) {
+	if (access(file_name, R_OK) != 0) {
 		clean_up_temporary_files();
-		adios((char *)0, "unable to access file \"%s\"", file_name);
+		adios(NULL, "unable to access file \"%s\"", file_name);
 	}
 
-	switch (attachformat) {
-	case 0:
-		/* Insert name, file mode, and Content-Id. */
-		(void)fprintf(composition_file,
-				"#%s; name=\"%s\"; x-unix-mode=0%.3ho",
-				content_type, ((p = strrchr(file_name, '/'))
-				== (char *)0) ? file_name : p + 1,
-				(unsigned short)(st.st_mode & 0777));
-
-		if (strlen(file_name) > MAXPATHLEN) {
-			clean_up_temporary_files();
-			adios((char *)0, "attachment file name `%s' too long.",
-					file_name);
-		}
-
-		(void)sprintf(cmd, "file '%s'", file_name);
-
-		if ((fp = popen(cmd, "r")) != (FILE *)0 &&
-				fgets(cmd, sizeof (cmd), fp) != (char *)0) {
-			*strchr(cmd, '\n') = '\0';
-
-			/*
-			**  The output of the "file" command is of the form
-			**
-			**       file: description
-			**
-			**  Strip off the "file:" and subsequent white space.
-			*/
-
-			for (p = cmd; *p != '\0'; p++) {
-				if (*p == ':') {
-					for (p++; *p != '\0'; p++) {
-						if (*p != '\t')
-							break;
-					}
-					break;
-				}
-			}
-
-			if (*p != '\0')
-				/* Insert Content-Description. */
-				(void)fprintf(composition_file, " [ %s ]", p);
 
-			(void)pclose(fp);
-		}
-
-		break;
-	case 1:
-		if (stringdex (m_maildir(invo_name), file_name) == 0) {
-			/*
-			** Content had been placed by send into a temp file.
-			** Don't generate Content-Disposition header, because
-			** it confuses Microsoft Outlook, Build 10.0.6626, at
-			** least.
-			*/
-			(void) fprintf (composition_file, "#%s <>", content_type);
-		} else {
-			/*
-			** Suppress Content-Id, insert simple
-			** Content-Disposition.
-			*/
-			(void) fprintf (composition_file,
-				"#%s; name=\"%s\" <>{attachment}",
-				content_type,
-				((p = strrchr(file_name, '/')) == (char *)0) ?
-				file_name : p + 1);
-		}
-
-		break;
-	case 2:
-		if (stringdex (m_maildir(invo_name), file_name) == 0) {
-			/*
-			** Content had been placed by send into a temp file.
-			** Don't generate Content-Disposition header, because
-			** it confuses Microsoft Outlook, Build 10.0.6626, at
-			** least.
-			*/
-			(void) fprintf (composition_file, "#%s <>",
-					content_type);
-		} else {
-			/*
-			** Suppress Content-Id, insert Content-Disposition
-			** with modification date.
-			*/
-			(void) fprintf (composition_file,
-				"#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}",
-				content_type,
-				((p = strrchr(file_name, '/')) == (char *)0) ?
-				file_name : p + 1, dtime (&st.st_mtime, 0));
-		}
-
-		break;
-	default:
-		adios ((char *)0, "unsupported attachformat %d", attachformat);
+	if (stringdex(toabsdir(invo_name), file_name) == 0) {
+		/*
+		** Content had been placed by send into a temp file.
+		** Don't generate Content-Disposition header, because
+		** it confuses Microsoft Outlook, Build 10.0.6626, at
+		** least.
+		*/
+		fprintf(composition_file, "#%s <>", content_type);
+	} else {
+		/*
+		** Suppress Content-Id, insert simple
+		** Content-Disposition.
+		*/
+		fprintf(composition_file,
+			"#%s; name=\"%s\" <>{attachment}",
+			content_type,
+			((p = strrchr(file_name, '/')) == NULL) ?
+			file_name : p + 1);
 	}
 
-	/*
-	** Finish up with the file name.
-	*/
-
-	(void)fprintf(composition_file, " %s\n", file_name);
+	/* Finish up with the file name. */
+	fprintf(composition_file, " %s\n", file_name);
 
 	return;
 }
@@ -573,36 +492,36 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 */
 
 static int
-sendaux (char **vec, int vecp, char *drft, struct stat *st)
+sendaux(char **vec, int vecp, char *drft, struct stat *st)
 {
 	pid_t child_id;
 	int i, status, fd, fd2;
 	char backup[BUFSIZ], buf[BUFSIZ];
 
-	fd = pushsw ? tmp_fd () : NOTOK;
+	fd = pushsw ? tmp_fd() : NOTOK;
 	fd2 = NOTOK;
 
 	vec[vecp++] = drft;
 	if (annotext) {
-		if ((fd2 = tmp_fd ()) != NOTOK) {
+		if ((fd2 = tmp_fd()) != NOTOK) {
 			vec[vecp++] = "-idanno";
-			snprintf (buf, sizeof(buf), "%d", fd2);
+			snprintf(buf, sizeof(buf), "%d", fd2);
 			vec[vecp++] = buf;
 		} else {
-			admonish (NULL, "unable to create file for annotation list");
+			admonish(NULL, "unable to create file for annotation list");
 		}
 	}
-	if (distfile && distout (drft, distfile, backup) == NOTOK)
-		done (1);
+	if (distfile && distout(drft, distfile, backup) == NOTOK)
+		done(1);
 	vec[vecp] = NULL;
 
-	for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
-		sleep (5);
+	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
+		sleep(5);
 
 	switch (child_id) {
 	case -1:
 		/* oops -- fork error */
-		adios ("fork", "unable to");
+		adios("fork", "unable to");
 		break;  /* NOT REACHED */
 
 	case 0:
@@ -613,14 +532,14 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st)
 		** file, so capture anything on stdout and stderr there.
 		*/
 		if (fd != NOTOK) {
-			dup2 (fd, fileno (stdout));
-			dup2 (fd, fileno (stderr));
-			close (fd);
+			dup2(fd, fileno(stdout));
+			dup2(fd, fileno(stderr));
+			close(fd);
 		}
-		execvp (postproc, vec);
-		fprintf (stderr, "unable to exec ");
-		perror (postproc);
-		_exit (-1);
+		execvp(postproc, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(postproc);
+		_exit(-1);
 		break;  /* NOT REACHED */
 
 	default:
@@ -629,7 +548,7 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st)
 		*/
 		if ((status = pidwait(child_id, NOTOK)) == OK) {
 			if (annotext && fd2 != NOTOK)
-				anno (fd2, st);
+				anno(fd2, st);
 		} else {
 			/*
 			** If postproc failed, and we have good fd (which
@@ -637,17 +556,17 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st)
 			** (and possibly the draft) back to the user.
 			*/
 			if (fd != NOTOK) {
-				alert (drft, fd);
-				close (fd);
+				alert(drft, fd);
+				close(fd);
 			} else {
-				advise (NULL, "message not delivered to anyone");
+				advise(NULL, "message not delivered to anyone");
 			}
 			if (annotext && fd2 != NOTOK)
-				close (fd2);
+				close(fd2);
 			if (distfile) {
-				unlink (drft);
-				if (rename (backup, drft) == NOTOK)
-					advise (drft, "unable to rename %s to",
+				unlink(drft);
+				if (rename(backup, drft) == NOTOK)
+					advise(drft, "unable to rename %s to",
 							backup);
 			}
 		}
@@ -664,66 +583,64 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st)
 */
 
 static void
-alert (char *file, int out)
+alert(char *file, int out)
 {
 	pid_t child_id;
 	int i, in;
 	char buf[BUFSIZ];
 
 	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep (5);
+		sleep(5);
 
 	switch (child_id) {
-		case NOTOK:
-			/* oops -- fork error */
-			advise ("fork", "unable to");
-
-		case OK:
-			/* child process -- send it */
-			SIGNAL (SIGHUP, SIG_IGN);
-			SIGNAL (SIGINT, SIG_IGN);
-			SIGNAL (SIGQUIT, SIG_IGN);
-			SIGNAL (SIGTERM, SIG_IGN);
-			if (forwsw) {
-				if ((in = open (file, O_RDONLY)) == NOTOK) {
-					admonish (file, "unable to re-open");
-				} else {
-					lseek (out, (off_t) 0, SEEK_END);
-					strncpy (buf, "\nMessage not delivered to anyone.\n", sizeof(buf));
-					write (out, buf, strlen (buf));
-					strncpy (buf, "\n------- Unsent Draft\n\n", sizeof(buf));
-					write (out, buf, strlen (buf));
-					cpydgst (in, out, file, "temporary file");
-					close (in);
-					strncpy (buf, "\n------- End of Unsent Draft\n", sizeof(buf));
-					write (out, buf, strlen (buf));
-					if (rename (file, strncpy (buf, m_backup (file), sizeof(buf))) == NOTOK)
-						admonish (buf, "unable to rename %s to", file);
-				}
+	case NOTOK:
+		/* oops -- fork error */
+		advise("fork", "unable to");
+
+	case OK:
+		/* child process -- send it */
+		SIGNAL(SIGHUP, SIG_IGN);
+		SIGNAL(SIGINT, SIG_IGN);
+		SIGNAL(SIGQUIT, SIG_IGN);
+		SIGNAL(SIGTERM, SIG_IGN);
+		if (forwsw) {
+			if ((in = open(file, O_RDONLY)) == NOTOK) {
+				admonish(file, "unable to re-open");
+			} else {
+				lseek(out, (off_t) 0, SEEK_END);
+				strncpy(buf, "\nMessage not delivered to anyone.\n", sizeof(buf));
+				write(out, buf, strlen(buf));
+				strncpy(buf, "\n------- Unsent Draft\n\n", sizeof(buf));
+				write(out, buf, strlen(buf));
+				cpydgst(in, out, file, "temporary file");
+				close(in);
+				strncpy(buf, "\n------- End of Unsent Draft\n", sizeof(buf));
+				write(out, buf, strlen(buf));
+				if (rename(file, strncpy(buf, m_backup(file), sizeof(buf))) == NOTOK)
+					admonish(buf, "unable to rename %s to", file);
 			}
-			lseek (out, (off_t) 0, SEEK_SET);
-			dup2 (out, fileno (stdin));
-			close (out);
-			/* create subject for error notification */
-			snprintf (buf, sizeof(buf), "send failed on %s",
-						forwsw ?
-						"enclosed draft" : file);
-
-			execlp (mailproc, r1bindex (mailproc, '/'),
-					getusername (),
-					"-subject", buf, NULL);
-			fprintf (stderr, "unable to exec ");
-			perror (mailproc);
-			_exit (-1);
-
-		default:  /* no waiting... */
-			break;
+		}
+		lseek(out, (off_t) 0, SEEK_SET);
+		dup2(out, fileno(stdin));
+		close(out);
+		/* create subject for error notification */
+		snprintf(buf, sizeof(buf), "send failed on %s",
+				forwsw ? "enclosed draft" : file);
+
+		execlp(mailproc, mhbasename(mailproc), getusername(),
+				"-subject", buf, NULL);
+		fprintf(stderr, "unable to exec ");
+		perror(mailproc);
+		_exit(-1);
+
+	default:  /* no waiting... */
+		break;
 	}
 }
 
 
 static int
-tmp_fd (void)
+tmp_fd(void)
 {
 	int fd;
 	char *tfile = NULL;
@@ -733,69 +650,68 @@ tmp_fd (void)
 	fchmod(fd, 0600);
 
 	if (debugsw)
-		advise (NULL, "temporary file %s selected", tfile);
+		advise(NULL, "temporary file %s selected", tfile);
 	else
-		if (unlink (tfile) == NOTOK)
-			advise (tfile, "unable to remove");
+		if (unlink(tfile) == NOTOK)
+			advise(tfile, "unable to remove");
 
 	return fd;
 }
 
 
 static void
-anno (int fd, struct stat *st)
+anno(int fd, struct stat *st)
 {
 	pid_t child_id;
 	sigset_t set, oset;
 	static char *cwd = NULL;
 	struct stat st2;
 
-	if (altmsg &&
-			(stat (altmsg, &st2) == NOTOK
-				|| st->st_mtime != st2.st_mtime
-				|| st->st_dev != st2.st_dev
-				|| st->st_ino != st2.st_ino)) {
+	if (altmsg && (stat(altmsg, &st2) == NOTOK ||
+			st->st_mtime != st2.st_mtime ||
+			st->st_dev != st2.st_dev ||
+			st->st_ino != st2.st_ino)) {
 		if (debugsw)
-			admonish (NULL, "$mhaltmsg mismatch");
+			admonish(NULL, "$mhaltmsg mismatch");
 		return;
 	}
 
-	child_id = debugsw ? NOTOK : fork ();
+	child_id = debugsw ? NOTOK : fork();
 	switch (child_id) {
-		case NOTOK:  /* oops */
-			if (!debugsw)
-				advise (NULL, "unable to fork, so doing annotations by hand...");
-			if (cwd == NULL)
-				cwd = getcpy (pwd ());
-
-		case OK:
-			/* block a few signals */
-			sigemptyset (&set);
-			sigaddset (&set, SIGHUP);
-			sigaddset (&set, SIGINT);
-			sigaddset (&set, SIGQUIT);
-			sigaddset (&set, SIGTERM);
-			SIGPROCMASK (SIG_BLOCK, &set, &oset);
-
-			annoaux (fd);
-			if (child_id == OK)
-				_exit (0);
-
-			/* reset the signal mask */
-			SIGPROCMASK (SIG_SETMASK, &oset, &set);
-
-			chdir (cwd);
-			break;
+	case NOTOK:  /* oops */
+		if (!debugsw)
+			advise(NULL, "unable to fork, so doing annotations by hand...");
+		if (cwd == NULL)
+			cwd = getcpy(pwd());
 
-		default:  /* no waiting... */
-			close (fd);
-			break;
+	case OK:
+		/* block a few signals */
+		sigemptyset(&set);
+		sigaddset(&set, SIGHUP);
+		sigaddset(&set, SIGINT);
+		sigaddset(&set, SIGQUIT);
+		sigaddset(&set, SIGTERM);
+		SIGPROCMASK(SIG_BLOCK, &set, &oset);
+
+		annoaux(fd);
+		if (child_id == OK)
+			_exit(0);
+
+		/* reset the signal mask */
+		SIGPROCMASK(SIG_SETMASK, &oset, &set);
+
+		chdir(cwd);
+		break;
+
+	default:  /* no waiting... */
+		close(fd);
+		break;
 	}
 }
 
 
 static void
-annoaux (int fd)
+annoaux(int fd)
 {
 	int fd2, fd3, msgnum;
 	char *cp, *folder, *maildir;
@@ -803,88 +719,89 @@ annoaux (int fd)
 	FILE *fp;
 	struct msgs *mp;
 
-	if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) {
+	if ((folder = getenv("mhfolder")) == NULL || *folder == 0) {
 		if (debugsw)
-			admonish (NULL, "$mhfolder not set");
+			admonish(NULL, "$mhfolder not set");
 		return;
 	}
-	maildir = m_maildir (folder);
-	if (chdir (maildir) == NOTOK) {
+	maildir = toabsdir(folder);
+	if (chdir(maildir) == NOTOK) {
 		if (debugsw)
-			admonish (maildir, "unable to change directory to");
+			admonish(maildir, "unable to change directory to");
 		return;
 	}
-	if (!(mp = folder_read (folder))) {
+	if (!(mp = folder_read(folder))) {
 		if (debugsw)
-			admonish (NULL, "unable to read folder %s", folder);
+			admonish(NULL, "unable to read folder %s", folder);
 		return;
 	}
 
 	/* check for empty folder */
 	if (mp->nummsg == 0) {
 		if (debugsw)
-			admonish (NULL, "no messages in %s", folder);
+			admonish(NULL, "no messages in %s", folder);
 		goto oops;
 	}
 
-	if ((cp = getenv ("mhmessages")) == NULL || *cp == 0) {
+	if ((cp = getenv("mhmessages")) == NULL || *cp == 0) {
 		if (debugsw)
-			admonish (NULL, "$mhmessages not set");
+			admonish(NULL, "$mhmessages not set");
 		goto oops;
 	}
 	if (!debugsw  /* MOBY HACK... */
 			&& pushsw
-			&& (fd3 = open ("/dev/null", O_RDWR)) != NOTOK
-			&& (fd2 = dup (fileno (stderr))) != NOTOK) {
-		dup2 (fd3, fileno (stderr));
-		close (fd3);
+			&& (fd3 = open("/dev/null", O_RDWR)) != NOTOK
+			&& (fd2 = dup(fileno(stderr))) != NOTOK) {
+		dup2(fd3, fileno(stderr));
+		close(fd3);
 	}
 	else
 		fd2 = NOTOK;
-	for (ap = brkstring (cp = getcpy (cp), " ", NULL); *ap; ap++)
-		m_convert (mp, *ap);
-	free (cp);
+	for (ap = brkstring(cp = getcpy(cp), " ", NULL); *ap; ap++)
+		m_convert(mp, *ap);
+	free(cp);
 	if (fd2 != NOTOK)
-		dup2 (fd2, fileno (stderr));
+		dup2(fd2, fileno(stderr));
 	if (mp->numsel == 0) {
 		if (debugsw)
-			admonish (NULL, "no messages to annotate");
+			admonish(NULL, "no messages to annotate");
 		goto oops;
 	}
 
-	lseek (fd, (off_t) 0, SEEK_SET);
-	if ((fp = fdopen (fd, "r")) == NULL) {
+	lseek(fd, (off_t) 0, SEEK_SET);
+	if ((fp = fdopen(fd, "r")) == NULL) {
 		if (debugsw)
-			admonish (NULL, "unable to fdopen annotation list");
+			admonish(NULL, "unable to fdopen annotation list");
 		goto oops;
 	}
 	cp = NULL;
-	while (fgets (buffer, sizeof(buffer), fp) != NULL)
-		cp = add (buffer, cp);
-	fclose (fp);
+	while (fgets(buffer, sizeof(buffer), fp) != NULL)
+		cp = add(buffer, cp);
+	fclose(fp);
 
 	if (debugsw)
-		advise (NULL, "annotate%s with %s: \"%s\"",
+		advise(NULL, "annotate%s with %s: \"%s\"",
 				inplace ? " inplace" : "", annotext, cp);
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 		if (is_selected(mp, msgnum)) {
 			if (debugsw)
-				advise (NULL, "annotate message %d", msgnum);
-			annotate (m_name (msgnum), annotext, cp, inplace, 1, -2, 0);
+				advise(NULL, "annotate message %d", msgnum);
+			annotate(m_name (msgnum), annotext, cp, inplace,
+					1, -2, 0);
 		}
 	}
 
-	free (cp);
+	free(cp);
 
 oops:
-	folder_free (mp);  /* free folder/message structure */
+	folder_free(mp);  /* free folder/message structure */
 }
 
 
 static void
-armed_done (int status)
+armed_done(int status)
 {
-	longjmp (env, status ? status : NOTOK);
+	longjmp(env, status ? status : NOTOK);
 
-	exit (status);
+	exit(status);
 }