m_name.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 25f212cbc7a798fb7672cb02c827136e270061fc..94f82fcc4355f280f3b2bb29c443638656f06375 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -409,6 +409,7 @@ noinst_HEADERS = \
     sbr/m_gmprot.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \
     sbr/m_gmprot.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \

+    sbr/m_name.h \

     sbr/m_popen.h \
     sbr/m_rand.h \
     sbr/makedir.h \
     sbr/m_popen.h \
     sbr/m_rand.h \
     sbr/makedir.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 3cec8aea15447f93222b64f4bd3e54bc820f395e..d47ac2241d458036e8d81b1292541231c8277198 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -15,8 +15,6 @@ char *etcpath(char *) NONNULL(1);
 
 struct msgs_array;
 
 
 struct msgs_array;
 

-char *m_name (int);
-

 int pidwait (pid_t, int);
 
 void scan_detect_mbox_style (FILE *);
 int pidwait (pid_t, int);
 
 void scan_detect_mbox_style (FILE *);

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 903a0771b8e74641907840b8b7278fe2b4167d34..a18f1ce74d4659d13bb3f4f5471f28ca04bc2f16 100644 (file)
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "m_name.h"

 #include "cpydata.h"
 #include "m_atoi.h"
 #include "ext_hook.h"
 #include "cpydata.h"
 #include "m_atoi.h"
 #include "ext_hook.h"

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 936dbf6a989b213c308d49307e836ce4a23925f5..533ab9bae2847104044ebb6de3c0880a5a2de4a9 100644 (file)
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "m_name.h"

 #include "seq_save.h"
 #include "m_backup.h"
 #include "ext_hook.h"
 #include "seq_save.h"
 #include "m_backup.h"
 #include "ext_hook.h"

diff --git a/sbr/folder_pack.c b/sbr/folder_pack.c
index 6a2b95098b29456a558f30987dab7a34b53d45e9..ba84d1f7f01435dd246612a19a05ff85c6b19bb5 100644 (file)
--- a/sbr/folder_pack.c
+++ b/sbr/folder_pack.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "m_name.h"

 #include "seq_setcur.h"
 #include "ext_hook.h"
 #include "folder_realloc.h"
 #include "seq_setcur.h"
 #include "ext_hook.h"
 #include "folder_realloc.h"

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index b5d252ab95aed700f42971de0f39223324a888a8..342f44f02df54d60ae922471e309b871b38b1391 100644 (file)
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "m_name.h"

 #include "seq_setprev.h"
 #include "seq_setcur.h"
 #include "seq_save.h"
 #include "seq_setprev.h"
 #include "seq_setcur.h"
 #include "seq_save.h"

diff --git a/sbr/m_name.c b/sbr/m_name.c
index 835c1ba254079bc804c1b615c89cb645dfb3f1c7..8bf8ac041e3cc4b7d49b5d4a616929e2480ed421 100644 (file)
--- a/sbr/m_name.c
+++ b/sbr/m_name.c
@@ -7,6 +7,7 @@
 
 #include <limits.h>
 #include "h/mh.h"
 
 #include <limits.h>
 #include "h/mh.h"

+#include "m_name.h"

 #include "h/utils.h"
 
 #define STR(s) #s
 #include "h/utils.h"
 
 #define STR(s) #s

diff --git a/sbr/m_name.h b/sbr/m_name.h
new file mode 100644 (file)
index 0000000..6ddfdf8
--- /dev/null
+++ b/sbr/m_name.h
@@ -0,0 +1,7 @@
+/* m_name.h -- return a message number as a string
+ *
+ * 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_name(int);

diff --git a/sbr/seq_list.c b/sbr/seq_list.c
index 2ebf6dd6d7218388988b22568dd271a2754ef6b6..0aef35e369730d779e5091214fcbb78fa1726c29 100644 (file)
--- a/sbr/seq_list.c
+++ b/sbr/seq_list.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "m_name.h"

 #include "seq_list.h"
 #include "seq_getnum.h"
 #include "h/utils.h"
 #include "seq_list.h"
 #include "seq_getnum.h"
 #include "h/utils.h"

diff --git a/uip/anno.c b/uip/anno.c
index 0207d472ce684ba5f49e247e5c202698475cbafb..bba9408242e960c1ee412960e295314878ac7d30 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/getarguments.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/burst.c b/uip/burst.c
index 5503e5e3424a904b6c3734a72919809a5c4c825c..09ecb9928bc022c986582042b449366c9a3010bc 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/comp.c b/uip/comp.c
index ae32f695bac32fc67e6b7240b9c53ee9be2dfcc5..6a22dd30b656fb00c654b190d6f6120650182a0b 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"

diff --git a/uip/dist.c b/uip/dist.c
index 0302b93be1c3f1132bd15933cf548962e968a435..30ae67d9c449107e366b33f738ac2099ed5fd93e 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 782ce5166522b2099bb43f663e2320c407d372de..94c3b97913ef0a5bbc9c8fed359fa0d7322730b0 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/forw.c b/uip/forw.c
index 864622163138ff6750f287ad535b0d243b623d85..a79fcc0537c44505fc981fb0a2555b01a57274c3 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"

diff --git a/uip/inc.c b/uip/inc.c
index 1a3b28b11cea6fd8ce5791a5e952f82e72c94222..ac39f72527ff245c47ba44a9192b05d392999391 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
 #endif
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/concat.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 35160708506d7c0b67abda7c544bd6d0df1c6751..eedee6cc6514217ff91867d893a2651ec1f7c162 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"

diff --git a/uip/mhlist.c b/uip/mhlist.c
index ea9d8de4bc6f8edab205c3c6584c6eff174fbfc7..b3bba8ba5d16d5b9350b61d3165311fd4073e5fe 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/mhn.c b/uip/mhn.c
index c576eeb524ed877afe38e54c7421e98bf439f13b..cc50a13c2b5cf0e15cca5f6b4f7926f174d5752f 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 46b24361119756f32ccad6d0ebb311bcc692bed2..03b902f55ca966b9076114c031fc618c4b9c0c07 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 1c6bdd8dad95858b91949b97fd88ecb8e84bb8fe..66d2366b027536e48660c159fdf44f7b588d5e25 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setunseen.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setunseen.h"

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 21bf0d18ca21c1c7ed810e3c440a85a24a77a51f..9cbdc69a4927195ab559b76f54bd63b64a72e650 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/packf.c b/uip/packf.c
index c61d6552872894b5927eefc8b24014c15d09c21c..3b9ce9d44474e27943ca6108360e71a14b3a8415 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_yes_or_no_if_tty.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_yes_or_no_if_tty.h"

diff --git a/uip/pick.c b/uip/pick.c
index 6ca9eaac3737b3637a1803fa8c8d12b35a8924c0..9abb826674977a8d3ed848d20433353ed9f53814 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"

diff --git a/uip/refile.c b/uip/refile.c
index 68202ae8108f612b43649abc184dd90fbfeb7aad..5994d905e9a2fa6ee16c3731204e5a2660c2f12c 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/repl.c b/uip/repl.c
index 7581c17fa5cc5d4e6bd21d12af19074235d7c2cd..3e3b1dce1cd7fc87ea18fbe443afbeaee4c18ddc 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/concat.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/concat.h"

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 9c1cd8eded6af314b363809da6f8fc346001fbc9..a76444b1b5903360275d390e17ddd0a1be6e32d9 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/m_getfld.h"
 #include "sbr/read_switch.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/m_getfld.h"
 #include "sbr/read_switch.h"

diff --git a/uip/scan.c b/uip/scan.c
index 65347680ea32f7c6c32366f13b8c1bd5275810cc..654f378a8477e0f990ffee4c4aee345cdf7d6d14 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"

diff --git a/uip/scansbr.c b/uip/scansbr.c
index fc66c829f926b62b5791df838d1cde92ae8e4f06..28c382fe1180b480ec7fa2c1e8b25f8ed0e8479c 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getcpy.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getcpy.h"

diff --git a/uip/send.c b/uip/send.c
index 08c87b45f7c94b33627e82428bf5ddc6bcfa8fe5..6c3dc9399017f8769bba463bcb5692e588b07d3a 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/concat.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/concat.h"

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 1b65efb88d58ada08dffea123af5391bd6b5a911..5163b1b754aa7fb81c5fd3a14e1d8b74e4ce1e19 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_getfld.h"
 #include "sbr/concat.h"
 #include "sbr/cpydgst.h"
 #include "sbr/m_getfld.h"
 #include "sbr/concat.h"
 #include "sbr/cpydgst.h"

diff --git a/uip/show.c b/uip/show.c
index ec56e537c649b7f9e4e8d160835f409597b7136c..004a2921891766e6792d841cf8aa9d731dbabc15 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setunseen.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setunseen.h"

diff --git a/uip/sortm.c b/uip/sortm.c
index b43934ca6869bb1cca503816d09f7a1123847b10..e2b6185c41c03d851f75dc827ded87442e77a54d 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index 8f5b534f076798838afcf644d0798c4e1e444de2..3c6e2ef71e7b59e2bed0d6c4488ccb068b52830c 100644 (file)
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/m_name.h"

 #include "sbr/r1bindex.h"
 #include "sbr/geteditor.h"
 #include "sbr/context_save.h"
 #include "sbr/r1bindex.h"
 #include "sbr/geteditor.h"
 #include "sbr/context_save.h"