X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fcontext_foil.c;h=94f687a8d74d50ad30f31f01e351dfa350e9bdd6;hp=7eccd79fd755136528c193301459cfd590c38fad;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2 diff --git a/sbr/context_foil.c b/sbr/context_foil.c index 7eccd79..94f687a 100644 --- a/sbr/context_foil.c +++ b/sbr/context_foil.c @@ -1,9 +1,6 @@ - /* * 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. @@ -20,53 +17,52 @@ int context_foil (char *path) { - register struct node *np; + register 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. - */ + /* 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. + */ - /* 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; + /* 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) { - m_defs = (struct node *) mh_xmalloc (sizeof(*np)); + /* + * If path is given, create a minimal profile/context list + */ + if (path) { + m_defs = (struct node *) mh_xmalloc (sizeof(*np)); - 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; + 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 (mypath == NULL && (mypath = getenv ("HOME")) != NULL) - if (!(mypath = strdup (mypath))) { - advise (NULL, "strdup failed"); - return -1; - } - } + if (mypath == NULL && (mypath = getenv ("HOME")) != NULL) + if (!(mypath = strdup (mypath))) { + advise (NULL, "strdup failed"); + return -1; + } + } - return 0; + return 0; } -