X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsendsbr.c;h=a8e09641ca9170b5e60aa0133bf4e5c23ea20734;hb=552fd7253e5ee9e554c5c7a8248a6322aa4363bb;hp=c7f4d447238ea7fc1c530607bdd55c98af742fd6;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index c7f4d44..a8e0964 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -258,10 +258,10 @@ attach(char *attachment_header_field_name, char *draft_file_name,
 	*/
 
 	(void)strncpy(body_file_name,
-			m_mktemp(m_maildir(invo_name), NULL, NULL),
+			m_mktemp(toabsdir(invo_name), NULL, NULL),
 			sizeof (body_file_name));
 	(void)strncpy(composition_file_name,
-			m_mktemp(m_maildir(invo_name), NULL, NULL),
+			m_mktemp(toabsdir(invo_name), NULL, NULL),
 			sizeof (composition_file_name));
 
 	if (has_body)
@@ -512,7 +512,7 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 
 		break;
 	case 1:
-		if (stringdex(m_maildir(invo_name), file_name) == 0) {
+		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
@@ -534,7 +534,7 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 
 		break;
 	case 2:
-		if (stringdex(m_maildir(invo_name), file_name) == 0) {
+		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
@@ -709,7 +709,7 @@ alert(char *file, int out)
 			snprintf(buf, sizeof(buf), "send failed on %s",
 					forwsw ? "enclosed draft" : file);
 
-			execlp(mailproc, r1bindex(mailproc, '/'),
+			execlp(mailproc, mhbasename(mailproc),
 					getusername(), "-subject", buf, NULL);
 			fprintf(stderr, "unable to exec ");
 			perror(mailproc);
@@ -806,7 +806,7 @@ annoaux(int fd)
 			admonish(NULL, "$mhfolder not set");
 		return;
 	}
-	maildir = m_maildir(folder);
+	maildir = toabsdir(folder);
 	if (chdir(maildir) == NOTOK) {
 		if (debugsw)
 			admonish(maildir, "unable to change directory to");