X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_draft.c;h=ceee73a8b9b5537a6875f39cdd8a663b9e3c53ca;hp=e47918693c1b334afa67036d57cccb683a8107fe;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c diff --git a/sbr/m_draft.c b/sbr/m_draft.c index e479186..ceee73a 100644 --- a/sbr/m_draft.c +++ b/sbr/m_draft.c @@ -1,4 +1,3 @@ - /* * m_draft.c -- construct the name of a draft message * @@ -15,66 +14,66 @@ char * m_draft (char *folder, char *msg, int use, int *isdf) { - register char *cp; - register struct msgs *mp; - static char buffer[BUFSIZ]; + register char *cp; + register struct msgs *mp; + static char buffer[BUFSIZ]; - if (*isdf == -1 || folder == NULL || *folder == '\0') { - if (*isdf == -1 || (cp = context_find ("Draft-Folder")) == NULL) { - *isdf = 0; - return m_maildir (msg && *msg ? msg : draft); - } else { - folder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp, - *cp != '@' ? TFOLDER : TSUBCWF); + if (*isdf == -1 || folder == NULL || *folder == '\0') { + if (*isdf == -1 || (cp = context_find ("Draft-Folder")) == NULL) { + *isdf = 0; + return m_maildir (msg && *msg ? msg : draft); + } else { + folder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp, + *cp != '@' ? TFOLDER : TSUBCWF); + } } - } - *isdf = 1; - - chdir (m_maildir ("")); - strncpy (buffer, m_maildir (folder), sizeof(buffer)); + *isdf = 1; + + chdir (m_maildir ("")); + strncpy (buffer, m_maildir (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. - */ - if (mp->hghmsg >= mp->hghoff) { - 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"); - } + /* + * 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"); + } else if (mp->lowoff > 1) { + if (!(mp = folder_realloc (mp, 1, mp->hghoff))) + adios (NULL, "unable to allocate folder storage"); + } - mp->msgflags |= ALLOW_NEW; /* allow the "new" sequence */ + mp->msgflags |= ALLOW_NEW; /* allow the "new" sequence */ - /* - * If we have been give a valid message name, then use that. - * Else, if we are given the "use" option, then use the - * current message. Else, use special sequence "new". - */ - if (!m_convert (mp, msg && *msg ? msg : use ? "cur" : "new")) - done (1); - seq_setprev (mp); + /* + * If we have been give a valid message name, then use that. + * Else, if we are given the "use" option, then use the + * current message. Else, use special sequence "new". + */ + if (!m_convert (mp, msg && *msg ? msg : use ? "cur" : "new")) + done (1); + seq_setprev (mp); - if (mp->numsel > 1) - adios (NULL, "only one message draft at a time!"); + if (mp->numsel > 1) + adios (NULL, "only one message draft at a time!"); - snprintf (buffer, sizeof(buffer), "%s/%s", mp->foldpath, m_name (mp->lowsel)); - cp = buffer; + snprintf (buffer, sizeof(buffer), "%s/%s", mp->foldpath, m_name (mp->lowsel)); + cp = buffer; - seq_setcur (mp, mp->lowsel);/* set current message for folder */ - seq_save (mp); /* synchronize message sequences */ - folder_free (mp); /* free folder/message structure */ + seq_setcur (mp, mp->lowsel);/* set current message for folder */ + seq_save (mp); /* synchronize message sequences */ + folder_free (mp); /* free folder/message structure */ - return cp; + return cp; }