Rearranged whitespace (and comments) in all the code!

[mmh] / sbr / context_foil.c

diff --git a/sbr/context_foil.c b/sbr/context_foil.c
index 208c45e..94f687a 100644 (file)
--- a/sbr/context_foil.c
+++ b/sbr/context_foil.c
@@ -1,11 +1,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
@@ -15,38 +17,52 @@
 int
 context_foil (char *path)
 {
-    register struct node *np;
+       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/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.
+        */
 
-    /*
-     * 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;
-       }
+       /* 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;
 
-       np = m_defs;
-       if (!(np->n_name = strdup ("Path"))) {
-           advise (NULL, "strdup failed");
-           return -1;
-       }
-       if (!(np->n_field = strdup (path))) {
-           advise (NULL, "strdup failed");
-           return -1;
-       }
-       np->n_context = 0;
-       np->n_next = NULL;
+       /*
+        * If path is given, create a minimal profile/context list
+        */
+       if (path) {
+               m_defs = (struct node *) mh_xmalloc (sizeof(*np));
 
-       if (mypath == NULL && (mypath = getenv ("HOME")) != NULL)
-           if (!(mypath = strdup (mypath))) {
-               advise (NULL, "strdup failed");
-               return -1;
-           }
-    }
+               np = m_defs;
+               if (!(np->n_name = strdup ("Path"))) {
+                       advise (NULL, "strdup failed");
+                       return -1;
+               }
+               if (!(np->n_field = strdup (path))) {
+                       advise (NULL, "strdup failed");
+                       return -1;
+               }
+               np->n_context = 0;
+               np->n_next = NULL;
 
-    return 0;
-}
+               if (mypath == NULL && (mypath = getenv ("HOME")) != NULL)
+                       if (!(mypath = strdup (mypath))) {
+                               advise (NULL, "strdup failed");
+                               return -1;
+                       }
+       }
 
+       return 0;
+}