showfile.c: Move interface to own file.

[nmh] / sbr / context_foil.c

diff --git a/sbr/context_foil.c b/sbr/context_foil.c
index 9b3f7eb136bff71e38687cf26ece1067709e9fb8..f8ab95190b58c28eab59b5fa1af774e0f1c64f6d 100644 (file)
--- a/sbr/context_foil.c
+++ b/sbr/context_foil.c
@@ -1,15 +1,13 @@
-
-/*
- * context_foil.c -- foil search of profile and context
- *
- * $Id$
+/* context_foil.c -- foil search of profile and context

  *
  * 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.
  */
 
  *
  * 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/mh.h"
+#include "error.h"
+#include "h/utils.h"

 
 /*
  * Foil search of users .mh_profile
 
 /*
  * Foil search of users .mh_profile


@@ -19,26 +17,40 @@
 int
 context_foil (char *path)
 {
 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/mark.c prints 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 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"))) {
        if (!(np->n_name = strdup ("Path"))) {

-           advise (NULL, "strdup failed");
+           inform("strdup failed");

            return -1;
        }
        if (!(np->n_field = strdup (path))) {
            return -1;
        }
        if (!(np->n_field = strdup (path))) {

-           advise (NULL, "strdup failed");
+           inform("strdup failed");

            return -1;
        }
        np->n_context = 0;
            return -1;
        }
        np->n_context = 0;


@@ -46,11 +58,10 @@ context_foil (char *path)
 
        if (mypath == NULL && (mypath = getenv ("HOME")) != NULL)
            if (!(mypath = strdup (mypath))) {
 
        if (mypath == NULL && (mypath = getenv ("HOME")) != NULL)
            if (!(mypath = strdup (mypath))) {

-               advise (NULL, "strdup failed");
+               inform("strdup failed");

                return -1;
            }
     }
 
     return 0;
 }
                return -1;
            }
     }
 
     return 0;
 }

-