sbr/m_maildir.c: Move prototypes from h/prototypes.h to new header.

diff --git a/Makefile.am b/Makefile.am
index 12462dd7eb1d11deceaa6d6cc52450efc0dcebd2..6d2488e0d7897365c34a9173126d4e0ed877c0f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -359,6 +359,7 @@ noinst_HEADERS = \
     mts/smtp/smtp.h \
     sbr/ctype-checked.h \
     sbr/lock_file.h \
+    sbr/m_maildir.h \
     sbr/m_mktemp.h \
     sbr/m_rand.h \
     thirdparty/jsmn/jsmn.h \

diff --git a/config/config.c b/config/config.c
index 633293e226bb9987ec3be5596f557e661de8925c..49d5c8a45a7fb3362cb0f876a3443fdc088c1837 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "../sbr/m_maildir.h"
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file

diff --git a/h/prototypes.h b/h/prototypes.h
index eb9c09f418aa32de3327a76519ead979e5e5e9cf..c9bac8d8dc832448d6e0c65d4772f4a6e23e368f 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -230,8 +230,6 @@ void m_getfld_state_destroy (m_getfld_state_t *);
 void m_getfld_track_filepos (m_getfld_state_t *, FILE *);
 int m_getfld (m_getfld_state_t *, char[NAMESZ], char *, int *, FILE *);
 int m_gmprot (void);
-char *m_maildir (char *);
-char *m_mailpath (char *);
 char *m_name (int);
 
 /*

diff --git a/sbr/context_read.c b/sbr/context_read.c
index 936bf2dd55030f105b332567d811bbbc5a43c056..589c6463dcad8d8fd8de78d4fcce9817a7140d43 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -23,6 +23,7 @@
 
 #include <h/mh.h>                              /* mh internals */
 #include "lock_file.h"
+#include "m_maildir.h"
 #include <pwd.h>                               /* structure for getpwuid() results */
 
 void

diff --git a/sbr/credentials.c b/sbr/credentials.c
index f6fd15de9f0ae2febe1ef83071397826b51c04da..82e3c292e175a2e2e435290b1c13ea510d219f85 100644 (file)
--- a/sbr/credentials.c
+++ b/sbr/credentials.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/mts.h>
+#include "m_maildir.h"
 
 struct nmh_creds {
     char *host;                /* Hostname corresponding to credentials */

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index eab1e1f4bb5a89a9a563c97ad2a1a88b504017ef..4edd8db6df9afce125526242c98bf66a8cf886fa 100644 (file)
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "m_maildir.h"
 
 /* We allocate the `mi' array 1024 elements at a time */
 #define        NUMMSGS  1024

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index 71095a98d258f61939695be28ec4195cca1ca15a..683af25cc6d85000988f3476b8813195f3f7592a 100644 (file)
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "m_maildir.h"
 
 
 char *

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 846268aca089b39bfb78dce92121f599cd978898..0f9584b6c38f5352d54a225c9175bb3364d5cff9 100644 (file)
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "m_maildir.h"
 
 #define        CWD     "./"
 #define        DOT     "."

diff --git a/sbr/m_maildir.h b/sbr/m_maildir.h
new file mode 100644 (file)
index 0000000..d7dc8a3
--- /dev/null
+++ b/sbr/m_maildir.h
@@ -0,0 +1,9 @@
+/* m_maildir.h -- get the path for the mail directory.
+ *
+ * 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.
+ */
+
+char *m_maildir(char *folder);
+char *m_mailpath(char *folder);

diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index 56810445734aec57b6d7e88231707e3b39f401f2..9a28b48af587dba8d8bcb62221dcfd037bb1537c 100644 (file)
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/signals.h>
+#include "m_maildir.h"
 #include "m_mktemp.h"
 
 static void register_for_removal(const char *);

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index 3dc507324d411a7d9910db370b8c809d12f319dc..7dbd4fdba7ac58ae3d3cf2d22a0a351f9c127ad2 100644 (file)
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -20,6 +20,7 @@
 
 #include <h/oauth.h>
 #include <h/utils.h>
+#include "m_maildir.h"
 
 static const struct mh_oauth_service_info SERVICES[] = {
     /* https://developers.google.com/accounts/docs/OAuth2InstalledApp */

diff --git a/sbr/path.c b/sbr/path.c
index 416c32b53d9928207b6e9041547578f80974f0e2..3038df413f4755c8dbfbdf90f0664ee9c9542dea 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "m_maildir.h"
 
 #define        CWD     "./"
 #define        DOT     "."

diff --git a/uip/anno.c b/uip/anno.c
index 191dd2dff72a3702c63282f8ec23895d2547bc83..145cc97c1a576f3f6adda6d2620b6adbe910202a 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -43,6 +43,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define ANNO_SWITCHES \
     X("component field", 0, COMPSW) \

diff --git a/uip/burst.c b/uip/burst.c
index 626e0bd104414d33f54cdb714c7715d4d7e4e94a..de762e9901ebb91f0690f7f2081685eb02a2f66a 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/mhparse.h>
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 

diff --git a/uip/comp.c b/uip/comp.c
index a78bcc69614cb597c3add90c5e9f4665c844287e..1e4ffa2affacc699ce2285810237139aad358a56 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
+#include "../sbr/m_maildir.h"
 #include <fcntl.h>
 
 #define COMP_SWITCHES \

diff --git a/uip/dist.c b/uip/dist.c
index cdebbd93c24f31861f0d28e1a3ed1186534751ef..19158bad2f32cf226f7b032d323e6610b0e4cbc1 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include <fcntl.h>
 
 #define DIST_SWITCHES \

diff --git a/uip/flist.c b/uip/flist.c
index 02d6f5e7d6d1ebf19af39bff94ea82417bf711b5..65ddf458168820c164e0fc1f4e49c4dbbb71d320 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -15,6 +15,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 /*
  * We allocate space to record the names of folders

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 19df310789a1a7bff56ab738a037e0a0730da0ed..c59348f0e057bd42aea31b9ba112a3630650dcb0 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -11,6 +11,7 @@
 #include <h/utils.h>
 #include <h/scansbr.h>
 #include <h/addrsbr.h>
+#include "../sbr/m_maildir.h"
 
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \

diff --git a/uip/folder.c b/uip/folder.c
index 077fa053a94f72bf75ac20a0980cd94ec6e3380b..c2ad8b89dc7a3e2440f9d83988ed9fe56755075c 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -10,6 +10,7 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \

diff --git a/uip/forw.c b/uip/forw.c
index ef536a56c94b7997e0ff03ec37ae48fe06a99996..8ee8da9ba60aae2b0c3c6aa3c73eed7ac50bc491 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 
 #define        IFORMAT "digest-issue-%s"

diff --git a/uip/inc.c b/uip/inc.c
index 38ab236c4dd1dac6341b7859efa6bc1e6287071a..b44e89e5a6ab64c8200bd4386808e0191226727e 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -41,6 +41,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include "../sbr/lock_file.h"
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 
 #ifndef TLS_SUPPORT

diff --git a/uip/install-mh.c b/uip/install-mh.c
index bcdb3a2e94270ba68d9092a123a178c86c9a4fd7..48bde2500393040c16d238563e502f56103000ae 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>                              /* mh internals */
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include <pwd.h>                               /* structure for getpwuid() results */
 
 #define INSTALLMH_SWITCHES \

diff --git a/uip/mark.c b/uip/mark.c
index 7c137a10ab488c0820b91c064d2ca666686993c5..bdfeeccb425d883bb86cf50d64d07d65e94c445c 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -9,6 +9,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define MARK_SWITCHES \
     X("add", 0, ADDSW) \

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index efb9c5269608a1c1f734f3eb4112e99475e1fffa..b39cc80989c6044ad10094cf8122098e7eafbce5 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -14,6 +14,7 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 #include "mhoutsbr.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index cef8593f717793ba8ccb83c6121b6acd2a124196..4b880b47a53b59436b44382dbcdf7796c6d6649b 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -11,6 +11,7 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/signals.h>
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 #include "mhoutsbr.h"

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 1d8020df843dd557ef3ebb5c044af0a79415a593..a467a528b9e0cef424ff6304f0915548ed6512eb 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -15,6 +15,7 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include "mhfree.h"
 
 #define MHLIST_SWITCHES \

diff --git a/uip/mhn.c b/uip/mhn.c
index 2eff96d740bfe8735ac46d7d7d8a08a8b16b54dd..6a1acc3851e2ec8494c39be7c70adadc7dfe09e9 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -16,6 +16,7 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include "mhfree.h"
 #include "mhshowsbr.h"
 

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 2f4af3b76cd3599182408ad9b71b213ff72911d2..16425ac182a1490f9081e5615cda5b662ea63fbb 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define MHPATH_SWITCHES \
     X("version", 0, VERSIONSW) \

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 16079dcda4ebb591076b588919a001ede75d4481..cf3940b448cb5cfbb2773eccf6f66e5c38914dee 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -16,6 +16,7 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include "mhfree.h"
 #include "mhshowsbr.h"
 

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 26db5f227de11ef1a54ebf2b8cc127d8fef9da7c..265b203f1dfb9e39ee32228b38c9711212668150 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -15,6 +15,7 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include "mhfree.h"
 
 #define MHSTORE_SWITCHES \

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index d707fb8eb124af98e01e498cdba553ac12925728..2bc78ceb948f43fdcfdc8e9baf23a305b5be5f06 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -15,6 +15,7 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include "mhshowsbr.h"
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 
 enum clobber_policy_t {

diff --git a/uip/new.c b/uip/new.c
index 70ee8cc7f556a6b0245f7d2b76317663b4eab9c5..49aba332baa9e46e4524f6a864f2294e32518e22 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -15,6 +15,7 @@
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 #include "../sbr/lock_file.h"
+#include "../sbr/m_maildir.h"
 
 #define NEW_SWITCHES \
     X("mode", 1, MODESW) \

diff --git a/uip/packf.c b/uip/packf.c
index 0fd1af178fdc3d1cd6d927afdb601147f9580cbc..6fa97b2d26790c6765ffb0184932659b5f9d89bb 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \

diff --git a/uip/pick.c b/uip/pick.c
index 8e05d3a1e52848a01f70a3611b35531ee2cd52d1..1fa6536424ede36220c4568faaabc02bedcdee54 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -9,6 +9,7 @@
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define PICK_SWITCHES \
     X("reverse", 0, REVSW) \

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 7e22d0af33605cf9c43d28375e54569928682cac..61702c4807bbaa21f074eb2edded1b94ea9490e7 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -10,6 +10,7 @@
 #include <h/signals.h>
 #include <h/mts.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 
 #define RCVSTORE_SWITCHES \

diff --git a/uip/refile.c b/uip/refile.c
index 8beae1b8d6c4a26b71924284be6794653e2424ae..84ef6f0bb234629d19ad786d3ab0e35a1cb76c6c 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 #include <fcntl.h>
 

diff --git a/uip/repl.c b/uip/repl.c
index 4ca18e7890ef8efb819a08a4d17d056390730f56..4b22bfb418612c6de9dcf5e4e0e91c2f0316bfc3 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/mime.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define REPL_SWITCHES \
     X("group", 0, GROUPSW) \

diff --git a/uip/rmf.c b/uip/rmf.c
index 7ac660cba24e5c15cef6e812c74584312af9a71e..ec2f8fa0dae2b49f9140f35ab0d3c8eccfbccf40 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 
 #define RMF_SWITCHES \

diff --git a/uip/rmm.c b/uip/rmm.c
index 03e0e6cbcdcff253ea21364b7a666616a7104f0c..f245478f1f091e2960c829fbf3497ebe40b16885 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define RMM_SWITCHES \
     X("unlink", 0, UNLINKSW) \

diff --git a/uip/scan.c b/uip/scan.c
index 4e9f6b9216851a0189bce06093cd098b364a9495..2b33708774feaafc1ce36cd9f471b92a4a639c07 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -11,6 +11,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define SCAN_SWITCHES \
     X("clear", 0, CLRSW) \

diff --git a/uip/send.c b/uip/send.c
index 83e148a770e4a5e54d33e37deb3911e9cc7ffcb7..297b8f043297146283c47d091244743f53f04966 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -11,6 +11,7 @@
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 
 #ifndef CYRUS_SASL

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 64a1ed683fc9f246d56830b0bb64619f5b0750ce..4ba5578829f2f2f92293e565295ec372f9f11bd4 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -24,6 +24,7 @@
 #ifdef OAUTH_SUPPORT
 #include <h/oauth.h>
 #endif
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 
 #ifdef OAUTH_SUPPORT

diff --git a/uip/show.c b/uip/show.c
index d5afcad18f45626886aa5359c5b6259ba6271041..9430e009e41f68b82b82c33e6a7fa2adf184d029 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/mime.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define SHOW_SWITCHES \
     X("checkmime", 0, CHECKMIMESW) \

diff --git a/uip/sortm.c b/uip/sortm.c
index 8fa9e5b538bd968f4c5e4b3d21dcda38ce05238c..dc62f5638fbe2cc94e566e8413d493ba6987d2cf 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define SORTM_SWITCHES \
     X("datefield field", 0, DATESW) \

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 3aa91716aaf5a0c412fa92edbf6bf304daf29345..cd7011c0e83fdf6fa9d46dac44cc8dc031e31f61 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -44,6 +44,7 @@
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 
 #define WHATNOW_SWITCHES \

diff --git a/uip/whom.c b/uip/whom.c
index f3a49f854d9cbafac00750c0868c44784de0689a..efa74c63d0a1fd6555f1db3cb3499b3c6453782b 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/signals.h>
+#include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 
 #ifndef CYRUS_SASL