Have to check for missing type parameter in message/related part

[nmh] / sbr / context_read.c

diff --git a/sbr/context_read.c b/sbr/context_read.c
index 6a1eea1259cfbaa94ac75a41232ff8abb3387525..8f63fedfa83a0ad4ea58c3c81fd89bc43a2aa60a 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -1,8 +1,6 @@
 /*
  * context_read.c -- find and read profile and context files
  *
 /*
  * context_read.c -- find and read profile and context files
  *

- * $Id$
- *

  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.


@@ -25,7 +23,6 @@
  */
 
 #include <h/mh.h>                              /* mh internals */
  */
 
 #include <h/mh.h>                              /* mh internals */

-#include <errno.h>                             /* system call errors */

 #include <pwd.h>                               /* structure for getpwuid() results */
 
 void
 #include <pwd.h>                               /* structure for getpwuid() results */
 
 void


@@ -37,6 +34,14 @@ context_read (void)
     struct     stat            st;             /* stat() results */
     register   struct  passwd  *pw;            /* getpwuid() results */
     register   FILE            *ib;            /* profile and context file pointer */
     struct     stat            st;             /* stat() results */
     register   struct  passwd  *pw;            /* getpwuid() results */
     register   FILE            *ib;            /* profile and context file pointer */

+    int failed_to_lock = 0;
+
+    /*
+     *  If this routine _is_ called again (despite the wanings in the
+     *  comments above), return immediately.
+     */
+    if ( m_defs != 0 )
+        return;

 
     /*
      * Find user's home directory.  Try the HOME environment variable first,
 
     /*
      * Find user's home directory.  Try the HOME environment variable first,


@@ -106,7 +111,7 @@ context_read (void)
        free (cp);
 
        if (!makedir (nd))
        free (cp);
 
        if (!makedir (nd))

-           adios (NULL, "unable to create", nd);
+           adios (NULL, "unable to create %s", nd);

     }
 
     else if ((st.st_mode & S_IFDIR) == 0)
     }
 
     else if ((st.st_mode & S_IFDIR) == 0)


@@ -131,9 +136,9 @@ context_read (void)
     
     ctxpath = getcpy (m_maildir (cp));
 
     
     ctxpath = getcpy (m_maildir (cp));
 

-    if ((ib = lkfopen (ctxpath, "r"))) {
+    if ((ib = lkfopendata (ctxpath, "r", &failed_to_lock))) {

        readconfig ((struct node **) 0, ib, cp, 1);
        readconfig ((struct node **) 0, ib, cp, 1);

-       lkfclose (ib, ctxpath);
+       lkfclosedata (ib, ctxpath);

     }
 
     return;
     }
 
     return;