Completely reworked the path convertion functions

[mmh] / sbr / m_draft.c

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index 4a64804..38584e4 100644 (file)
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -1,10 +1,10 @@
 /*
- * m_draft.c -- construct the name of a draft message
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** m_draft.c -- construct the name of a draft message
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/utils.h>
@@ -18,56 +18,53 @@
 char *
 m_draft(char *which)
 {
-       register char *cp;
        register struct msgs *mp;
        static char buffer[BUFSIZ];
        char *folder;
 
-       cp = draftfolder;
-       folder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
-                       *cp != '@' ? TFOLDER : TSUBCWF);
+       folder = getcpy(expandfol(draftfolder));
 
-       chdir (m_maildir (""));
-       strncpy (buffer, m_maildir (folder), sizeof(buffer));
+       chdir(toabsdir("+"));
+       strncpy(buffer, toabsdir(folder), sizeof(buffer));
 
-       create_folder (buffer, 0, done);
+       create_folder(buffer, 0, done);
 
-       if (chdir (buffer) == -1)
-               adios (buffer, "unable to change directory to");
+       if (chdir(buffer) == -1)
+               adios(buffer, "unable to change directory to");
 
-       if (!(mp = folder_read (folder)))
-               adios (NULL, "unable to read folder %s", folder);
+       if (!(mp = folder_read(folder)))
+               adios(NULL, "unable to read folder %s", folder);
 
        /*
-        * Make sure we have enough message status space for all
-        * the message numbers from 1 to "new", since we might
-        * select an empty slot.  If we add more space at the
-        * end, go ahead and add 10 additional slots.
-        */
+       ** Make sure we have enough message status space for all
+       ** the message numbers from 1 to "new", since we might
+       ** select an empty slot.  If we add more space at the
+       ** end, go ahead and add 10 additional slots.
+       */
        if (mp->hghmsg >= mp->hghoff) {
-               if (!(mp = folder_realloc (mp, 1, mp->hghmsg + 10)))
-                       adios (NULL, "unable to allocate folder storage");
+               if (!(mp = folder_realloc(mp, 1, mp->hghmsg + 10)))
+                       adios(NULL, "unable to allocate folder storage");
        } else if (mp->lowoff > 1) {
-               if (!(mp = folder_realloc (mp, 1, mp->hghoff)))
-                       adios (NULL, "unable to allocate folder storage");
+               if (!(mp = folder_realloc(mp, 1, mp->hghoff)))
+                       adios(NULL, "unable to allocate folder storage");
        }
 
        mp->msgflags |= ALLOW_NEW;  /* allow the "new" sequence */
 
        /*
-        * The draft message name to return is defined by `which'.
-        * Usually it is "cur" (for the current draft) or "new"
-        * (to start a new draft).
-        */
-       if (!m_convert (mp, which))
-               done (1);
-       seq_setprev (mp);
+       ** The draft message name to return is defined by `which'.
+       ** Usually it is "cur" (for the current draft) or "new"
+       ** (to start a new draft).
+       */
+       if (!m_convert(mp, which))
+               done(1);
+       seq_setprev(mp);
 
-       snprintf (buffer, sizeof(buffer), "%s/%s", mp->foldpath,
-                       m_name (mp->lowsel));
-       seq_setcur (mp, mp->lowsel);
-       seq_save (mp);
-       folder_free (mp);
+       snprintf(buffer, sizeof(buffer), "%s/%s", mp->foldpath,
+                       m_name(mp->lowsel));
+       seq_setcur(mp, mp->lowsel);
+       seq_save(mp);
+       folder_free(mp);
 
        return buffer;
 }