X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0a032eea07f6d77ac6ea4d5a39c9491c34358058..63621a81d16ab743de6b57d47578a9a2c670ad22:/config/config.c

diff --git a/config/config.c b/config/config.c
index d3d3a023..5b08db28 100644
--- a/config/config.c
+++ b/config/config.c
@@ -1,5 +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
@@ -7,12 +6,12 @@
  */
 
 #include <h/mh.h>
+#include "sbr/m_maildir.h"
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
 #define nmhlibexecdir(file) NMHLIBEXECDIR#file
 #define nmhetcdir(file) NMHETCDIR#file
-#define nmhdocdir(file) NMHDOCDIR#file
 
 
 /*
@@ -57,15 +56,15 @@ 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;
-		/* FALLTHRU */
-try_it:
 
+            /* FALLTHRU */
+try_it:
 	default: 
 	    /* Check nmh Mail directory */
 	    if (access ((cp = m_mailpath (file)), R_OK) != NOTOK) {