X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fconfigmanager.lua;h=e7677df67e63ff2a4a48b2362cfecf3b14fc02c6;hb=562c5a60021ff900f7bdd3f9255a2c0cfda7cf91;hp=a7c7c4be59d1f0dcd0b75abce87e970619d50b26;hpb=b758596b055327e0708c763a8a2b31616bc2ee04;p=prosody.git diff --git a/core/configmanager.lua b/core/configmanager.lua index a7c7c4be..e7677df6 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. @@ -68,7 +68,7 @@ function load(filename, format) if parsers[format] and parsers[format].load then local f, err = io.open(filename); - if f then + if f then local ok, err = parsers[format].load(f:read("*a"), filename); f:close(); if ok then @@ -95,6 +95,15 @@ function addparser(format, parser) end end +-- _M needed to avoid name clash with local 'parsers' +function _M.parsers() + local p = {}; + for format in pairs(parsers) do + table.insert(p, format); + end + return p; +end + -- Built-in Lua parser do local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;