X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/042f5bed7ff3e5b34ff3166951a7b98bf6bbf105..9291a5f82480f2458e04cb9ea7e6749bc952b308:/config/config.c

diff --git a/config/config.c b/config/config.c
index 633293e2..55d862e7 100644
--- a/config/config.c
+++ b/config/config.c
@@ -5,13 +5,14 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/context_read.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
 
 
 /*
@@ -23,6 +24,7 @@
  * 3) Next, check in nmh Mail directory.
  * 4) Next, check in nmh `etc' directory.
  *
+ * Does not return NULL.
  */
 
 char *
@@ -62,9 +64,9 @@ etcpath (char *file)
 
 	    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) {
@@ -77,7 +79,7 @@ try_it:
 
     /* 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;
 }