/*
-** `which' should either be "cur" to use the current draft
-** or "new" to start with a new draft.
+** `which' should either be the cur sequence to use the current draft
+** or the beyond sequence to start with a new draft.
*/
char *
m_draft(char *which)
{
- register char *cp;
register struct msgs *mp;
static char buffer[BUFSIZ];
char *folder;
- cp = draftfolder;
- folder = pluspath(cp);
-
- chdir(m_maildir(""));
- strncpy(buffer, m_maildir(folder), sizeof(buffer));
-
- create_folder(buffer, 0, done);
-
- if (chdir(buffer) == -1)
- adios(buffer, "unable to change directory to");
-
- if (!(mp = folder_read(folder)))
+ folder = getcpy(toabsdir(draftfolder));
+ create_folder(folder, 0, exit);
+ if (!(mp = folder_read(folder))) {
adios(NULL, "unable to read folder %s", folder);
+ }
+ free(folder);
/*
** Make sure we have enough message status space for all
- ** the message numbers from 1 to "new", since we might
+ ** the message numbers from 1 to one beyond last, since we might
** select an empty slot. If we add more space at the
** end, go ahead and add 10 additional slots.
*/
adios(NULL, "unable to allocate folder storage");
}
- mp->msgflags |= ALLOW_NEW; /* allow the "new" sequence */
+ mp->msgflags |= ALLOW_BEYOND; /* allow the beyond sequence */
/*
** The draft message name to return is defined by `which'.
- ** Usually it is "cur" (for the current draft) or "new"
+ ** Usually it is seq_cur (for the current draft) or seq_beyond
** (to start a new draft).
*/
if (!m_convert(mp, which))
- done(1);
+ exit(1);
seq_setprev(mp);
snprintf(buffer, sizeof(buffer), "%s/%s", mp->foldpath,