From f5cf7d893011b8c49e66c27b8fedded9b20d3c42 Mon Sep 17 00:00:00 2001
From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Sat, 11 Nov 2017 14:35:55 +0000
Subject: [PATCH] getfolder.c: Move interface to own file.

---
 Makefile.am      | 1 +
 h/prototypes.h   | 2 --
 sbr/getfolder.c  | 1 +
 sbr/getfolder.h  | 7 +++++++
 sbr/m_maildir.c  | 1 +
 sbr/path.c       | 1 +
 uip/anno.c       | 1 +
 uip/burst.c      | 1 +
 uip/comp.c       | 1 +
 uip/dist.c       | 1 +
 uip/flist.c      | 1 +
 uip/fmttest.c    | 1 +
 uip/folder.c     | 1 +
 uip/forw.c       | 1 +
 uip/inc.c        | 1 +
 uip/mark.c       | 1 +
 uip/mhbuildsbr.c | 1 +
 uip/mhfixmsg.c   | 1 +
 uip/mhlist.c     | 1 +
 uip/mhn.c        | 1 +
 uip/mhpath.c     | 1 +
 uip/mhshow.c     | 1 +
 uip/mhstore.c    | 1 +
 uip/mhstoresbr.c | 1 +
 uip/packf.c      | 1 +
 uip/pick.c       | 1 +
 uip/rcvstore.c   | 1 +
 uip/refile.c     | 1 +
 uip/repl.c       | 1 +
 uip/rmf.c        | 1 +
 uip/rmm.c        | 1 +
 uip/scan.c       | 1 +
 uip/show.c       | 1 +
 uip/sortm.c      | 1 +
 34 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 sbr/getfolder.h

diff --git a/Makefile.am b/Makefile.am
index 5e3d092e..c9eafa17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -385,6 +385,7 @@ noinst_HEADERS = \
     sbr/folder_read.h \
     sbr/folder_realloc.h \
     sbr/geteditor.h \
+    sbr/getfolder.h \
     sbr/lock_file.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \
diff --git a/h/prototypes.h b/h/prototypes.h
index 8d855ea0..40276b95 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -113,8 +113,6 @@ char *get_charset(void);
 /* Return malloc'd copy of str, or of "" if NULL, exit on failure. */
 char *getcpy(const char *str);
 
-char *getfolder(int) PURE;
-
 int m_atoi (char *) PURE;
 char *m_backup (const char *);
 int m_convert (struct msgs *, char *);
diff --git a/sbr/getfolder.c b/sbr/getfolder.c
index c77d3961..fb3696b5 100644
--- a/sbr/getfolder.c
+++ b/sbr/getfolder.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "getfolder.h"
 #include "context_find.h"
 
 
diff --git a/sbr/getfolder.h b/sbr/getfolder.h
new file mode 100644
index 00000000..e25d159b
--- /dev/null
+++ b/sbr/getfolder.h
@@ -0,0 +1,7 @@
+/* getfolder.h -- get the current or default folder
+ *
+ * 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 *getfolder(int) PURE;
diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index e72cd780..5edc9360 100644
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "getfolder.h"
 #include "context_find.h"
 #include "path.h"
 #include "h/utils.h"
diff --git a/sbr/path.c b/sbr/path.c
index d425dc8b..5505451e 100644
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "getfolder.h"
 #include "path.h"
 #include "h/utils.h"
 #include "m_maildir.h"
diff --git a/uip/anno.c b/uip/anno.c
index 18fc4dd7..087d4275 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_save.h"
diff --git a/uip/burst.c b/uip/burst.c
index cee84490..5cae730c 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/ext_hook.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_realloc.h"
diff --git a/uip/comp.c b/uip/comp.c
index f543db6d..b07a0dc0 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/fdcompare.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
diff --git a/uip/dist.c b/uip/dist.c
index 242fa75e..93ca612b 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/flist.c b/uip/flist.c
index 28592791..5ea877d8 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_save.h"
diff --git a/uip/fmttest.c b/uip/fmttest.c
index 798b573d..bec1b45b 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_save.h"
diff --git a/uip/folder.c b/uip/folder.c
index 8cea4fa5..d7b8673a 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_pack.h"
 #include "sbr/folder_free.h"
diff --git a/uip/forw.c b/uip/forw.c
index e0c5423d..9cb068fc 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/inc.c b/uip/inc.c
index 107e8739..302e0af4 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/ext_hook.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_realloc.h"
diff --git a/uip/mark.c b/uip/mark.c
index 7ca41aae..f6d7ab49 100644
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_save.h"
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index faca5716..e64d6833 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_find.h"
diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 1468fbc6..a21aa5e1 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 0bbe5903..57dd75ee 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/mhn.c b/uip/mhn.c
index 95aed5db..9c07bc56 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/mhpath.c b/uip/mhpath.c
index 81a69cbd..f9147cc7 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_realloc.h"
 #include "sbr/folder_free.h"
diff --git a/uip/mhshow.c b/uip/mhshow.c
index f9d5a5b5..78c1eb94 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/mhstore.c b/uip/mhstore.c
index 968c2f29..d5eb9b67 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 5855b0b8..f2164e30 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/folder_addmsg.h"
diff --git a/uip/packf.c b/uip/packf.c
index f414ce35..5bf3128c 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_save.h"
diff --git a/uip/pick.c b/uip/pick.c
index a8599c6a..959ffd55 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_save.h"
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 61980ea2..7b0d68df 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/folder_addmsg.h"
diff --git a/uip/refile.c b/uip/refile.c
index 16cc7fcc..055efff9 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/folder_delmsgs.h"
diff --git a/uip/repl.c b/uip/repl.c
index 1be63fbb..9fecb27f 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/rmf.c b/uip/rmf.c
index 1d2930b0..2fa33d75 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/ext_hook.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/rmm.c b/uip/rmm.c
index 38090baa..eb6fbf17 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/folder_delmsgs.h"
diff --git a/uip/scan.c b/uip/scan.c
index 74876236..942895f2 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_save.h"
diff --git a/uip/show.c b/uip/show.c
index 9d387f63..b35dcd83 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
diff --git a/uip/sortm.c b/uip/sortm.c
index 5505b82f..c03ac8b7 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getfolder.h"
 #include "sbr/ext_hook.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
-- 
2.56.0