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

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 5c0591ca42fc5ec1b7071c7d147f8028494cb4db..e1c4e5b80676fc244ec5eb50e0084bd211522229 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -11,8 +11,9 @@
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
-#define nmhetcdir(file) NMHETCDIR#file
 #define nmhlibexecdir(file) NMHLIBEXECDIR#file
+#define nmhetcdir(file) NMHETCDIR#file
+#define nmhdocdir(file) NMHDOCDIR#file
 
 
 /*
@@ -105,6 +106,9 @@ char *mh_profile = ".mh_profile";
 /* name of credentials file, defaults to .netrc in either Path or $HOME. */
 char *credentials_file;
 
+/* if set to 1, do not check permissions on credentials file */
+int credentials_no_perm_check = 0;
+
 /* name of current message "sequence" */
 char *current = "cur";
 
@@ -144,8 +148,9 @@ char *nmhaccessftp = "nmh-access-ftp";
 char *nmhaccessurl = "nmh-access-url";
 
 char *mhbindir = NMHBINDIR;
-char *mhetcdir = NMHETCDIR;
 char *mhlibexecdir = NMHLIBEXECDIR;
+char *mhetcdir = NMHETCDIR;
+char *mhdocdir = NMHDOCDIR;
 
 /* 
  * nmh not-so constants
@@ -242,13 +247,6 @@ char *moreproc = NULL;
 
 char *mhlproc = nmhlibexecdir (/mhl);
 
-/* 
- * This is the super handy BBoard reading program, which is
- * really just the nmh shell program.
- */
-
-char *mshproc = nmhbindir (/msh);
-
 /* 
  * This program is called to pack a folder.  
  */
@@ -299,13 +297,6 @@ char *showmimeproc = nmhbindir (/mhshow);
 
 char *showproc = nmhlibexecdir (/mhl);
 
-/* 
- * This program is called by vmh as the back-end to the window management
- * protocol
- */
-
-char *vmhproc = nmhbindir (/msh);
-
 /* 
  * This program is called after comp, et. al., have built a draft
  */