Replaced explicit list of files to be copied in test/common.sh.in

[nmh] / sbr / context_read.c

diff --git a/sbr/context_read.c b/sbr/context_read.c
index a655effc41bc20d54ac6cadebd9a1103c838df7f..8f63fedfa83a0ad4ea58c3c81fd89bc43a2aa60a 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -23,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


@@ -35,6 +34,7 @@ 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
 
     /*
      *  If this routine _is_ called again (despite the wanings in the


@@ -136,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;