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 39d43660c6764659431f69e717694f8c539faf80..5b08db28b7fb6f1934bb1193b98cc22dc03a7a6b 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -6,7 +6,7 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index f340e1ee9e9297b62b58ee164c2c3bb14f3d5a40..80dabb7831ead6f2c274ee51e17673609c121bd7 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -13,7 +13,7 @@
 #include <h/netsec.h>
 
 #include <sys/socket.h>
 #include <h/netsec.h>
 
 #include <sys/socket.h>

-#include "../../sbr/base64.h"
+#include "sbr/base64.h"

 
 /*
  * This module implements an interface to SendMail very similar
 
 /*
  * This module implements an interface to SendMail very similar

diff --git a/uip/anno.c b/uip/anno.c
index d074717639c1e0bab03bf7bd8e31c1340f7a75a9..521f7b96a3fc50a831bdbd2fb3e9b2df34793784 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -43,7 +43,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define ANNO_SWITCHES \
     X("component field", 0, COMPSW) \
 
 #define ANNO_SWITCHES \
     X("component field", 0, COMPSW) \

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 7e7cefd0b6fb8bdbafa26d3a8c7fd7a4f568765f..20719804570ed48b5d55d4a37f8eeebee6d0d388 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -8,8 +8,8 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>

-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"

 #include <fcntl.h>
 #include <utime.h>
 
 #include <fcntl.h>
 #include <utime.h>
 

diff --git a/uip/ap.c b/uip/ap.c
index d08a635d38ef464ba63a6becd99519e45ccdad5e..1d1ee522f74b44ea18623f5d67d6b26c5a924f5d 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -10,7 +10,7 @@
 #include <h/fmt_scan.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/mts.h>
 #include <h/utils.h>

-#include "../sbr/terminal.h"
+#include "sbr/terminal.h"

 
 #define        NADDRS  100
 
 
 #define        NADDRS  100
 

diff --git a/uip/burst.c b/uip/burst.c
index f188bf1f870f7db24ca88287154a2c9b89b24bea..87538ae709aee7c9f6c90583396a65e4132903d7 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -8,8 +8,8 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/mhparse.h>
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/mhparse.h>

-#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 \
 #include "mhfree.h"
 
 #define BURST_SWITCHES \

diff --git a/uip/comp.c b/uip/comp.c
index e3d87808f927016ab76c0c7d78511ac4b006d998..969b9792d011eeb33fff1b8d242c658ff856ceac 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 #include <fcntl.h>
 
 #define COMP_SWITCHES \
 #include <fcntl.h>
 
 #define COMP_SWITCHES \

diff --git a/uip/dist.c b/uip/dist.c
index de0ba433662ea693eb019b11ded3f79b396692ae..b0728bddcebc2831849b0d9772286617cdc12d60 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -7,7 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 #include <fcntl.h>
 
 #define DIST_SWITCHES \
 #include <fcntl.h>
 
 #define DIST_SWITCHES \

diff --git a/uip/distsbr.c b/uip/distsbr.c
index f29426e24c37a129f90cf0a3de9de88751a82326..bf469c3e8638cf2f846b843e9228b0f627f09ca9 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/utils.h>
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/utils.h>

-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"

 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;
 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;

diff --git a/uip/dp.c b/uip/dp.c
index 3575c979d4c092a3d6fe4737652537c221d0469b..dbc2670518dcfe310fc217d173bf3274733057e0 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -9,7 +9,7 @@
 #include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>

-#include "../sbr/terminal.h"
+#include "sbr/terminal.h"

 
 #define        NDATES 100
 
 
 #define        NDATES 100
 

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 5dae7874156bc3dd9bc8ce06a296ba8b5686b240..40ec9b806451feb55949738fbb41eb98a38f0e5e 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -11,8 +11,8 @@
 #include <h/dropsbr.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/dropsbr.h>
 #include <h/mts.h>
 #include <h/tws.h>

-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"

 #include <fcntl.h>
 
 /*
 #include <fcntl.h>
 
 /*

diff --git a/uip/flist.c b/uip/flist.c
index cd505043f84a1e90100b1eff32af96e27688ab43..cd5682af6dd8ffff4e42c3f93a306acdcfeb64b2 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -15,7 +15,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 /*
  * We allocate space to record the names of folders
 
 /*
  * We allocate space to record the names of folders

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 1c4159a8c640926f92f5368e635e1e7b7a3d878e..627123b483ab1ae4e3489a2f551a928bcecfef81 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -11,8 +11,8 @@
 #include <h/utils.h>
 #include <h/scansbr.h>
 #include <h/addrsbr.h>
 #include <h/utils.h>
 #include <h/scansbr.h>
 #include <h/addrsbr.h>

-#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) \
 
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \

diff --git a/uip/folder.c b/uip/folder.c
index 84d0de536b48e56e707b2c94fcecc38ccb8d5c1e..625d68adc96c2a5c6ce0cf6ba994293a95236fbe 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -10,7 +10,7 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \
 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \

diff --git a/uip/forw.c b/uip/forw.c
index 153b79539bb180cfbebca94fc5d24d88580f30ae..ce8a4fccd8a583f53a27687e449ffe139431d4c1 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/tws.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 
 #define        IFORMAT "digest-issue-%s"
 
 
 #define        IFORMAT "digest-issue-%s"

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index bce58aee85ffc1bf5c49dc6fc96d8312ffef671c..775c8aeb1d9a0c8168e833e06662a552bdbef889 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -10,7 +10,7 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>

-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"

 
 /*
  * Take from replsbr.c - a buffer big enough to read in data header lines
 
 /*
  * 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 ad454e10dfef39d465f2570f167bf8b5ff1b6cee..2bd1b71ff3f0914a50fd5fd89aa90689fbb8d32a 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -40,9 +40,9 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>

-#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)
 
 #ifndef TLS_SUPPORT
 # define TLSminc(a) (a)

diff --git a/uip/install-mh.c b/uip/install-mh.c
index ff6635759019f5f02a16a84b0878584f7e96c5ab..e3eab12f55354a312a7c30b9a4382deccf31b14c 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -7,10 +7,10 @@
 
 #include <h/mh.h>                              /* mh internals */
 #include <h/utils.h>
 
 #include <h/mh.h>                              /* mh internals */
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
-#include "../sbr/makedir.h"
+#include "sbr/m_maildir.h"
+#include "sbr/makedir.h"

 #include <pwd.h>                               /* structure for getpwuid() results */
 #include <pwd.h>                               /* structure for getpwuid() results */

-#include "../sbr/read_line.h"
+#include "sbr/read_line.h"

 
 #define INSTALLMH_SWITCHES \
     X("auto", 0, AUTOSW) \
 
 #define INSTALLMH_SWITCHES \
     X("auto", 0, AUTOSW) \

diff --git a/uip/mark.c b/uip/mark.c
index 92957cd0bf87d6382040be72bcb3505f50105e86..0b17b862a0d0f11770d19b35201c4242d28590db 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -9,7 +9,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define MARK_SWITCHES \
     X("add", 0, ADDSW) \
 
 #define MARK_SWITCHES \
     X("add", 0, ADDSW) \

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index faf9aa3bc6e9d84a29c3a1d0ffbc19ccaf6cad8e..3b17f356d925a319c6ffed22c64629e0334f5e98 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -14,8 +14,8 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>

-#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"
 
 #include "mhfree.h"
 #include "mhoutsbr.h"
 

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 9c5bd92a7cec676dca45f76e9f2d62c7c7d5a754..4af6e590bd1337d608e3d938af00be515ad8336c 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -24,9 +24,9 @@
 #include <h/utils.h>
 #include "h/mhcachesbr.h"
 #include "mhmisc.h"
 #include <h/utils.h>
 #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"
 
 #include "mhfree.h"
 #include "mhshowsbr.h"
 

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 4c177d18686b25cd0d1c1fd3503bacd4710b982d..9b410e22058799bd549505be770e9b1acb24cfa9 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -15,8 +15,8 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #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 <sys/time.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 438f8a66a7ab03427721c5e961398f080085dde3..672d830b089af6095c365ceefd8540cf6c678ccc 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -11,9 +11,9 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/signals.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/signals.h>

-#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"
 #include "mhmisc.h"
 #include "mhfree.h"
 #include "mhoutsbr.h"

diff --git a/uip/mhfree.c b/uip/mhfree.c
index 1bb488d1678147b5c8ddf9e9693671a55cc889fb..936c94c7aaa63f6f600efaac202edf1fac5558ed 100644 (file)
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -10,7 +10,7 @@
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"

 #include "mhfree.h"
 
 /* The list of top-level contents to display */
 #include "mhfree.h"
 
 /* The list of top-level contents to display */

diff --git a/uip/mhlist.c b/uip/mhlist.c
index bc8e2a25eafca04d17bf197156189f808ed5f9fa..26045062fcd2f099a3b8608ec2c12966fd8dca10 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -16,7 +16,7 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 #include "mhfree.h"
 
 #define MHLIST_SWITCHES \
 #include "mhfree.h"
 
 #define MHLIST_SWITCHES \

diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index 3e10f99e6443450841fd8dc6994dd48f4910a5cc..e78ae68f263991a9d7faff77ac52be5ef33df461 100644 (file)
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -12,7 +12,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/oauth.h>
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/oauth.h>

-#include "../sbr/lock_file.h"
+#include "sbr/lock_file.h"

 
 #define MHLOGIN_SWITCHES \
     X("user username", 0, USERSW) \
 
 #define MHLOGIN_SWITCHES \
     X("user username", 0, USERSW) \

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index d32d38f9d117eed83329be7b9c66a9eecc97373b..5ff3f4dc926cd53460d4d76a0580333557d139a0 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -11,10 +11,10 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>

-#include "../sbr/m_popen.h"
+#include "sbr/m_popen.h"

 #include <setjmp.h>
 #include <sys/types.h>
 #include <setjmp.h>
 #include <sys/types.h>

-#include "../sbr/terminal.h"
+#include "sbr/terminal.h"

 
 /*
  * MAJOR BUG:
 
 /*
  * MAJOR BUG:

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 380d7eacf84e67bb77b7ec547c546ffcc4eec5be..acaae82ab0b54bf6702b3987c04ef8104717aa09 100644 (file)
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -9,7 +9,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>

-#include "../sbr/makedir.h"
+#include "sbr/makedir.h"

 #include "mhmisc.h"
 
 extern int debugsw;
 #include "mhmisc.h"
 
 extern int debugsw;

diff --git a/uip/mhn.c b/uip/mhn.c
index 68def2bf6e3e79a14b0942d565db23344916e54a..811a4ac9d4c27f6d109e1a44bf452028a113f300 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -17,7 +17,7 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 #include "mhfree.h"
 #include "mhshowsbr.h"
 
 #include "mhfree.h"
 #include "mhshowsbr.h"
 

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index a9735d0b2897f8b5984e50ecd581abe3c0bfde92..4a3166f3f819b5c3401aa841768d1f8a28a359c8 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -15,7 +15,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include "mhoutsbr.h"
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include "mhoutsbr.h"

-#include "../sbr/base64.h"
+#include "sbr/base64.h"

 
 
 /*
 
 
 /*

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 716f3900607e4059d09a220bb0114436afb58cb6..c42d1c32cab8ea7bf005b03ea11721ed433929bc 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -15,12 +15,12 @@
 #include <h/utils.h>
 #include "mhmisc.h"
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
 #include <h/mhcachesbr.h>

-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"

 #include "mhfree.h"
 #ifdef HAVE_ICONV
 # include <iconv.h>
 #endif /* HAVE_ICONV */
 #include "mhfree.h"
 #ifdef HAVE_ICONV
 # include <iconv.h>
 #endif /* HAVE_ICONV */

-#include "../sbr/base64.h"
+#include "sbr/base64.h"

 
 
 extern int debugsw;
 
 
 extern int debugsw;

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 1b5fd3b1f23e042f7cad719624a5f89e8c514e06..abf6b01f28247bdc0c3b5f9a994d9368bc1fdb1b 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -7,7 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define MHPATH_SWITCHES \
     X("version", 0, VERSIONSW) \
 
 #define MHPATH_SWITCHES \
     X("version", 0, VERSIONSW) \

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 786c0b6cccfb03e6c6707494ab0e61a90248a036..e01091e1a9fc8a5180b301a772579ef0c690371d 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -17,8 +17,8 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #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"
 
 #include "mhfree.h"
 #include "mhshowsbr.h"
 

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 3b54a4c7048fe34157b822e2adda4e220caedcad..ebb295b7c57a38a412e74c894b950271c86fe7b2 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -17,7 +17,7 @@
 #include <h/utils.h>
 #include "mhmisc.h"
 #include "mhshowsbr.h"
 #include <h/utils.h>
 #include "mhmisc.h"
 #include "mhshowsbr.h"

-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"

 #ifdef HAVE_ICONV
 #   include <iconv.h>
 #endif /* ! HAVE_ICONV */
 #ifdef HAVE_ICONV
 #   include <iconv.h>
 #endif /* ! HAVE_ICONV */

diff --git a/uip/mhstore.c b/uip/mhstore.c
index b8feba96ecdf0ccf5eeed27635533aaf1613960f..80eddb27dd88028ed7d1e0e7b6a89cb5308c11dd 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -16,7 +16,7 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 #include "mhfree.h"
 
 #define MHSTORE_SWITCHES \
 #include "mhfree.h"
 
 #define MHSTORE_SWITCHES \

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 4052a67bcf2a52c2d0c99ed7795df5be52a26175..32d23c51ea631db17215ad5d8b3d7002aa105654 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -16,8 +16,8 @@
 #include <h/utils.h>
 #include "mhmisc.h"
 #include "mhshowsbr.h"
 #include <h/utils.h>
 #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,
 
 enum clobber_policy_t {
   NMH_CLOBBER_ALWAYS = 0,

diff --git a/uip/new.c b/uip/new.c
index a787806d2abf19ec1ff3090700d778acab058255..c1c7999a2b3b285f4339aed231d9827be87fdb3d 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -14,8 +14,8 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>

-#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) \
 
 #define NEW_SWITCHES \
     X("mode", 1, MODESW) \

diff --git a/uip/packf.c b/uip/packf.c
index 2424c97c4e4d52dd85984ed72c5fe5add9ef222a..94a18eff2697d0930f0493fccb9f7efba862c9d9 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \
 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \

diff --git a/uip/pick.c b/uip/pick.c
index 596133afeb8fbe2cdf40dc3b715cee4f321cfa3b..1084a478ba755f67415c49ac5be01d47aacebb1c 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -9,7 +9,7 @@
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define PICK_SWITCHES \
     X("reverse", 0, REVSW) \
 
 #define PICK_SWITCHES \
     X("reverse", 0, REVSW) \

diff --git a/uip/popsbr.c b/uip/popsbr.c
index c5af09dd0421d25b10263a60096f7c116cb0647f..ecf1aa3857fa8eb90e7460d529304d353b36861c 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -12,7 +12,7 @@
 
 #include <h/popsbr.h>
 #include <h/signals.h>
 
 #include <h/popsbr.h>
 #include <h/signals.h>

-#include "../sbr/base64.h"
+#include "sbr/base64.h"

 
 #define        TRM     "."
 
 
 #define        TRM     "."
 

diff --git a/uip/post.c b/uip/post.c
index f7726885c55a809c375df3651cdb5102f1abd598..69fe6b86c2c62ec1458badda67f56317e5321c28 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -15,8 +15,8 @@
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>

-#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 <sys/time.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/prompter.c b/uip/prompter.c
index e5170dfeecebe77c67b067f0538859a5c661b9c0..224734e01237079d63491277e76f73fe11acdb6d 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/utils.h>

-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"

 #include <setjmp.h>
 
 #include <termios.h>
 #include <setjmp.h>
 
 #include <termios.h>

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 35bbfb7cbbcb201487c4d7cf8d9a5f1499a93694..a75e21aca73c89cdf6c88c1c99863dc5b5598f4a 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -11,7 +11,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>

-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"

 
 #define RCVDIST_SWITCHES \
     X("form formfile", 4, FORMSW) \
 
 #define RCVDIST_SWITCHES \
     X("form formfile", 4, FORMSW) \

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 660d7cee93daf776e83400bf7356340a57ef8fd0..6f82f812520b960c4b47db3514d90199504de2c7 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -10,9 +10,9 @@
 #include <h/signals.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #include <h/signals.h>
 #include <h/mts.h>
 #include <h/utils.h>

-#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) \
 
 #define RCVSTORE_SWITCHES \
     X("create", 0, CRETSW) \

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 1e28623a20019367b74d5a51c0aff1e1fa7eacc9..101aa5ab9f422be7d19b9f86e4371dec3632c041 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -18,7 +18,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>

-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"

 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT

diff --git a/uip/refile.c b/uip/refile.c
index 84ef6f0bb234629d19ad786d3ab0e35a1cb76c6c..bed5cba6558fc3955d13768a251ea32fe7c8b42a 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -8,8 +8,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"

 #include <fcntl.h>
 
 #define REFILE_SWITCHES \
 #include <fcntl.h>
 
 #define REFILE_SWITCHES \

diff --git a/uip/repl.c b/uip/repl.c
index 2707b3682e4022dcb5816b56065e78aa27880c7a..2979dd9579d7fcd28446dd9a36497ada54e3ad5c 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/mime.h>
 #include <h/utils.h>
 #include <h/mh.h>
 #include <h/mime.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define REPL_SWITCHES \
     X("group", 0, GROUPSW) \
 
 #define REPL_SWITCHES \
     X("group", 0, GROUPSW) \

diff --git a/uip/rmf.c b/uip/rmf.c
index 5450fd69d6c828dab883579270c9d60864908049..e8fa45f3b37847dca2a8cd0d564e601ceabbd38e 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,8 +7,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-#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) \
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \

diff --git a/uip/rmm.c b/uip/rmm.c
index 64fe272778882453bde71f717137e63d96fc818b..fa5fe5b93ea685ff2224d2c676a088c715643dfe 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -7,7 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define RMM_SWITCHES \
     X("unlink", 0, UNLINKSW) \
 
 #define RMM_SWITCHES \
     X("unlink", 0, UNLINKSW) \

diff --git a/uip/scan.c b/uip/scan.c
index b65fef7490e8dc68a825d5e37d08afd21754f53d..c62be0f0425c63d165919e0515aef67176becb3b 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -11,8 +11,8 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>

-#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) \
 
 #define SCAN_SWITCHES \
     X("clear", 0, CLRSW) \

diff --git a/uip/scansbr.c b/uip/scansbr.c
index bbc5a1680b3dddfce48be5843e30dff2b08d4e6e..457379cdc6c9dd0ae343c64af854fcd8599948ac 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -11,7 +11,7 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/utils.h>

-#include "../sbr/terminal.h"
+#include "sbr/terminal.h"

 
 static struct format *fmt;
 static struct comp *datecomp;          /* pntr to "date" comp             */
 
 static struct format *fmt;
 static struct comp *datecomp;          /* pntr to "date" comp             */

diff --git a/uip/send.c b/uip/send.c
index 297b8f043297146283c47d091244743f53f04966..1f419f57194f46442ba49e042a5309c4d18455a3 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -11,8 +11,8 @@
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #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)
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 0d13b52823eee3c6ef0fc6a3c7440760c0c6c135..3fd30f33ebfa8a23f1e6669e148803fce0796e2c 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -24,9 +24,9 @@
 #ifdef OAUTH_SUPPORT
 #include <h/oauth.h>
 #endif
 #ifdef OAUTH_SUPPORT
 #include <h/oauth.h>
 #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 **);
 
 #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 55707da4d6e3fec9e3c836f9a66a61695f6e661c..86e8e5b5ae8946a266a774b4e75e9752dca2e6b3 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/mime.h>
 #include <h/utils.h>
 #include <h/mh.h>
 #include <h/mime.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define SHOW_SWITCHES \
     X("checkmime", 0, CHECKMIMESW) \
 
 #define SHOW_SWITCHES \
     X("checkmime", 0, CHECKMIMESW) \

diff --git a/uip/slocal.c b/uip/slocal.c
index d8568036f425f22abea4b5b2162bef883643d387..723cb27a26114d2f23b96ba4ab62fa77590e6b7a 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -27,8 +27,8 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>

-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"

 
 #include <pwd.h>
 #include <sys/ioctl.h>
 
 #include <pwd.h>
 #include <sys/ioctl.h>

diff --git a/uip/sortm.c b/uip/sortm.c
index 7e966db6f3b7fe6f1d73011ad73f5a14d4c4bdcc..1546f75af213b84774f6726ad3a5a807762aa13e 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>

-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"

 
 #define SORTM_SWITCHES \
     X("datefield field", 0, DATESW) \
 
 #define SORTM_SWITCHES \
     X("datefield field", 0, DATESW) \

diff --git a/uip/viamail.c b/uip/viamail.c
index 2104686d289781d612fae6e46adc725636949d4e..db93066fc95849dc6340691cac730a7d55bccd2e 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -13,8 +13,8 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>

-#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) \
 
 #define VIAMAIL_SWITCHES \
     X("to mailpath", 0, TOSW) \

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index f06d4b3a1e0a17707078f404895862fdd5a0d651..72b315f41be2b7c24b724a112e4c263fa46ea0bc 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -44,9 +44,9 @@
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #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) \
 
 #define WHATNOW_SWITCHES \
     X("draftfolder +folder", 0, DFOLDSW) \

diff --git a/uip/whom.c b/uip/whom.c
index 542e67ff3dac359a160ace6509a8f543916a1f7e..145190b7c6baffaf654bff73bff427bbfed0820f 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -8,8 +8,8 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/signals.h>
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/signals.h>

-#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)
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)