From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Mon, 30 Oct 2017 20:58:46 +0000 (+0000)
Subject: nmh_init(): Replace integer parameter with two bools.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/dbdbd49d59ae5c14e66b1c148a63b8abc9d076ab?hp=00d760f7506c2d5c32ab5abf9f11b3066999f08a

nmh_init(): Replace integer parameter with two bools.

Removes the 0, 1, or 2 passed by callers.  If the options get more
complex then an enum of possible actions might be a better fit.
---

diff --git a/h/utils.h b/h/utils.h
index 7cb96efd..91c637d9 100644
--- a/h/utils.h
+++ b/h/utils.h
@@ -112,12 +112,10 @@ char *m_strn(int value, unsigned int width);
  * program initialization
  *
  * argv0        - argv[0], presumably the program name
- * read_context - 0: don't read context
- *              - 1: read context, check nmh version, and issue warning message
- *                   if non-existent or old
- *              - 2: read context, don't check nmh version
+ * read_context - whether to read the context
+ * check_version - if read_context, whether to check the version, and issue warning message if non-existent or old
  */
-int nmh_init(const char *argv0, int read_context);
+int nmh_init(const char *argv0, bool read_context, bool check_version);
 
 /*
  * Compares prior version of nmh with current version.  Returns 1
diff --git a/sbr/utils.c b/sbr/utils.c
index 839670b5..efb0cde3 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -417,8 +417,8 @@ void to_upper(char *s)
 }
 
 
-int
-nmh_init(const char *argv0, int read_context) {
+int nmh_init(const char *argv0, bool read_context, bool check_version)
+{
     int status = OK;
     char *locale;
 
@@ -441,7 +441,7 @@ nmh_init(const char *argv0, int read_context) {
 
         context_read();
 
-        if (read_context != 1  ||
+        if (!check_version ||
             ((cp = context_find ("Welcome")) && strcasecmp (cp, "disable") == 0)) {
             allow_version_check = 0;
         } else if ((cp = getenv ("MHCONTEXT")) != NULL && *cp != '\0') {
@@ -453,7 +453,7 @@ nmh_init(const char *argv0, int read_context) {
 
         /* Check to see if the user is running a different (or older, if
            specified) version of nmh than they had run before, and notify them
-           if so.  But only if read_context was set to a value to enable. */
+           if so. */
         if (allow_version_check  &&  isatty (fileno (stdin))  &&
             isatty (fileno (stdout))  &&  isatty (fileno (stderr))) {
             if (nmh_version_changed (check_older_version)) {
diff --git a/uip/ali.c b/uip/ali.c
index 760a26f8..bcf8c79e 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -52,7 +52,7 @@ main (int argc, char **argv)
     char **vec = mh_xmalloc (argc * sizeof (char *)), **arguments;
     struct aka *ak;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
diff --git a/uip/anno.c b/uip/anno.c
index 56935c24..21a5987d 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -94,7 +94,7 @@ main (int argc, char **argv)
     bool	list;			/* list header elements if set */
     int		number = 0;		/* delete specific number of like elements if set */
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/ap.c b/uip/ap.c
index fbcf62b0..140160c0 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -53,7 +53,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], **argp;
     char *addrs[NADDRS + 1]; /* Includes terminating NULL. */
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     mts_init ();
 
diff --git a/uip/burst.c b/uip/burst.c
index 6bd96ea6..dd1970ce 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -76,7 +76,7 @@ main (int argc, char **argv)
     struct smsg *smsgs;
     struct msgs *mp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/comp.c b/uip/comp.c
index 3667f2e4..1aba2808 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
     struct format *fmt;
     struct stat st;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/dist.c b/uip/dist.c
index ad42e1f0..4fb33bf1 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     struct stat st;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/dp.c b/uip/dp.c
index c2bed42c..656440ff 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -51,7 +51,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], **argp;
     char *dates[NDATES + 1]; /* Includes terminating NULL. */
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     argp = getarguments (invo_name, argc, argv, 1);
     while ((cp = *argp++)) {
diff --git a/uip/flist.c b/uip/flist.c
index 99009ca3..fec2c841 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -113,7 +113,7 @@ main(int argc, char **argv)
     char **arguments;
     char buf[BUFSIZ];
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     /*
      * If program was invoked with name ending
diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index abcffeff..7293e134 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -51,7 +51,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], *nfs, **argp, **arguments;
     struct format *fmt;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/fmttest.c b/uip/fmttest.c
index c5e9079c..91a83a5f 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -123,7 +123,7 @@ main (int argc, char **argv)
     int dat[5];
     struct fmt_callbacks cb, *cbp = NULL;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/folder.c b/uip/folder.c
index 2be44264..e7dc1873 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -112,7 +112,7 @@ main (int argc, char **argv)
     char *cp, *dp, *msg = NULL, *argfolder = NULL;
     char **ap, **argp, buf[BUFSIZ], **arguments;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     /*
      * If program was invoked with name ending
diff --git a/uip/forw.c b/uip/forw.c
index ac2f7652..3d526962 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -118,7 +118,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     int buildsw = 0;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/imaptest.c b/uip/imaptest.c
index c250c214..baa18d15 100644
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -97,7 +97,7 @@ main (int argc, char **argv)
     size_t len;
     struct timeval tv_start, tv_connect, tv_auth;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/inc.c b/uip/inc.c
index 6c49b3d8..d65c46fb 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -205,7 +205,7 @@ main (int argc, char **argv)
     SAVEGROUPPRIVS();
     TRYDROPGROUPPRIVS();
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
diff --git a/uip/install-mh.c b/uip/install-mh.c
index fb01e8de..b1184899 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -41,7 +41,7 @@ main (int argc, char **argv)
     FILE *in, *out;
     int		check;
 
-    if (nmh_init(argv[0], 0 /* use context_foil() */ )) { return 1; }
+    if (nmh_init(argv[0], false, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
diff --git a/uip/mark.c b/uip/mark.c
index 00cc2fb2..8c028251 100644
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -52,7 +52,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index c506432f..c94002df 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -102,7 +102,7 @@ main (int argc, char **argv)
     int header_encoding = CE_UNKNOWN;
     size_t n;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index cbfc08c9..7a298e0b 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -144,7 +144,7 @@ main (int argc, char **argv) {
     fx.lf_line_endings = 0;
     fx.textcharset = NULL;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/mhical.c b/uip/mhical.c
index 9cae3c38..6cf7c0e1 100644
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -77,7 +77,7 @@ main (int argc, char *argv[]) {
 
     icaldebug = 0;  /* Global provided by bison (with name-prefix "ical"). */
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/mhl.c b/uip/mhl.c
index e3608208..35543815 100644
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -13,7 +13,7 @@
 int
 main (int argc, char **argv)
 {
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     done (mhl (argc, argv));
     return 1;
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 77e22274..5b14b88a 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     CT ct, *ctp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     set_done(freects_done);
 
diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index 64885d12..4a82c5c9 100644
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -143,7 +143,7 @@ main(int argc, char **argv)
     const char *user = NULL, *saslmech = NULL, *svc = NULL, *browser = NULL;
     int snoop = 0;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/mhn.c b/uip/mhn.c
index ce532799..c361c5be 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -117,7 +117,7 @@ main (int argc, char **argv)
     FILE *fp;
     mhstoreinfo_t info;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     set_done(freects_done);
 
diff --git a/uip/mhparam.c b/uip/mhparam.c
index abb44b36..ad41ad3f 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -145,7 +145,7 @@ main(int argc, char **argv)
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/mhpath.c b/uip/mhpath.c
index ceed4762..3eefb112 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -32,7 +32,7 @@ main(int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/mhshow.c b/uip/mhshow.c
index f03c5702..f868065c 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -92,7 +92,7 @@ main (int argc, char **argv)
     CT ct, *ctp;
     FILE *fp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     set_done(freects_done);
 
diff --git a/uip/mhstore.c b/uip/mhstore.c
index a8482240..e09be9de 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -77,7 +77,7 @@ main (int argc, char **argv)
     int files_not_clobbered;
     mhstoreinfo_t info;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     set_done(freects_done);
 
diff --git a/uip/mkstemp.c b/uip/mkstemp.c
index 3cb95ffb..f066c536 100644
--- a/uip/mkstemp.c
+++ b/uip/mkstemp.c
@@ -152,7 +152,7 @@ process_args(int argc, char **argv, const char **directory,
     NMH_UNUSED(suffix);
 #   endif /* ! HAVE_MKSTEMPS */
 
-    if (nmh_init(argv[0], 2)) { done(1); }
+    if (nmh_init(argv[0], true, false)) { done(1); }
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
diff --git a/uip/msgchk.c b/uip/msgchk.c
index dac9cda0..a553300f 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -86,7 +86,7 @@ main (int argc, char **argv)
     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     mts_init ();
 
diff --git a/uip/new.c b/uip/new.c
index 2d035a16..d6f524a2 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -444,7 +444,7 @@ main(int argc, char **argv)
     char *unseen;
     struct node *folder;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/packf.c b/uip/packf.c
index 1dce11ed..8022e38a 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -45,7 +45,7 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     set_done(mbxclose_done);
 
diff --git a/uip/pick.c b/uip/pick.c
index 0a1ea244..4bfc17a6 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -71,7 +71,7 @@ main (int argc, char **argv)
     int reverse = 0;
     int start, end, inc;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     set_done(putzero_done);
 
diff --git a/uip/post.c b/uip/post.c
index dbe936b6..ee0d380b 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -326,7 +326,7 @@ main (int argc, char **argv)
     FILE *in, *out;
     m_getfld_state_t gstate;
 
-    if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }
+    if (nmh_init(argv[0], false, false)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 0);
diff --git a/uip/prompter.c b/uip/prompter.c
index 4336ff22..6dcf3bb0 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -67,7 +67,7 @@ main (int argc, char **argv)
     char *tmpfil;
     m_getfld_state_t gstate;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index eaa66bf6..e9067403 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -48,7 +48,7 @@ main (int argc, char **argv)
     FILE *fp;
     char *tfile = NULL;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     set_done(unlink_done);
 
diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f6416673..086d3535 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -40,7 +40,7 @@ main (int argc, char **argv)
     char *cp, *file = NULL, buf[BUFSIZ];
     char **argp, **arguments;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index a3f4d3cf..fb0a8b94 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -57,7 +57,7 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     set_done(unlink_done);
 
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index cb164b54..693cd814 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
     char **argp, **arguments, *vec[MAXARGS];
     struct utmpx *utp;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
diff --git a/uip/refile.c b/uip/refile.c
index 4cba2e1d..f9d3b54f 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -69,7 +69,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/repl.c b/uip/repl.c
index ca35a9d2..83e64a5b 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -134,7 +134,7 @@ main (int argc, char **argv)
 
     int buildsw = 0;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/rmf.c b/uip/rmf.c
index 6faaa4fe..724bd26f 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -40,7 +40,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], **argp, **arguments;
     char *fp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/rmm.c b/uip/rmm.c
index c49bf654..0d71be96 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -37,7 +37,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/scan.c b/uip/scan.c
index 592cc0a4..7fd636a7 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -53,7 +53,7 @@ main (int argc, char **argv)
     struct msgs *mp;
     FILE *in;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
diff --git a/uip/send.c b/uip/send.c
index 52fbbd1e..7bf3c7cb 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -125,7 +125,7 @@ main (int argc, char **argv)
     int snoop = 0;
     char *auth_svc = NULL;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/show.c b/uip/show.c
index 5153ffb2..25ede029 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -75,7 +75,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs_array vec = { 0, 0, NULL }, non_mhl_vec = { 0, 0, NULL };
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     if (!strcasecmp (invo_name, "next")) {
 	mode = NEXT;
diff --git a/uip/slocal.c b/uip/slocal.c
index 9f1d8a47..98c1af16 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -189,7 +189,7 @@ main (int argc, char **argv)
     char mailbox[BUFSIZ], tmpfil[BUFSIZ];
     char **argp, **arguments;
 
-    if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }
+    if (nmh_init(argv[0], false, false)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 0);
diff --git a/uip/sortm.c b/uip/sortm.c
index 41652ece..9807a02b 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
     struct smsg **dlist;
     int checksw = 0;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
diff --git a/uip/viamail.c b/uip/viamail.c
index 4bfd50c7..7d9214e6 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -58,7 +58,7 @@ main (int argc, char **argv)
     char *cp, buf[BUFSIZ];
     char **argp, **arguments;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
diff --git a/uip/whatnow.c b/uip/whatnow.c
index 86a17f93..450d9e3b 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -12,7 +12,7 @@
 int
 main (int argc, char **argv)
 {
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     return WhatNow (argc, argv);
 }
diff --git a/uip/whom.c b/uip/whom.c
index 34323820..da34146f 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -66,7 +66,7 @@ main (int argc, char **argv)
     char *msg = NULL, **ap, **argp, backup[BUFSIZ];
     char buf[BUFSIZ], **arguments, *vec[MAXARGS];
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;