readline(3) wrapper: Move free(3) of line to where it's reachable.

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 020d610d4d38fc609b24b7c5467283bf0983fb95..5b08db28b7fb6f1934bb1193b98cc22dc03a7a6b 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
  *
  * 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,12 +6,12 @@
  */
 
 #include <h/mh.h>
  */
 
 #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
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
 #define nmhlibexecdir(file) NMHLIBEXECDIR#file
 #define nmhetcdir(file) NMHETCDIR#file

-#define nmhdocdir(file) NMHDOCDIR#file

 
 
 /*
 
 
 /*


@@ -58,14 +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)
            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) {
        default: 
            /* Check nmh Mail directory */
            if (access ((cp = m_mailpath (file)), R_OK) != NOTOK) {


@@ -332,4 +331,3 @@ char *foldprot = "700";
  */
 
 char *msgprot = "600";
  */
 
 char *msgprot = "600";

-