X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..f22cf2b92424abe55f1322142d08516be452d68b:/sbr/context_read.c?ds=inline diff --git a/sbr/context_read.c b/sbr/context_read.c index cf52ebbb..8350b98d 100644 --- a/sbr/context_read.c +++ b/sbr/context_read.c @@ -22,6 +22,9 @@ */ #include /* mh internals */ +#include "lock_file.h" +#include "m_maildir.h" +#include "makedir.h" #include /* structure for getpwuid() results */ void @@ -36,7 +39,7 @@ context_read (void) int failed_to_lock = 0; /* - * If this routine _is_ called again (despite the wanings in the + * If this routine _is_ called again (despite the warnings in the * comments above), return immediately. */ if ( m_defs != 0 ) @@ -50,8 +53,7 @@ context_read (void) if ((mypath = getenv("HOME")) == NULL) { if ((pw = getpwuid(getuid())) == NULL || *pw->pw_dir == '\0') adios(NULL, "cannot determine your home directory"); - else - mypath = pw->pw_dir; + mypath = pw->pw_dir; } /* @@ -128,7 +130,7 @@ context_read (void) /* context is NULL if context_foil() was called to disable use of context * We also support users setting explicitly setting MHCONTEXT to /dev/null. - * (if this wasn't specialcased then the locking would be liable to fail) + * (if this wasn't special-cased then the locking would be liable to fail) */ if (!cp || (strcmp(cp,"/dev/null") == 0)) { ctxpath = NULL; @@ -141,6 +143,4 @@ context_read (void) readconfig ((struct node **) 0, ib, cp, 1); lkfclosedata (ib, ctxpath); } - - return; }