From 85158b5904b245542dc475445a6a478509389f8c Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Thu, 2 Nov 2017 23:08:38 +0000 Subject: [PATCH] print_help.c: Move interface to own file. --- Makefile.am | 1 + h/prototypes.h | 2 -- sbr/print_help.c | 1 + sbr/print_help.h | 9 +++++++++ sbr/utils.c | 1 + uip/ali.c | 1 + uip/anno.c | 1 + uip/ap.c | 1 + uip/burst.c | 1 + uip/comp.c | 1 + uip/dist.c | 1 + uip/dp.c | 1 + uip/flist.c | 1 + uip/fmtdump.c | 1 + uip/fmttest.c | 1 + uip/folder.c | 1 + uip/forw.c | 1 + uip/imaptest.c | 1 + uip/inc.c | 1 + uip/install-mh.c | 1 + uip/mark.c | 1 + uip/mhbuild.c | 1 + uip/mhfixmsg.c | 1 + uip/mhical.c | 1 + uip/mhlist.c | 1 + uip/mhlogin.c | 1 + uip/mhlsbr.c | 1 + uip/mhn.c | 1 + uip/mhparam.c | 1 + uip/mhpath.c | 1 + uip/mhshow.c | 1 + uip/mhstore.c | 1 + uip/mkstemp.c | 1 + uip/msgchk.c | 1 + uip/new.c | 1 + uip/packf.c | 1 + uip/pick.c | 1 + uip/post.c | 1 + uip/prompter.c | 1 + uip/rcvdist.c | 1 + uip/rcvpack.c | 1 + uip/rcvstore.c | 1 + uip/rcvtty.c | 1 + uip/refile.c | 1 + uip/repl.c | 1 + uip/rmf.c | 1 + uip/rmm.c | 1 + uip/scan.c | 1 + uip/send.c | 1 + uip/show.c | 1 + uip/slocal.c | 1 + uip/sortm.c | 1 + uip/viamail.c | 1 + uip/whatnowsbr.c | 1 + uip/whom.c | 1 + 55 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 sbr/print_help.h diff --git a/Makefile.am b/Makefile.am index ab0bcd9d..52332b0d 100644 --- 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 6f79c6da..bd68e35a 100644 --- 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 81b1ab4b..97d140ca 100644 --- 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 index 00000000..cf9ba9fe --- /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 c385b45b..03d92044 100644 --- 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 40ad1b8c..6e0f39c1 100644 --- 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 3a874380..97cba8a7 100644 --- 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 212a2d12..e33a434f 100644 --- 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 84ab9392..deee946a 100644 --- 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 0d597851..aadc17ed 100644 --- 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 4bfec7d1..db10b5d0 100644 --- 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 9339b279..0b3a2399 100644 --- 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 47b6922b..0b258136 100644 --- 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 e8c3aa2a..c3302669 100644 --- 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 719214a6..5d19d09d 100644 --- 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 60e8c19a..6eafff8d 100644 --- 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 80fa7f49..a0dbf913 100644 --- 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 diff --git a/uip/imaptest.c b/uip/imaptest.c index e624bc4d..db6336e8 100644 --- 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 90a93528..0ce7d7c7 100644 --- 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 diff --git a/uip/install-mh.c b/uip/install-mh.c index 776c30d4..8d70c0a0 100644 --- 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 eef54156..11ffc109 100644 --- 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 00156705..0c17573d 100644 --- 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 #include "h/md5.h" diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index 4cd9d05a..719e879a 100644 --- 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 71201102..7aa580ab 100644 --- 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 974397d2..0751fedc 100644 --- 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 #include "h/signals.h" diff --git a/uip/mhlogin.c b/uip/mhlogin.c index 84b6205c..8179a21f 100644 --- a/uip/mhlogin.c +++ b/uip/mhlogin.c @@ -10,6 +10,7 @@ #include #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 4a54f710..cb907261 100644 --- 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 454c4348..7afdd85a 100644 --- 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 #include "h/signals.h" diff --git a/uip/mhparam.c b/uip/mhparam.c index 4ba2e4ed..d31c825d 100644 --- 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 2450089f..5904de83 100644 --- 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 730ae95d..04f3efad 100644 --- 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 #include "h/signals.h" diff --git a/uip/mhstore.c b/uip/mhstore.c index e7ad1af9..a6adb878 100644 --- 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 #include "h/signals.h" diff --git a/uip/mkstemp.c b/uip/mkstemp.c index e49f999d..13ebcd27 100644 --- 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 10feb3cb..80772d2e 100644 --- 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 68a7a16e..2fa48378 100644 --- a/uip/new.c +++ b/uip/new.c @@ -12,6 +12,7 @@ #include #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 8d71686e..ed314c03 100644 --- 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 #include "h/dropsbr.h" diff --git a/uip/pick.c b/uip/pick.c index 21ae8b36..0f2ce2a3 100644 --- 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 6fbccdf9..63e53028 100644 --- 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 diff --git a/uip/prompter.c b/uip/prompter.c index c13a3b8f..0cd6fc26 100644 --- 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 #include "h/signals.h" diff --git a/uip/rcvdist.c b/uip/rcvdist.c index 9f52a4b2..2de2153e 100644 --- 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 f63a89d0..58fe4040 100644 --- 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 9c609c23..df1c1e89 100644 --- 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 diff --git a/uip/rcvtty.c b/uip/rcvtty.c index 6edcaf8f..50a656ec 100644 --- 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 diff --git a/uip/refile.c b/uip/refile.c index 2e9da1c6..b0deb9ee 100644 --- 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 8fc058d8..cfb81a6d 100644 --- 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 585fa135..f00a7bca 100644 --- 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 40bb97da..6f52a08b 100644 --- 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 f39ef096..024c834b 100644 --- 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 3d559ff5..d4cfd2e9 100644 --- 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 diff --git a/uip/show.c b/uip/show.c index 7573432e..9229f51e 100644 --- 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 6f7460d6..f60e66fe 100644 --- 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 62baa8ed..f64e7a8e 100644 --- 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 37066a4f..045f43fe 100644 --- 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 diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 07bd22bc..67a5f3cf 100644 --- 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 diff --git a/uip/whom.c b/uip/whom.c index ee818581..f1f38fe1 100644 --- 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" -- 2.56.0