Completely reworked the path convertion functions

[mmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 4670345..a8e0964 100644 (file)
--- 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
@@ -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");