getfolder.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 5e3d092..c9eafa1 100644 (file)
--- 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 8d855ea..40276b9 100644 (file)
--- 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 c77d396..fb3696b 100644 (file)
--- 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 (file)
index 0000000..e25d159
--- /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 e72cd78..5edc936 100644 (file)
--- 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 d425dc8..5505451 100644 (file)
--- 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 18fc4dd..087d427 100644 (file)
--- 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 cee8449..5cae730 100644 (file)
--- 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 f543db6..b07a0dc 100644 (file)
--- 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 242fa75..93ca612 100644 (file)
--- 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 2859279..5ea877d 100644 (file)
--- 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 798b573..bec1b45 100644 (file)
--- 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 8cea4fa..d7b8673 100644 (file)
--- 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 e0c5423..9cb068f 100644 (file)
--- 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 107e873..302e0af 100644 (file)
--- 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 7ca41aa..f6d7ab4 100644 (file)
--- 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 faca571..e64d683 100644 (file)
--- 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 1468fbc..a21aa5e 100644 (file)
--- 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 0bbe590..57dd75e 100644 (file)
--- 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 95aed5d..9c07bc5 100644 (file)
--- 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 81a69cb..f9147cc 100644 (file)
--- 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 f9d5a5b..78c1eb9 100644 (file)
--- 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 968c2f2..d5eb9b6 100644 (file)
--- 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 5855b0b..f2164e3 100644 (file)
--- 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 f414ce3..5bf3128 100644 (file)
--- 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 a8599c6..959ffd5 100644 (file)
--- 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 61980ea..7b0d68d 100644 (file)
--- 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 16cc7fc..055efff 100644 (file)
--- 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 1be63fb..9fecb27 100644 (file)
--- 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 1d2930b..2fa33d7 100644 (file)
--- 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 38090ba..eb6fbf1 100644 (file)
--- 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 7487623..942895f 100644 (file)
--- 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 9d387f6..b35dcd8 100644 (file)
--- 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 5505b82..c03ac8b 100644 (file)
--- 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"