X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fcontext_read.c;h=1a584e4cb98e68e3ac46f61e2e3fc62fc349da2b;hb=30fd2ad6d3eff3749b2ae99ec90d2215bf1b1aca;hp=e6cdfff03f275abe1f2810fddf4b30ba5b92ccc2;hpb=5afa7072e3fe7fc42287e2149e1c23b363700795;p=mmh

diff --git a/sbr/context_read.c b/sbr/context_read.c
index e6cdfff..1a584e4 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -28,8 +28,6 @@
 #include <errno.h>				/* system call errors */
 #include <pwd.h>				/* structure for getpwuid() results */
 
-extern	int	errno;				/* system call error number */
-
 void
 context_read (void)
 {
@@ -41,6 +39,13 @@ context_read (void)
     register	FILE		*ib;		/* profile and context file pointer */
 
     /*
+     *  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,
      *	the home directory field in the password file if that's not found.
      */
@@ -108,7 +113,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 +127,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 = fopen (ctxpath, "r"))) {
+    if ((ib = lkfopen (ctxpath, "r"))) {
 	readconfig ((struct node **) 0, ib, cp, 1);
-	fclose (ib);
+	lkfclose (ib, ctxpath);
     }
 
     return;