X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fm_draft.c;h=e97dd1e851a3af0062292d3685e38639aa2d48c7;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hp=77ea394ae4856d9268776fb52e65b81d32d0b00a;hpb=a3ba584be2a9daf451bbe3c488d73703d14e8d53;p=mmh diff --git a/sbr/m_draft.c b/sbr/m_draft.c index 77ea394..e97dd1e 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) @@ -23,14 +23,15 @@ m_draft(char *which) char *folder; folder = getcpy(toabsdir(draftfolder)); - create_folder(folder, 0, done); + 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. */ @@ -42,15 +43,15 @@ 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)) - done(1); + exit(1); seq_setprev(mp); snprintf(buffer, sizeof(buffer), "%s/%s", mp->foldpath,