Simplified m_strn() per Ralph's suggestions.

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 919c1eecf31ff2e5df28261a576d5a53b8a63ce2..c44f1396fcac9fd63b8865f57e6a1449672de062 100644 (file)
--- 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,13 @@
  */
 
 #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
+#define nmhdocdir(file) NMHDOCDIR#file
 
 
 /*
@@ -57,23 +57,23 @@ 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 */
@@ -105,6 +105,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 +147,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
@@ -328,4 +332,3 @@ char *foldprot = "700";
  */
 
 char *msgprot = "600";
-