From: Ralph Corderoy Date: Sat, 9 Sep 2017 20:56:42 +0000 (+0100) Subject: Refer to #include files from the root of nmh's source. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/3b6170b27ba8fedbb4d67d2842bfaa38d4417962?hp=ea1fd31a3d41352b024fb35a1a781dce6a2f7afe Refer to #include files from the root of nmh's source. One of the -I options given to the C compiler is the root of the nmh source. This means uip/foo.c's #include of the relative ../sbr/bar.h can also be written more tidily as sbr/bar.h. --- diff --git a/config/config.c b/config/config.c index 39d43660..5b08db28 100644 --- a/config/config.c +++ b/config/config.c @@ -6,7 +6,7 @@ */ #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #include #define nmhbindir(file) NMHBINDIR#file diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c index f340e1ee..80dabb78 100644 --- a/mts/smtp/smtp.c +++ b/mts/smtp/smtp.c @@ -13,7 +13,7 @@ #include #include -#include "../../sbr/base64.h" +#include "sbr/base64.h" /* * This module implements an interface to SendMail very similar diff --git a/uip/anno.c b/uip/anno.c index d0747176..521f7b96 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -43,7 +43,7 @@ #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define ANNO_SWITCHES \ X("component field", 0, COMPSW) \ diff --git a/uip/annosbr.c b/uip/annosbr.c index 7e7cefd0..20719804 100644 --- a/uip/annosbr.c +++ b/uip/annosbr.c @@ -8,8 +8,8 @@ #include #include #include -#include "../sbr/lock_file.h" -#include "../sbr/m_mktemp.h" +#include "sbr/lock_file.h" +#include "sbr/m_mktemp.h" #include #include diff --git a/uip/ap.c b/uip/ap.c index d08a635d..1d1ee522 100644 --- a/uip/ap.c +++ b/uip/ap.c @@ -10,7 +10,7 @@ #include #include #include -#include "../sbr/terminal.h" +#include "sbr/terminal.h" #define NADDRS 100 diff --git a/uip/burst.c b/uip/burst.c index f188bf1f..87538ae7 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -8,8 +8,8 @@ #include #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #include "mhfree.h" #define BURST_SWITCHES \ diff --git a/uip/comp.c b/uip/comp.c index e3d87808..969b9792 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -8,7 +8,7 @@ #include #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #include #define COMP_SWITCHES \ diff --git a/uip/dist.c b/uip/dist.c index de0ba433..b0728bdd 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -7,7 +7,7 @@ #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #include #define DIST_SWITCHES \ diff --git a/uip/distsbr.c b/uip/distsbr.c index f29426e2..bf469c3e 100644 --- a/uip/distsbr.c +++ b/uip/distsbr.c @@ -8,7 +8,7 @@ #include #include #include -#include "../sbr/m_mktemp.h" +#include "sbr/m_mktemp.h" static int hdrfd = NOTOK; static int txtfd = NOTOK; diff --git a/uip/dp.c b/uip/dp.c index 3575c979..dbc26705 100644 --- a/uip/dp.c +++ b/uip/dp.c @@ -9,7 +9,7 @@ #include #include #include -#include "../sbr/terminal.h" +#include "sbr/terminal.h" #define NDATES 100 diff --git a/uip/dropsbr.c b/uip/dropsbr.c index 5dae7874..40ec9b80 100644 --- a/uip/dropsbr.c +++ b/uip/dropsbr.c @@ -11,8 +11,8 @@ #include #include #include -#include "../sbr/lock_file.h" -#include "../sbr/m_mktemp.h" +#include "sbr/lock_file.h" +#include "sbr/m_mktemp.h" #include /* diff --git a/uip/flist.c b/uip/flist.c index cd505043..cd5682af 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -15,7 +15,7 @@ #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" /* * We allocate space to record the names of folders diff --git a/uip/fmttest.c b/uip/fmttest.c index 1c4159a8..627123b4 100644 --- a/uip/fmttest.c +++ b/uip/fmttest.c @@ -11,8 +11,8 @@ #include #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/terminal.h" +#include "sbr/m_maildir.h" +#include "sbr/terminal.h" #define FMTTEST_SWITCHES \ X("form formatfile", 0, FORMSW) \ diff --git a/uip/folder.c b/uip/folder.c index 84d0de53..625d68ad 100644 --- a/uip/folder.c +++ b/uip/folder.c @@ -10,7 +10,7 @@ #include #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define FOLDER_SWITCHES \ X("all", 0, ALLSW) \ diff --git a/uip/forw.c b/uip/forw.c index 153b7953..ce8a4fcc 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -9,7 +9,7 @@ #include #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define IFORMAT "digest-issue-%s" diff --git a/uip/forwsbr.c b/uip/forwsbr.c index bce58aee..775c8aeb 100644 --- a/uip/forwsbr.c +++ b/uip/forwsbr.c @@ -10,7 +10,7 @@ #include #include #include -#include "../sbr/m_mktemp.h" +#include "sbr/m_mktemp.h" /* * Take from replsbr.c - a buffer big enough to read in data header lines diff --git a/uip/inc.c b/uip/inc.c index ad454e10..2bd1b71f 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -40,9 +40,9 @@ #include #include #include -#include "../sbr/lock_file.h" -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" +#include "sbr/lock_file.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #ifndef TLS_SUPPORT # define TLSminc(a) (a) diff --git a/uip/install-mh.c b/uip/install-mh.c index ff663575..e3eab12f 100644 --- a/uip/install-mh.c +++ b/uip/install-mh.c @@ -7,10 +7,10 @@ #include /* mh internals */ #include -#include "../sbr/m_maildir.h" -#include "../sbr/makedir.h" +#include "sbr/m_maildir.h" +#include "sbr/makedir.h" #include /* structure for getpwuid() results */ -#include "../sbr/read_line.h" +#include "sbr/read_line.h" #define INSTALLMH_SWITCHES \ X("auto", 0, AUTOSW) \ diff --git a/uip/mark.c b/uip/mark.c index 92957cd0..0b17b862 100644 --- a/uip/mark.c +++ b/uip/mark.c @@ -9,7 +9,7 @@ #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define MARK_SWITCHES \ X("add", 0, ADDSW) \ diff --git a/uip/mhbuild.c b/uip/mhbuild.c index faf9aa3b..3b17f356 100644 --- a/uip/mhbuild.c +++ b/uip/mhbuild.c @@ -14,8 +14,8 @@ #include #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #include "mhfree.h" #include "mhoutsbr.h" diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index 9c5bd92a..4af6e590 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -24,9 +24,9 @@ #include #include "h/mhcachesbr.h" #include "mhmisc.h" -#include "../sbr/m_mktemp.h" -#include "../sbr/message_id.h" -#include "../sbr/mime_type.h" +#include "sbr/m_mktemp.h" +#include "sbr/message_id.h" +#include "sbr/mime_type.h" #include "mhfree.h" #include "mhshowsbr.h" diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c index 4c177d18..9b410e22 100644 --- a/uip/mhcachesbr.c +++ b/uip/mhcachesbr.c @@ -15,8 +15,8 @@ #include #include #include "mhmisc.h" -#include "../sbr/lock_file.h" -#include "../sbr/m_mktemp.h" +#include "sbr/lock_file.h" +#include "sbr/m_mktemp.h" #ifdef HAVE_SYS_TIME_H # include diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index 438f8a66..672d830b 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -11,9 +11,9 @@ #include #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" -#include "../sbr/mime_type.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" +#include "sbr/mime_type.h" #include "mhmisc.h" #include "mhfree.h" #include "mhoutsbr.h" diff --git a/uip/mhfree.c b/uip/mhfree.c index 1bb488d1..936c94c7 100644 --- a/uip/mhfree.c +++ b/uip/mhfree.c @@ -10,7 +10,7 @@ #include #include #include -#include "../sbr/m_mktemp.h" +#include "sbr/m_mktemp.h" #include "mhfree.h" /* The list of top-level contents to display */ diff --git a/uip/mhlist.c b/uip/mhlist.c index bc8e2a25..26045062 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -16,7 +16,7 @@ #include #include #include "mhmisc.h" -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #include "mhfree.h" #define MHLIST_SWITCHES \ diff --git a/uip/mhlogin.c b/uip/mhlogin.c index 3e10f99e..e78ae68f 100644 --- a/uip/mhlogin.c +++ b/uip/mhlogin.c @@ -12,7 +12,7 @@ #include #include #include -#include "../sbr/lock_file.h" +#include "sbr/lock_file.h" #define MHLOGIN_SWITCHES \ X("user username", 0, USERSW) \ diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index d32d38f9..5ff3f4dc 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -11,10 +11,10 @@ #include #include #include -#include "../sbr/m_popen.h" +#include "sbr/m_popen.h" #include #include -#include "../sbr/terminal.h" +#include "sbr/terminal.h" /* * MAJOR BUG: diff --git a/uip/mhmisc.c b/uip/mhmisc.c index 380d7eac..acaae82a 100644 --- a/uip/mhmisc.c +++ b/uip/mhmisc.c @@ -9,7 +9,7 @@ #include #include #include -#include "../sbr/makedir.h" +#include "sbr/makedir.h" #include "mhmisc.h" extern int debugsw; diff --git a/uip/mhn.c b/uip/mhn.c index 68def2bf..811a4ac9 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -17,7 +17,7 @@ #include #include #include "mhmisc.h" -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #include "mhfree.h" #include "mhshowsbr.h" diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c index a9735d0b..4a3166f3 100644 --- a/uip/mhoutsbr.c +++ b/uip/mhoutsbr.c @@ -15,7 +15,7 @@ #include #include #include "mhoutsbr.h" -#include "../sbr/base64.h" +#include "sbr/base64.h" /* diff --git a/uip/mhparse.c b/uip/mhparse.c index 716f3900..c42d1c32 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -15,12 +15,12 @@ #include #include "mhmisc.h" #include -#include "../sbr/m_mktemp.h" +#include "sbr/m_mktemp.h" #include "mhfree.h" #ifdef HAVE_ICONV # include #endif /* HAVE_ICONV */ -#include "../sbr/base64.h" +#include "sbr/base64.h" extern int debugsw; diff --git a/uip/mhpath.c b/uip/mhpath.c index 1b5fd3b1..abf6b01f 100644 --- a/uip/mhpath.c +++ b/uip/mhpath.c @@ -7,7 +7,7 @@ #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define MHPATH_SWITCHES \ X("version", 0, VERSIONSW) \ diff --git a/uip/mhshow.c b/uip/mhshow.c index 786c0b6c..e01091e1 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -17,8 +17,8 @@ #include #include #include "mhmisc.h" -#include "../sbr/m_maildir.h" -#include "../sbr/m_popen.h" +#include "sbr/m_maildir.h" +#include "sbr/m_popen.h" #include "mhfree.h" #include "mhshowsbr.h" diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 3b54a4c7..ebb295b7 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -17,7 +17,7 @@ #include #include "mhmisc.h" #include "mhshowsbr.h" -#include "../sbr/m_mktemp.h" +#include "sbr/m_mktemp.h" #ifdef HAVE_ICONV # include #endif /* ! HAVE_ICONV */ diff --git a/uip/mhstore.c b/uip/mhstore.c index b8feba96..80eddb27 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -16,7 +16,7 @@ #include #include #include "mhmisc.h" -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #include "mhfree.h" #define MHSTORE_SWITCHES \ diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index 4052a67b..32d23c51 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -16,8 +16,8 @@ #include #include "mhmisc.h" #include "mhshowsbr.h" -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" enum clobber_policy_t { NMH_CLOBBER_ALWAYS = 0, diff --git a/uip/new.c b/uip/new.c index a787806d..c1c7999a 100644 --- a/uip/new.c +++ b/uip/new.c @@ -14,8 +14,8 @@ #include #include #include -#include "../sbr/lock_file.h" -#include "../sbr/m_maildir.h" +#include "sbr/lock_file.h" +#include "sbr/m_maildir.h" #define NEW_SWITCHES \ X("mode", 1, MODESW) \ diff --git a/uip/packf.c b/uip/packf.c index 2424c97c..94a18eff 100644 --- a/uip/packf.c +++ b/uip/packf.c @@ -9,7 +9,7 @@ #include #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define PACKF_SWITCHES \ X("file name", 0, FILESW) \ diff --git a/uip/pick.c b/uip/pick.c index 596133af..1084a478 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -9,7 +9,7 @@ #include #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define PICK_SWITCHES \ X("reverse", 0, REVSW) \ diff --git a/uip/popsbr.c b/uip/popsbr.c index c5af09dd..ecf1aa38 100644 --- a/uip/popsbr.c +++ b/uip/popsbr.c @@ -12,7 +12,7 @@ #include #include -#include "../sbr/base64.h" +#include "sbr/base64.h" #define TRM "." diff --git a/uip/post.c b/uip/post.c index f7726885..69fe6b86 100644 --- a/uip/post.c +++ b/uip/post.c @@ -15,8 +15,8 @@ #include #include #include -#include "../sbr/m_mktemp.h" -#include "../sbr/message_id.h" +#include "sbr/m_mktemp.h" +#include "sbr/message_id.h" #ifdef HAVE_SYS_TIME_H # include diff --git a/uip/prompter.c b/uip/prompter.c index e5170dfe..224734e0 100644 --- a/uip/prompter.c +++ b/uip/prompter.c @@ -9,7 +9,7 @@ #include #include #include -#include "../sbr/m_mktemp.h" +#include "sbr/m_mktemp.h" #include #include diff --git a/uip/rcvdist.c b/uip/rcvdist.c index 35bbfb7c..a75e21ac 100644 --- a/uip/rcvdist.c +++ b/uip/rcvdist.c @@ -11,7 +11,7 @@ #include #include #include -#include "../sbr/m_mktemp.h" +#include "sbr/m_mktemp.h" #define RCVDIST_SWITCHES \ X("form formfile", 4, FORMSW) \ diff --git a/uip/rcvstore.c b/uip/rcvstore.c index 660d7cee..6f82f812 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -10,9 +10,9 @@ #include #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" -#include "../sbr/makedir.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" +#include "sbr/makedir.h" #define RCVSTORE_SWITCHES \ X("create", 0, CRETSW) \ diff --git a/uip/rcvtty.c b/uip/rcvtty.c index 1e28623a..101aa5ab 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -18,7 +18,7 @@ #include #include #include -#include "../sbr/m_mktemp.h" +#include "sbr/m_mktemp.h" #include #ifdef HAVE_GETUTXENT diff --git a/uip/refile.c b/uip/refile.c index 84ef6f0b..bed5cba6 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -8,8 +8,8 @@ #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #include #define REFILE_SWITCHES \ diff --git a/uip/repl.c b/uip/repl.c index 2707b368..2979dd95 100644 --- a/uip/repl.c +++ b/uip/repl.c @@ -8,7 +8,7 @@ #include #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define REPL_SWITCHES \ X("group", 0, GROUPSW) \ diff --git a/uip/rmf.c b/uip/rmf.c index 5450fd69..e8fa45f3 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -7,8 +7,8 @@ #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #define RMF_SWITCHES \ X("interactive", 0, INTRSW) \ diff --git a/uip/rmm.c b/uip/rmm.c index 64fe2727..fa5fe5b9 100644 --- a/uip/rmm.c +++ b/uip/rmm.c @@ -7,7 +7,7 @@ #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define RMM_SWITCHES \ X("unlink", 0, UNLINKSW) \ diff --git a/uip/scan.c b/uip/scan.c index b65fef74..c62be0f0 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -11,8 +11,8 @@ #include #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/terminal.h" +#include "sbr/m_maildir.h" +#include "sbr/terminal.h" #define SCAN_SWITCHES \ X("clear", 0, CLRSW) \ diff --git a/uip/scansbr.c b/uip/scansbr.c index bbc5a168..457379cd 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -11,7 +11,7 @@ #include #include #include -#include "../sbr/terminal.h" +#include "sbr/terminal.h" static struct format *fmt; static struct comp *datecomp; /* pntr to "date" comp */ diff --git a/uip/send.c b/uip/send.c index 297b8f04..1f419f57 100644 --- a/uip/send.c +++ b/uip/send.c @@ -11,8 +11,8 @@ #ifdef OAUTH_SUPPORT # include #endif -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #ifndef CYRUS_SASL # define SASLminc(a) (a) diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 0d13b528..3fd30f33 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -24,9 +24,9 @@ #ifdef OAUTH_SUPPORT #include #endif -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" -#include "../sbr/message_id.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" +#include "sbr/message_id.h" #ifdef OAUTH_SUPPORT static int setup_oauth_params(char *[], int *, const char *, const char **); diff --git a/uip/show.c b/uip/show.c index 55707da4..86e8e5b5 100644 --- a/uip/show.c +++ b/uip/show.c @@ -8,7 +8,7 @@ #include #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define SHOW_SWITCHES \ X("checkmime", 0, CHECKMIMESW) \ diff --git a/uip/slocal.c b/uip/slocal.c index d8568036..723cb27a 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -27,8 +27,8 @@ #include #include #include -#include "../sbr/lock_file.h" -#include "../sbr/m_mktemp.h" +#include "sbr/lock_file.h" +#include "sbr/m_mktemp.h" #include #include diff --git a/uip/sortm.c b/uip/sortm.c index 7e966db6..1546f75a 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -8,7 +8,7 @@ #include #include #include -#include "../sbr/m_maildir.h" +#include "sbr/m_maildir.h" #define SORTM_SWITCHES \ X("datefield field", 0, DATESW) \ diff --git a/uip/viamail.c b/uip/viamail.c index 2104686d..db93066f 100644 --- a/uip/viamail.c +++ b/uip/viamail.c @@ -13,8 +13,8 @@ #include #include #include -#include "../sbr/m_mktemp.h" -#include "../sbr/base64.h" +#include "sbr/m_mktemp.h" +#include "sbr/base64.h" #define VIAMAIL_SWITCHES \ X("to mailpath", 0, TOSW) \ diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index f06d4b3a..72b315f4 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -44,9 +44,9 @@ #ifdef OAUTH_SUPPORT # include #endif -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" -#include "../sbr/mime_type.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" +#include "sbr/mime_type.h" #define WHATNOW_SWITCHES \ X("draftfolder +folder", 0, DFOLDSW) \ diff --git a/uip/whom.c b/uip/whom.c index 542e67ff..145190b7 100644 --- a/uip/whom.c +++ b/uip/whom.c @@ -8,8 +8,8 @@ #include #include #include -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #ifndef CYRUS_SASL # define SASLminc(a) (a)