X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1e0b1d40a6285c532b722f4584fa7ddde220deff..872ef4dde72a88ceb1358849a462f791135b842d:/config/config.c

diff --git a/config/config.c b/config/config.c
index 5c0591ca..fa3df3bd 100644
--- a/config/config.c
+++ b/config/config.c
@@ -1,6 +1,4 @@
-
-/*
- * config.c -- master nmh configuration file
+/* config.c -- master nmh configuration file
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -8,11 +6,12 @@
  */
 
 #include <h/mh.h>
+#include "sbr/m_maildir.h"
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
-#define nmhetcdir(file) NMHETCDIR#file
 #define nmhlibexecdir(file) NMHLIBEXECDIR#file
+#define nmhetcdir(file) NMHETCDIR#file
 
 
 /*
@@ -57,28 +56,28 @@ etcpath (char *file)
 		}
 	    }
 
-	    snprintf (epath, sizeof(epath), "%s/%s", pp, cp ? cp : "");
+	    snprintf (epath, sizeof(epath), "%s/%s", pp, FENDNULL(cp));
 	    if (cp)
 		*--cp = '/';
 
 	    if (access (epath, R_OK) != NOTOK)
-		return epath;	/* else fall */
-try_it:
+		return epath;
 
+            /* FALLTHRU */
+try_it:
 	default: 
 	    /* Check nmh Mail directory */
 	    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);
 	    }
+            free (cp);
     }
 
     /* Check nmh `etc' directory */
     snprintf (epath, sizeof(epath), nmhetcdir(/%s), file);
-    return (access (epath, R_OK) != NOTOK ? epath : file);
+    return access(epath, R_OK) != NOTOK ? epath : file;
 }
 
 
@@ -105,6 +104,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 +146,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 +245,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 +295,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
  */
@@ -342,4 +331,3 @@ char *foldprot = "700";
  */
 
 char *msgprot = "600";
-