Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 4fe8c8d3e4b285395f9e98b1a32511cf9b082cf2..bf0dfae7bff973b7724f0bf5da2da8a0fe9e03cf 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -30,8 +30,9 @@ DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
 extern char *mhbindir;
-extern char *mhetcdir;
 extern char *mhlibexecdir;
+extern char *mhetcdir;
+extern char *mhdocdir;
 
 static char *sbackup = BACKUP_PREFIX;
 
@@ -76,6 +77,13 @@ static char *iconv =
     "";
 #endif
 
+static char *oauth =
+#ifdef OAUTH_SUPPORT
+    "oauth";
+#else
+    "";
+#endif
+
 struct proc {
     char *p_name;
     char **p_field;
@@ -106,14 +114,16 @@ static struct proc procs [] = {
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },
-     { "etcdir",           &mhetcdir },
-     { "libdir",           &mhlibexecdir },
      { "libexecdir",       &mhlibexecdir },
+     { "libdir",           &mhlibexecdir },
+     { "etcdir",           &mhetcdir },
+     { "docdir",           &mhdocdir },
      { "localmbox",       &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
      { "spoollocking",     &spoollocking },
      { "iconv",                   &iconv },
+     { "oauth",                   &oauth },
      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },
@@ -135,7 +145,7 @@ main(int argc, char **argv)
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -204,7 +214,7 @@ main(int argc, char **argv)
        if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
        /* In case spoollocking was set in mts.conf. */
-       mts_init(invo_name);
+       mts_init();
 
        /* Also set localmbox here */
        if (! localmbox_primed) {
@@ -225,11 +235,11 @@ main(int argc, char **argv)
            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(invo_name);
+               mts_init();
             }
 
            value = context_find (comps[i]);