Added -nocontentid (and -contentid, for symmetry) switch to mhbuild. This allows...

[mmh] / sbr / context_read.c

diff --git a/sbr/context_read.c b/sbr/context_read.c
index d2524c7..32051c5 100644 (file)
--- 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.
      */
@@ -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 = lkfopen (ctxpath, "r"))) {
        readconfig ((struct node **) 0, ib, cp, 1);
-       lkfclose (ib);
+       lkfclose (ib, ctxpath);
     }
 
     return;