Make buffy a lua package as well.

[apps/madmutt.git] / lib-lua / runtime.c

diff --git a/lib-lua/runtime.c b/lib-lua/runtime.c
index ac724af..6023ae6 100644 (file)
--- a/lib-lua/runtime.c
+++ b/lib-lua/runtime.c
@@ -22,6 +22,8 @@
 
 #include "../alias.h"
 #include "../mutt.h"
+#include "../charset.h"
+#include "../buffy.h"
 
 static lua_State *L;
 
@@ -39,6 +41,9 @@ void luaM_initialize(void)
         {"MCore",         luaopen_MCore},
         {"MTransport",    luaopen_MTransport},
         {"MAlias",        luaopen_MAlias},
+        {"MCharset",      luaopen_MCharset},
+        {"Mime",          luaopen_Mime},
+        {"Buffy",         luaopen_Buffy},
     };
 
     int i;
@@ -75,8 +80,21 @@ int luaM_wrap(void (*errfun)(const char *fmt, ...), int status)
 quadopt_t luaM_checkquadopt(lua_State *Ls, int narg)
 {
     const char *s;
-    int i = luaL_checkinteger(Ls, narg);
+    int i;
+
+    if (lua_type(Ls, narg) == LUA_TSTRING) {
+        s = lua_tostring(Ls, narg);
+        switch (mlua_which_token(s, -1)) {
+          case LTK_YES:     return M_YES;
+          case LTK_NO:      return M_NO;
+          case LTK_ASK_YES: return M_ASKYES;
+          case LTK_ASK_NO:  return M_ASKNO;
+          default:
+            break;
+        }
+    }
 
+    i = luaL_checkinteger(Ls, narg);
     if (i & ~3) {
         s = lua_pushfstring(Ls, "int in [0-3] expected, got %d", i);
         return luaL_argerror(Ls, narg, s);
@@ -84,6 +102,17 @@ quadopt_t luaM_checkquadopt(lua_State *Ls, int narg)
     return i;
 }
 
+void luaM_pushquadopt(lua_State *Ls, int val)
+{
+    switch (val) {
+      case M_YES:    return lua_pushstring(Ls, "yes");
+      case M_NO:     return lua_pushstring(Ls, "no");
+      case M_ASKYES: return lua_pushstring(Ls, "ask-yes");
+      case M_ASKNO:  return lua_pushstring(Ls, "ask-no");
+      default:       return lua_pushnil(Ls);
+    }
+}
+
 const char *luaM_checkrx(lua_State *Ls, int narg)
 {
     const char *s = luaL_checkstring(Ls, narg);
@@ -98,6 +127,14 @@ const char *luaM_checkrx(lua_State *Ls, int narg)
     return s;
 }
 
+rx_t *luaM_rxnew(const char *val)
+{
+    if (m_strisempty(val))
+        val = ".";
+
+    return rx_compile(val, mutt_which_case(val));
+}
+
 char *luaM_pathnew(const char *val)
 {
     char path[PATH_MAX];
@@ -105,11 +142,10 @@ char *luaM_pathnew(const char *val)
     return m_strdup(path);
 }
 
-rx_t *luaM_rxnew(const char *val)
-{
-    if (m_strisempty(val))
-        val = ".";
 
-    return rx_compile(val, mutt_which_case(val));
+void luaM_pushaddr(lua_State *Ls, address_t *addr)
+{
+    char s[HUGE_STRING] = "";
+    rfc822_addrcat(s, sizeof(s), addr, 0);
+    lua_pushstring(Ls, s);
 }
-