#include <lib-lib/lib-lib.h>
#include <sys/utsname.h>
+#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
#include <lib-sys/mutt_ssl.h>
-
#include <lib-ui/curses.h>
#include <lib-ui/history.h>
#include <lib-mx/mx.h>
+#include <lib-crypt/crypt.h>
#include "mutt.h"
#include "keymap.h"
#include "charset.h"
#include "thread.h"
-#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
const struct mapping_t *map,
char* errbuf, ssize_t errlen);
-static HASH *ConfigOptions = NULL;
+static hash_t *ConfigOptions = NULL;
/* for synonym warning reports: synonym found during parsing */
typedef struct syn_t {
static void rx_to_string (char* dst, ssize_t dstlen, struct option_t* option);
static void magic_to_string (char* dst, ssize_t dstlen, struct option_t* option);
static void addr_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void user_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void sys_to_string (char* dst, ssize_t dstlen, struct option_t* option);
/* protos for config type handles: convert to value from string */
static int bool_from_string (struct option_t* dst, const char* val,
char* errbuf, ssize_t errlen);
static int addr_from_string (struct option_t* dst, const char* val,
char* errbuf, ssize_t errlen);
-static int user_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
static struct {
unsigned short type;
* but must define it as DT_ is used for indexing */
{ DT_SYN, NULL, NULL },
{ DT_ADDR, addr_to_string, addr_from_string },
- { DT_USER, user_to_string, user_from_string },
- { DT_SYS, sys_to_string, NULL },
};
static void bool_to_string (char* dst, ssize_t dstlen,
NONULL (*((char**) option->data)));
}
-static void user_to_string (char* dst, ssize_t dstlen,
- struct option_t* option) {
- snprintf (dst, dstlen, "%s=\"%s\"", option->option,
- NONULL (((char*) option->data)));
-}
-
-static void sys_to_string (char* dst, ssize_t dstlen,
- struct option_t* option) {
- char *val = NULL, *t = NULL;
- int clean = 0;
-
- /* get some $madmutt_ values dynamically */
- if (m_strcmp("madmutt_pwd", option->option) == 0) {
- val = p_new(char, _POSIX_PATH_MAX);
- val = getcwd (val, _POSIX_PATH_MAX-1);
- clean = 1;
- } else if (m_strcmp("madmutt_folder_path", option->option) == 0 &&
- CurrentFolder && *CurrentFolder) {
- val = CurrentFolder;
- } else if (m_strcmp("madmutt_folder_name", option->option) == 0 &&
- CurrentFolder && *CurrentFolder) {
-
- ssize_t Maildirlength = m_strlen(Maildir);
-
- /*
- * if name starts with $folder, just strip it to keep hierarchy
- * $folder=imap://host, path=imap://host/inbox/b -> inbox/b
- */
- if (Maildirlength > 0 && m_strncmp(CurrentFolder, Maildir,
- Maildirlength) == 0 &&
- m_strlen(CurrentFolder) > Maildirlength) {
- val = CurrentFolder + Maildirlength;
- if (Maildir[Maildirlength]!='/')
- val += 1;
- /* if not $folder, just use everything after last / */
- } else if ((t = strrchr (CurrentFolder, '/')) != NULL)
- val = t+1;
- /* default: use as-is */
- else
- val = (char *) CurrentFolder;
-
- } else
- val = (char *) option->init;
-
- snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val));
- if (clean)
- p_delete(&val);
-}
-
static int path_from_string (struct option_t* dst, const char* val,
char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
char path[_POSIX_PATH_MAX];
return (1);
}
-static int user_from_string (struct option_t* dst, const char* val,
- char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
- /* if dst == NULL, we may get here in case the user did unset it,
- * see parse_set() where item is free()'d before coming here; so
- * just silently ignore it */
- if (!dst)
- return (1);
- if (m_strlen((char*) dst->data) == 0)
- dst->data = (unsigned long) m_strdup(val);
- else {
- char* s = (char*) dst->data;
- m_strreplace(&s, val);
- }
- if (m_strlen(dst->init) == 0)
- dst->init = m_strdup((char*) dst->data);
- return (1);
-}
-
static void quad_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
const char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
return (QuadOptions[n] >> b) & 0x3;
}
+int query_quadoption2(int opt, const char *prompt)
+{
+ int v = mlua_reggeti(opt);
+
+ switch (v) {
+ case M_YES:
+ case M_NO:
+ return (v);
+
+ default:
+ v = mutt_yesorno(prompt, (v == M_ASKYES));
+ CLEARLINE (LINES - 1);
+ return (v);
+ }
+}
+
int query_quadoption (int opt, const char *prompt)
{
int v = quadoption (opt);
ptr->init = m_strdup(buf);
}
-static struct option_t* add_option (const char* name, const char* init,
- short type, short dodup) {
- struct option_t* option = p_new(struct option_t, 1);
-
- option->option = m_strdup(name);
- option->type = type;
- if (init)
- option->init = dodup ? m_strdup(init) : (char*) init;
- return (option);
-}
-
-/* creates new option_t* of type DT_USER for $user_ var */
-static struct option_t* add_user_option (const char* name) {
- return (add_option (name, NULL, DT_USER, 1));
-}
-
-/* free()'s option_t* */
-static void del_option (void* p) {
- struct option_t *ptr = (struct option_t*) p;
- char* s = (char*) ptr->data;
- p_delete(&ptr->option);
- p_delete(&s);
- p_delete(&ptr->init);
- p_delete(&ptr);
-}
-
static int init_expand (char** dst, struct option_t* src) {
BUFFER token, in;
ssize_t len = 0;
option = newopt;
}
- /* see if we need to add $user_ var */
- if (!option && m_strncmp("user_", tmp->data, 5) == 0) {
- /* there's no option named like this yet so only add one
- * if the action isn't any of: reset, unset, query */
- if (!(reset || unset || query || *s->dptr != '=')) {
- option = add_user_option (tmp->data);
- hash_insert (ConfigOptions, option->option, option, 0);
- }
- }
-
if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
return (-1);
set_option (OPTRESORTINIT);
set_option (OPTREDRAWTREE);
return (0);
- }
- else if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
- snprintf (err->data, err->dsize, _("$%s is read-only"), option->option);
- r = -1;
- break;
} else {
CHECK_PAGER;
mutt_restore_default (NULL, option, 1);
DTYPE (option->type) == DT_MAGIC ||
DTYPE (option->type) == DT_NUM ||
DTYPE (option->type) == DT_SORT ||
- DTYPE (option->type) == DT_RX ||
- DTYPE (option->type) == DT_USER ||
- DTYPE (option->type) == DT_SYS) {
-
+ DTYPE (option->type) == DT_RX)
+ {
/* XXX maybe we need to get unset into handlers? */
if (DTYPE (option->type) == DT_STR ||
DTYPE (option->type) == DT_PATH ||
- DTYPE (option->type) == DT_ADDR ||
- DTYPE (option->type) == DT_USER ||
- DTYPE (option->type) == DT_SYS) {
+ DTYPE (option->type) == DT_ADDR)
+ {
if (unset) {
CHECK_PAGER;
- if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
- snprintf (err->data, err->dsize, _("$%s is read-only"),
- option->option);
- r = -1;
- break;
- } else if (DTYPE (option->type) == DT_ADDR)
+ if (DTYPE (option->type) == DT_ADDR)
address_list_wipe((address_t **) option->data);
- else if (DTYPE (option->type) == DT_USER)
- /* to unset $user_ means remove */
- hash_delete (ConfigOptions, option->option,
- option, del_option);
else
p_delete((void **)(void *)&option->data);
break;
break;
}
- /* the $madmutt_ variables are read-only */
- if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
- snprintf (err->data, err->dsize, _("$%s is read-only"),
- option->option);
+ CHECK_PAGER;
+ s->dptr++;
+ mutt_extract_token (tmp, s, 0);
+ if (!FuncTable[DTYPE (option->type)].opt_fromstr
+ (option, tmp->data, err->data, err->dsize))
r = -1;
- break;
- } else {
- CHECK_PAGER;
- s->dptr++;
- mutt_extract_token (tmp, s, 0);
- if (!FuncTable[DTYPE (option->type)].opt_fromstr
- (option, tmp->data, err->data, err->dsize))
- r = -1;
- }
}
else if (DTYPE (option->type) == DT_QUAD) {
return 0;
}
-#include "parse.h"
-#include "rcparser.h"
-
void mutt_init (int skip_sys_rc, string_list_t * commands)
{
struct passwd *pw;
err.data = error;
err.dsize = sizeof(error);
- /* use 3*sizeof(muttvars) instead of 2*sizeof()
- * to have some room for $user_ vars */
- ConfigOptions = hash_create (sizeof(MuttVars) * 3);
+ ConfigOptions = hash_new (sizeof(MuttVars) * 2, 0);
for (i = 0; MuttVars[i].option; i++) {
- if (DTYPE (MuttVars[i].type) != DT_SYS)
- hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
- else
- hash_insert (ConfigOptions, MuttVars[i].option,
- add_option (MuttVars[i].option, MuttVars[i].init,
- DT_SYS, 0), 0);
+ hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i]);
}
/*
mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx);
Realname = m_strdup(rnbuf);
- Shell = m_strdup(pw->pw_shell);
endpwent ();
}
else {
fputs (_("unable to determine username"), stderr);
exit (1);
}
- Shell = m_strdup((p = getenv ("SHELL")) ? p : "/bin/sh");
}
/* And about the host... */
Tempdir = m_strdup((p = getenv ("TMPDIR")) ? p : "/tmp");
- p = getenv ("VISUAL");
- if (!p) {
- p = getenv ("EDITOR");
- if (!p)
- p = "vi";
- }
- Editor = m_strdup(p);
-
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
From = rfc822_parse_adrlist (NULL, p);
charset_initialize();
+ mlua_initialize();
/* Set standard defaults */
hash_map (ConfigOptions, mutt_set_default, 0);
}
}
-#if 0
- {
- void *parser = rcparseAlloc(malloc);
- struct rcstate state;
- segment s1 = {" ", 1};
- segment s2 = {"toto", 4 };
- segment s3 = {"titi", 4 };
- segment s4 = {"\"", 1 };
-
- mutt_endwin(NULL);
-
- p_clear(&state, 1);
-
- rcparseTrace(stderr, "> ");
- rcparse(parser, RCTK_ALTERNATIVE_ORDER, s1, &state);
- rcparse(parser, RCTK_SPACE, s1, &state);
- rcparse(parser, RCTK_ATOM, s2, &state);
- rcparse(parser, RCTK_SPACE, s1, &state);
- rcparse(parser, RCTK_DQUOTE, s4, &state);
- rcparse(parser, RCTK_ATOM, s3, &state);
- rcparse(parser, RCTK_SPACE, s1, &state);
- rcparse(parser, RCTK_ATOM, s3, &state);
- rcparse(parser, RCTK_DQUOTE, s4, &state);
- rcparse(parser, RCTK_NL, s1, &state);
- rcparse(parser, 0, s1, &state);
-
- exit(0);
- }
-#endif
-
/* Read the user's initialization file. */
if (access (Muttrc, F_OK) != -1) {
if (!option (OPTNOCURSES))
exit (1);
}
+ /* LUA {{{ */
+ snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(Homedir));
+ if (access(buffer, F_OK) < 0)
+ snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(Homedir));
+ if (!access(buffer, F_OK)) {
+ need_pause = mlua_wrap(mutt_error, mlua_dofile(buffer));
+ }
+ /* }}} */
+
if (mutt_execute_commands (commands) != 0)
need_pause = 1;
projects / apps / madmutt.git / blobdiff