X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fcontext_foil.c;h=7eccd79fd755136528c193301459cfd590c38fad;hp=9b3f7eb136bff71e38687cf26ece1067709e9fb8;hb=0aef47ae5c03e1d9e3f225efe5ae362e7cf5ee35;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68

diff --git a/sbr/context_foil.c b/sbr/context_foil.c
index 9b3f7eb..7eccd79 100644
--- a/sbr/context_foil.c
+++ b/sbr/context_foil.c
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /*
  * Foil search of users .mh_profile
@@ -21,16 +22,31 @@ context_foil (char *path)
 {
     register struct node *np;
 
-    defpath = context = "/dev/null";
+    /* In fact, nobody examines defpath in code paths where
+     * it's been set by us -- the uses in the source tree are:
+     *  1 sbr/context_read.c uses it only after setting it itself
+     *  2 uip/install_mh.c uses it only after setting it itself
+     *  3 uip/mshcmds.c and uip/mark.c print it if given the -debug switch
+     * A worthwhile piece of code cleanup would be to make 1 and
+     * 2 use a local variable and just delete 3.
+     *
+     * Similarly, context and ctxpath are not really used
+     * outside the context_* routines. It might be worth combining
+     * them into one file so the variables can be made static.
+     */
+
+    /* We set context to NULL to indicate that no context file
+     * is to be read. (Using /dev/null doesn't work because we
+     * would try to lock it, which causes timeouts with some
+     * locking methods.)
+     */
+    defpath = context = NULL;
 
     /*
      * If path is given, create a minimal profile/context list
      */
     if (path) {
-	if (!(m_defs = (struct node *) malloc (sizeof(*np)))) {
-	    advise (NULL, "unable to allocate profile storage");
-	    return -1;
-	}
+	m_defs = (struct node *) mh_xmalloc (sizeof(*np));
 
 	np = m_defs;
 	if (!(np->n_name = strdup ("Path"))) {