pending-release-notes: add mhshow's "-prefer", and mh-format's %(kibi/kilo)

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 02265c0a6befb8457041cec19a3f4f7d93162cef..5c0591ca42fc5ec1b7071c7d147f8028494cb4db 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -8,12 +8,11 @@
  */
 
 #include <h/mh.h>
-#include <stdio.h>
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
 #define nmhetcdir(file) NMHETCDIR#file
-#define nmhlibdir(file) NMHLIBDIR#file
+#define nmhlibexecdir(file) NMHLIBEXECDIR#file
 
 
 /*
@@ -68,8 +67,13 @@ try_it:
 
        default: 
            /* Check nmh Mail directory */
-           if (access ((cp = m_mailpath (file)), R_OK) != NOTOK)
+           if (access ((cp = m_mailpath (file)), R_OK) != NOTOK) {
+               /* Will leak because caller doesn't know cp was
+                  dynamically allocated. */
                return cp;
+           } else {
+               free (cp);
+           }
     }
 
     /* Check nmh `etc' directory */
@@ -98,6 +102,9 @@ char *mh_defaults = nmhetcdir (/mh.profile);
 /* default name of user profile */
 char *mh_profile = ".mh_profile";
 
+/* name of credentials file, defaults to .netrc in either Path or $HOME. */
+char *credentials_file;
+
 /* name of current message "sequence" */
 char *current = "cur";
 
@@ -133,8 +140,12 @@ char *nmhprivcache = "nmh-private-cache";
 /* profile entry for external ftp access command */
 char *nmhaccessftp = "nmh-access-ftp";
 
-char *mhlibdir = NMHLIBDIR;
+/* profile entry for external url access command */
+char *nmhaccessurl = "nmh-access-url";
+
+char *mhbindir = NMHBINDIR;
 char *mhetcdir = NMHETCDIR;
+char *mhlibexecdir = NMHLIBEXECDIR;
 
 /* 
  * nmh not-so constants
@@ -146,15 +157,11 @@ char *mhetcdir = NMHETCDIR;
 char *context = "context";
 
 /*
- * Default name of file for public sequences.  If NULL,
- * then nmh will use private sequences by default, unless the
- * user defines a value using the "mh-sequences" profile entry.
+ * Default name of file for public sequences.  If "\0" (an empty
+ * "mh-sequences" profile entry), then nmh will use private sequences by
+ * default.
  */
-#ifdef NOPUBLICSEQ
-char *mh_seq = NULL;
-#else
 char *mh_seq = ".mh_sequences";
-#endif
 
 /* 
  * nmh globals
@@ -201,13 +208,6 @@ char *formatproc = NULL;
 
 char *incproc = nmhbindir (/inc);
 
-/*
- * When a user runs an nmh program for the first time, this program
- * is called to create his nmh profile, and mail directory.
- */
-
-char *installproc = nmhlibdir (/install-mh);
-
 /*
  * This is the default program invoked by a "list" response
  * at the "What now?" prompt.  It is also used by the draft
@@ -240,7 +240,7 @@ char *moreproc = NULL;
  * for "Bcc:" recipients.
  */
 
-char *mhlproc = nmhlibdir (/mhl);
+char *mhlproc = nmhlibexecdir (/mhl);
 
 /* 
  * This is the super handy BBoard reading program, which is
@@ -260,14 +260,14 @@ char *packproc = nmhbindir (/packf);
  * deliver mail to users.  This is the interface to the MTS.
  */
 
-char *postproc = nmhlibdir (/post);
+char *postproc = nmhlibexecdir (/post);
 
 /*
  * This is program is called by slocal to handle
  * the action `folder' or `+'.
  */
 
-char *rcvstoreproc = nmhlibdir (/rcvstore);
+char *rcvstoreproc = nmhlibexecdir (/rcvstore);
 
 /* 
  * This program is called to remove a message by rmm or refile -nolink.
@@ -297,7 +297,7 @@ char *showmimeproc = nmhbindir (/mhshow);
  * that such message not be filtered in any way.
  */
 
-char *showproc = nmhlibdir (/mhl);
+char *showproc = nmhlibexecdir (/mhl);
 
 /* 
  * This program is called by vmh as the back-end to the window management