test/common.sh.in: Clarify it's the first failure by a *named* test.

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index e1c4e5b80676fc244ec5eb50e0084bd211522229..49d5c8a45a7fb3362cb0f876a3443fdc088c1837 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,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "../sbr/m_maildir.h"
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
@@ -58,12 +57,13 @@ 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 */
+               return epath;
+               /* FALLTHRU */
 try_it:
 
        default: 
@@ -72,9 +72,8 @@ try_it:
                /* 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";
-