From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Thu, 2 Nov 2017 13:44:24 +0000 (+0000)
Subject: error.c: Move interface to own file.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/bfff2c60b2c860c2bc466bdab94daf770d86aec5

error.c: Move interface to own file.
---

diff --git a/Makefile.am b/Makefile.am
index 2b0c7094..bce4eb2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -364,6 +364,7 @@ noinst_HEADERS = \
     mts/smtp/smtp.h \
     sbr/base64.h \
     sbr/ctype-checked.h \
+    sbr/error.h \
     sbr/lock_file.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \
diff --git a/h/prototypes.h b/h/prototypes.h
index f4fb375c..c1c54842 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -16,12 +16,6 @@ char *etcpath(char *) NONNULL(1);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);
-void inform(char *fmt, ...) CHECK_PRINTF(1, 2);
-void adios (const char *, const char *, ...) CHECK_PRINTF(2, 3) NORETURN;
-void die(const char *, ...) CHECK_PRINTF(1, 2) NORETURN;
-void admonish (char *, char *, ...) CHECK_PRINTF(2, 3);
-void advertise (const char *, char *, const char *, va_list) CHECK_PRINTF(3, 0);
-void advise (const char *, const char *, ...) CHECK_PRINTF(2, 3);
 char **argsplit (char *, char **, int *) NONNULL(1, 2);
 void argsplit_msgarg (struct msgs_array *, char *, char **) NONNULL(1, 2, 3);
 void argsplit_insert (struct msgs_array *, char *, char **) NONNULL(1, 2, 3);
diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index f22e738b..bdac1e9d 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "smtp.h"
 #include <h/mts.h>
 #include <h/signals.h>
diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index fe508ba9..5b93f705 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/addrsbr.h>
 #include <h/mf.h>
 #include <h/mts.h>
diff --git a/sbr/ambigsw.c b/sbr/ambigsw.c
index 3f874f29..b4b2d2c7 100644
--- a/sbr/ambigsw.c
+++ b/sbr/ambigsw.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 
 void
diff --git a/sbr/arglist.c b/sbr/arglist.c
index 716c8be6..ed8dfbc6 100644
--- a/sbr/arglist.c
+++ b/sbr/arglist.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 /*
diff --git a/sbr/base64.c b/sbr/base64.c
index 75e82301..5e17a1f9 100644
--- a/sbr/base64.c
+++ b/sbr/base64.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/mime.h>
 #include <h/md5.h>
 #include <inttypes.h>
diff --git a/sbr/context_del.c b/sbr/context_del.c
index 592af0ca..04d92b31 100644
--- a/sbr/context_del.c
+++ b/sbr/context_del.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 /*
diff --git a/sbr/context_foil.c b/sbr/context_foil.c
index 09bfe30c..c502dd23 100644
--- a/sbr/context_foil.c
+++ b/sbr/context_foil.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 /*
diff --git a/sbr/context_read.c b/sbr/context_read.c
index def50969..1049123d 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -22,6 +22,7 @@
  */
 
 #include <h/mh.h>				/* mh internals */
+#include "error.h"
 #include "lock_file.h"
 #include "m_maildir.h"
 #include "makedir.h"
diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 154f3f6b..9dba8d87 100644
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 
diff --git a/sbr/context_save.c b/sbr/context_save.c
index 61aa736f..393ebbf5 100644
--- a/sbr/context_save.c
+++ b/sbr/context_save.c
@@ -12,6 +12,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/signals.h>
 #include "lock_file.h"
 
diff --git a/sbr/cpydata.c b/sbr/cpydata.c
index 49b9927c..cc7f6e57 100644
--- a/sbr/cpydata.c
+++ b/sbr/cpydata.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 void
 cpydata (int in, int out, const char *ifile, const char *ofile)
diff --git a/sbr/cpydgst.c b/sbr/cpydgst.c
index 7d33cf47..73617eb9 100644
--- a/sbr/cpydgst.c
+++ b/sbr/cpydgst.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 /*
  * We want to perform the substitution
diff --git a/sbr/crawl_folders.c b/sbr/crawl_folders.c
index ab90a4ca..b7901b23 100644
--- a/sbr/crawl_folders.c
+++ b/sbr/crawl_folders.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 
diff --git a/sbr/credentials.c b/sbr/credentials.c
index c728c52f..8d2ed617 100644
--- a/sbr/credentials.c
+++ b/sbr/credentials.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 #include <h/mts.h>
 #include "m_maildir.h"
diff --git a/sbr/datetime.c b/sbr/datetime.c
index f51ed2f4..f79c9424 100644
--- a/sbr/datetime.c
+++ b/sbr/datetime.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "error.h"
 #include "h/icalendar.h"
 #include <h/fmt_scan.h>
 #include "h/tws.h"
diff --git a/sbr/done.c b/sbr/done.c
index 5f2bc8db..58e8c56d 100644
--- a/sbr/done.c
+++ b/sbr/done.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 static void (*altexit)(int) NORETURN = exit;
 
diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index be74c67c..709082fb 100644
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/mhparse.h>
 #include <h/addrsbr.h>
 #include <h/utils.h>
diff --git a/sbr/error.c b/sbr/error.c
index 54d6fac5..fd0d7833 100644
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/sbr/error.h b/sbr/error.h
new file mode 100644
index 00000000..a6c7b887
--- /dev/null
+++ b/sbr/error.h
@@ -0,0 +1,12 @@
+/* error.h -- main error handling routines
+ *
+ * This code is Copyright (c) 2017, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information. */
+
+void inform(char *fmt, ...) CHECK_PRINTF(1, 2);
+void advise(const char *, const char *, ...) CHECK_PRINTF(2, 3);
+void adios(const char *, const char *, ...) CHECK_PRINTF(2, 3) NORETURN;
+void die(const char *, ...) CHECK_PRINTF(1, 2) NORETURN;
+void admonish(char *, char *, ...) CHECK_PRINTF(2, 3);
+void advertise(const char *, char *, const char *, va_list) CHECK_PRINTF(3, 0);
diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c
index b88be2db..1ee9c170 100644
--- a/sbr/ext_hook.c
+++ b/sbr/ext_hook.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 int
 ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2)
diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 216b8e71..421876c6 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -40,6 +40,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/addrsbr.h>
 #include <h/tws.h>
 #include <h/fmt_scan.h>
diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c
index 05da19bc..cd7d26b6 100644
--- a/sbr/fmt_new.c
+++ b/sbr/fmt_new.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 #define QUOTE '\\'
diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 207692fc..0a948179 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -9,6 +9,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 5a78a124..ce25767c 100644
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <fcntl.h>
 
 /*
diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 43eb0ad3..ac5e9367 100644
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 #include "m_mktemp.h"
 
diff --git a/sbr/folder_pack.c b/sbr/folder_pack.c
index 22c02079..9f00398a 100644
--- a/sbr/folder_pack.c
+++ b/sbr/folder_pack.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 /*
  * Pack the message in a folder.
diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index 3b1c63bd..7171cb13 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 #include "m_maildir.h"
 
diff --git a/sbr/folder_realloc.c b/sbr/folder_realloc.c
index 8eb2fcce..827d3b17 100644
--- a/sbr/folder_realloc.c
+++ b/sbr/folder_realloc.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 /*
diff --git a/sbr/icalparse.y b/sbr/icalparse.y
index ef302001..0213fa90 100644
--- a/sbr/icalparse.y
+++ b/sbr/icalparse.y
@@ -34,6 +34,7 @@
     */
 
 #include "h/mh.h"
+#include "sbr/error.h"
 #include "h/icalendar.h"
 #include "h/utils.h"
 
diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 8f1732b4..00f18331 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -14,6 +14,7 @@
  */
  
 #include <h/mh.h>
+#include "error.h"
 #include <h/signals.h>
 #include <h/utils.h>
 #include <h/mts.h>
diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index 8a86535f..3f67b2cc 100644
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 /*
diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index 8bfb8397..7f24dd81 100644
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 #include "m_maildir.h"
 #include "h/done.h"
diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index d7ef292c..60b263f3 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/mts.h>
 #include <h/utils.h>
 #include <inttypes.h>
diff --git a/sbr/m_popen.c b/sbr/m_popen.c
index 9a1c1a5e..79e0c9b1 100644
--- a/sbr/m_popen.c
+++ b/sbr/m_popen.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/signals.h>
 #include "m_popen.h"
 
diff --git a/sbr/makedir.c b/sbr/makedir.c
index 04e5d779..e7c3efa9 100644
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include "makedir.h"
 #include <sys/file.h>
 
diff --git a/sbr/mime_type.c b/sbr/mime_type.c
index 4e3ebbb7..6b4f9725 100644
--- a/sbr/mime_type.c
+++ b/sbr/mime_type.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 #include <h/tws.h>
 #include "mime_type.h"
diff --git a/sbr/mts.c b/sbr/mts.c
index d67153fe..f9923646 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>   /* for snprintf() */
+#include "error.h"
 #include <h/utils.h>
 
 #define nmhetcdir(file) NMHETCDIR#file
diff --git a/sbr/oauth.c b/sbr/oauth.c
index d2abf2f2..4f2d84ff 100755
--- a/sbr/oauth.c
+++ b/sbr/oauth.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 #ifdef OAUTH_SUPPORT
 
diff --git a/sbr/push.c b/sbr/push.c
index 4576c8e9..a49b2755 100644
--- a/sbr/push.c
+++ b/sbr/push.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/signals.h>
 #include "h/done.h"
 #include "m_mktemp.h"
diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 0b823b93..ff57f851 100644
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 struct procstr {
diff --git a/sbr/refile.c b/sbr/refile.c
index 3c4d4e25..fea72e21 100644
--- a/sbr/refile.c
+++ b/sbr/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 
diff --git a/sbr/remdir.c b/sbr/remdir.c
index b15c9e15..c3589a3f 100644
--- a/sbr/remdir.c
+++ b/sbr/remdir.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 
 int
diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index b6fa6370..81fd13ea 100644
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -22,6 +22,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 #include <pwd.h>
 
diff --git a/sbr/seq_add.c b/sbr/seq_add.c
index 2641ac4e..9688502e 100644
--- a/sbr/seq_add.c
+++ b/sbr/seq_add.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 
 /*
diff --git a/sbr/seq_del.c b/sbr/seq_del.c
index 01335923..cb4560e6 100644
--- a/sbr/seq_del.c
+++ b/sbr/seq_del.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 
 /*
diff --git a/sbr/seq_nameok.c b/sbr/seq_nameok.c
index 6d219c52..72b37fe1 100644
--- a/sbr/seq_nameok.c
+++ b/sbr/seq_nameok.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 
 int
diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 9a4b9131..a4170111 100644
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 #include "lock_file.h"
 
diff --git a/sbr/seq_save.c b/sbr/seq_save.c
index ac7b53e9..30dcbdd3 100644
--- a/sbr/seq_save.c
+++ b/sbr/seq_save.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/signals.h>
 #include "lock_file.h"
 #include "m_mktemp.h"
diff --git a/sbr/showfile.c b/sbr/showfile.c
index 98b22df4..703132bd 100644
--- a/sbr/showfile.c
+++ b/sbr/showfile.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 
 
 int
diff --git a/sbr/utils.c b/sbr/utils.c
index feb3e76b..514a7d7a 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 #include <h/signals.h>
 #include "m_mktemp.h"
diff --git a/sbr/vfgets.c b/sbr/vfgets.c
index d21c797a..37d1d90c 100644
--- a/sbr/vfgets.c
+++ b/sbr/vfgets.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "error.h"
 #include <h/utils.h>
 
 #define	QUOTE	'\\'
diff --git a/uip/ali.c b/uip/ali.c
index bcf8c79e..6a9078bd 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/addrsbr.h>
 #include <h/aliasbr.h>
 #include <h/mts.h>
diff --git a/uip/anno.c b/uip/anno.c
index 21a5987d..bc5e14e7 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/utils.h>
 #include "h/done.h"
 #include "sbr/m_maildir.h"
diff --git a/uip/annosbr.c b/uip/annosbr.c
index c5ca38bf..dd887fff 100644
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/tws.h>
 #include <h/utils.h>
 #include "sbr/lock_file.h"
diff --git a/uip/ap.c b/uip/ap.c
index 140160c0..e320efc1 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/mts.h>
diff --git a/uip/burst.c b/uip/burst.c
index 82822c6e..8ed571fb 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/utils.h>
 #include <h/mhparse.h>
 #include "h/done.h"
diff --git a/uip/comp.c b/uip/comp.c
index fb1051e7..03f87a30 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/utils.h>
 #include <h/fmt_scan.h>
 #include "h/done.h"
diff --git a/uip/dist.c b/uip/dist.c
index d2c48875..9bd8911c 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/utils.h>
 #include "sbr/m_maildir.h"
 #include <fcntl.h>
diff --git a/uip/distsbr.c b/uip/distsbr.c
index 64b8ae19..baace547 100644
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/utils.h>
 #include "sbr/m_mktemp.h"
diff --git a/uip/dp.c b/uip/dp.c
index 656440ff..e6cfa60c 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 #include <h/fmt_scan.h>
diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index cc44c8d4..93263dee 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -7,6 +7,7 @@
 
 #include <h/nmh.h>
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/utils.h>
 #include <h/dropsbr.h>
 #include <h/mts.h>
diff --git a/uip/flist.c b/uip/flist.c
index 2372ffc0..f1902a36 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/utils.h>
 #include "h/done.h"
 #include "sbr/m_maildir.h"
diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 7293e134..808d97ba 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 #include <h/scansbr.h>
diff --git a/uip/fmttest.c b/uip/fmttest.c
index 568b5597..3e1d1a09 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 #include <h/utils.h>
diff --git a/uip/folder.c b/uip/folder.c
index 4b8c12fc..41eaa2d5 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/crawl_folders.h>
 #include "h/done.h"
 #include <h/utils.h>
diff --git a/uip/forw.c b/uip/forw.c
index 9692ae40..84d10ade 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/tws.h>
 #include "h/done.h"
diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 608e2555..4c997cb1 100644
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
diff --git a/uip/imaptest.c b/uip/imaptest.c
index e83c25e5..200af2b0 100644
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/utils.h>
 #include <h/netsec.h>
 #include <stdarg.h>
diff --git a/uip/inc.c b/uip/inc.c
index 44d61935..a797088d 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/dropsbr.h>
diff --git a/uip/install-mh.c b/uip/install-mh.c
index f059296a..31af64b8 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>				/* mh internals */
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 #include "sbr/m_maildir.h"
diff --git a/uip/mark.c b/uip/mark.c
index 3941e938..57d45868 100644
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 #include "sbr/m_maildir.h"
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index d9ad4423..4a042e93 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/md5.h>
 #include <h/mts.h>
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index b563443a..21cd58bb 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/md5.h>
 #include <h/mts.h>
diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 10f41d87..a7fdf90f 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/md5.h>
 #include <h/mts.h>
diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 1067f01b..5d3a2ceb 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
diff --git a/uip/mhical.c b/uip/mhical.c
index 561935bf..70323eeb 100644
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/error.h"
 #include "h/icalendar.h"
 #include "sbr/icalparse.h"
 #include <h/fmt_scan.h>
diff --git a/uip/mhlist.c b/uip/mhlist.c
index dd9b6d00..cd3114af 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index 4a82c5c9..d41ec6d1 100644
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 #include <h/oauth.h>
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index bafc7d92..2cc506bc 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/signals.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 559c3cda..c49a4f1d 100644
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
diff --git a/uip/mhn.c b/uip/mhn.c
index 9e506885..866cdf2c 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 4a3166f3..00aa8df6 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/utils.h>
 #include <h/md5.h>
diff --git a/uip/mhparam.c b/uip/mhparam.c
index 21804f4c..178520b7 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -9,6 +9,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/mts.h>
 #include "h/done.h"
 #include <h/utils.h>
diff --git a/uip/mhparse.c b/uip/mhparse.c
index 9c005bff..5091e97e 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/md5.h>
 #include <h/mts.h>
diff --git a/uip/mhpath.c b/uip/mhpath.c
index 3eefb112..884ae42d 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 #include "sbr/m_maildir.h"
diff --git a/uip/mhshow.c b/uip/mhshow.c
index e44dd115..85b158eb 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 2a754a41..3ed6f8b9 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
diff --git a/uip/mhstore.c b/uip/mhstore.c
index 66ad91e9..e34bbee0 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index f73e68a9..e56ff915 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/md5.h>
 #include <h/mts.h>
diff --git a/uip/mkstemp.c b/uip/mkstemp.c
index 906d21ea..226a948e 100644
--- a/uip/mkstemp.c
+++ b/uip/mkstemp.c
@@ -120,6 +120,7 @@ build_template(const char *directory, const char *prefix, const char *suffix)
 
 #if NMH
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 
diff --git a/uip/msgchk.c b/uip/msgchk.c
index bf95d907..65f0df91 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/mts.h>
 #include <h/tws.h>
 #include "h/done.h"
diff --git a/uip/new.c b/uip/new.c
index d6f524a2..b09e1aac 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/crawl_folders.h>
 #include "h/done.h"
 #include <h/utils.h>
diff --git a/uip/packf.c b/uip/packf.c
index 8022e38a..38d4ac9d 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include "h/done.h"
diff --git a/uip/pick.c b/uip/pick.c
index 967e1255..fde8ce60 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include "h/done.h"
diff --git a/uip/picksbr.c b/uip/picksbr.c
index 4d4d99a1..bd1efb98 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include <h/utils.h>
diff --git a/uip/popsbr.c b/uip/popsbr.c
index 1466a2e1..81f3db75 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/utils.h>
 #include <h/oauth.h>
 #include <h/netsec.h>
diff --git a/uip/post.c b/uip/post.c
index c2af2948..e8b2587b 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/addrsbr.h>
diff --git a/uip/prompter.c b/uip/prompter.c
index 2c346607..3f049d14 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/signals.h>
 #include "h/done.h"
diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index e9067403..a6742a1a 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/fmt_scan.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 086d3535..6199e229 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index e3277093..a01c57ff 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/mts.h>
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 5f3dd430..55314073 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -11,6 +11,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/signals.h>
 #include <setjmp.h>
 #include <h/rcvmail.h>
diff --git a/uip/refile.c b/uip/refile.c
index 2552ec66..d14d2778 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 #include "sbr/m_maildir.h"
diff --git a/uip/repl.c b/uip/repl.c
index ffb54844..e4c14f7d 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/mime.h>
 #include "h/done.h"
 #include <h/utils.h>
diff --git a/uip/replsbr.c b/uip/replsbr.c
index 2f26c373..76d027f8 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include "h/done.h"
diff --git a/uip/rmf.c b/uip/rmf.c
index 38b07a14..7e8d7415 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 #include "sbr/m_maildir.h"
diff --git a/uip/rmm.c b/uip/rmm.c
index fc32a520..9f1d60e1 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 #include "sbr/m_maildir.h"
diff --git a/uip/scan.c b/uip/scan.c
index 60c5ebcc..7ad1f7b3 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
diff --git a/uip/scansbr.c b/uip/scansbr.c
index a4508c02..17e54cb7 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
diff --git a/uip/send.c b/uip/send.c
index dde2029b..1401ff1e 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include "h/done.h"
 #include <h/utils.h>
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 974bf002..50ca8054 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 #include <h/signals.h>
diff --git a/uip/show.c b/uip/show.c
index 3de3a836..c6429acc 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/mime.h>
 #include "h/done.h"
 #include <h/utils.h>
diff --git a/uip/slocal.c b/uip/slocal.c
index 8677b3f2..8694f44e 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -20,6 +20,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/signals.h>
diff --git a/uip/sortm.c b/uip/sortm.c
index 75c322a2..79543207 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <h/tws.h>
 #include "h/done.h"
 #include <h/utils.h>
diff --git a/uip/viamail.c b/uip/viamail.c
index c2520542..3324d46b 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/md5.h>
 #include <h/mts.h>
diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index 8a4c372b..31f1e396 100644
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 
 
diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 2f00ba58..787e0152 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include <fcntl.h>
 #include <h/mime.h>
 #include <h/utils.h>
diff --git a/uip/whom.c b/uip/whom.c
index da34146f..d766da9d 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "sbr/error.h"
 #include "h/done.h"
 #include <h/utils.h>
 #include <h/signals.h>