projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use context/ctxpath==NULL to indicate that no context file should be read,
[mmh]
/
sbr
/
context_read.c
diff --git
a/sbr/context_read.c
b/sbr/context_read.c
index
d2524c7
..
fcc12f9
100644
(file)
--- a/
sbr/context_read.c
+++ b/
sbr/context_read.c
@@
-28,8
+28,6
@@
#include <errno.h> /* system call errors */
#include <pwd.h> /* structure for getpwuid() results */
#include <errno.h> /* system call errors */
#include <pwd.h> /* structure for getpwuid() results */
-extern int errno; /* system call error number */
-
void
context_read (void)
{
void
context_read (void)
{
@@
-122,11
+120,17
@@
context_read (void)
if ((cp = getenv ("MHCONTEXT")) == (char *)0 || *cp == '\0')
cp = context;
if ((cp = getenv ("MHCONTEXT")) == (char *)0 || *cp == '\0')
cp = context;
+ /* context is NULL if context_foil() was called to disable use of context */
+ if (!cp) {
+ ctxpath = NULL;
+ return;
+ }
+
ctxpath = getcpy (m_maildir (cp));
if ((ib = lkfopen (ctxpath, "r"))) {
readconfig ((struct node **) 0, ib, cp, 1);
ctxpath = getcpy (m_maildir (cp));
if ((ib = lkfopen (ctxpath, "r"))) {
readconfig ((struct node **) 0, ib, cp, 1);
- lkfclose (ib);
+ lkfclose (ib, ctxpath);
}
return;
}
return;