X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9e43ae1d70f7da5d175425092395f9beb2d625d3..4c8279307f5959223cdfef84ef167e10f0ea4f23:/sbr/context_read.c?ds=sidebyside

diff --git a/sbr/context_read.c b/sbr/context_read.c
index c3fe5995..8f63fedf 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -1,8 +1,6 @@
 /*
  * 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.
@@ -25,11 +23,8 @@
  */
 
 #include <h/mh.h>				/* mh internals */
-#include <errno.h>				/* system call errors */
 #include <pwd.h>				/* structure for getpwuid() results */
 
-extern	int	errno;				/* system call error number */
-
 void
 context_read (void)
 {
@@ -39,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 */
+    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,
@@ -108,7 +111,7 @@ context_read (void)
 	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)
@@ -122,11 +125,20 @@ context_read (void)
     if ((cp = getenv ("MHCONTEXT")) == (char *)0 || *cp == '\0')
 	cp = context;
 
+    /* context is NULL if context_foil() was called to disable use of context
+     * We also support users setting explicitly setting MHCONTEXT to /dev/null.
+     * (if this wasn't specialcased then the locking would be liable to fail)
+     */
+    if (!cp || (strcmp(cp,"/dev/null") == 0)) {
+	ctxpath = NULL;
+	return;
+    }
+    
     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);
-	lkfclose (ib, ctxpath);
+	lkfclosedata (ib, ctxpath);
     }
 
     return;