X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lua%2Fmadmutt.cpkg;h=89ff6f2153b7e86b6558d01d51c6cc34d187af5e;hp=9d1ffd7f4299372949a468d96909918b6d955e31;hb=558b0bd9de90a9dc28f409d8f46679bf48c72ded;hpb=cc707c1e986b60f2c1c1932d0789038d465a7a59 diff --git a/lib-lua/madmutt.cpkg b/lib-lua/madmutt.cpkg index 9d1ffd7..89ff6f2 100644 --- a/lib-lua/madmutt.cpkg +++ b/lib-lua/madmutt.cpkg @@ -31,6 +31,18 @@ static const char *madmutt_init_shell(void) return pw ? pw->pw_shell : (getenv("SHELL") ?: "/bin/sh"); } +static const char *madmutt_init_username(void) +{ + struct passwd *pw = getpwuid(getuid()); + return pw ? pw->pw_name : (getenv("USER") ?: "john_doe"); +} + +static const char *madmutt_init_homedir(void) +{ + struct passwd *pw = getpwuid(getuid()); + return pw ? pw->pw_dir : (getenv("HOME") ?: "/"); +} + static const char *madmutt_pwd(void) { char path[_POSIX_PATH_MAX]; @@ -77,7 +89,7 @@ static const char *luaM_path_post(const char *val) # define HCACHE_BACKEND "unknown" #endif -@package madmutt { +@package MCore { const string_t version = VERSION; const string_t sysconfdir = SYSCONFDIR; const string_t bindir = BINDIR; @@ -86,14 +98,23 @@ static const char *luaM_path_post(const char *val) path_t dotlock = BINDIR "/mutt_dotlock"; path_t editor = getenv("VISUAL") ?: getenv("EDITOR") ?: "vi"; - path_t sendmail = SENDMAIL " -eom -oi"; path_t shell = madmutt_init_shell(); + path_t username = madmutt_init_username(); + path_t homedir = madmutt_init_homedir(); + path_t tmpdir = getenv("TMPDIR") ?: "/tmp"; quadopt_t quit = M_YES; bool beep = 1; bool beep_new = 0; const string_t pwd(void) = madmutt_pwd(); -} ml_core; +} MCore; + +@package MTransport { + path_t sendmail = SENDMAIL " -eom -oi"; + + string_t dsn_notify = NULL; + string_t dsn_return = NULL; +} MTransport; /* vim:set ft=c: */