Lock e2lib.globals table and clean up variables

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index ffa73816a4e85ae3f1b5caa8d66ca3b6b0548d83..5ac1fba9dbac9108002790a308546e9882597c79 100644 (file)
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -61,19 +61,26 @@ local trace = require("trace")
 
 local global_config = false
 
-e2lib.globals = {
+e2lib.globals = strict.lock({
     logflags = {
         { "v1", true },    -- minimal
         { "v2", true },    -- verbose
         { "v3", false },   -- verbose-build
         { "v4", false }    -- tooldebug
     },
-    log_debug = false, -- debug log/warning level
-    -- variables initialized in init()
-    username = nil,
-    homedir = nil,
-    tmpdirs = {},
-    tmpfiles = {},
+    warn_category = {
+        WDEFAULT = false,
+        WDEPRECATED = false,
+        WOTHER = true,
+        WPOLICY = false,
+        WHINT = false,
+    },
+    log_debug = false,  -- debug log/warning level
+    osenv = {},         -- environment variable dictionary
+    tmpdir = false,     -- base temp dir, defaults to /tmp
+    tmpdirs = {},       -- vector of temp dirs created by e2
+    tmpfiles = {},      -- vector of temp files created by e2
+    lock = false,       -- lock object
     default_projects_server = "projects",
     default_project_version = "2",
     --- command line arguments that influence global settings are stored here
@@ -84,7 +91,6 @@ e2lib.globals = {
     extension_config = ".e2/extensions",
     e2config = ".e2/e2config",
     global_interface_version_file = ".e2/global-version",
-    lock = nil,
     logrotate = 5,   -- configurable via config.log.logrotate
     _version = "e2factory, the emlix embedded build system, version " ..
     buildconfig.VERSION,
@@ -101,9 +107,9 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.]],
-    debuglogfile = nil,
+    debuglogfile = false,
     debuglogfilebuffer = {},
-}
+})
 
 --- Get current working directory.
 -- @return Current working directory (string) or false on error.
@@ -367,7 +373,6 @@ function e2lib.init()
         { name = "E2_SSH", required = false },
     }
 
-    local osenv = {}
     for _, var in pairs(getenv) do
         var.val = os.getenv(var.name)
         if var.required and not var.val then
@@ -376,13 +381,9 @@ function e2lib.init()
         if var.default and not var.val then
             var.val = var.default
         end
-        osenv[var.name] = var.val
+        e2lib.globals.osenv[var.name] = var.val
     end
-    e2lib.globals.osenv = osenv
 
-    -- assign some frequently used environment variables
-    e2lib.globals.homedir = e2lib.globals.osenv["HOME"]
-    e2lib.globals.username = e2lib.globals.osenv["USER"]
     if e2lib.globals.osenv["E2TMPDIR"] then
         e2lib.globals.tmpdir = e2lib.globals.osenv["E2TMPDIR"]
     else
@@ -862,7 +863,7 @@ end
 -- @return bool
 -- @return error string on error
 function e2lib.read_global_config(e2_config_file)
-    local cf
+    local cf, home
     local rc, re
     if type(e2lib.globals.cmdline["e2-config"]) == "string" then
         cf = e2lib.globals.cmdline["e2-config"]
@@ -876,13 +877,14 @@ function e2lib.read_global_config(e2_config_file)
     elseif e2_config_file then
         cf_path = { e2_config_file }
     else
+        home = e2lib.globals.osenv["HOME"]
         cf_path = {
             -- this is ordered by priority
-            string.format("%s/.e2/e2.conf-%s.%s.%s", e2lib.globals.homedir,
+            string.format("%s/.e2/e2.conf-%s.%s.%s", home,
             buildconfig.MAJOR, buildconfig.MINOR, buildconfig.PATCHLEVEL),
-            string.format("%s/.e2/e2.conf-%s.%s", e2lib.globals.homedir, buildconfig.MAJOR,
+            string.format("%s/.e2/e2.conf-%s.%s", home, buildconfig.MAJOR,
             buildconfig.MINOR),
-            string.format("%s/.e2/e2.conf", e2lib.globals.homedir),
+            string.format("%s/.e2/e2.conf", home),
             string.format("%s/e2.conf-%s.%s.%s", buildconfig.SYSCONFDIR,
             buildconfig.MAJOR, buildconfig.MINOR, buildconfig.PATCHLEVEL),
             string.format("%s/e2.conf-%s.%s", buildconfig.SYSCONFDIR,
@@ -2155,7 +2157,7 @@ function e2lib.setup_cache()
         return false, e:append("invalid cache configuration: config.cache.path")
     end
 
-    local replace = { u=e2lib.globals.username }
+    local replace = { u = e2lib.globals.osenv["USER"] }
     local cache_path = e2lib.format_replace(config.cache.path, replace)
     local cache_url = string.format("file://%s", cache_path)
     local c, re = cache.new_cache("local cache", cache_url)

diff --git a/generic/e2option.lua b/generic/e2option.lua
index da9e4d1dd6e8f39227e4cc58347e21cb3c718677..1f1a7868b77dafae2c024342cf82a5d3135594fb 100644 (file)
--- a/generic/e2option.lua
+++ b/generic/e2option.lua
@@ -218,7 +218,7 @@ local function defaultoptions()
 end
 
 local function userdefaultoptions(opts)
-    local home = e2lib.globals.homedir
+    local home = e2lib.globals.osenv["HOME"]
     if not home then
         return true
     end

diff --git a/local/e2build.lua b/local/e2build.lua
index c12db3c43cc54768497b88af3888fe7e802996c2..b67fbd669cd2f031e7d8e4222469038a0558330d 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -209,7 +209,7 @@ function e2build.build_config(info, r)
 
     local tmpdir = string.format("%s/e2factory-%s.%s.%s-build/%s",
         e2lib.globals.tmpdir, buildconfig.MAJOR, buildconfig.MINOR,
-        buildconfig.PATCHLEVEL, e2lib.globals.username)
+        buildconfig.PATCHLEVEL, e2lib.globals.osenv["USER"])
     local builddir = "tmp/e2"
 
     bc.base = e2lib.join(tmpdir, info.project.name, r)