X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/cdce53212b7310f834773ed65fce9a72b8c089cc..cfb444d37fc236a9fdac369cbcf2a5bfc37a33f5:/config/config.c

diff --git a/config/config.c b/config/config.c
index e1c4e5b8..c44f1396 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,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "../sbr/m_maildir.h"
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
@@ -58,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 */
@@ -333,4 +332,3 @@ char *foldprot = "700";
  */
 
 char *msgprot = "600";
-