print_help.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index ab0bcd9..52332b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -374,6 +374,7 @@ noinst_HEADERS = \
     sbr/makedir.h \
     sbr/message_id.h \
     sbr/mime_type.h \
+    sbr/print_help.h \
     sbr/read_line.h \
     sbr/seq_add.h \
     sbr/seq_bits.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 6f79c6d..bd68e35 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -175,8 +175,6 @@ char *path(char *, int);
 int pidwait (pid_t, int);
 int pidstatus (int, FILE *, char *);
 char *pluspath(char *);
-void print_help (char *, struct swit *, int);
-void print_intro (FILE *, bool);
 void print_sw (const char *, const struct swit *, char *, FILE *);
 void print_version (char *);
 void push (void);

diff --git a/sbr/print_help.c b/sbr/print_help.c
index 81b1ab4..97d140c 100644 (file)
--- a/sbr/print_help.c
+++ b/sbr/print_help.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "print_help.h"
 
 
 void

diff --git a/sbr/print_help.h b/sbr/print_help.h
new file mode 100644 (file)
index 0000000..cf9ba9f
--- /dev/null
+++ b/sbr/print_help.h
@@ -0,0 +1,9 @@
+/* print_help.h -- print a help message, and possibly the
+ *              -- profile/context entries for this command
+ *
+ * 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. */
+
+void print_help(char *, struct swit *, int);
+void print_intro(FILE *, bool);

diff --git a/sbr/utils.c b/sbr/utils.c
index c385b45..03d9204 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "print_help.h"
 #include "error.h"
 #include "h/utils.h"
 #include "h/signals.h"

diff --git a/uip/ali.c b/uip/ali.c
index 40ad1b8..6e0f39c 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/addrsbr.h"
 #include "h/aliasbr.h"

diff --git a/uip/anno.c b/uip/anno.c
index 3a87438..97cba8a 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/utils.h"
 #include "h/done.h"

diff --git a/uip/ap.c b/uip/ap.c
index 212a2d1..e33a434 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/addrsbr.h"
 #include "h/fmt_scan.h"

diff --git a/uip/burst.c b/uip/burst.c
index 84ab939..deee946 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/utils.h"
 #include "h/mhparse.h"

diff --git a/uip/comp.c b/uip/comp.c
index 0d59785..aadc17e 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/utils.h"
 #include "h/fmt_scan.h"

diff --git a/uip/dist.c b/uip/dist.c
index 4bfec7d..db10b5d 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/utils.h"
 #include "sbr/m_maildir.h"

diff --git a/uip/dp.c b/uip/dp.c
index 9339b27..0b3a239 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"

diff --git a/uip/flist.c b/uip/flist.c
index 47b6922..0b25813 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/seq_getnum.h"
 #include "sbr/error.h"
 #include "h/utils.h"

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index e8c3aa2..c330266 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/fmt_compile.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 719214a..5d19d09 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/seq_getnum.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"

diff --git a/uip/folder.c b/uip/folder.c
index 60e8c19..6eafff8 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/crawl_folders.h"
 #include "h/done.h"

diff --git a/uip/forw.c b/uip/forw.c
index 80fa7f4..a0dbf91 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include <fcntl.h>

diff --git a/uip/imaptest.c b/uip/imaptest.c
index e624bc4..db6336e 100644 (file)
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/utils.h"
 #include "h/netsec.h"

diff --git a/uip/inc.c b/uip/inc.c
index 90a9352..0ce7d7c 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/utils.h"
 #include <fcntl.h>

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 776c30d..8d70c0a 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"

diff --git a/uip/mark.c b/uip/mark.c
index eef5415..11ffc10 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/seq_bits.h"
 #include "sbr/seq_del.h"
 #include "sbr/seq_print.h"

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 0015670..0c17573 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/md5.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 4cd9d05..719e879 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/mime.h"

diff --git a/uip/mhical.c b/uip/mhical.c
index 7120110..7aa580a 100644 (file)
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/icalendar.h"
 #include "sbr/icalparse.h"

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 974397d..0751fed 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"

diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index 84b6205..8179a21 100644 (file)
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 4a54f71..cb90726 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include "h/signals.h"

diff --git a/uip/mhn.c b/uip/mhn.c
index 454c434..7afdd85 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 4ba2e4e..d31c825 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -9,6 +9,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/mts.h"
 #include "h/done.h"

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 2450089..5904de8 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 730ae95..04f3efa 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"

diff --git a/uip/mhstore.c b/uip/mhstore.c
index e7ad1af..a6adb87 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"

diff --git a/uip/mkstemp.c b/uip/mkstemp.c
index e49f999..13ebcd2 100644 (file)
--- a/uip/mkstemp.c
+++ b/uip/mkstemp.c
@@ -120,6 +120,7 @@ build_template(const char *directory, const char *prefix, const char *suffix)
 
 #if NMH
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 10feb3c..80772d2 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/mts.h"
 #include "h/tws.h"

diff --git a/uip/new.c b/uip/new.c
index 68a7a16..2fa4837 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/crawl_folders.h"
 #include "h/done.h"

diff --git a/uip/packf.c b/uip/packf.c
index 8d71686..ed314c0 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/dropsbr.h"

diff --git a/uip/pick.c b/uip/pick.c
index 21ae8b3..0f2ce2a 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/seq_nameok.h"
 #include "sbr/seq_add.h"
 #include "sbr/error.h"

diff --git a/uip/post.c b/uip/post.c
index 6fbccdf..63e5302 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include <fcntl.h>

diff --git a/uip/prompter.c b/uip/prompter.c
index c13a3b8..0cd6fc2 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 9f52a4b..2de2153 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f63a89d..58fe404 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/dropsbr.h"
 #include "h/rcvmail.h"

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 9c609c2..df1c1e8 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/seq_add.h"
 #include "sbr/error.h"
 #include <fcntl.h>

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 6edcaf8..50a656e 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -11,6 +11,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/signals.h"
 #include <setjmp.h>

diff --git a/uip/refile.c b/uip/refile.c
index 2e9da1c..b0deb9e 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/seq_getnum.h"
 #include "sbr/seq_add.h"
 #include "sbr/arglist.h"

diff --git a/uip/repl.c b/uip/repl.c
index 8fc058d..cfb81a6 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/mime.h"
 #include "h/done.h"

diff --git a/uip/rmf.c b/uip/rmf.c
index 585fa13..f00a7bc 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"

diff --git a/uip/rmm.c b/uip/rmm.c
index 40bb97d..6f52a08 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"

diff --git a/uip/scan.c b/uip/scan.c
index f39ef09..024c834 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/seq_getnum.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"

diff --git a/uip/send.c b/uip/send.c
index 3d559ff..d4cfd2e 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include <fcntl.h>

diff --git a/uip/show.c b/uip/show.c
index 7573432..9229f51 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include "h/mime.h"

diff --git a/uip/slocal.c b/uip/slocal.c
index 6f7460d..f60e66f 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -20,6 +20,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/dropsbr.h"
 #include "h/rcvmail.h"

diff --git a/uip/sortm.c b/uip/sortm.c
index 62baa8e..f64e7a8 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/tws.h"
 #include "h/done.h"

diff --git a/uip/viamail.c b/uip/viamail.c
index 37066a4..045f43f 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include <fcntl.h>

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 07bd22b..67a5f3c 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include <fcntl.h>

diff --git a/uip/whom.c b/uip/whom.c
index ee81858..f1f38fe 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"