m_convert.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 122fbcf..d32f5fe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -389,6 +389,7 @@ noinst_HEADERS = \
     sbr/lock_file.h \
     sbr/m_atoi.h \
     sbr/m_backup.h \
+    sbr/m_convert.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \
     sbr/m_popen.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index cfa981e..a379386 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -113,7 +113,6 @@ char *get_charset(void);
 /* Return malloc'd copy of str, or of "" if NULL, exit on failure. */
 char *getcpy(const char *str);
 
-int m_convert (struct msgs *, char *);
 char *m_draft (char *, char *, int, int *);
 
 m_getfld_state_t m_getfld_state_init(FILE *iob);

diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index fc198e8..f62fbb0 100644 (file)
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "m_convert.h"
 #include "folder_realloc.h"
 #include "context_find.h"
 #include "seq_getnum.h"

diff --git a/sbr/m_convert.h b/sbr/m_convert.h
new file mode 100644 (file)
index 0000000..dca87af
--- /dev/null
+++ b/sbr/m_convert.h
@@ -0,0 +1,7 @@
+/* m_convert.h -- parse a message range or sequence and set SELECTED
+ *
+ * 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. */
+
+int m_convert(struct msgs *, char *);

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index 0ec7829..1a4aab5 100644 (file)
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "m_convert.h"
 #include "folder_read.h"
 #include "folder_realloc.h"
 #include "folder_free.h"

diff --git a/uip/anno.c b/uip/anno.c
index 087d427..c0e98b2 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/burst.c b/uip/burst.c
index 962e317..a683dc5 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/getfolder.h"
 #include "sbr/ext_hook.h"

diff --git a/uip/comp.c b/uip/comp.c
index b07a0dc..adffcbb 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/fdcompare.h"
 #include "sbr/folder_read.h"

diff --git a/uip/dist.c b/uip/dist.c
index 93ca612..8b05d9e 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index bec1b45..4613794 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/folder.c b/uip/folder.c
index d7b8673..2b231bb 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_pack.h"

diff --git a/uip/forw.c b/uip/forw.c
index 9cb068f..fa56b02 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"

diff --git a/uip/mark.c b/uip/mark.c
index f6d7ab4..d39ed19 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index e64d683..9730e60 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 9306c37..2193a70 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 57dd75e..8e6274e 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"

diff --git a/uip/mhn.c b/uip/mhn.c
index 9c07bc5..61e9de8 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"

diff --git a/uip/mhpath.c b/uip/mhpath.c
index f9147cc..474d6f6 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_realloc.h"

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 78c1eb9..c0115d5 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"

diff --git a/uip/mhstore.c b/uip/mhstore.c
index d5eb9b6..f935a37 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"

diff --git a/uip/packf.c b/uip/packf.c
index 5bf3128..eb9ea42 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/pick.c b/uip/pick.c
index 959ffd5..595fde7 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/refile.c b/uip/refile.c
index 055efff..8cf5902 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/repl.c b/uip/repl.c
index 9fecb27..6d4e125 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"

diff --git a/uip/rmm.c b/uip/rmm.c
index eb6fbf1..2049e4f 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/scan.c b/uip/scan.c
index 942895f..1847037 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/send.c b/uip/send.c
index 9cc0ca5..f19ecba 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_find.h"

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 82068ee..8bb04fa 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/show.c b/uip/show.c
index b35dcd8..697dbd8 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"

diff --git a/uip/sortm.c b/uip/sortm.c
index c03ac8b..709fc6d 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/ext_hook.h"
 #include "sbr/folder_read.h"