From 0e9f377b34afad3fe1a08353cff91d93e909f826 Mon Sep 17 00:00:00 2001 From: "Rob Swindell (on Debian Linux)" <rob@synchro.net> Date: Fri, 25 Apr 2025 12:37:27 -0700 Subject: [PATCH] Support legacy scripts (e.g. webInit.js) thtat just load('modopts.js') without passing any parameters (just returns null) Throw an exception in get_mod_options() if passed a falsey modname. --- exec/load/modopts.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exec/load/modopts.js b/exec/load/modopts.js index 4167593d5b..3adf2bbcb3 100644 --- a/exec/load/modopts.js +++ b/exec/load/modopts.js @@ -40,6 +40,8 @@ "use strict"; function get_mod_options(modname, optname, default_optval) { + if(!modname) + throw new Error("No module name specified"); var ini_file = new File(system.ctrl_dir + "modopts/" + modname.replace(":", "-") + ".ini"); if(ini_file.open("r")) { var obj = ini_file.iniGetObject(/* lowercase */false, /* blanks: */true); @@ -84,4 +86,5 @@ function get_mod_options(modname, optname, default_optval) return val; } -get_mod_options(argv[0], argv[1], argv[2]); +if(argv.length) + get_mod_options.apply(null, argv); -- GitLab