new.c: Order two return statements to match comment.

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 7d9f26338c093eba1e3d7fd613397e40a0f29719..fa3df3bd8068d99ad46772bac8c1a76fb701ee72 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -6,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
 
 
 /*
@@ -56,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) {
@@ -77,7 +77,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;
 }