X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..ff168106b44fdfbaed7d7cf08c54a72ee1fe2c0a:/sbr/m_draft.c?ds=inline

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index 71095a98..342f44f0 100644
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -5,10 +5,25 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "m_name.h"
+#include "seq_setprev.h"
+#include "seq_setcur.h"
+#include "seq_save.h"
+#include "m_draft.h"
+#include "m_convert.h"
+#include "folder_read.h"
+#include "folder_realloc.h"
+#include "folder_free.h"
+#include "context_find.h"
+#include "path.h"
+#include "error.h"
+#include "h/utils.h"
+#include "m_maildir.h"
+#include "h/done.h"
 
 
+/* Does not return NULL. */
 char *
 m_draft (char *folder, char *msg, int use, int *isdf)
 {
@@ -38,7 +53,7 @@ m_draft (char *folder, char *msg, int use, int *isdf)
 	adios (buffer, "unable to change directory to");
 
     if (!(mp = folder_read (folder, 1)))
-	adios (NULL, "unable to read folder %s", folder);
+	die("unable to read folder %s", folder);
 
     /*
      * Make sure we have enough message status space for all
@@ -48,10 +63,10 @@ m_draft (char *folder, char *msg, int use, int *isdf)
      */
     if (mp->hghmsg >= mp->hghoff) {
 	if (!(mp = folder_realloc (mp, 1, mp->hghmsg + 10)))
-	    adios (NULL, "unable to allocate folder storage");
+	    die("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");
+	    die("unable to allocate folder storage");
     }
 
     mp->msgflags |= ALLOW_NEW;	/* allow the "new" sequence */
@@ -66,7 +81,7 @@ m_draft (char *folder, char *msg, int use, int *isdf)
     seq_setprev (mp);
 
     if (mp->numsel > 1)
-	adios (NULL, "only one message draft at a time!");
+	die("only one message draft at a time!");
 
     snprintf (buffer, sizeof(buffer), "%s/%s", mp->foldpath, m_name (mp->lowsel));
     cp = buffer;