X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..4ac978448:/sbr/context_foil.c?ds=sidebyside

diff --git a/sbr/context_foil.c b/sbr/context_foil.c
index 9b3f7eb1..e8407066 100644
--- a/sbr/context_foil.c
+++ b/sbr/context_foil.c
@@ -2,14 +2,13 @@
 /*
  * context_foil.c -- foil search of profile and context
  *
- * $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.
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /*
  * Foil search of users .mh_profile
@@ -19,20 +18,34 @@
 int
 context_foil (char *path)
 {
-    register struct node *np;
+    struct node *np;
+
+    /* 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.
+     */
 
-    defpath = context = "/dev/null";
+    /* 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;
-	}
-
-	np = m_defs;
+	NEW(np);
+	m_defs = np;
 	if (!(np->n_name = strdup ("Path"))) {
 	    advise (NULL, "strdup failed");
 	    return -1;