From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Mon, 15 May 2017 23:30:59 +0000 (+0100)
Subject: sbr/m_maildir.c: Move prototypes from h/prototypes.h to new header.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/0509728c8a506f287fa3483d8e8ffaf8fb66d41d?ds=inline;hp=--cc

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

0509728c8a506f287fa3483d8e8ffaf8fb66d41d
diff --git a/Makefile.am b/Makefile.am
index 12462dd7..6d2488e0 100644
--- 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 633293e2..49d5c8a4 100644
--- 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 eb9c09f4..c9bac8d8 100644
--- 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 936bf2dd..589c6463 100644
--- 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 f6fd15de..82e3c292 100644
--- 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 eab1e1f4..4edd8db6 100644
--- 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 71095a98..683af25c 100644
--- 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 846268ac..0f9584b6 100644
--- 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
index 00000000..d7dc8a34
--- /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 56810445..9a28b48a 100644
--- 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 3dc50732..7dbd4fdb 100644
--- 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 416c32b5..3038df41 100644
--- 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 191dd2df..145cc97c 100644
--- 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 626e0bd1..de762e99 100644
--- 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 a78bcc69..1e4ffa2a 100644
--- 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 cdebbd93..19158bad 100644
--- 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 02d6f5e7..65ddf458 100644
--- 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 19df3107..c59348f0 100644
--- 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 077fa053..c2ad8b89 100644
--- 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 ef536a56..8ee8da9b 100644
--- 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 38ab236c..b44e89e5 100644
--- 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 bcdb3a2e..48bde250 100644
--- 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 7c137a10..bdfeeccb 100644
--- 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 efb9c526..b39cc809 100644
--- 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 cef8593f..4b880b47 100644
--- 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 1d8020df..a467a528 100644
--- 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 2eff96d7..6a1acc38 100644
--- 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 2f4af3b7..16425ac1 100644
--- 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 16079dcd..cf3940b4 100644
--- 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 26db5f22..265b203f 100644
--- 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 d707fb8e..2bc78ceb 100644
--- 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 70ee8cc7..49aba332 100644
--- 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 0fd1af17..6fa97b2d 100644
--- 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 8e05d3a1..1fa65364 100644
--- 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 7e22d0af..61702c48 100644
--- 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 8beae1b8..84ef6f0b 100644
--- 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 4ca18e78..4b22bfb4 100644
--- 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 7ac660cb..ec2f8fa0 100644
--- 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 03e0e6cb..f245478f 100644
--- 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 4e9f6b92..2b337087 100644
--- 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 83e148a7..297b8f04 100644
--- 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 64a1ed68..4ba55788 100644
--- 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 d5afcad1..9430e009 100644
--- 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 8fa9e5b5..dc62f563 100644
--- 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 3aa91716..cd7011c0 100644
--- 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 f3a49f85..efa74c63 100644
--- 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