X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_draft.c;h=3659ff3d498e3934823f8e872ff6c9264f7f6b7f;hp=38584e4a451ba484d6438522edbe9ad15ebdeb58;hb=39e87a75b5c2d3572ec72e717720b44af291e88a;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0 diff --git a/sbr/m_draft.c b/sbr/m_draft.c index 38584e4..3659ff3 100644 --- a/sbr/m_draft.c +++ b/sbr/m_draft.c @@ -12,8 +12,8 @@ /* -** `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) @@ -22,22 +22,16 @@ m_draft(char *which) static char buffer[BUFSIZ]; char *folder; - folder = getcpy(expandfol(draftfolder)); - - chdir(toabsdir("+")); - strncpy(buffer, toabsdir(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, done); + 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. */ @@ -49,11 +43,11 @@ m_draft(char *which) 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))