From: David Levine <levinedl@acm.org>
Date: Sun, 14 Apr 2013 15:27:47 +0000 (-0500)
Subject: Moved #include of errno.h to h/nmh.h.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/61ccf1dbeea93978803303d2cd43efa5da2cc7d1

Moved #include of errno.h to h/nmh.h.
---

diff --git a/h/nmh.h b/h/nmh.h
index 4f5f5e48..ca32f58b 100644
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -29,8 +29,9 @@
 # include <sys/param.h>
 #endif
 
-# include <locale.h>
-# include <limits.h>
+#include <locale.h>
+#include <limits.h>
+#include <errno.h>
 
 /*
  * we should be getting this value from pathconf(_PC_PATH_MAX)
diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 8b17042c..08b77498 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -26,7 +26,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <errno.h>
 #endif /* CYRUS_SASL */
 
 #ifdef TLS_SUPPORT
diff --git a/sbr/client.c b/sbr/client.c
index 9704f89c..7417ed54 100644
--- a/sbr/client.c
+++ b/sbr/client.c
@@ -10,7 +10,6 @@
 #include <h/mh.h>
 #include <h/mts.h>
 #include <h/utils.h>
-#include <errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
diff --git a/sbr/context_read.c b/sbr/context_read.c
index bee5566b..164f6794 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -23,7 +23,6 @@
  */
 
 #include <h/mh.h>				/* mh internals */
-#include <errno.h>				/* system call errors */
 #include <pwd.h>				/* structure for getpwuid() results */
 
 void
diff --git a/sbr/error.c b/sbr/error.c
index 6dc69957..ca73329a 100644
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -14,8 +14,6 @@
 # include <sys/uio.h>
 #endif
 
-#include <errno.h>
-
 
 /*
  * print out error message
diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index fea73130..5e5a5a8e 100644
--- a/sbr/fmt_rfc2047.c
+++ b/sbr/fmt_rfc2047.c
@@ -11,7 +11,6 @@
 #include <h/utils.h>
 #ifdef HAVE_ICONV
 #  include <iconv.h>
-#  include <errno.h>
 #endif
 
 static signed char hexindex[] = {
diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 1a1c8b10..c1e836c1 100644
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <errno.h>
 
 /*
  * Link message into a folder.  Return the new number
diff --git a/sbr/getans.c b/sbr/getans.c
index 3ef01ed5..c5609053 100644
--- a/sbr/getans.c
+++ b/sbr/getans.c
@@ -11,7 +11,6 @@
 #include <h/signals.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <errno.h>
 
 static char ansbuf[BUFSIZ];
 static sigjmp_buf sigenv;
diff --git a/sbr/getansreadline.c b/sbr/getansreadline.c
index fc03c97c..99c90fec 100644
--- a/sbr/getansreadline.c
+++ b/sbr/getansreadline.c
@@ -11,7 +11,6 @@
 #include <h/signals.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <errno.h>
 
 #ifdef READLINE_SUPPORT
 #include <readline/readline.h>
diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 13a16029..079f0896 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -24,7 +24,6 @@
 # include <sys/time.h>
 #endif
 #include <time.h>
-#include <errno.h>
 #include <fcntl.h>
 #ifdef HAVE_FLOCK
 # include <sys/file.h>
diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index a8c973d2..9d28606c 100644
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include <errno.h>
 
 
 char *
diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index c08f614e..ca4ab29c 100644
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -6,7 +6,6 @@
  * complete copyright information.
  */
 
-#include <errno.h>
 #include <h/mh.h>
 
 static char *get_temp_dir();
diff --git a/sbr/makedir.c b/sbr/makedir.c
index 98a5d7f3..ed8c0896 100644
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -12,7 +12,6 @@
  */
 
 #include <h/mh.h>
-#include <errno.h>
 #include <sys/param.h>
 #include <sys/file.h>
 	
diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index f454161d..a7d92119 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
-#include <errno.h>
 #include <signal.h>
 
 int
diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index f5ef74a4..3c8565fd 100644
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -23,7 +23,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <pwd.h>
-#include <errno.h>
 
 static FILE *cfile;
 
diff --git a/sbr/utils.c b/sbr/utils.c
index 81620567..1db230bf 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -11,7 +11,6 @@
 #include <h/utils.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <errno.h>
 
 /*
  * We allocate space for messages (msgs array)
diff --git a/uip/annosbr.c b/uip/annosbr.c
index 27533f77..ae9df280 100644
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -11,7 +11,6 @@
 #include <h/tws.h>
 #include <h/utils.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <utime.h>
 
 
diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 09ee2c1f..5fcef29e 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -14,7 +14,6 @@
 #include <h/dropsbr.h>
 #include <h/mts.h>
 #include <h/tws.h>
-#include <errno.h>
 
 #ifdef NTOHLSWAP
 # include <netinet/in.h>
diff --git a/uip/folder.c b/uip/folder.c
index 29ef616a..9fa29840 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -12,7 +12,6 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
-#include <errno.h>
 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \
diff --git a/uip/inc.c b/uip/inc.c
index e1c58cb1..083a46e6 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -37,7 +37,6 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
-#include <errno.h>
 #include <signal.h>
 
 #ifndef CYRUS_SASL
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index e91e3586..17833f59 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 1eaed6f0..07358cd3 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -19,7 +19,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index f0185682..36b05b9b 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhfree.c b/uip/mhfree.c
index 2328b78a..5fa2a59c 100644
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -9,7 +9,6 @@
  */
 
 #include <h/mh.h>
-#include <errno.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 38060739..71540f22 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index b39ed3d7..8e25c164 100644
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -11,7 +11,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 69e3f1f6..6e4b1934 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -15,7 +15,6 @@
 #include <h/utils.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <errno.h>
 #include <sys/types.h>
 
 /*
diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 895ec313..7d320239 100644
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -8,7 +8,6 @@
  */
 
 #include <h/mh.h>
-#include <errno.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
diff --git a/uip/mhn.c b/uip/mhn.c
index ced10f2e..f0f7fc53 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 3e5d3ce0..246d99b4 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -12,7 +12,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhparse.c b/uip/mhparse.c
index 3d4d7733..3ff5fd7e 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhshow.c b/uip/mhshow.c
index 76a0d022..d4d767c3 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 3d2d8eb0..67aaa4d0 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <h/mts.h>
diff --git a/uip/mhstore.c b/uip/mhstore.c
index cd84aeef..00e07158 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 911dff69..367f51bd 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mhtest.c b/uip/mhtest.c
index aa6d8e43..155ec056 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index acd7671f..dfa3bbeb 100644
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -14,7 +14,6 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/msh.h>
 #include <h/picksbr.h>
diff --git a/uip/packf.c b/uip/packf.c
index d82ef782..f070f48d 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>
-#include <errno.h>
 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \
diff --git a/uip/popsbr.c b/uip/popsbr.c
index bdd55c58..0116febb 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -24,7 +24,6 @@
 #include <h/popsbr.h>
 #include <h/signals.h>
 #include <signal.h>
-#include <errno.h>
 
 #define	TRM	"."
 #define	TRMLEN	(sizeof TRM - 1)
diff --git a/uip/post.c b/uip/post.c
index 9c7af29e..e0bc4773 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -19,7 +19,6 @@
 #include <h/tws.h>
 #include <h/mts.h>
 
-#include <errno.h>
 #include <signal.h>
 
 #ifdef HAVE_SYS_TIME_H
diff --git a/uip/prompter.c b/uip/prompter.c
index 563da058..488210df 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -10,7 +10,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <errno.h>
 #include <signal.h>
 #include <setjmp.h>
 
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 5875c21a..12d1ab2d 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -10,7 +10,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 
diff --git a/uip/refile.c b/uip/refile.c
index 9b6361c7..3afd0d6d 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -11,7 +11,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
-#include <errno.h>
 
 #define REFILE_SWITCHES \
     X("draft", 0, DRAFTSW) \
diff --git a/uip/replsbr.c b/uip/replsbr.c
index 1aff02e6..de37e744 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -12,7 +12,6 @@
 #include <h/fmt_scan.h>
 #include <h/utils.h>
 #include <sys/file.h>		/* L_SET */
-#include <errno.h>
 
 extern short ccto;		/* from repl.c */
 extern short cccc;
diff --git a/uip/scan.c b/uip/scan.c
index 932ffda0..6a134631 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -13,7 +13,6 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
-#include <errno.h>
 
 #define SCAN_SWITCHES \
     X("clear", 0, CLRSW) \
diff --git a/uip/send.c b/uip/send.c
index 626593ef..58a926d5 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <signal.h>
 
 
diff --git a/uip/viamail.c b/uip/viamail.c
index 37514d5a..c6dfb2dc 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
diff --git a/uip/vmhsbr.c b/uip/vmhsbr.c
index ca78c03f..4c0c8c18 100644
--- a/uip/vmhsbr.c
+++ b/uip/vmhsbr.c
@@ -15,7 +15,6 @@
 #include <h/mh.h>
 #include <h/vmhsbr.h>
 #include <h/utils.h>
-#include <errno.h>
 
 static char *types[] = {
     "OK",