Fixed inc(1) and %(me) to not obey Local-Mailbox profile component.

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 325a1a34fdd7782ce5a37e39bfc83f8b26334c79..65082a0bd353c57ca11978fb757df6970a133b0b 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -1,6 +1,4 @@
-
-/*
- * mhparam.c -- print mh_profile values
+/* mhparam.c -- print mh_profile values

  *
  * Originally contributed by
  * Jeffrey C Honig <Jeffrey_C_Honig@cornell.edu>
  *
  * Originally contributed by
  * Jeffrey C Honig <Jeffrey_C_Honig@cornell.edu>


@@ -10,7 +8,17 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "h/utils.h"

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


@@ -28,43 +36,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;
+static char *sbackup = BACKUP_PREFIX;

 
 

-char *datalocking = "fcntl";
+static char *datalocking = "fcntl";
+static char *localmbox = "";
+static bool localmbox_primed;

 
 extern char *spoollocking;
 
 
 extern char *spoollocking;
 

-char *sasl =
+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;


@@ -85,7 +111,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 },


@@ -93,14 +118,18 @@ 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 },

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

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

      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
      { "spoollocking",     &spoollocking },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
      { "spoollocking",     &spoollocking },

+     { "iconv",                   &iconv },
+     { "oauth",                   &oauth },

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


@@ -110,19 +139,21 @@ static struct proc procs [] = {
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static char *p_find(char *);
+static char *p_find(char *) PURE;

 
 
 int
 main(int argc, char **argv)
 {
 
 
 int
 main(int argc, char **argv)
 {

-    int i, compp = 0, missed = 0;
-    int all = 0, debug = 0;
+    int i, compp = 0;
+    bool missed;
+    bool all = false;
+    bool debug = false;

     int components = -1;
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 
     int components = -1;
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }

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


@@ -134,7 +165,7 @@ main(int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [profile-components] [switches]",
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [profile-components] [switches]",


@@ -153,15 +184,19 @@ main(int argc, char **argv)
                    break;
 
                case ALLSW:
                    break;
 
                case ALLSW:

-                   all = 1;
+                   all = true;

                    break;
 
                case DEBUGSW:
                    break;
 
                case DEBUGSW:

-                   debug = 1;
+                   debug = true;

                    break;
            }
        } else {
            comps[compp++] = cp;
                    break;
            }
        } else {
            comps[compp++] = cp;

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

        }
     }
 
        }
     }
 


@@ -169,36 +204,56 @@ main(int argc, char **argv)
         struct node *np;
 
        if (compp)
         struct node *np;
 
        if (compp)

-           advise(NULL, "profile-components ignored with -all");
+           inform("profile-components ignored with -all");

 
        if (components >= 0)
 
        if (components >= 0)

-           advise(NULL, "-%scomponents ignored with -all",
+           inform("-%scomponents ignored with -all",

                   components ? "" : "no");
 
                   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);
 
        for (np = m_defs; np; np = np->n_next)
            printf("%s: %s\n", np->n_name, np->n_field);
 

-    } else if (debug) {
+    }
+
+    if (debug) {

        struct proc *ps;
 
        struct proc *ps;
 

-       /* Need to see if datalocking was set in profile. */
+       /* In case datalocking was set in profile. */

        if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
        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 = true;
+       }
+

        /*
         * Print the current value of everything in
         * procs array.  This will show their current
         * value (as determined after context is read).
          */
        for (ps = procs; ps->p_name; ps++)
        /*
         * Print the current value of everything in
         * procs array.  This will show their current
         * value (as determined after context is read).
          */
        for (ps = procs; ps->p_name; ps++)

-           printf ("%s: %s\n", ps->p_name, *ps->p_field ? *ps->p_field : "");
+           printf ("%s: %s\n", ps->p_name, FENDNULL(*ps->p_field));
+
+    }

 
 

-    } else {
+    missed = false;
+    if (! all) {

         if (components < 0)
            components = compp > 1;
 
        for (i = 0; i < compp; i++)  {
         if (components < 0)
            components = compp > 1;
 
        for (i = 0; i < compp; i++)  {

-           register char *value;
+           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 = context_find (comps[i]);
            if (!value)


@@ -207,14 +262,13 @@ main(int argc, char **argv)
                if (components)
                    printf("%s: ", comps[i]);
 
                if (components)
                    printf("%s: ", comps[i]);
 

-               printf("%s\n", value);
+               puts(value);

            } else
            } else

-               missed++;
+                missed = true;

        }
     }
 
        }
     }
 

-    done (missed);
-    return 1;
+    done(missed);

 }
 
 
 }
 
 


@@ -224,8 +278,8 @@ p_find(char *str)
     struct proc *ps;
 
     for (ps = procs; ps->p_name; ps++)
     struct proc *ps;
 
     for (ps = procs; ps->p_name; ps++)

-       if (!strcasecmp (ps->p_name, str ? str : ""))
-           return (*ps->p_field);
+       if (!strcasecmp (ps->p_name, str))
+           return *ps->p_field;

 
     return NULL;
 }
 
     return NULL;
 }