From ff2b7b715934b346b6121a2a434db116d3203663 Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Thu, 2 Nov 2017 13:57:23 +0000 Subject: [PATCH] Use #include with `""' for including nmh's source. Compilers vary on how they handle #includes with `""' and `<>', but consistency on using `""' for nmh's files, and `<>' for the system's, means it's easy to tell which is which at a glance. --- config/config.c | 2 +- h/md5.h | 2 +- h/mf.h | 2 +- h/mh.h | 4 ++-- h/nmh.h | 4 ++-- h/rcvmail.h | 2 +- h/signals.h | 2 +- mts/smtp/smtp.c | 10 +++++----- sbr/addrsbr.c | 10 +++++----- sbr/ambigsw.c | 2 +- sbr/arglist.c | 4 ++-- sbr/atooi.c | 2 +- sbr/base64.c | 6 +++--- sbr/brkstring.c | 4 ++-- sbr/charstring.c | 4 ++-- sbr/check_charset.c | 2 +- sbr/client.c | 6 +++--- sbr/closefds.c | 2 +- sbr/concat.c | 4 ++-- sbr/context_del.c | 4 ++-- sbr/context_find.c | 2 +- sbr/context_foil.c | 4 ++-- sbr/context_read.c | 2 +- sbr/context_replace.c | 4 ++-- sbr/context_save.c | 4 ++-- sbr/copyip.c | 2 +- sbr/cpydata.c | 2 +- sbr/cpydgst.c | 2 +- sbr/crawl_folders.c | 6 +++--- sbr/credentials.c | 6 +++--- sbr/ctype-checked.c | 4 ++-- sbr/datetime.c | 2 +- sbr/discard.c | 2 +- sbr/done.c | 2 +- sbr/dtime.c | 8 ++++---- sbr/dtimep.l | 8 ++++---- sbr/encode_rfc2047.c | 8 ++++---- sbr/error.c | 2 +- sbr/escape_addresses.c | 4 ++-- sbr/ext_hook.c | 2 +- sbr/fdcompare.c | 2 +- sbr/fmt_addr.c | 8 ++++---- sbr/fmt_compile.c | 14 +++++++------- sbr/fmt_new.c | 4 ++-- sbr/fmt_rfc2047.c | 4 ++-- sbr/fmt_scan.c | 12 ++++++------ sbr/folder_addmsg.c | 2 +- sbr/folder_delmsgs.c | 4 ++-- sbr/folder_free.c | 4 ++-- sbr/folder_pack.c | 2 +- sbr/folder_read.c | 4 ++-- sbr/folder_realloc.c | 4 ++-- sbr/getarguments.c | 4 ++-- sbr/getcpy.c | 4 ++-- sbr/geteditor.c | 4 ++-- sbr/getfolder.c | 2 +- sbr/getline.c | 2 +- sbr/getpass.c | 2 +- sbr/lock_file.c | 8 ++++---- sbr/m_atoi.c | 2 +- sbr/m_backup.c | 2 +- sbr/m_convert.c | 4 ++-- sbr/m_draft.c | 4 ++-- sbr/m_getfld.c | 6 +++--- sbr/m_gmprot.c | 2 +- sbr/m_maildir.c | 4 ++-- sbr/m_mktemp.c | 6 +++--- sbr/m_name.c | 4 ++-- sbr/m_popen.c | 4 ++-- sbr/m_rand.c | 2 +- sbr/makedir.c | 2 +- sbr/md5.c | 2 +- sbr/message_id.c | 2 +- sbr/mf.c | 6 +++--- sbr/mime_type.c | 6 +++--- sbr/mts.c | 6 +++--- sbr/netsec.c | 8 ++++---- sbr/oauth.c | 8 ++++---- sbr/oauth_prof.c | 6 +++--- sbr/path.c | 4 ++-- sbr/pidstatus.c | 2 +- sbr/pidwait.c | 4 ++-- sbr/print_help.c | 2 +- sbr/print_sw.c | 2 +- sbr/print_version.c | 2 +- sbr/push.c | 4 ++-- sbr/r1bindex.c | 2 +- sbr/read_line.c | 4 ++-- sbr/read_switch.c | 2 +- sbr/read_switch_multiword.c | 4 ++-- sbr/read_switch_multiword_via_readline.c | 2 +- sbr/read_yes_or_no_if_tty.c | 2 +- sbr/readconfig.c | 4 ++-- sbr/refile.c | 4 ++-- sbr/remdir.c | 2 +- sbr/ruserpass.c | 4 ++-- sbr/seq_add.c | 2 +- sbr/seq_bits.c | 2 +- sbr/seq_del.c | 2 +- sbr/seq_getnum.c | 2 +- sbr/seq_list.c | 4 ++-- sbr/seq_nameok.c | 2 +- sbr/seq_print.c | 2 +- sbr/seq_read.c | 4 ++-- sbr/seq_save.c | 4 ++-- sbr/seq_setcur.c | 2 +- sbr/seq_setprev.c | 4 ++-- sbr/seq_setunseen.c | 4 ++-- sbr/showfile.c | 2 +- sbr/signals.c | 4 ++-- sbr/smatch.c | 2 +- sbr/snprintb.c | 2 +- sbr/ssequal.c | 2 +- sbr/strindex.c | 2 +- sbr/terminal.c | 4 ++-- sbr/trimcpy.c | 4 ++-- sbr/unquote.c | 2 +- sbr/uprf.c | 2 +- sbr/utils.c | 6 +++--- sbr/vector.c | 4 ++-- sbr/vfgets.c | 4 ++-- uip/ali.c | 10 +++++----- uip/aliasbr.c | 8 ++++---- uip/anno.c | 4 ++-- uip/annosbr.c | 6 +++--- uip/ap.c | 10 +++++----- uip/burst.c | 6 +++--- uip/comp.c | 6 +++--- uip/dist.c | 4 ++-- uip/distsbr.c | 4 ++-- uip/dp.c | 8 ++++---- uip/dropsbr.c | 12 ++++++------ uip/flist.c | 4 ++-- uip/fmtdump.c | 10 +++++----- uip/fmttest.c | 12 ++++++------ uip/folder.c | 6 +++--- uip/forw.c | 6 +++--- uip/forwsbr.c | 8 ++++---- uip/imaptest.c | 6 +++--- uip/inc.c | 18 +++++++++--------- uip/install-mh.c | 4 ++-- uip/mark.c | 4 ++-- uip/mhbuild.c | 16 ++++++++-------- uip/mhbuildsbr.c | 16 ++++++++-------- uip/mhcachesbr.c | 16 ++++++++-------- uip/mhfixmsg.c | 12 ++++++------ uip/mhfree.c | 8 ++++---- uip/mhical.c | 2 +- uip/mhl.c | 4 ++-- uip/mhlist.c | 18 +++++++++--------- uip/mhlistsbr.c | 12 ++++++------ uip/mhlogin.c | 6 +++--- uip/mhlsbr.c | 12 ++++++------ uip/mhmisc.c | 8 ++++---- uip/mhn.c | 20 ++++++++++---------- uip/mhoutsbr.c | 14 +++++++------- uip/mhparam.c | 6 +++--- uip/mhparse.c | 16 ++++++++-------- uip/mhpath.c | 4 ++-- uip/mhshow.c | 20 ++++++++++---------- uip/mhshowsbr.c | 18 +++++++++--------- uip/mhstore.c | 18 +++++++++--------- uip/mhstoresbr.c | 16 ++++++++-------- uip/mkstemp.c | 6 +++--- uip/msgchk.c | 10 +++++----- uip/new.c | 6 +++--- uip/packf.c | 6 +++--- uip/pick.c | 8 ++++---- uip/picksbr.c | 8 ++++---- uip/popsbr.c | 12 ++++++------ uip/post.c | 20 ++++++++++---------- uip/prompter.c | 6 +++--- uip/rcvdist.c | 12 ++++++------ uip/rcvpack.c | 12 ++++++------ uip/rcvstore.c | 8 ++++---- uip/rcvtty.c | 16 ++++++++-------- uip/refile.c | 4 ++-- uip/repl.c | 6 +++--- uip/replsbr.c | 8 ++++---- uip/rmf.c | 4 ++-- uip/rmm.c | 4 ++-- uip/scan.c | 12 ++++++------ uip/scansbr.c | 12 ++++++------ uip/send.c | 6 +++--- uip/sendsbr.c | 18 +++++++++--------- uip/show.c | 6 +++--- uip/slocal.c | 14 +++++++------- uip/sortm.c | 6 +++--- uip/viamail.c | 14 +++++++------- uip/whatnow.c | 4 ++-- uip/whatnowproc.c | 2 +- uip/whatnowsbr.c | 8 ++++---- uip/whom.c | 6 +++--- 193 files changed, 568 insertions(+), 568 deletions(-) diff --git a/config/config.c b/config/config.c index 2511472e..4d380557 100644 --- a/config/config.c +++ b/config/config.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/m_maildir.h" #include diff --git a/h/md5.h b/h/md5.h index 568874a4..cc053ef6 100644 --- a/h/md5.h +++ b/h/md5.h @@ -6,7 +6,7 @@ * RSAREF types and constants */ -#include +#include "h/nmh.h" #include /* UINT4 defines a four byte word */ diff --git a/h/mf.h b/h/mf.h index 6b17a4c0..8a5536d7 100644 --- a/h/mf.h +++ b/h/mf.h @@ -1,7 +1,7 @@ /* mf.h -- include file for mailbox filters */ -#include +#include "h/nmh.h" #ifndef NOTOK # define NOTOK (-1) diff --git a/h/mh.h b/h/mh.h index ebd124d1..83223a61 100644 --- a/h/mh.h +++ b/h/mh.h @@ -1,7 +1,7 @@ /* mh.h -- main header file for all of nmh */ -#include +#include "h/nmh.h" /* It's undefined behaviour in C99 to convert from a function pointer to * a data-object pointer, e.g. void pointer. gcc's -pedantic warns of @@ -574,4 +574,4 @@ extern char *version_str; extern char *whatnowproc; extern char *whomproc; -#include +#include "h/prototypes.h" diff --git a/h/nmh.h b/h/nmh.h index c2f8dfca..e3dd3c6c 100644 --- a/h/nmh.h +++ b/h/nmh.h @@ -2,7 +2,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include @@ -10,7 +10,7 @@ #include #ifndef NDEBUG /* See etc/gen-ctype-checked.c. */ -# include +#include "sbr/ctype-checked.h" #endif #include diff --git a/h/rcvmail.h b/h/rcvmail.h index b294b09d..1e133974 100644 --- a/h/rcvmail.h +++ b/h/rcvmail.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include "mts/smtp/smtp.h" #define RCV_MOK 0 diff --git a/h/signals.h b/h/signals.h index babc4bf5..192c00f6 100644 --- a/h/signals.h +++ b/h/signals.h @@ -2,7 +2,7 @@ */ #ifdef HAVE_CONFIG_H -# include +# include "config.h" #endif #include diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c index bdac1e9d..0887e1cd 100644 --- a/mts/smtp/smtp.c +++ b/mts/smtp/smtp.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include "smtp.h" -#include -#include -#include -#include +#include "h/mts.h" +#include "h/signals.h" +#include "h/utils.h" +#include "h/netsec.h" #include #include "sbr/base64.h" diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c index 5b93f705..4cd68278 100644 --- a/sbr/addrsbr.c +++ b/sbr/addrsbr.c @@ -5,12 +5,12 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include -#include -#include -#include +#include "h/addrsbr.h" +#include "h/mf.h" +#include "h/mts.h" +#include "h/utils.h" /* High level parsing of addresses: diff --git a/sbr/ambigsw.c b/sbr/ambigsw.c index b4b2d2c7..d951af45 100644 --- a/sbr/ambigsw.c +++ b/sbr/ambigsw.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" diff --git a/sbr/arglist.c b/sbr/arglist.c index ed8dfbc6..75c48825 100644 --- a/sbr/arglist.c +++ b/sbr/arglist.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" /* * Split up a command into an appropriate array to pass to execvp() diff --git a/sbr/atooi.c b/sbr/atooi.c index 128f917c..b8b064a9 100644 --- a/sbr/atooi.c +++ b/sbr/atooi.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" int diff --git a/sbr/base64.c b/sbr/base64.c index 5e17a1f9..ef3aa32a 100644 --- a/sbr/base64.c +++ b/sbr/base64.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include -#include +#include "h/mime.h" +#include "h/md5.h" #include static const char nib2b64[0x40+1] = diff --git a/sbr/brkstring.c b/sbr/brkstring.c index 0f7c17fc..599ac31a 100644 --- a/sbr/brkstring.c +++ b/sbr/brkstring.c @@ -6,8 +6,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" /* allocate this number of pointers at a time */ #define NUMBROKEN 256 diff --git a/sbr/charstring.c b/sbr/charstring.c index d6243717..8f8b5ea5 100644 --- a/sbr/charstring.c +++ b/sbr/charstring.c @@ -6,8 +6,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" #ifdef MULTIBYTE_SUPPORT # define NMH_MAX_CHARWIDTH MB_CUR_MAX diff --git a/sbr/check_charset.c b/sbr/check_charset.c index be7b92ee..fcd8cc1c 100644 --- a/sbr/check_charset.c +++ b/sbr/check_charset.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include #include diff --git a/sbr/client.c b/sbr/client.c index a64461bc..a90d4e01 100644 --- a/sbr/client.c +++ b/sbr/client.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include -#include -#include +#include "h/mh.h" +#include "h/mts.h" +#include "h/utils.h" #include #include #include diff --git a/sbr/closefds.c b/sbr/closefds.c index 6215d6f8..cb59d782 100644 --- a/sbr/closefds.c +++ b/sbr/closefds.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" void diff --git a/sbr/concat.c b/sbr/concat.c index b97c6e44..262b93f5 100644 --- a/sbr/concat.c +++ b/sbr/concat.c @@ -6,8 +6,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" /* concat returns a non-NULL malloc'd pointer to the catenation of the diff --git a/sbr/context_del.c b/sbr/context_del.c index 04d92b31..bd7ae70d 100644 --- a/sbr/context_del.c +++ b/sbr/context_del.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" /* * Delete a key/value pair from the context/profile list. diff --git a/sbr/context_find.c b/sbr/context_find.c index e312bceb..e725adaa 100644 --- a/sbr/context_find.c +++ b/sbr/context_find.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" char * diff --git a/sbr/context_foil.c b/sbr/context_foil.c index c502dd23..f8ab9519 100644 --- a/sbr/context_foil.c +++ b/sbr/context_foil.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" /* * Foil search of users .mh_profile diff --git a/sbr/context_read.c b/sbr/context_read.c index 1049123d..072e3df1 100644 --- a/sbr/context_read.c +++ b/sbr/context_read.c @@ -21,7 +21,7 @@ * environment variable or by the profile. */ -#include /* mh internals */ +#include "h/mh.h" /* mh internals */ #include "error.h" #include "lock_file.h" #include "m_maildir.h" diff --git a/sbr/context_replace.c b/sbr/context_replace.c index 9dba8d87..d5c25531 100644 --- a/sbr/context_replace.c +++ b/sbr/context_replace.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" void diff --git a/sbr/context_save.c b/sbr/context_save.c index 393ebbf5..01afbd80 100644 --- a/sbr/context_save.c +++ b/sbr/context_save.c @@ -11,9 +11,9 @@ * because there no longer are setuid/setgid programs in nmh. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/signals.h" #include "lock_file.h" void diff --git a/sbr/copyip.c b/sbr/copyip.c index a9a05613..c6ba24d1 100644 --- a/sbr/copyip.c +++ b/sbr/copyip.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" char ** diff --git a/sbr/cpydata.c b/sbr/cpydata.c index cc7f6e57..0760bb42 100644 --- a/sbr/cpydata.c +++ b/sbr/cpydata.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" void diff --git a/sbr/cpydgst.c b/sbr/cpydgst.c index 73617eb9..60dc78a8 100644 --- a/sbr/cpydgst.c +++ b/sbr/cpydgst.c @@ -6,7 +6,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" /* diff --git a/sbr/crawl_folders.c b/sbr/crawl_folders.c index b7901b23..9f1327ce 100644 --- a/sbr/crawl_folders.c +++ b/sbr/crawl_folders.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include -#include +#include "h/crawl_folders.h" +#include "h/utils.h" struct crawl_context { int max; /* how many folders we currently can hold in diff --git a/sbr/credentials.c b/sbr/credentials.c index 8d2ed617..55e7a6b2 100644 --- a/sbr/credentials.c +++ b/sbr/credentials.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include -#include +#include "h/utils.h" +#include "h/mts.h" #include "m_maildir.h" struct nmh_creds { diff --git a/sbr/ctype-checked.c b/sbr/ctype-checked.c index 4f2a15d3..3c576642 100644 --- a/sbr/ctype-checked.c +++ b/sbr/ctype-checked.c @@ -6,7 +6,7 @@ * distribution for complete copyright information. */ -#include +#include "config.h" #ifndef NDEBUG @@ -15,7 +15,7 @@ #error "Please report this to nmh's authors." #endif -#include +#include "sbr/ctype-checked.h" /* ctype_identity returns its index less one allowing [EOF, 255] to be * used as indexes to ctype_identity + 1. */ diff --git a/sbr/datetime.c b/sbr/datetime.c index f79c9424..e4d2d148 100644 --- a/sbr/datetime.c +++ b/sbr/datetime.c @@ -8,7 +8,7 @@ #include "h/mh.h" #include "error.h" #include "h/icalendar.h" -#include +#include "h/fmt_scan.h" #include "h/tws.h" #include "h/utils.h" #include "unquote.h" diff --git a/sbr/discard.c b/sbr/discard.c index a77240b7..6591bc04 100644 --- a/sbr/discard.c +++ b/sbr/discard.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include diff --git a/sbr/done.c b/sbr/done.c index 58e8c56d..8b197b25 100644 --- a/sbr/done.c +++ b/sbr/done.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" static void (*altexit)(int) NORETURN = exit; diff --git a/sbr/dtime.c b/sbr/dtime.c index 26b451da..c2a5bf8d 100644 --- a/sbr/dtime.c +++ b/sbr/dtime.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include /* for snprintf() */ -#include -#include -#include +#include "h/mh.h" /* for snprintf() */ +#include "h/nmh.h" +#include "h/utils.h" +#include "h/tws.h" #include #if !defined(HAVE_STRUCT_TM_TM_GMTOFF) diff --git a/sbr/dtimep.l b/sbr/dtimep.l index 4db108dc..68f0ea7b 100644 --- a/sbr/dtimep.l +++ b/sbr/dtimep.l @@ -10,10 +10,10 @@ %n2500 %a5000 %{ -#include -#include -#include -#include +#include "h/nmh.h" +#include "h/mh.h" +#include "h/utils.h" +#include "h/tws.h" /* Since we're looking at a string at a time, don't worry about * wrapping to the next buffer. diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c index 709082fb..f4689723 100644 --- a/sbr/encode_rfc2047.c +++ b/sbr/encode_rfc2047.c @@ -5,11 +5,11 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include -#include -#include +#include "h/mhparse.h" +#include "h/addrsbr.h" +#include "h/utils.h" #include "base64.h" #include "unquote.h" diff --git a/sbr/error.c b/sbr/error.c index fd0d7833..fc5c6afa 100644 --- a/sbr/error.c +++ b/sbr/error.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" #include diff --git a/sbr/escape_addresses.c b/sbr/escape_addresses.c index ac314a61..6463ec61 100644 --- a/sbr/escape_addresses.c +++ b/sbr/escape_addresses.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" static void escape_component (char *name, size_t namesize, char *chars); diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c index 1ee9c170..8a4a91b3 100644 --- a/sbr/ext_hook.c +++ b/sbr/ext_hook.c @@ -6,7 +6,7 @@ * Only produce the error message once. */ -#include +#include "h/mh.h" #include "error.h" int diff --git a/sbr/fdcompare.c b/sbr/fdcompare.c index 925a026a..b1767439 100644 --- a/sbr/fdcompare.c +++ b/sbr/fdcompare.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" int diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c index 37b286a2..fc9c4db0 100644 --- a/sbr/fmt_addr.c +++ b/sbr/fmt_addr.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include -#include -#include -#include +#include "h/mh.h" +#include "h/addrsbr.h" +#include "h/fmt_scan.h" +#include "h/utils.h" static char *buf; /* our current working buffer */ static char *bufend; /* end of working buffer */ diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c index 421876c6..27af937e 100644 --- a/sbr/fmt_compile.c +++ b/sbr/fmt_compile.c @@ -39,14 +39,14 @@ * */ -#include +#include "h/mh.h" #include "error.h" -#include -#include -#include -#include -#include -#include +#include "h/addrsbr.h" +#include "h/tws.h" +#include "h/fmt_scan.h" +#include "h/fmt_compile.h" +#include "h/mts.h" +#include "h/utils.h" #include "terminal.h" #ifdef HAVE_SYS_TIME_H diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c index cd7d26b6..97e2a7ad 100644 --- a/sbr/fmt_new.c +++ b/sbr/fmt_new.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" #define QUOTE '\\' diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c index d98b5008..45374765 100644 --- a/sbr/fmt_rfc2047.c +++ b/sbr/fmt_rfc2047.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" #ifdef HAVE_ICONV # include #endif diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index 0a948179..cd148ed7 100644 --- a/sbr/fmt_scan.c +++ b/sbr/fmt_scan.c @@ -8,13 +8,13 @@ * fmt_compile (found in fmt_compile.c). */ -#include +#include "h/mh.h" #include "error.h" -#include -#include -#include -#include -#include +#include "h/addrsbr.h" +#include "h/fmt_scan.h" +#include "h/tws.h" +#include "h/fmt_compile.h" +#include "h/utils.h" #include "unquote.h" #ifdef HAVE_SYS_TIME_H diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c index ce25767c..4ea7cd6d 100644 --- a/sbr/folder_addmsg.c +++ b/sbr/folder_addmsg.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" #include diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c index ac5e9367..2ef88590 100644 --- a/sbr/folder_delmsgs.c +++ b/sbr/folder_delmsgs.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" #include "m_mktemp.h" /* diff --git a/sbr/folder_free.c b/sbr/folder_free.c index 7c6267f6..66c07d0e 100644 --- a/sbr/folder_free.c +++ b/sbr/folder_free.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" #include "lock_file.h" diff --git a/sbr/folder_pack.c b/sbr/folder_pack.c index 9f00398a..ee2a2f90 100644 --- a/sbr/folder_pack.c +++ b/sbr/folder_pack.c @@ -6,7 +6,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" /* diff --git a/sbr/folder_read.c b/sbr/folder_read.c index 7171cb13..589fac0f 100644 --- a/sbr/folder_read.c +++ b/sbr/folder_read.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" #include "m_maildir.h" /* We allocate the `mi' array 1024 elements at a time */ diff --git a/sbr/folder_realloc.c b/sbr/folder_realloc.c index 827d3b17..69461eda 100644 --- a/sbr/folder_realloc.c +++ b/sbr/folder_realloc.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" /* * Reallocate some of the space in the folder diff --git a/sbr/getarguments.c b/sbr/getarguments.c index 28cbe465..829c9b30 100644 --- a/sbr/getarguments.c +++ b/sbr/getarguments.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" char ** getarguments (char *invo_name, int argc, char **argv, int check_context) diff --git a/sbr/getcpy.c b/sbr/getcpy.c index 003971b2..7182c7c7 100644 --- a/sbr/getcpy.c +++ b/sbr/getcpy.c @@ -9,8 +9,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" /* Return malloc'd copy of str, or of "" if NULL, exit on failure. */ char * diff --git a/sbr/geteditor.c b/sbr/geteditor.c index 2fbe1f56..e946e0a8 100644 --- a/sbr/geteditor.c +++ b/sbr/geteditor.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" static char *default_editor = NULL; diff --git a/sbr/getfolder.c b/sbr/getfolder.c index d1a298bf..d27854ed 100644 --- a/sbr/getfolder.c +++ b/sbr/getfolder.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" /* Does not return NULL. */ diff --git a/sbr/getline.c b/sbr/getline.c index d4da460d..9fae30fe 100644 --- a/sbr/getline.c +++ b/sbr/getline.c @@ -10,7 +10,7 @@ #include #include -#include +#include "h/mh.h" /* Largest possible size of buffer that allows SSIZE_MAX to be returned * to indicate SSIZE_MAX - 1 characters read before the '\n'. The diff --git a/sbr/getpass.c b/sbr/getpass.c index 12805f2f..99c03e00 100644 --- a/sbr/getpass.c +++ b/sbr/getpass.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. */ -#include +#include "h/mh.h" #include /* We don't use MAX_PASS here because the maximum password length on a remote diff --git a/sbr/lock_file.c b/sbr/lock_file.c index 00f18331..edb0917e 100644 --- a/sbr/lock_file.c +++ b/sbr/lock_file.c @@ -13,11 +13,11 @@ * Ruud de Rooij Sun, 28 Mar 1999 15:34:03 +0200 */ -#include +#include "h/mh.h" #include "error.h" -#include -#include -#include +#include "h/signals.h" +#include "h/utils.h" +#include "h/mts.h" #include "lock_file.h" #include "m_mktemp.h" diff --git a/sbr/m_atoi.c b/sbr/m_atoi.c index 87a78283..45855caf 100644 --- a/sbr/m_atoi.c +++ b/sbr/m_atoi.c @@ -7,7 +7,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" int diff --git a/sbr/m_backup.c b/sbr/m_backup.c index 5a616f26..73971101 100644 --- a/sbr/m_backup.c +++ b/sbr/m_backup.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "m_mktemp.h" diff --git a/sbr/m_convert.c b/sbr/m_convert.c index 3f67b2cc..64346fb9 100644 --- a/sbr/m_convert.c +++ b/sbr/m_convert.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" /* * error codes for sequence diff --git a/sbr/m_draft.c b/sbr/m_draft.c index 7f24dd81..7fdd1c16 100644 --- a/sbr/m_draft.c +++ b/sbr/m_draft.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" #include "m_maildir.h" #include "h/done.h" diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index 60b263f3..5647dd15 100644 --- a/sbr/m_getfld.c +++ b/sbr/m_getfld.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include -#include +#include "h/mts.h" +#include "h/utils.h" #include /* diff --git a/sbr/m_gmprot.c b/sbr/m_gmprot.c index 534ff02b..249a28ab 100644 --- a/sbr/m_gmprot.c +++ b/sbr/m_gmprot.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" int diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c index 103d02c6..8be011d5 100644 --- a/sbr/m_maildir.c +++ b/sbr/m_maildir.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" #include "m_maildir.h" #define CWD "./" diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c index 726ce823..61a32f68 100644 --- a/sbr/m_mktemp.c +++ b/sbr/m_mktemp.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include -#include -#include +#include "h/mh.h" +#include "h/utils.h" +#include "h/signals.h" #include "m_maildir.h" #include "m_mktemp.h" diff --git a/sbr/m_name.c b/sbr/m_name.c index 9bc8c0b5..835c1ba2 100644 --- a/sbr/m_name.c +++ b/sbr/m_name.c @@ -6,8 +6,8 @@ */ #include -#include -#include +#include "h/mh.h" +#include "h/utils.h" #define STR(s) #s #define SIZE(n) (sizeof STR(n)) /* Includes NUL. */ diff --git a/sbr/m_popen.c b/sbr/m_popen.c index 79e0c9b1..db51f4b7 100644 --- a/sbr/m_popen.c +++ b/sbr/m_popen.c @@ -6,9 +6,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/signals.h" #include "m_popen.h" static int m_pid = NOTOK; /* Process we're waiting for */ diff --git a/sbr/m_rand.c b/sbr/m_rand.c index bac97507..24e5998d 100644 --- a/sbr/m_rand.c +++ b/sbr/m_rand.c @@ -11,7 +11,7 @@ #include /* for getpid() */ #include /* for time() */ -#include +#include "config.h" #include "m_rand.h" #if !HAVE_ARC4RANDOM diff --git a/sbr/makedir.c b/sbr/makedir.c index e7c3efa9..10c46b1f 100644 --- a/sbr/makedir.c +++ b/sbr/makedir.c @@ -9,7 +9,7 @@ * Modified to try recursive create. */ -#include +#include "h/mh.h" #include "error.h" #include "makedir.h" #include diff --git a/sbr/md5.c b/sbr/md5.c index 34bd1424..8dbc0b71 100644 --- a/sbr/md5.c +++ b/sbr/md5.c @@ -29,7 +29,7 @@ * documentation and/or software. */ -#include +#include "h/md5.h" /* Constants for MD5Transform routine. */ #define S11 7 diff --git a/sbr/message_id.c b/sbr/message_id.c index 0075ca80..7130cd47 100644 --- a/sbr/message_id.c +++ b/sbr/message_id.c @@ -6,7 +6,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "h/mts.h" #include "m_rand.h" #include "message_id.h" diff --git a/sbr/mf.c b/sbr/mf.c index 6c4afec5..4f59e616 100644 --- a/sbr/mf.c +++ b/sbr/mf.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include -#include -#include +#include "h/mh.h" +#include "h/mf.h" +#include "h/utils.h" /* * static prototypes diff --git a/sbr/mime_type.c b/sbr/mime_type.c index 6b4f9725..36930216 100644 --- a/sbr/mime_type.c +++ b/sbr/mime_type.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include -#include +#include "h/utils.h" +#include "h/tws.h" #include "mime_type.h" #ifdef MIMETYPEPROC diff --git a/sbr/mts.c b/sbr/mts.c index f9923646..a167b09e 100644 --- a/sbr/mts.c +++ b/sbr/mts.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include /* for snprintf() */ +#include "h/mh.h" /* for snprintf() */ #include "error.h" -#include +#include "h/utils.h" #define nmhetcdir(file) NMHETCDIR#file -#include +#include "h/mts.h" #include #include #include diff --git a/sbr/netsec.c b/sbr/netsec.c index 0fb41262..0109288c 100644 --- a/sbr/netsec.c +++ b/sbr/netsec.c @@ -6,10 +6,10 @@ * complete copyright information. */ -#include -#include -#include -#include +#include "h/mh.h" +#include "h/utils.h" +#include "h/netsec.h" +#include "h/oauth.h" #include #include #include "base64.h" diff --git a/sbr/oauth.c b/sbr/oauth.c index 4f2d84ff..718a6884 100755 --- a/sbr/oauth.c +++ b/sbr/oauth.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" #ifdef OAUTH_SUPPORT @@ -21,10 +21,10 @@ #include #include -#include +#include "thirdparty/jsmn/jsmn.h" -#include -#include +#include "h/oauth.h" +#include "h/utils.h" #include "lock_file.h" #define JSON_TYPE "application/json" diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c index 51a5f7ac..8b375a70 100644 --- a/sbr/oauth_prof.c +++ b/sbr/oauth_prof.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #ifdef OAUTH_SUPPORT @@ -18,8 +18,8 @@ #include #include -#include -#include +#include "h/oauth.h" +#include "h/utils.h" #include "m_maildir.h" static const struct mh_oauth_service_info SERVICES[] = { diff --git a/sbr/path.c b/sbr/path.c index 9f70bc16..278a101f 100644 --- a/sbr/path.c +++ b/sbr/path.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" #include "m_maildir.h" #define CWD "./" diff --git a/sbr/pidstatus.c b/sbr/pidstatus.c index 1800ccd9..ce596a51 100644 --- a/sbr/pidstatus.c +++ b/sbr/pidstatus.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" /* * Return 0 if the command exited with an exit code of zero, a nonzero code diff --git a/sbr/pidwait.c b/sbr/pidwait.c index bd6602cb..8ccc6891 100644 --- a/sbr/pidwait.c +++ b/sbr/pidwait.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/signals.h" int pidwait (pid_t id, int sigsok) diff --git a/sbr/print_help.c b/sbr/print_help.c index 66d27a02..81b1ab4b 100644 --- a/sbr/print_help.c +++ b/sbr/print_help.c @@ -6,7 +6,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" void diff --git a/sbr/print_sw.c b/sbr/print_sw.c index cf5cda74..42df6d22 100644 --- a/sbr/print_sw.c +++ b/sbr/print_sw.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" void diff --git a/sbr/print_version.c b/sbr/print_version.c index b88cef9f..0b6d9fc4 100644 --- a/sbr/print_version.c +++ b/sbr/print_version.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" void diff --git a/sbr/push.c b/sbr/push.c index a49b2755..d014f188 100644 --- a/sbr/push.c +++ b/sbr/push.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/signals.h" #include "h/done.h" #include "m_mktemp.h" diff --git a/sbr/r1bindex.c b/sbr/r1bindex.c index 0fd8d51d..70d650b9 100644 --- a/sbr/r1bindex.c +++ b/sbr/r1bindex.c @@ -8,7 +8,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" /* Does not return NULL. */ char * diff --git a/sbr/read_line.c b/sbr/read_line.c index a6367de4..5f33cac6 100644 --- a/sbr/read_line.c +++ b/sbr/read_line.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" #include "read_line.h" /* diff --git a/sbr/read_switch.c b/sbr/read_switch.c index 8ca0be33..6abce534 100644 --- a/sbr/read_switch.c +++ b/sbr/read_switch.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" int diff --git a/sbr/read_switch_multiword.c b/sbr/read_switch_multiword.c index a5aedae3..af44432c 100644 --- a/sbr/read_switch_multiword.c +++ b/sbr/read_switch_multiword.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/signals.h" #include static char ansbuf[BUFSIZ]; diff --git a/sbr/read_switch_multiword_via_readline.c b/sbr/read_switch_multiword_via_readline.c index 0c099c56..a2c36218 100644 --- a/sbr/read_switch_multiword_via_readline.c +++ b/sbr/read_switch_multiword_via_readline.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #ifdef READLINE_SUPPORT #include diff --git a/sbr/read_yes_or_no_if_tty.c b/sbr/read_yes_or_no_if_tty.c index 93484e4e..8d7dac6e 100644 --- a/sbr/read_yes_or_no_if_tty.c +++ b/sbr/read_yes_or_no_if_tty.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" int diff --git a/sbr/readconfig.c b/sbr/readconfig.c index ff57f851..5a850b04 100644 --- a/sbr/readconfig.c +++ b/sbr/readconfig.c @@ -6,9 +6,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" struct procstr { char *procname; diff --git a/sbr/refile.c b/sbr/refile.c index fea72e21..4e375917 100644 --- a/sbr/refile.c +++ b/sbr/refile.c @@ -6,9 +6,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" int diff --git a/sbr/remdir.c b/sbr/remdir.c index c3589a3f..18ea9244 100644 --- a/sbr/remdir.c +++ b/sbr/remdir.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c index 81fd13ea..3c0b7179 100644 --- a/sbr/ruserpass.c +++ b/sbr/ruserpass.c @@ -21,9 +21,9 @@ * distribution for complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" #include static FILE *cfile; diff --git a/sbr/seq_add.c b/sbr/seq_add.c index 9688502e..8b51e31e 100644 --- a/sbr/seq_add.c +++ b/sbr/seq_add.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" diff --git a/sbr/seq_bits.c b/sbr/seq_bits.c index a31b0995..7fd1b0a5 100644 --- a/sbr/seq_bits.c +++ b/sbr/seq_bits.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" char * diff --git a/sbr/seq_del.c b/sbr/seq_del.c index cb4560e6..b4f5a527 100644 --- a/sbr/seq_del.c +++ b/sbr/seq_del.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" diff --git a/sbr/seq_getnum.c b/sbr/seq_getnum.c index f2f0c06e..8a9f8709 100644 --- a/sbr/seq_getnum.c +++ b/sbr/seq_getnum.c @@ -6,7 +6,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" int diff --git a/sbr/seq_list.c b/sbr/seq_list.c index b7ed5707..20617a54 100644 --- a/sbr/seq_list.c +++ b/sbr/seq_list.c @@ -6,8 +6,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" /* allocate this much buffer space at a time */ #define MAXBUFFER 1024 diff --git a/sbr/seq_nameok.c b/sbr/seq_nameok.c index 72b37fe1..f537a71f 100644 --- a/sbr/seq_nameok.c +++ b/sbr/seq_nameok.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" diff --git a/sbr/seq_print.c b/sbr/seq_print.c index fafad6d8..a373d925 100644 --- a/sbr/seq_print.c +++ b/sbr/seq_print.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" /* * Print all the sequences in a folder diff --git a/sbr/seq_read.c b/sbr/seq_read.c index a4170111..01f5475c 100644 --- a/sbr/seq_read.c +++ b/sbr/seq_read.c @@ -6,9 +6,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" #include "lock_file.h" /* diff --git a/sbr/seq_save.c b/sbr/seq_save.c index 30dcbdd3..5978dd73 100644 --- a/sbr/seq_save.c +++ b/sbr/seq_save.c @@ -6,9 +6,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/signals.h" #include "lock_file.h" #include "m_mktemp.h" diff --git a/sbr/seq_setcur.c b/sbr/seq_setcur.c index 03362085..cb995fcd 100644 --- a/sbr/seq_setcur.c +++ b/sbr/seq_setcur.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" void diff --git a/sbr/seq_setprev.c b/sbr/seq_setprev.c index 5e5c43e9..a2dc3015 100644 --- a/sbr/seq_setprev.c +++ b/sbr/seq_setprev.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" /* * Add all the messages currently SELECTED to diff --git a/sbr/seq_setunseen.c b/sbr/seq_setunseen.c index acba9d96..c521f9c6 100644 --- a/sbr/seq_setunseen.c +++ b/sbr/seq_setunseen.c @@ -6,8 +6,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" /* * We scan through the folder and act upon all messages diff --git a/sbr/showfile.c b/sbr/showfile.c index 703132bd..da8df2fb 100644 --- a/sbr/showfile.c +++ b/sbr/showfile.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" diff --git a/sbr/signals.c b/sbr/signals.c index ba37ee5e..36ba9d02 100644 --- a/sbr/signals.c +++ b/sbr/signals.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/signals.h" #include "m_mktemp.h" diff --git a/sbr/smatch.c b/sbr/smatch.c index 802e4da0..cb23e8f9 100644 --- a/sbr/smatch.c +++ b/sbr/smatch.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" int diff --git a/sbr/snprintb.c b/sbr/snprintb.c index 47aea95f..bf99c9ba 100644 --- a/sbr/snprintb.c +++ b/sbr/snprintb.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" char * diff --git a/sbr/ssequal.c b/sbr/ssequal.c index 7bd30031..0704a0a1 100644 --- a/sbr/ssequal.c +++ b/sbr/ssequal.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" /* * THIS CODE DOES NOT WORK AS ADVERTISED. diff --git a/sbr/strindex.c b/sbr/strindex.c index b2bc9ff9..c92da6ee 100644 --- a/sbr/strindex.c +++ b/sbr/strindex.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" int stringdex (char *p1, char *p2) diff --git a/sbr/terminal.c b/sbr/terminal.c index 761ed245..51f97026 100644 --- a/sbr/terminal.c +++ b/sbr/terminal.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" #include diff --git a/sbr/trimcpy.c b/sbr/trimcpy.c index 3263231a..6ed00b99 100644 --- a/sbr/trimcpy.c +++ b/sbr/trimcpy.c @@ -7,8 +7,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" char * diff --git a/sbr/unquote.c b/sbr/unquote.c index b6411e11..f2e3fd07 100644 --- a/sbr/unquote.c +++ b/sbr/unquote.c @@ -6,7 +6,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "unquote.h" /* diff --git a/sbr/uprf.c b/sbr/uprf.c index c74af7bd..bcd4c135 100644 --- a/sbr/uprf.c +++ b/sbr/uprf.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" /* uprf returns true if s starts with prefix, ignoring case. diff --git a/sbr/utils.c b/sbr/utils.c index 514a7d7a..c385b45b 100644 --- a/sbr/utils.c +++ b/sbr/utils.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include -#include +#include "h/utils.h" +#include "h/signals.h" #include "m_mktemp.h" #include "makedir.h" #include diff --git a/sbr/vector.c b/sbr/vector.c index 77908cb1..d0ebc336 100644 --- a/sbr/vector.c +++ b/sbr/vector.c @@ -16,8 +16,8 @@ * can be as large as needed, as long as it fits in (virtual) memory. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" /* The default size of a struct bvector's bits, measured in bits. * The struct's tiny member is used for storage. */ diff --git a/sbr/vfgets.c b/sbr/vfgets.c index 37d1d90c..1bc4bc3e 100644 --- a/sbr/vfgets.c +++ b/sbr/vfgets.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "error.h" -#include +#include "h/utils.h" #define QUOTE '\\' diff --git a/uip/ali.c b/uip/ali.c index 6a9078bd..40ad1b8c 100644 --- a/uip/ali.c +++ b/uip/ali.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include +#include "h/addrsbr.h" +#include "h/aliasbr.h" +#include "h/mts.h" #include "h/done.h" -#include +#include "h/utils.h" #define ALI_SWITCHES \ X("alias aliasfile", 0, ALIASW) \ diff --git a/uip/aliasbr.c b/uip/aliasbr.c index 40687bbc..754a4d18 100644 --- a/uip/aliasbr.c +++ b/uip/aliasbr.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include -#include -#include -#include +#include "h/mh.h" +#include "h/aliasbr.h" +#include "h/addrsbr.h" +#include "h/utils.h" #include static int akvis; diff --git a/uip/anno.c b/uip/anno.c index bc5e14e7..3a874380 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -41,9 +41,9 @@ * value of 1 is assumed if this argument is absent. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/utils.h" #include "h/done.h" #include "sbr/m_maildir.h" diff --git a/uip/annosbr.c b/uip/annosbr.c index dd887fff..eafcbfc1 100644 --- a/uip/annosbr.c +++ b/uip/annosbr.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include +#include "h/tws.h" +#include "h/utils.h" #include "sbr/lock_file.h" #include "sbr/m_mktemp.h" #include diff --git a/uip/ap.c b/uip/ap.c index e320efc1..212a2d12 100644 --- a/uip/ap.c +++ b/uip/ap.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include +#include "h/addrsbr.h" +#include "h/fmt_scan.h" +#include "h/mts.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/terminal.h" #define NADDRS 100 diff --git a/uip/burst.c b/uip/burst.c index 8ed571fb..84ab9392 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include +#include "h/utils.h" +#include "h/mhparse.h" #include "h/done.h" #include "sbr/m_maildir.h" #include "sbr/m_mktemp.h" diff --git a/uip/comp.c b/uip/comp.c index 03f87a30..0d597851 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include +#include "h/utils.h" +#include "h/fmt_scan.h" #include "h/done.h" #include "sbr/m_maildir.h" #include diff --git a/uip/dist.c b/uip/dist.c index 9bd8911c..4bfec7d1 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #include #include "h/done.h" diff --git a/uip/distsbr.c b/uip/distsbr.c index baace547..4a62cd88 100644 --- a/uip/distsbr.c +++ b/uip/distsbr.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include +#include "h/utils.h" #include "sbr/m_mktemp.h" static int hdrfd = NOTOK; diff --git a/uip/dp.c b/uip/dp.c index e6cfa60c..9339b279 100644 --- a/uip/dp.c +++ b/uip/dp.c @@ -5,12 +5,12 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" -#include -#include -#include +#include "h/utils.h" +#include "h/fmt_scan.h" +#include "h/tws.h" #include "sbr/terminal.h" #define NDATES 100 diff --git a/uip/dropsbr.c b/uip/dropsbr.c index 93263dee..2d19f219 100644 --- a/uip/dropsbr.c +++ b/uip/dropsbr.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include -#include +#include "h/nmh.h" +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include -#include +#include "h/utils.h" +#include "h/dropsbr.h" +#include "h/mts.h" +#include "h/tws.h" #include "sbr/lock_file.h" #include "sbr/m_mktemp.h" #include diff --git a/uip/flist.c b/uip/flist.c index f1902a36..4435d2da 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -13,9 +13,9 @@ * any specification. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/utils.h" #include "h/done.h" #include "sbr/m_maildir.h" diff --git a/uip/fmtdump.c b/uip/fmtdump.c index 808d97ba..e8c3aa2a 100644 --- a/uip/fmtdump.c +++ b/uip/fmtdump.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include +#include "h/fmt_scan.h" +#include "h/fmt_compile.h" +#include "h/scansbr.h" #include "h/done.h" -#include +#include "h/utils.h" #define FMTDUMP_SWITCHES \ X("form formatfile", 0, FORMSW) \ diff --git a/uip/fmttest.c b/uip/fmttest.c index 3e1d1a09..4214ab1b 100644 --- a/uip/fmttest.c +++ b/uip/fmttest.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include -#include -#include +#include "h/fmt_scan.h" +#include "h/fmt_compile.h" +#include "h/utils.h" +#include "h/scansbr.h" +#include "h/addrsbr.h" #include "h/done.h" #include "sbr/m_maildir.h" #include "sbr/terminal.h" diff --git a/uip/folder.c b/uip/folder.c index 41eaa2d5..60e8c19a 100644 --- a/uip/folder.c +++ b/uip/folder.c @@ -7,11 +7,11 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/crawl_folders.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #define FOLDER_SWITCHES \ diff --git a/uip/forw.c b/uip/forw.c index 84d10ade..939832af 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -5,12 +5,12 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include +#include "h/tws.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #include "forwsbr.h" diff --git a/uip/forwsbr.c b/uip/forwsbr.c index 4c997cb1..6978d183 100644 --- a/uip/forwsbr.c +++ b/uip/forwsbr.c @@ -5,12 +5,12 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include +#include "h/fmt_scan.h" +#include "h/tws.h" +#include "h/utils.h" #include "sbr/m_mktemp.h" #include "forwsbr.h" diff --git a/uip/imaptest.c b/uip/imaptest.c index 200af2b0..e624bc4d 100644 --- a/uip/imaptest.c +++ b/uip/imaptest.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include +#include "h/utils.h" +#include "h/netsec.h" #include #include #include "h/done.h" diff --git a/uip/inc.c b/uip/inc.c index a797088d..90a93528 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -30,17 +30,17 @@ */ #endif -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/utils.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "h/dropsbr.h" +#include "h/popsbr.h" +#include "h/fmt_scan.h" +#include "h/scansbr.h" +#include "h/signals.h" +#include "h/tws.h" +#include "h/mts.h" #include "h/done.h" #include "sbr/lock_file.h" #include "sbr/m_maildir.h" diff --git a/uip/install-mh.c b/uip/install-mh.c index 31af64b8..59e88da0 100644 --- a/uip/install-mh.c +++ b/uip/install-mh.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include /* mh internals */ +#include "h/mh.h" /* mh internals */ #include "sbr/error.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #include "sbr/makedir.h" #include /* structure for getpwuid() results */ diff --git a/uip/mark.c b/uip/mark.c index 57d45868..9ec5c5ca 100644 --- a/uip/mark.c +++ b/uip/mark.c @@ -7,10 +7,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #define MARK_SWITCHES \ diff --git a/uip/mhbuild.c b/uip/mhbuild.c index 4a042e93..00156705 100644 --- a/uip/mhbuild.c +++ b/uip/mhbuild.c @@ -5,17 +5,17 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/mhcachesbr.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #include "sbr/m_mktemp.h" #include "mhfree.h" diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index 21cd58bb..2b3f9a0f 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -13,17 +13,17 @@ * streamlining and removal of unneeded code. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/fmt_scan.h" +#include "h/mime.h" +#include "h/mhparse.h" #include "h/done.h" -#include +#include "h/utils.h" #include "h/mhcachesbr.h" #include "mhmisc.h" #include "sbr/m_mktemp.h" diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c index a7fdf90f..453c356f 100644 --- a/uip/mhcachesbr.c +++ b/uip/mhcachesbr.c @@ -5,16 +5,16 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/mhcachesbr.h" +#include "h/utils.h" #include "mhmisc.h" #include "sbr/lock_file.h" #include "sbr/m_mktemp.h" diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index 5d3a2ceb..4cd9d05a 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -5,14 +5,14 @@ * distribution for complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include +#include "h/fmt_scan.h" +#include "h/mime.h" +#include "h/mhparse.h" #include "h/done.h" -#include -#include +#include "h/utils.h" +#include "h/signals.h" #include "sbr/m_maildir.h" #include "sbr/m_mktemp.h" #include "sbr/mime_type.h" diff --git a/uip/mhfree.c b/uip/mhfree.c index 6a827e08..d9eaeef0 100644 --- a/uip/mhfree.c +++ b/uip/mhfree.c @@ -6,10 +6,10 @@ * complete copyright information. */ -#include -#include -#include -#include +#include "h/mh.h" +#include "h/utils.h" +#include "h/mime.h" +#include "h/mhparse.h" #include "sbr/m_mktemp.h" #include "mhfree.h" diff --git a/uip/mhical.c b/uip/mhical.c index 70323eeb..71201102 100644 --- a/uip/mhical.c +++ b/uip/mhical.c @@ -9,7 +9,7 @@ #include "sbr/error.h" #include "h/icalendar.h" #include "sbr/icalparse.h" -#include +#include "h/fmt_scan.h" #include "h/addrsbr.h" #include "h/mts.h" #include "h/done.h" diff --git a/uip/mhl.c b/uip/mhl.c index 35543815..c3b12e51 100644 --- a/uip/mhl.c +++ b/uip/mhl.c @@ -5,9 +5,9 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "h/done.h" -#include +#include "h/utils.h" int diff --git a/uip/mhlist.c b/uip/mhlist.c index cd3114af..974397d2 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -5,18 +5,18 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "h/signals.h" +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/mhcachesbr.h" #include "h/done.h" -#include +#include "h/utils.h" #include "mhmisc.h" #include "sbr/m_maildir.h" #include "mhfree.h" diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c index d58d43f9..4b66a84b 100644 --- a/uip/mhlistsbr.c +++ b/uip/mhlistsbr.c @@ -6,13 +6,13 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include -#include -#include -#include -#include -#include +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/utils.h" #include "mhmisc.h" /* diff --git a/uip/mhlogin.c b/uip/mhlogin.c index d41ec6d1..84b6205c 100644 --- a/uip/mhlogin.c +++ b/uip/mhlogin.c @@ -9,11 +9,11 @@ #include #include -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" -#include -#include +#include "h/utils.h" +#include "h/oauth.h" #include "sbr/lock_file.h" #define MHLOGIN_SWITCHES \ diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 2cc506bc..c4f452ba 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -5,14 +5,14 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include -#include +#include "h/signals.h" +#include "h/addrsbr.h" +#include "h/fmt_scan.h" +#include "h/tws.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_popen.h" #include #include diff --git a/uip/mhmisc.c b/uip/mhmisc.c index c49a4f1d..24fb9b2c 100644 --- a/uip/mhmisc.c +++ b/uip/mhmisc.c @@ -5,11 +5,11 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/utils.h" #include "sbr/makedir.h" #include "mhmisc.h" diff --git a/uip/mhn.c b/uip/mhn.c index 866cdf2c..454c4348 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -5,19 +5,19 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "h/signals.h" +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/fmt_scan.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/mhcachesbr.h" #include "h/done.h" -#include +#include "h/utils.h" #include "mhmisc.h" #include "sbr/m_maildir.h" #include "mhfree.h" diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c index 00aa8df6..0f2b9eb3 100644 --- a/uip/mhoutsbr.c +++ b/uip/mhoutsbr.c @@ -6,15 +6,15 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include +#include "h/utils.h" +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" #include "mhoutsbr.h" #include "sbr/base64.h" diff --git a/uip/mhparam.c b/uip/mhparam.c index 178520b7..4ba2e4ed 100644 --- a/uip/mhparam.c +++ b/uip/mhparam.c @@ -8,11 +8,11 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/mts.h" #include "h/done.h" -#include +#include "h/utils.h" #define MHPARAM_SWITCHES \ X("components", 0, COMPSW) \ diff --git a/uip/mhparse.c b/uip/mhparse.c index 5091e97e..fc863c3a 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -5,17 +5,17 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/utils.h" #include "mhmisc.h" -#include +#include "h/mhcachesbr.h" #include "sbr/m_mktemp.h" #include "mhfree.h" #ifdef HAVE_ICONV diff --git a/uip/mhpath.c b/uip/mhpath.c index 884ae42d..2450089f 100644 --- a/uip/mhpath.c +++ b/uip/mhpath.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #define MHPATH_SWITCHES \ diff --git a/uip/mhshow.c b/uip/mhshow.c index 85b158eb..730ae95d 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -5,19 +5,19 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "h/signals.h" +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/fmt_scan.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/mhcachesbr.h" #include "h/done.h" -#include +#include "h/utils.h" #include "mhmisc.h" #include "sbr/m_maildir.h" #include "sbr/m_popen.h" diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 3ed6f8b9..071ff8aa 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -5,18 +5,18 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "h/signals.h" +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/fmt_scan.h" #include "h/done.h" -#include +#include "h/utils.h" #include "mhmisc.h" #include "mhshowsbr.h" #include "sbr/m_mktemp.h" diff --git a/uip/mhstore.c b/uip/mhstore.c index e34bbee0..e7ad1af9 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -5,18 +5,18 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "h/signals.h" +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/mhcachesbr.h" #include "h/done.h" -#include +#include "h/utils.h" #include "mhmisc.h" #include "sbr/m_maildir.h" #include "mhfree.h" diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index e56ff915..0644753c 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -5,16 +5,16 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/fmt_scan.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/utils.h" #include "mhmisc.h" #include "mhshowsbr.h" #include "sbr/m_maildir.h" diff --git a/uip/mkstemp.c b/uip/mkstemp.c index 226a948e..e49f999d 100644 --- a/uip/mkstemp.c +++ b/uip/mkstemp.c @@ -11,7 +11,7 @@ #endif /* ! NMH */ #ifdef HAVE_CONFIG_H -# include +# include "config.h" #endif /* HAVE_CONFIG_H */ #include #include @@ -119,10 +119,10 @@ build_template(const char *directory, const char *prefix, const char *suffix) #if NMH -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" -#include +#include "h/utils.h" #if HAVE_MKSTEMPS # define MHFIXMSG_SWITCHES \ diff --git a/uip/msgchk.c b/uip/msgchk.c index 65f0df91..10feb3cb 100644 --- a/uip/msgchk.c +++ b/uip/msgchk.c @@ -5,15 +5,15 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include +#include "h/mts.h" +#include "h/tws.h" #include "h/done.h" -#include +#include "h/utils.h" #include -#include +#include "h/popsbr.h" #ifndef CYRUS_SASL # define SASLminc(a) (a) diff --git a/uip/new.c b/uip/new.c index b09e1aac..68a7a16e 100644 --- a/uip/new.c +++ b/uip/new.c @@ -11,11 +11,11 @@ #include -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/crawl_folders.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/lock_file.h" #include "sbr/m_maildir.h" diff --git a/uip/packf.c b/uip/packf.c index 38d4ac9d..8d71686e 100644 --- a/uip/packf.c +++ b/uip/packf.c @@ -5,12 +5,12 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include +#include "h/dropsbr.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #define PACKF_SWITCHES \ diff --git a/uip/pick.c b/uip/pick.c index fde8ce60..737814a8 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -5,12 +5,12 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include +#include "h/tws.h" +#include "h/picksbr.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #define PICK_SWITCHES \ diff --git a/uip/picksbr.c b/uip/picksbr.c index bd1efb98..9fe07cd2 100644 --- a/uip/picksbr.c +++ b/uip/picksbr.c @@ -5,11 +5,11 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include +#include "h/tws.h" +#include "h/picksbr.h" +#include "h/utils.h" #ifdef HAVE_SYS_TIME_H # include diff --git a/uip/popsbr.c b/uip/popsbr.c index 81f3db75..b3c85d39 100644 --- a/uip/popsbr.c +++ b/uip/popsbr.c @@ -5,14 +5,14 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include +#include "h/utils.h" +#include "h/oauth.h" +#include "h/netsec.h" -#include -#include +#include "h/popsbr.h" +#include "h/signals.h" #include "sbr/base64.h" #define TRM "." diff --git a/uip/post.c b/uip/post.c index e8b2587b..75a7749b 100644 --- a/uip/post.c +++ b/uip/post.c @@ -5,18 +5,18 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include +#include "h/signals.h" +#include "h/addrsbr.h" +#include "h/aliasbr.h" +#include "h/dropsbr.h" +#include "h/mime.h" #include "h/done.h" -#include -#include -#include +#include "h/utils.h" +#include "h/tws.h" +#include "h/mts.h" #include "sbr/m_mktemp.h" #include "sbr/message_id.h" @@ -25,7 +25,7 @@ #endif #include -#include +#include "mts/smtp/smtp.h" #ifndef CYRUS_SASL # define SASLminc(a) (a) diff --git a/uip/prompter.c b/uip/prompter.c index 3f049d14..c13a3b8f 100644 --- a/uip/prompter.c +++ b/uip/prompter.c @@ -5,12 +5,12 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include +#include "h/signals.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_mktemp.h" #include diff --git a/uip/rcvdist.c b/uip/rcvdist.c index a6742a1a..6436854f 100644 --- a/uip/rcvdist.c +++ b/uip/rcvdist.c @@ -5,14 +5,14 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include -#include +#include "h/fmt_scan.h" +#include "h/rcvmail.h" +#include "h/tws.h" +#include "h/mts.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_mktemp.h" #define RCVDIST_SWITCHES \ diff --git a/uip/rcvpack.c b/uip/rcvpack.c index 6199e229..f63a89d0 100644 --- a/uip/rcvpack.c +++ b/uip/rcvpack.c @@ -5,14 +5,14 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include -#include +#include "h/dropsbr.h" +#include "h/rcvmail.h" +#include "h/tws.h" +#include "h/mts.h" #include "h/done.h" -#include +#include "h/utils.h" #define RCVPACK_SWITCHES \ X("mbox", 0, MBOXSW) \ diff --git a/uip/rcvstore.c b/uip/rcvstore.c index a01c57ff..b5bdd2fd 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include +#include "h/signals.h" +#include "h/mts.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #include "sbr/m_mktemp.h" #include "sbr/makedir.h" diff --git a/uip/rcvtty.c b/uip/rcvtty.c index 55314073..6edcaf8f 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -10,17 +10,17 @@ * Ruud de Rooij Sun, 28 May 2000 17:28:55 +0200 */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/signals.h" #include -#include -#include -#include -#include -#include +#include "h/rcvmail.h" +#include "h/scansbr.h" +#include "h/fmt_scan.h" +#include "h/tws.h" +#include "h/mts.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_mktemp.h" #include diff --git a/uip/refile.c b/uip/refile.c index d14d2778..cebc5c90 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -6,10 +6,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #include "sbr/m_mktemp.h" #include diff --git a/uip/repl.c b/uip/repl.c index e4c14f7d..8fc058d8 100644 --- a/uip/repl.c +++ b/uip/repl.c @@ -5,11 +5,11 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/mime.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #include "replsbr.h" diff --git a/uip/replsbr.c b/uip/replsbr.c index 76d027f8..12d75cd9 100644 --- a/uip/replsbr.c +++ b/uip/replsbr.c @@ -5,12 +5,12 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include +#include "h/addrsbr.h" +#include "h/fmt_scan.h" #include "h/done.h" -#include +#include "h/utils.h" #include /* L_SET */ #include "replsbr.h" diff --git a/uip/rmf.c b/uip/rmf.c index 7e8d7415..585fa135 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #include "sbr/m_mktemp.h" diff --git a/uip/rmm.c b/uip/rmm.c index 9f1d60e1..40bb97da 100644 --- a/uip/rmm.c +++ b/uip/rmm.c @@ -5,10 +5,10 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #define RMM_SWITCHES \ diff --git a/uip/scan.c b/uip/scan.c index 7ad1f7b3..8a8a59b1 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -5,14 +5,14 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include -#include +#include "h/fmt_scan.h" +#include "h/scansbr.h" +#include "h/tws.h" +#include "h/mts.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #include "sbr/terminal.h" diff --git a/uip/scansbr.c b/uip/scansbr.c index 17e54cb7..b82c3c56 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include -#include -#include +#include "h/addrsbr.h" +#include "h/fmt_scan.h" +#include "h/scansbr.h" +#include "h/tws.h" +#include "h/utils.h" #include "sbr/terminal.h" static struct format *fmt; diff --git a/uip/send.c b/uip/send.c index 1401ff1e..02c5cb85 100644 --- a/uip/send.c +++ b/uip/send.c @@ -5,13 +5,13 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include #include "h/done.h" -#include +#include "h/utils.h" #ifdef OAUTH_SUPPORT -# include +#include "h/oauth.h" #endif #include "sbr/m_maildir.h" #include "sbr/m_mktemp.h" diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 50ca8054..57066165 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -5,17 +5,17 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include +#include "h/fmt_scan.h" +#include "h/fmt_compile.h" +#include "h/signals.h" #include #include -#include -#include -#include -#include +#include "h/mime.h" +#include "h/tws.h" +#include "h/utils.h" +#include "h/mts.h" #ifdef HAVE_SYS_TIME_H # include @@ -23,7 +23,7 @@ #include #ifdef OAUTH_SUPPORT -#include +#include "h/oauth.h" #endif #include "h/done.h" #include "sbr/m_maildir.h" diff --git a/uip/show.c b/uip/show.c index c6429acc..51793fc6 100644 --- a/uip/show.c +++ b/uip/show.c @@ -5,11 +5,11 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/mime.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #define SHOW_SWITCHES \ diff --git a/uip/slocal.c b/uip/slocal.c index 8694f44e..6f7460d6 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -19,16 +19,16 @@ * Ruud de Rooij Sun, 28 May 2000 17:28:55 +0200 */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include -#include -#include +#include "h/dropsbr.h" +#include "h/rcvmail.h" +#include "h/signals.h" #include -#include -#include +#include "h/tws.h" +#include "h/mts.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/lock_file.h" #include "sbr/m_mktemp.h" diff --git a/uip/sortm.c b/uip/sortm.c index 79543207..62baa8ed 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -5,11 +5,11 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" -#include +#include "h/tws.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_maildir.h" #define SORTM_SWITCHES \ diff --git a/uip/viamail.c b/uip/viamail.c index 3324d46b..58772dc3 100644 --- a/uip/viamail.c +++ b/uip/viamail.c @@ -5,16 +5,16 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include -#include -#include -#include +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" #include "h/done.h" -#include +#include "h/utils.h" #include "sbr/m_mktemp.h" #include "sbr/base64.h" diff --git a/uip/whatnow.c b/uip/whatnow.c index 450d9e3b..b571994a 100644 --- a/uip/whatnow.c +++ b/uip/whatnow.c @@ -5,8 +5,8 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "h/utils.h" int diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c index 31f1e396..a4d22a79 100644 --- a/uip/whatnowproc.c +++ b/uip/whatnowproc.c @@ -5,7 +5,7 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 787e0152..01279147 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -37,13 +37,13 @@ * by attachment number. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include -#include -#include +#include "h/mime.h" +#include "h/utils.h" #ifdef OAUTH_SUPPORT -# include +#include "h/oauth.h" #endif #include "h/done.h" #include "sbr/m_maildir.h" diff --git a/uip/whom.c b/uip/whom.c index d766da9d..ee818581 100644 --- a/uip/whom.c +++ b/uip/whom.c @@ -5,11 +5,11 @@ * complete copyright information. */ -#include +#include "h/mh.h" #include "sbr/error.h" #include "h/done.h" -#include -#include +#include "h/utils.h" +#include "h/signals.h" #include "sbr/m_maildir.h" #include "sbr/m_mktemp.h" -- 2.56.0