From 68af8da96bea87a5541988870130b6209ce396f6 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Thu, 28 Jun 2012 20:08:16 +0200 Subject: [PATCH] Removed context_foil(). We don't need it anymore. To not read the profile and context, don't call context_read(). Anyway, all mmh tools should read the context. slocal, which is not truly part of mmh, does not. --- h/prototypes.h | 1 - sbr/Makefile.in | 2 +- sbr/context_foil.c | 67 ---------------------------------------------------- sbr/context_read.c | 4 ++-- 4 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 sbr/context_foil.c diff --git a/h/prototypes.h b/h/prototypes.h index 20820b5..a9e081d 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -32,7 +32,6 @@ int is_native_charset(char *); char *concat(char *, ...); int context_del(char *); char *context_find(char *); -int context_foil(char *); void context_read(void); void context_replace(char *, char *); void context_save(void); diff --git a/sbr/Makefile.in b/sbr/Makefile.in index ca49c46..f7cd8d3 100644 --- a/sbr/Makefile.in +++ b/sbr/Makefile.in @@ -45,7 +45,7 @@ SIGNAL_H = @SIGNAL_H@ # source for library functions SRCS = addrsbr.c ambigsw.c brkstring.c \ charset.c concat.c context_del.c \ - context_find.c context_foil.c context_read.c \ + context_find.c context_read.c \ context_replace.c context_save.c \ cpydata.c cpydgst.c crawl_folders.c \ discard.c done.c dtime.c dtimep.c \ diff --git a/sbr/context_foil.c b/sbr/context_foil.c deleted file mode 100644 index 5a38030..0000000 --- a/sbr/context_foil.c +++ /dev/null @@ -1,67 +0,0 @@ -/* -** 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. -*/ - -#include -#include - -/* -** Foil search of users .mh_profile -** If error, return -1, else return 0 -*/ -int -context_foil(char *path) -{ - 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/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) { - 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; - - if (mypath == NULL && (mypath = getenv("HOME")) != NULL) - if (!(mypath = strdup(mypath))) { - advise(NULL, "strdup failed"); - return -1; - } - } - - return 0; -} diff --git a/sbr/context_read.c b/sbr/context_read.c index 600efab..abf666c 100644 --- a/sbr/context_read.c +++ b/sbr/context_read.c @@ -154,8 +154,8 @@ context_read(void) } /* - ** context is NULL if context_foil() was called to disable use - ** of context. We also support users setting explicitly setting + ** context is NULL if the use of the context was diabled. + ** We also support users setting explicitly setting ** MMHC to /dev/null. (If this wasn't special-cased then the ** locking would be liable to fail.) */ -- 1.7.10.4