More test-version-check debugging, on Linux buildbot hosts.

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index b0c119cfa4365a676536d62e9ffc93fbe32c8672..a2a7489a1b2373959567b619bca6a1440511f4be 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -11,6 +11,7 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

+#include <h/mts.h>

 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \
 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \


@@ -28,53 +29,61 @@ DEFINE_SWITCH_ENUM(MHPARAM);
 DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
 DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 

-extern char *mhlibdir;
+extern char *mhbindir;
+extern char *mhlibexecdir;

 extern char *mhetcdir;
 extern char *mhetcdir;

+extern char *mhdocdir;

 
 

-char *sbackup = BACKUP_PREFIX;
-
-char *lockmethod =
-#if defined FCNTL_LOCKING
-    "fcntl"
-#elif defined FLOCK_LOCKING
-    "flock"
-#elif defined LOCKF_LOCKING
-    "lockf"
-#elif defined DOT_LOCKING
-    "dot"
-#else
-    "none"
-#endif
-    ;
+static char *sbackup = BACKUP_PREFIX;
+
+static char *datalocking = "fcntl";
+static char *localmbox = "";
+static int localmbox_primed = 0;

 
 

-char *sasl =
+extern char *spoollocking;
+
+static char *sasl =

 #ifdef CYRUS_SASL
     "cyrus_sasl";
 #else
     "";
 #endif
 
 #ifdef CYRUS_SASL
     "cyrus_sasl";
 #else
     "";
 #endif
 

-char *tls =
+static char *tls =

 #ifdef TLS_SUPPORT
     "tls";
 #else
     "";
 #endif
 
 #ifdef TLS_SUPPORT
     "tls";
 #else
     "";
 #endif
 

-char *mimetypeproc =
+static char *mimetypeproc =

 #ifdef MIMETYPEPROC
     MIMETYPEPROC;
 #else
     "";
 #endif
 
 #ifdef MIMETYPEPROC
     MIMETYPEPROC;
 #else
     "";
 #endif
 

-char *mimeencodingproc =
+static char *mimeencodingproc =

 #ifdef MIMEENCODINGPROC
     MIMEENCODINGPROC;
 #else
     "";
 #endif
 
 #ifdef MIMEENCODINGPROC
     MIMEENCODINGPROC;
 #else
     "";
 #endif
 

+static char *iconv =
+#ifdef HAVE_ICONV
+    "iconv";
+#else
+    "";
+#endif
+
+static char *oauth =
+#ifdef OAUTH_SUPPORT
+    "oauth";
+#else
+    "";
+#endif
+

 struct proc {
     char *p_name;
     char **p_field;
 struct proc {
     char *p_name;
     char **p_field;


@@ -95,7 +104,6 @@ static struct proc procs [] = {
      { "mimeencodingproc", &mimeencodingproc },
      { "moreproc",         &moreproc },
      { "msgprot",          &msgprot },
      { "mimeencodingproc", &mimeencodingproc },
      { "moreproc",         &moreproc },
      { "msgprot",          &msgprot },

-     { "mshproc",          &mshproc },

      { "packproc",         &packproc },
      { "postproc",         &postproc },
      { "rmmproc",          &rmmproc },
      { "packproc",         &packproc },
      { "postproc",         &postproc },
      { "rmmproc",          &rmmproc },


@@ -103,13 +111,19 @@ static struct proc procs [] = {
      { "showmimeproc",     &showmimeproc },
      { "showproc",         &showproc },
      { "version",          &version_num },
      { "showmimeproc",     &showmimeproc },
      { "showproc",         &showproc },
      { "version",          &version_num },

-     { "vmhproc",          &vmhproc },

      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },

+     { "bindir",           &mhbindir },
+     { "libexecdir",       &mhlibexecdir },
+     { "libdir",           &mhlibexecdir },

      { "etcdir",           &mhetcdir },
      { "etcdir",           &mhetcdir },

-     { "libdir",           &mhlibdir },
+     { "docdir",           &mhdocdir },
+     { "localmbox",       &localmbox },

      { "sbackup",          &sbackup },
      { "sbackup",          &sbackup },

-     { "lockmethod",       &lockmethod },
+     { "datalocking",      &datalocking },
+     { "spoollocking",     &spoollocking },
+     { "iconv",                   &iconv },
+     { "oauth",                   &oauth },

      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },
      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },


@@ -131,10 +145,7 @@ main(int argc, char **argv)
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 

-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 2)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -174,6 +185,10 @@ main(int argc, char **argv)
            }
        } else {
            comps[compp++] = cp;
            }
        } else {
            comps[compp++] = cp;

+           if (strcmp("localmbox", cp) == 0 && ! localmbox_primed) {
+               localmbox = getlocalmbox();
+               localmbox_primed = 1;
+           }

        }
     }
 
        }
     }
 


@@ -187,13 +202,26 @@ main(int argc, char **argv)
            advise(NULL, "-%scomponents ignored with -all",
                   components ? "" : "no");
 
            advise(NULL, "-%scomponents ignored with -all",
                   components ? "" : "no");
 

-       /* print all entries in context/profile list */
+       /* Print all entries in context/profile list.  That does not
+          include entries in mts.conf, such as spoollocking. */

        for (np = m_defs; np; np = np->n_next)
            printf("%s: %s\n", np->n_name, np->n_field);
 
     } else if (debug) {
        struct proc *ps;
 
        for (np = m_defs; np; np = np->n_next)
            printf("%s: %s\n", np->n_name, np->n_field);
 
     } else if (debug) {
        struct proc *ps;
 

+       /* In case datalocking was set in profile. */
+       if ((cp = context_find("datalocking"))) { datalocking = cp; }
+
+       /* In case spoollocking was set in mts.conf. */
+       mts_init();
+
+       /* Also set localmbox here */
+       if (! localmbox_primed) {
+           localmbox = getlocalmbox();
+           localmbox_primed = 1;
+       }
+

        /*
         * Print the current value of everything in
         * procs array.  This will show their current
        /*
         * Print the current value of everything in
         * procs array.  This will show their current


@@ -209,6 +237,11 @@ main(int argc, char **argv)
        for (i = 0; i < compp; i++)  {
            register char *value;
 
        for (i = 0; i < compp; i++)  {
            register char *value;
 

+           if (! strcmp ("spoollocking", comps[i])) {
+               /* In case spoollocking was set in mts.conf. */
+               mts_init();
+            }
+

            value = context_find (comps[i]);
            if (!value)
                value = p_find (comps[i]);
            value = context_find (comps[i]);
            if (!value)
                value = p_find (comps[i]);


@@ -221,7 +254,7 @@ main(int argc, char **argv)
                missed++;
        }
     }
                missed++;
        }
     }

-    
+

     done (missed);
     return 1;
 }
     done (missed);
     return 1;
 }